Index: services/core.service.php
===================================================================
--- services/core.service.php	(revision 6370)
+++ services/core.service.php	(working copy)
@@ -1,45 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-/*
- * File Author: Blake
- * File Creation Date: Oct 17, 2008
- * Purpose: Base Objects for all services and Core Services Objects.
- */
-
-
-
-class CoreService {
-	
-	function __construct($db = NULL){
-		# assign db
-		if (!$db) { global $db; }
-		$this->db = $db;
-	}
-	
-	function updateRecord($fields,$value) {
-	
-	}
-	
-	function insertRecord($data) {
-	
-	}
-	
-	function deleteRecord($where,$equals) {
-	
-	}
-	
-};
-
-
-
-
-?>
\ No newline at end of file
Index: services/projects.service.php
===================================================================
--- services/projects.service.php	(revision 6370)
+++ services/projects.service.php	(working copy)
@@ -1,7 +0,0 @@
-<?php
-
-class ProjectService extends CoreService {
-
-}
-
-?>
\ No newline at end of file
Index: scripts/messages.po
===================================================================
--- scripts/messages.po	(revision 6370)
+++ scripts/messages.po	(working copy)
@@ -1,16 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-11-16 16:36+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
Index: scripts/db/mysql_update-1.8.2k-2.0.0.sql
===================================================================
--- scripts/db/mysql_update-1.8.2k-2.0.0.sql	(revision 6370)
+++ scripts/db/mysql_update-1.8.2k-2.0.0.sql	(working copy)
@@ -1,28 +0,0 @@
--- # $Id: mysql_update-1.8.2k-2.0.0.sql,v 1.2 2007/11/27 12:10:08 liedekef Exp $
--- #
--- # Table update for phpESP
--- # Written by Franky Van Liedekerke
-
--- # Use this script to update the phpESP tables from version 1.8.2k to
--- # version 1.8.2l.
--- #
--- # To execute this script via the mysql CLI, run:
--- #   mysql -u root -p phpesp < mysql_update-1.8.2k-1.8.2l.sql
--- # If you used a database name other than "phpesp", use it in place
--- # of "phpesp" in the command line.
--- #
-
-
-CREATE TABLE conditions (
-        id              INT UNSIGNED NOT NULL AUTO_INCREMENT,
-        survey_id       INT UNSIGNED NOT NULL,
-        q1_id           INT UNSIGNED NOT NULL,
-        q2_id           INT UNSIGNED NOT NULL,
-        cond            INT UNSIGNED NOT NULL,
-        cond_value      TEXT,
-        PRIMARY KEY (id)
-);
-
--- # To be sure, I add these again
-ALTER TABLE respondent MODIFY COLUMN password CHAR(64) NOT NULL;
-ALTER TABLE designer   MODIFY COLUMN password CHAR(64) NOT NULL;
Index: scripts/db/mysql4.x_upgrade.sql
===================================================================
--- scripts/db/mysql4.x_upgrade.sql	(revision 6370)
+++ scripts/db/mysql4.x_upgrade.sql	(working copy)
@@ -1,4 +0,0 @@
-ALTER TABLE `respondent` CHANGE `password` `password` CHAR( 64 ) NOT NULL;
-ALTER TABLE `designer` CHANGE `password` `password` CHAR( 64 ) NOT NULL;
-ALTER TABLE `response` ADD COLUMN ip CHAR(64);
-ALTER TABLE `survey` ADD COLUMN auto_num enum('Y','N') DEFAULT 'Y' NOT NULL;
Index: scripts/db/mysql_create.sql
===================================================================
--- scripts/db/mysql_create.sql	(revision 6370)
+++ scripts/db/mysql_create.sql	(working copy)
@@ -1,38 +0,0 @@
--- # $Id: mysql_create.sql,v 1.1 2003/02/27 19:04:51 jimmerman Exp $
--- #
--- # Database and User creation phpESP
--- # Written by James Flemer
--- # <jflemer@alum.rpi.edu>
-
--- # Use this script to create the phpESP database and user. Please
--- # change the password below before running this script. This should
--- # be executed _before_ the mysql_populate.sql script. If you are
--- # upgrading an existing phpESP database, you should not use this
--- # script.
--- # 
--- # To execute this script via the mysql CLI, run:
--- #   mysql -u root -p < mysql_create.sql
--- #
-
--- # Create a database called 'phpesp'.
-CREATE DATABASE phpesp;
-
--- # Switch to the mysql database.
-USE mysql;
-
--- # Create a user called 'phpesp', with a password 'phpesp'. The
--- # 'localhost' limits this user to connecting to the database only via
--- # localhost. You may change the password by changing the
--- # PASSWORD('...') clause.
-INSERT INTO user (host, user, password) VALUES ( 'localhost',
-  'phpesp', PASSWORD('phpesp'));
-
--- # Grant the 'phpesp' user (from 'localhost') privileges to select,
--- # insert, update, and delete on the database 'phpesp'.
-INSERT INTO db (host, db, user, select_priv, insert_priv,
-  update_priv, delete_priv) VALUES ( 'localhost', 'phpesp',
-  'phpesp', 'Y', 'Y', 'Y', 'Y');
-
--- # Tell mysql to re-read the privileges tables so the previous two
--- # operations take effect.
-FLUSH PRIVILEGES;
Index: scripts/db/mysql_update-1.5-1.6.sql
===================================================================
--- scripts/db/mysql_update-1.5-1.6.sql	(revision 6370)
+++ scripts/db/mysql_update-1.5-1.6.sql	(working copy)
@@ -1,28 +0,0 @@
--- # $Id: mysql_update-1.5-1.6.sql,v 1.2 2007/07/09 12:58:21 liedekef Exp $
--- #
--- # Table update for phpESP
--- # Written by James Flemer
--- # For eGrad2000.com
--- # <jflemer@alum.rpi.edu>
-
--- # Use this script to update the phpESP tables from version 1.5 to
--- # version 1.6.
--- # 
--- # To execute this script via the mysql CLI, run:
--- #   mysql -u root -p phpesp < mysql_update-1.5-1.6.sql
--- # If you used a database name other than "phpesp", use it in place
--- # of "phpesp" in the command line.
--- #
-
--- # Expand the username fields to 64 characters.
-ALTER TABLE respondent MODIFY COLUMN username CHAR(64) NOT NULL;
-ALTER TABLE designer   MODIFY COLUMN username CHAR(64) NOT NULL;
-ALTER TABLE response   MODIFY COLUMN username CHAR(64);
-ALTER TABLE response   ADD COLUMN ip CHAR(64);
-
--- # Add fields for resume and navigate options.
-ALTER TABLE access     ADD    COLUMN resume   ENUM('Y','N') NOT NULL DEFAULT 'N';
-ALTER TABLE access     ADD    COLUMN navigate ENUM('Y','N') NOT NULL DEFAULT 'N';
-
--- # Create the group for Self added users.
-INSERT INTO realm (name, title) VALUES ('auto', 'Self added users');
Index: scripts/db/sqlite_populate.sql
===================================================================
--- scripts/db/sqlite_populate.sql	(revision 6370)
+++ scripts/db/sqlite_populate.sql	(working copy)
@@ -1,257 +0,0 @@
---
--- Table structure for table `access`
---
-
-CREATE TABLE access (
-  id integer NOT NULL,
-  survey_id id integer  NOT NULL default '0',
-  realm char(16) default NULL,
-  maxlogin id integer  default '0',
-  resume VARCHAR(1)  NOT NULL default 'N',
-  navigate VARCHAR(1)  NOT NULL default 'N',
-  PRIMARY KEY  (id)
-) ;
-
---
--- Table structure for table `designer`
---
-
-CREATE TABLE designer (
-  username char(64) NOT NULL default '',
-  password char(64) NOT NULL default '',
-  auth char(16) NOT NULL default 'BASIC',
-  realm char(16) NOT NULL default '',
-  fname char(16) default NULL,
-  lname char(24) default NULL,
-  email char(64) default NULL,
-  pdesign VARCHAR(1)  NOT NULL default 'Y',
-  pstatus VARCHAR(1)  NOT NULL default 'N',
-  pdata VARCHAR(1)  NOT NULL default 'N',
-  pall VARCHAR(1)  NOT NULL default 'N',
-  pgroup VARCHAR(1)  NOT NULL default 'N',
-  puser VARCHAR(1)  NOT NULL default 'N',
-  disabled VARCHAR(1)  NOT NULL default 'N',
-  changed timestamp(14) default NULL,
-  expiration timestamp(14) NOT NULL default '0',
-  PRIMARY KEY  (username,realm)
-) ;
-
---
--- Dumping data for table `designer`
---
-
-INSERT INTO designer VALUES ('root','6915dba446289209cb5d2d799778a6d2','BASIC','superuser','ESP','Superuser',NULL,'Y','Y','Y','Y','Y','Y','N',date('now'),0);
-
---
--- Table structure for table `question`
---
-
-CREATE TABLE question (
-  id integer NOT NULL,
-  survey_id id integer  NOT NULL default '0',
-  name varchar(30) NOT NULL default '',
-  type_id id integer  NOT NULL default '0',
-  result_id id integer  default NULL,
-  length int(11) NOT NULL default '0',
-  precise int(11) NOT NULL default '0',
-  position id integer  NOT NULL default '0',
-  content text NOT NULL,
-  required VARCHAR(1)  NOT NULL default 'N',
-  deleted VARCHAR(1)  NOT NULL default 'N',
-  public VARCHAR(1)  NOT NULL default 'Y',
-  PRIMARY KEY  (id)
-) ;
-
---
--- Table structure for table `question_choice`
---
-
-CREATE TABLE question_choice (
-  id integer NOT NULL,
-  question_id id integer  NOT NULL default '0',
-  content text NOT NULL,
-  value text,
-  PRIMARY KEY  (id)
-) ;
-
---
--- Table structure for table `question_type`
---
-
-CREATE TABLE question_type (
-  id integer NOT NULL,
-  type char(32) NOT NULL default '',
-  has_choices VARCHAR(1)  NOT NULL default 'Y',
-  response_table char(32) NOT NULL default '',
-  PRIMARY KEY  (id)
-) ;
-
---
--- Dumping data for table `question_type`
---
-
-INSERT INTO question_type VALUES (1,'Yes/No','N','response_bool');
-INSERT INTO question_type VALUES (2,'Text Box','N','response_text');
-INSERT INTO question_type VALUES (3,'Essay Box','N','response_text');
-INSERT INTO question_type VALUES (4,'Radio Buttons','Y','response_single');
-INSERT INTO question_type VALUES (5,'Check Boxes','Y','response_multiple');
-INSERT INTO question_type VALUES (6,'Dropdown Box','Y','response_single');
-INSERT INTO question_type VALUES (8,'Rate (scale 1..5)','Y','response_rank');
-INSERT INTO question_type VALUES (9,'Date','N','response_date');
-INSERT INTO question_type VALUES (10,'Numeric','N','response_text');
-INSERT INTO question_type VALUES (99,'Page Break','N','');
-INSERT INTO question_type VALUES (100,'Section Text','N','');
-
---
--- Table structure for table `realm`
---
-
-CREATE TABLE realm (
-  name char(16) NOT NULL default '',
-  title char(64) NOT NULL default '',
-  changed timestamp(14) default NULL,
-  PRIMARY KEY  (name)
-) ;
-
---
--- Dumping data for table `realm`
---
-
-INSERT INTO realm VALUES ('superuser','ESP System Administrators',date('now'));
-INSERT INTO realm VALUES ('auto','Self added users',date('now'));
-
---
--- Table structure for table `respondent`
---
-
-CREATE TABLE respondent (
-  username char(64) NOT NULL default '',
-  password char(64) NOT NULL default '',
-  auth char(16) NOT NULL default 'BASIC',
-  realm char(16) NOT NULL default '',
-  fname char(16) default NULL,
-  lname char(24) default NULL,
-  email char(64) default NULL,
-  disabled VARCHAR(1)  NOT NULL default 'N',
-  changed timestamp(14) default NULL,
-  expiration timestamp(14) NOT NULL default '0',
-  PRIMARY KEY  (username,realm)
-) ;
-
---
--- Table structure for table `response`
---
-
-CREATE TABLE response (
-  id integer NOT NULL,
-  survey_id id integer  NOT NULL default '0',
-  submitted timestamp(14) NOT NULL,
-  complete VARCHAR(1)  NOT NULL default 'N',
-  username char(64) default NULL,
-  PRIMARY KEY  (id)
-) ;
-
---
--- Table structure for table `response_bool`
---
-
-CREATE TABLE response_bool (
-  response_id id integer  NOT NULL default '0',
-  question_id id integer  NOT NULL default '0',
-  choice_id VARCHAR(1)  NOT NULL default 'Y',
-  PRIMARY KEY  (response_id,question_id)
-) ;
-
---
--- Table structure for table `response_date`
---
-
-CREATE TABLE response_date (
-  response_id id integer  NOT NULL default '0',
-  question_id id integer  NOT NULL default '0',
-  response date default NULL,
-  PRIMARY KEY  (response_id,question_id)
-) ;
-
---
--- Table structure for table `response_multiple`
---
-
-CREATE TABLE response_multiple (
-  id integer NOT NULL,
-  response_id id integer  NOT NULL default '0',
-  question_id id integer  NOT NULL default '0',
-  choice_id id integer  NOT NULL default '0',
-  PRIMARY KEY  (id)
-) ;
-
---
--- Table structure for table `response_other`
---
-
-CREATE TABLE response_other (
-  response_id id integer  NOT NULL default '0',
-  question_id id integer  NOT NULL default '0',
-  choice_id id integer  NOT NULL default '0',
-  response text,
-  PRIMARY KEY  (response_id,question_id,choice_id)
-) ;
-
---
--- Table structure for table `response_rank`
---
-
-CREATE TABLE response_rank (
-  response_id id integer  NOT NULL default '0',
-  question_id id integer  NOT NULL default '0',
-  choice_id id integer  NOT NULL default '0',
-  rank int(11) NOT NULL default '0',
-  PRIMARY KEY  (response_id,question_id,choice_id)
-) ;
-
---
--- Table structure for table `response_single`
---
-
-CREATE TABLE response_single (
-  response_id id integer  NOT NULL default '0',
-  question_id id integer  NOT NULL default '0',
-  choice_id id integer  NOT NULL default '0',
-  PRIMARY KEY  (response_id,question_id)
-) ;
-
-
---
--- Table structure for table `response_text`
---
-
-CREATE TABLE response_text (
-  response_id id integer  NOT NULL default '0',
-  question_id id integer  NOT NULL default '0',
-  response text,
-  PRIMARY KEY  (response_id,question_id)
-) ;
-
---
--- Table structure for table `survey`
---
-
-CREATE TABLE survey (
-  id integer NOT NULL,
-  name varchar(64) NOT NULL default '',
-  owner varchar(16) NOT NULL default '',
-  realm varchar(64) NOT NULL default '',
-  public VARCHAR(1)  NOT NULL default 'Y',
-  status id integer  NOT NULL default '0',
-  title varchar(255) NOT NULL default '',
-  email varchar(64) default NULL,
-  subtitle text,
-  info text,
-  theme varchar(64) default NULL,
-  thanks_page varchar(255) default NULL,
-  thank_head varchar(255) default NULL,
-  thank_body text,
-  changed timestamp(14) default NULL,
-  unique(name),
-  PRIMARY KEY  (id)
-) ;
Index: scripts/db/mysql_populate.sql
===================================================================
--- scripts/db/mysql_populate.sql	(revision 6370)
+++ scripts/db/mysql_populate.sql	(working copy)
@@ -1,265 +0,0 @@
-
-DROP TABLE IF EXISTS realm;
-CREATE TABLE realm (
-	name		CHAR(16) NOT NULL,
-	title		CHAR(64) NOT NULL,
-	changed         TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
-	PRIMARY KEY(name)
-);
-
--- # table of respondents (people who enter data / take surveys)
-DROP TABLE IF EXISTS respondent;
-CREATE TABLE respondent (
-	username	CHAR(64) NOT NULL,
-	password	CHAR(64) NOT NULL,
-	auth		CHAR(16) NOT NULL DEFAULT 'BASIC',
-	realm		CHAR(16) NOT NULL,
-	fname		CHAR(16),
-	lname		CHAR(24),
-	email		CHAR(64),
-	disabled	ENUM('Y','N') NOT NULL DEFAULT 'N',
-	changed         TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-	expiration	TIMESTAMP,
-	PRIMARY KEY (username, realm)
-);
-
--- # table of designers (people who create forms / surveys)
-DROP TABLE IF EXISTS designer;
-CREATE TABLE designer (
-	username	CHAR(64) NOT NULL,
-	password	CHAR(64) NOT NULL,
-	auth		CHAR(16) NOT NULL DEFAULT 'BASIC',
-	realm		CHAR(16) NOT NULL,
-	fname		CHAR(16),
-	lname		CHAR(24),
-	email		CHAR(64),
-	pdesign		ENUM('Y','N') NOT NULL DEFAULT 'Y',
-	pstatus		ENUM('Y','N') NOT NULL DEFAULT 'N',
-	pdata		ENUM('Y','N') NOT NULL DEFAULT 'N',
-	pall		ENUM('Y','N') NOT NULL DEFAULT 'N',
-	pgroup		ENUM('Y','N') NOT NULL DEFAULT 'N',
-	puser		ENUM('Y','N') NOT NULL DEFAULT 'N',
-	disabled	ENUM('Y','N') NOT NULL DEFAULT 'N',
-	changed         TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-	expiration	TIMESTAMP,
-	PRIMARY KEY(username, realm)
-);
-
--- # create the _special_ superuser group
--- # members of this group have superuser status
-INSERT INTO realm ( name, title )
-	VALUES ( 'superuser', 'ESP System Administrators' ),
-		( 'auto', 'Self added users' );
-
--- # default root account
-INSERT INTO designer (username, password, fname, lname, realm, pdesign, pstatus, pdata, pall, pgroup, puser, disabled)
-	VALUES ('root', PASSWORD('esp'), 'ESP', 'Superuser', 'superuser', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N');
-
--- ...............................................................
--- ..................... SURVEYS/FORMS ...........................
--- ...............................................................
-
--- # table of different surveys available
-DROP TABLE IF EXISTS survey;
-CREATE TABLE survey (
-	id			INT UNSIGNED NOT NULL AUTO_INCREMENT,
-	name		CHAR(64) NOT NULL,
-	owner		CHAR(16) NOT NULL,
-	realm		CHAR(64) NOT NULL,
-	public		ENUM('Y','N') NOT NULL DEFAULT 'Y',
-	status		INT UNSIGNED NOT NULL DEFAULT '0',
-	title		CHAR(255) NOT NULL,
-	email		CHAR(64),
-	subtitle	TEXT,
-	info		TEXT,
-	theme		CHAR(64),
-	thanks_page	CHAR(255),
-	thank_head	CHAR(255),
-	thank_body	TEXT,
-	changed         TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-	auto_num	ENUM('Y','N') NOT NULL DEFAULT 'Y',
-	PRIMARY KEY (id),
-	UNIQUE(name)
-);
-
--- # types of questions
-DROP TABLE IF EXISTS question_type;
-CREATE TABLE question_type (
-	id		INT UNSIGNED NOT NULL AUTO_INCREMENT,
-	type		CHAR(32) NOT NULL,
-	has_choices	ENUM('Y','N') NOT NULL,
-	response_table	CHAR(32) NOT NULL,
-	PRIMARY KEY (id)
-);
-
--- # table of the questions for all the surveys
-DROP TABLE IF EXISTS question;
-CREATE TABLE question (
-	id		INT UNSIGNED NOT NULL AUTO_INCREMENT,
-	survey_id	INT UNSIGNED NOT NULL,
-	name		CHAR(30) NOT NULL,
-	type_id		INT UNSIGNED NOT NULL,
-	result_id	INT UNSIGNED,
-	length		INT NOT NULL DEFAULT 0,
-	precise		INT NOT NULL DEFAULT 0,
-	position	INT UNSIGNED NOT NULL,
-	content		TEXT NOT NULL,
-	required	ENUM('Y','N') NOT NULL DEFAULT 'N',
-	deleted		ENUM('Y','N') NOT NULL DEFAULT 'N',
-	public		ENUM('Y','N') NOT NULL DEFAULT 'Y',
-	PRIMARY KEY (id),
-	KEY `result_id` (`result_id`),
-	KEY `survey_id` (`survey_id`)
-);
-
--- # table of the choices (possible answers) of each question
-DROP TABLE IF EXISTS question_choice;
-CREATE TABLE question_choice (
-	id		INT UNSIGNED NOT NULL AUTO_INCREMENT,
-	question_id	INT UNSIGNED NOT NULL,
-	content		TEXT NOT NULL,
-	value		TEXT,
-	PRIMARY KEY (id),
-	KEY `question_id` (`question_id`)
-);
-
--- # access control to adding data to a form / survey
-DROP TABLE IF EXISTS access;
-CREATE TABLE access (
-	id		INT UNSIGNED NOT NULL AUTO_INCREMENT,
-	survey_id	INT UNSIGNED NOT NULL,
-	realm		CHAR(16),
-	maxlogin	INT UNSIGNED DEFAULT '0',
-        resume		ENUM('Y','N') NOT NULL DEFAULT 'N',
-        navigate	ENUM('Y','N') NOT NULL DEFAULT 'N',
-	PRIMARY KEY(id),
-	KEY `survey_id` (`survey_id`)
-);
-
--- ...............................................................
--- ..................... RESPONSE DATA ...........................
--- ...............................................................
-
--- # this table holds info to distinguish one servey response from another
--- # (plus timestamp, and username if known)
-DROP TABLE IF EXISTS response;
-CREATE TABLE response (
-	id			INT UNSIGNED NOT NULL AUTO_INCREMENT,
-	survey_id	INT UNSIGNED NOT NULL,
-	submitted	TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
-	complete	ENUM('Y','N') NOT NULL DEFAULT 'N',
-	username	CHAR(64),
-	ip		CHAR(64),
-	PRIMARY KEY (id),
-	KEY `survey_id` (`survey_id`)
-);
-
--- # answers to boolean questions (yes/no)
-DROP TABLE IF EXISTS response_bool;
-CREATE TABLE response_bool (
-	response_id	INT UNSIGNED NOT NULL,
-	question_id	INT UNSIGNED NOT NULL,
-	choice_id	ENUM('Y','N') NOT NULL,
-	PRIMARY KEY(response_id,question_id),
-	KEY `response_id` (`response_id`),
-	KEY `question_id` (`question_id`)
-);
-
--- # answers to single answer questions (radio, boolean, rate) (chose one of n)
-DROP TABLE IF EXISTS response_single;
-CREATE TABLE response_single (
-	response_id	INT UNSIGNED NOT NULL,
-	question_id	INT UNSIGNED NOT NULL,
-	choice_id	INT UNSIGNED NOT NULL,
-	PRIMARY KEY(response_id,question_id),
-	KEY `response_id` (`response_id`),
-	KEY `question_id` (`question_id`)
-);
-
--- # answers to questions where multiple responses are allowed
--- # (checkbox, select multiple)
-DROP TABLE IF EXISTS response_multiple;
-CREATE TABLE response_multiple (
-	id			INT UNSIGNED NOT NULL AUTO_INCREMENT,
-	response_id	INT UNSIGNED NOT NULL,
-	question_id	INT UNSIGNED NOT NULL,
-	choice_id	INT UNSIGNED NOT NULL,
-	PRIMARY KEY(id),
-	KEY `response_id` (`response_id`),
-	KEY `question_id` (`question_id`),
-	KEY `choice_id` (`choice_id`)
-);
-
--- # answers to rank questions
-DROP TABLE IF EXISTS response_rank;
-CREATE TABLE response_rank (
-	response_id	INT UNSIGNED NOT NULL,
-	question_id	INT UNSIGNED NOT NULL,
-	choice_id	INT UNSIGNED NOT NULL,
-	rank		INT NOT NULL,
-	PRIMARY KEY(response_id,question_id,choice_id),
-	KEY `response_id` (`response_id`),
-	KEY `question_id` (`question_id`),
-	KEY `choice_id` (`choice_id`)
-);
-
--- # answers to any fill in the blank or essay question
-DROP TABLE IF EXISTS response_text;
-CREATE TABLE response_text (
-	response_id	INT UNSIGNED NOT NULL,
-	question_id INT UNSIGNED NOT NULL,
-	response	TEXT,
-	PRIMARY KEY (response_id,question_id),
-	KEY `response_id` (`response_id`),
-	KEY `question_id` (`question_id`)
-);
-
--- # answers to any Other: ___ questions
-DROP TABLE IF EXISTS response_other;
-CREATE TABLE response_other (
-	response_id	INT UNSIGNED NOT NULL,
-	question_id INT UNSIGNED NOT NULL,
-	choice_id	INT UNSIGNED NOT NULL,
-	response	TEXT,
-	PRIMARY KEY (response_id, question_id, choice_id),
-	KEY `response_id` (`response_id`),
-	KEY `choice_id` (`choice_id`),
-	KEY `question_id` (`question_id`)
-);
-
--- # answers to any date questions
-DROP TABLE IF EXISTS response_date;
-CREATE TABLE response_date (
-	response_id	INT UNSIGNED NOT NULL,
-	question_id INT UNSIGNED NOT NULL,
-	response	DATE,
-	PRIMARY KEY (response_id,question_id),
-	KEY `response_id` (`response_id`),
-	KEY `question_id` (`question_id`)
-);
-
--- # populate the types of questions
-INSERT INTO question_type VALUES ('1','Yes/No','N','response_bool');
-INSERT INTO question_type VALUES ('2','Text Box','N','response_text');
-INSERT INTO question_type VALUES ('3','Essay Box','N','response_text');
-INSERT INTO question_type VALUES ('4','Radio Buttons','Y','response_single');
-INSERT INTO question_type VALUES ('5','Check Boxes','Y','response_multiple');
-INSERT INTO question_type VALUES ('6','Dropdown Box','Y','response_single');
--- # INSERT INTO question_type VALUES ('7','Rating','N','response_rank');
-INSERT INTO question_type VALUES ('8','Rate (scale 1..5)','Y','response_rank');
-INSERT INTO question_type VALUES ('9','Date','N','response_date');
-INSERT INTO question_type VALUES ('10','Numeric','N','response_text');
-INSERT INTO question_type VALUES ('99','Page Break','N','');
-INSERT INTO question_type VALUES ('100','Section Text','N','');
-
-DROP TABLE IF EXISTS conditions;
-CREATE TABLE conditions (
-        id              INT UNSIGNED NOT NULL AUTO_INCREMENT,
-	survey_id	INT UNSIGNED NOT NULL,
-	q1_id		INT UNSIGNED NOT NULL,
-	q2_id 		INT UNSIGNED NOT NULL,
-	cond		INT UNSIGNED NOT NULL,
-	cond_value	TEXT,
-	PRIMARY KEY (id)
-);
-
Index: scripts/db/postgres_populate.sql
===================================================================
--- scripts/db/postgres_populate.sql	(revision 6370)
+++ scripts/db/postgres_populate.sql	(working copy)
@@ -1,427 +0,0 @@
-BEGIN;
-
---
--- Sequences for table ACCESS
---
-
-CREATE SEQUENCE access_id_seq;
-
--- MySQL dump 9.10
---
--- Host: bfs.itlab.musc.edu    Database: esp_test
--- ------------------------------------------------------
--- Server version	4.0.16-log
-
---
--- Table structure for table `access`
---
-
-CREATE TABLE access (
-  id INT4 DEFAULT nextval('access_id_seq'),
-  survey_id INT4  NOT NULL DEFAULT '0',
-  realm varchar(16) DEFAULT NULL,
-  maxlogin INT4  DEFAULT '0',
-  resume varchar (1) NOT NULL DEFAULT 'N',
-  navigate varchar (1) NOT NULL DEFAULT 'N',
-  PRIMARY KEY (id),
-  CHECK (survey_id>=0),
-  CHECK (maxlogin>=0)
-
-);
-
---
--- Table structure for table `designer`
---
-
-CREATE TABLE designer (
-  username varchar(64) NOT NULL DEFAULT '',
-  password varchar(64) NOT NULL DEFAULT '',
-  auth varchar(16) NOT NULL DEFAULT 'BASIC',
-  realm varchar(16) NOT NULL DEFAULT '',
-  fname varchar(16) DEFAULT NULL,
-  lname varchar(24) DEFAULT NULL,
-  email varchar(64) DEFAULT NULL,
-  pdesign varchar(1) NOT NULL DEFAULT 'Y',
-  pstatus varchar(1) NOT NULL DEFAULT 'N',
-  pdata varchar(1) NOT NULL DEFAULT 'N',
-  pall varchar(1) NOT NULL DEFAULT 'N',
-  pgroup varchar(1) NOT NULL DEFAULT 'N',
-  puser varchar(1) NOT NULL DEFAULT 'N',
-  disabled varchar(1) NOT NULL DEFAULT 'N',
-  changed TIMESTAMP NOT NULL,
-  expiration varchar (19) NULL,
-  PRIMARY KEY (username,realm)
-
-);
-
---
--- Dumping data for table `designer`
---
-
-INSERT INTO designer VALUES ('root',md5('esp'),'BASIC','superuser','ESP','Superuser',NULL,'Y','Y','Y','Y','Y','Y','N',now(),'0');
-
-
---
--- Table structure for table `question`
---
-
-
-
---
--- Sequences for table QUESTION
---
-
-CREATE SEQUENCE question_id_seq;
-
-CREATE TABLE question (
-  id INT4 DEFAULT nextval('question_id_seq'),
-  survey_id INT4  NOT NULL DEFAULT '0',
-  name varchar(30) NOT NULL DEFAULT '',
-  type_id INT4  NOT NULL DEFAULT '0',
-  result_id INT4  DEFAULT NULL,
-  length INT4 NOT NULL DEFAULT '0',
-  precise INT4 NOT NULL DEFAULT '0',
-  position INT4  NOT NULL DEFAULT '0',
-  content TEXT DEFAULT '' NOT NULL,
-  required varchar(1) NOT NULL DEFAULT 'N',
-  deleted varchar(1) NOT NULL DEFAULT 'N',
-  public varchar(1) NOT NULL DEFAULT 'Y',
-  PRIMARY KEY (id),
-  CHECK (survey_id>=0),
-  CHECK (type_id>=0),
-  CHECK (result_id>=0),
-  CHECK (position>=0)
-
-);
-
---
--- Table structure for table `question_choice`
---
-
-
-
---
--- Sequences for table QUESTION_CHOICE
---
-
-CREATE SEQUENCE question_choice_id_seq;
-
-CREATE TABLE question_choice (
-  id INT4 DEFAULT nextval('question_choice_id_seq'),
-  question_id INT4  NOT NULL DEFAULT '0',
-  content TEXT DEFAULT '' NOT NULL,
-  value text,
-  PRIMARY KEY (id),
-  CHECK (question_id>=0)
-
-);
-
---
--- Table structure for table `question_type`
---
-
-
-
---
--- Sequences for table QUESTION_TYPE
---
-
-CREATE SEQUENCE question_type_id_seq;
-
-CREATE TABLE question_type (
-  id INT4 DEFAULT nextval('question_type_id_seq'),
-  type varchar(32) NOT NULL DEFAULT '',
-  has_choices varchar(1) NOT NULL DEFAULT 'Y',
-  response_table varchar(32) NOT NULL DEFAULT '',
-  PRIMARY KEY (id)
-
-);
-
---
--- Dumping data for table `question_type`
---
-
-INSERT INTO question_type VALUES (1,'Yes/No','N','response_bool');
-INSERT INTO question_type VALUES (2,'Text Box','N','response_text');
-INSERT INTO question_type VALUES (3,'Essay Box','N','response_text');
-INSERT INTO question_type VALUES (4,'Radio Buttons','Y','response_single');
-INSERT INTO question_type VALUES (5,'Check Boxes','Y','response_multiple');
-INSERT INTO question_type VALUES (6,'Dropdown Box','Y','response_single');
-INSERT INTO question_type VALUES (8,'Rate (scale 1..5)','Y','response_rank');
-INSERT INTO question_type VALUES (9,'Date','N','response_date');
-INSERT INTO question_type VALUES (10,'Numeric','N','response_text');
-INSERT INTO question_type VALUES (99,'Page Break','N','');
-INSERT INTO question_type VALUES (100,'Section Text','N','');
-
---
--- Table structure for table `realm`
---
-
-CREATE TABLE realm (
-  name varchar(16) NOT NULL DEFAULT '',
-  title varchar(64) NOT NULL DEFAULT '',
-  changed TIMESTAMP NOT NULL,
-  PRIMARY KEY (name)
-
-);
-
---
--- Dumping data for table `realm`
---
-
-INSERT INTO realm VALUES ('superuser','ESP System Administrators','20040212 205000');
-INSERT INTO realm VALUES ('auto','Self added users','20040212 205000');
-
---
--- Table structure for table `respondent`
---
-
-CREATE TABLE respondent (
-  username varchar(64) NOT NULL DEFAULT '',
-  password varchar(64) NOT NULL DEFAULT '',
-  auth varchar(16) NOT NULL DEFAULT 'BASIC',
-  realm varchar(16) NOT NULL DEFAULT '',
-  fname varchar(16) DEFAULT NULL,
-  lname varchar(24) DEFAULT NULL,
-  email varchar(64) DEFAULT NULL,
-  disabled varchar(1) NOT NULL DEFAULT 'N',
-  changed TIMESTAMP NOT NULL,
-  expiration varchar(19) NULL,
-  PRIMARY KEY (username,realm)
-
-);
-
---
--- Table structure for table `response`
---
-
-
-
---
--- Sequences for table RESPONSE
---
-
-CREATE SEQUENCE response_id_seq;
-
-CREATE TABLE response (
-  id INT4 DEFAULT nextval('response_id_seq'),
-  survey_id INT4  NOT NULL DEFAULT '0',
-  submitted TIMESTAMP NOT NULL,
-  complete varchar (1) NOT NULL DEFAULT 'N',
-  username varchar(64) DEFAULT NULL,
-  PRIMARY KEY (id),
-  CHECK (survey_id>=0)
-
-);
-
---
--- Table structure for table `response_bool`
---
-
-CREATE TABLE response_bool (
-  response_id INT4  NOT NULL DEFAULT '0',
-  question_id INT4  NOT NULL DEFAULT '0',
-  choice_id varchar (1) NOT NULL DEFAULT 'Y',
-  PRIMARY KEY (response_id,question_id),
-  CHECK (response_id>=0),
-  CHECK (question_id>=0)
-
-);
-
---
--- Table structure for table `response_date`
---
-
-CREATE TABLE response_date (
-  response_id INT4  NOT NULL DEFAULT '0',
-  question_id INT4  NOT NULL DEFAULT '0',
-  response DATE DEFAULT NULL,
-  PRIMARY KEY (response_id,question_id),
-  CHECK (response_id>=0),
-  CHECK (question_id>=0)
-
-);
-
---
--- Sequences for table RESPONSE_MULTIPLE
---
-
-CREATE SEQUENCE response_multiple_id_seq;
-
-CREATE TABLE response_multiple (
-  id INT4 DEFAULT nextval('response_multiple_id_seq'),
-  response_id INT4  NOT NULL DEFAULT '0',
-  question_id INT4  NOT NULL DEFAULT '0',
-  choice_id INT4  NOT NULL DEFAULT '0',
-  PRIMARY KEY (id),
-  CHECK (response_id>=0),
-  CHECK (question_id>=0),
-  CHECK (choice_id>=0)
-
-);
-
---
--- Table structure for table `response_other`
---
-
-CREATE TABLE response_other (
-  response_id INT4  NOT NULL DEFAULT '0',
-  question_id INT4  NOT NULL DEFAULT '0',
-  choice_id INT4  NOT NULL DEFAULT '0',
-  response text,
-  PRIMARY KEY (response_id,question_id,choice_id),
-  CHECK (response_id>=0),
-  CHECK (question_id>=0),
-  CHECK (choice_id>=0)
-
-);
-
---
--- Table structure for table `response_rank`
---
-
-CREATE TABLE response_rank (
-  response_id INT4  NOT NULL DEFAULT '0',
-  question_id INT4  NOT NULL DEFAULT '0',
-  choice_id INT4  NOT NULL DEFAULT '0',
-  rank INT4 NOT NULL DEFAULT '0',
-  PRIMARY KEY (response_id,question_id,choice_id),
-  CHECK (response_id>=0),
-  CHECK (question_id>=0),
-  CHECK (choice_id>=0)
-
-);
-
---
--- Table structure for table `response_single`
---
-
-CREATE TABLE response_single (
-  response_id INT4  NOT NULL DEFAULT '0',
-  question_id INT4  NOT NULL DEFAULT '0',
-  choice_id INT4  NOT NULL DEFAULT '0',
-  PRIMARY KEY (response_id,question_id),
-  CHECK (response_id>=0),
-  CHECK (question_id>=0),
-  CHECK (choice_id>=0)
-
-);
-
---
--- Table structure for table `response_text`
---
-
-CREATE TABLE response_text (
-  response_id INT4  NOT NULL DEFAULT '0',
-  question_id INT4  NOT NULL DEFAULT '0',
-  response text,
-  PRIMARY KEY (response_id,question_id),
-  CHECK (response_id>=0),
-  CHECK (question_id>=0)
-
-);
-
---
--- Table structure for table `survey`
---
-
-
-
---
--- Sequences for table SURVEY
---
-
-CREATE SEQUENCE survey_id_seq;
-
-CREATE TABLE survey (
-  id INT4 DEFAULT nextval('survey_id_seq'),
-  name varchar(64) NOT NULL DEFAULT '',
-  owner varchar(16) NOT NULL DEFAULT '',
-  realm varchar(64) NOT NULL DEFAULT '',
-  public varchar (1) NOT NULL DEFAULT 'Y',
-  -- status BIT VARYING(4)  NOT NULL DEFAULT B'0',
-  status INT4  NOT NULL DEFAULT '0',
-  title varchar(255) NOT NULL DEFAULT '',
-  email varchar(64) DEFAULT NULL,
-  subtitle text,
-  info text,
-  theme varchar(64) DEFAULT NULL,
-  thanks_page varchar(255) DEFAULT NULL,
-  thank_head varchar(255) DEFAULT NULL,
-  thank_body text,
-  changed TIMESTAMP NOT NULL,
-  PRIMARY KEY (id)
-);
-
---
--- Indexes for table SURVEY
---
-
-CREATE UNIQUE INDEX name_survey_index ON survey (name);
-
---
--- Sequences for table QUESTION
---
-
-SELECT SETVAL('question_id_seq',(select case when max(id)>0 then max(id)+1 else 1 end from question));
-
---
--- Sequences for table SURVEY
---
-
-SELECT SETVAL('survey_id_seq',(select case when max(id)>0 then max(id)+1 else 1 end from survey));
-
---
--- Sequences for table RESPONSE
---
-
-SELECT SETVAL('response_id_seq',(select case when max(id)>0 then max(id)+1 else 1 end from response));
-
---
--- Sequences for table ACCESS
---
-
-SELECT SETVAL('access_id_seq',(select case when max(id)>0 then max(id)+1 else 1 end from access));
-
---
--- Sequences for table RESPONSE_MULTIPLE
---
-
-SELECT SETVAL('response_multiple_id_seq',(select case when max(id)>0 then max(id)+1 else 1 end from response_multiple));
-
---
--- Sequences for table QUESTION_TYPE
---
-
-SELECT SETVAL('question_type_id_seq',(select case when max(id)>0 then max(id)+1 else 1 end from question_type));
-
---
--- Sequences for table QUESTION_CHOICE
---
-
-SELECT SETVAL('question_choice_id_seq',(select case when max(id)>0 then max(id)+1 else 1 end from question_choice));
-
---
--- Functions for table SURVEY
---
-CREATE FUNCTION plpgsql_call_handler() RETURNS language_handler
-    AS '$libdir/plpgsql', 'plpgsql_call_handler'
-        LANGUAGE c;
-
-CREATE TRUSTED PROCEDURAL LANGUAGE plpgsql HANDLER plpgsql_call_handler;
-
-CREATE FUNCTION bin_compare(integer, integer) RETURNS boolean AS '
-    DECLARE 
-	status ALIAS FOR $1; 
-	code ALIAS FOR $2; 
-    BEGIN 
-        IF (status & code) >= 1 THEN
-	   RETURN true;
-	ELSE IF (status & code) = 0 THEN 
-	    RETURN false; 
-	END IF; 
-	END IF;
-    END; 
-' LANGUAGE 'plpgsql';
-
-COMMIT;
Index: scripts/db/mysql_update-1.8.2h-1.8.2i.sql
===================================================================
--- scripts/db/mysql_update-1.8.2h-1.8.2i.sql	(revision 6370)
+++ scripts/db/mysql_update-1.8.2h-1.8.2i.sql	(working copy)
@@ -1,17 +0,0 @@
--- # $Id: mysql_update-1.8.2h-1.8.2i.sql,v 1.1 2007/07/09 12:58:21 liedekef Exp $
--- #
--- # Table update for phpESP
--- # Written by James Flemer
--- # For eGrad2000.com
--- # <jflemer@alum.rpi.edu>
-
--- # Use this script to update the phpESP tables from version 1.8.2h to
--- # version 1.8.2i.
--- # 
--- # To execute this script via the mysql CLI, run:
--- #   mysql -u root -p phpesp < mysql_update-1.8.2h-1.8.2i.sql
--- # If you used a database name other than "phpesp", use it in place
--- # of "phpesp" in the command line.
--- #
-
-ALTER TABLE survey     ADD    COLUMN auto_num   ENUM('Y','N') NOT NULL DEFAULT 'Y';
Index: scripts/gettextize.sh
===================================================================
--- scripts/gettextize.sh	(revision 6370)
+++ scripts/gettextize.sh	(working copy)
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-# $Id: gettextize.sh,v 1.3 2007/12/10 10:50:36 liedekef Exp $
-
-name=`basename "$0"`
-ldir="locale"
-
-while [ ! -z "$1" ]; do
-  case "$1" in
-  -d)
-    shift
-    ldir="$1"
-    ;;
-  *)
-    echo "usage: $name [-d directory]"
-    exit 1
-	;;
-  esac
-  shift
-done
-
-langs=`echo "$ldir"/[a-z][a-z]_[A-Z][A-Z] | sed "s,$ldir/,,g"`
-cwd=`pwd`
-dir=`basename "$cwd"`
-
-script_dir=`dirname "$0" | sed "s:^\\.:$cwd:"`
-
-echo "==> Extracting language strings [$langs]"
-(cd ..; \
-  $script_dir/pgettext.pl -o - -s \
-    `find "$dir" -name \*.php -o -name \*.inc` | \
-	sed s/charset=CHARSET/charset=UTF-8/ > "$dir/locale/new.po";)
-
-date=`date "+%Y-%m-%d %H:%M%z" | sed s/\\n//`
-cd "$ldir"
-for i in $langs; do
-  echo ''
-  /bin/echo -n "==> Merging strings for $i "
-  msgmerge --strict -o "$i.po" "$i/LC_MESSAGES/messages.po" new.po
-#   sed -E "s/Project-Id-Version: $package-.*\\\\n/Project-Id-Version: $package-$version\\\\n/;
-#	s/PO(-Revision|T-Creation)-Date: .*\\\\n/PO\\1-Date: $date\\\\n/" > "$i.po"
-#  echo "==> Compiling strings for $i"
-# We don't want the fuzzy translations compiled, people should update the language files
-#  msgfmt --strict -f -c -v -o "$i.mo" "$i.po"
-  msgfmt --strict -c -v -o "$i.mo" "$i.po"
-  mv "$i.po" "$i/LC_MESSAGES/messages.po"
-  mv "$i.mo" "$i/LC_MESSAGES/messages.mo"
-done
Index: scripts/pgettext.pl
===================================================================
--- scripts/pgettext.pl	(revision 6370)
+++ scripts/pgettext.pl	(working copy)
@@ -1,148 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-# $Id: pgettext.pl,v 1.1 2004/09/14 00:29:42 jimmerman Exp $
-
-# set up variables
-my $verbose = 0;
-my $strict = 0;
-my $php = 0;
-my $debug = 0;
-my $width = 80;
-my $output = 'messages.po';
-
-my %msgs;
-my @order = ();
-
-sub usage {
-	print "usage: $0 [-v|--verbose] [-s|--strict] [-o|--output file] file ...\n\n";
-	exit 1;
-}
-
-sub debug {
-	my $level = shift;
-	if ($debug >= $level) {
-		print STDERR shift;
-		return 1;
-	}
-	return 0;
-}
-
-sub add_msg {
-	my $msg = shift;
-	my $file = shift;
-	my $line = shift;
-	
-	debug(1, "$file:$line == $msg\n");
-
-	if (exists($msgs{$msg})) {
-		push(@{$msgs{$msg}}, [ $file, $line ]);
-	} else {
-		$msgs{$msg} = [ [ $file, $line ] ];
-		push(@order, $msg);
-	}
-}
-
-sub msg_cmp {
-	# $args = [ $file, $line ]
-	if ($a->[0] eq $b->[0]) {
-		return ($a->[1] <=> $b->[1]);
-	}
-	return ($a->[0] cmp $b->[0]);
-}
-
-my $s_blank = "\n";
-my $s_pre = "#: ";
-my $s_fmt = "%s:%d";
-
-{
-	my $arg = "";
-	ARG: while ($arg = shift @ARGV) {
-		if ($arg =~ s/^-//) {
-			while ($arg ne '') {
-				if ($arg =~ s/^v//) {
-						$verbose++;
-						$| = 1;
-				} elsif ($arg =~ s/^s//) {
-						$strict++;
-				} elsif ($arg =~ s/^o//) {
-						$output = shift @ARGV
-							or usage();
-						if ($output eq '-') {
-							$output = '&STDOUT';
-						}
-				} elsif ($arg =~ s/^p//) {
-						$php++;
-				} elsif ($arg =~ s/^g//) {
-						$debug++;
-						$| = 1;
-				} elsif ($arg eq '-') {
-					last ARG;
-				} elsif ($arg =~ s/^-(.).*/$1/) {
-					# long arg type
-				} else {
-					usage();
-				}
-			}
-		} else {
-			last ARG;
-		}
-	}
-	if ($arg ne '-') {
-		unshift @ARGV, $arg;
-	}
-}
-
-if ($strict) {
-	$s_blank = "#\n";
-	$s_pre = "# ";
-	$s_fmt = "File: %s, line: %d\n";
-}
-
-@ARGV = sort @ARGV;
-
-while (my $file = shift @ARGV) {
-	open IN, $file
-		or die "Can't open $file.";
-	if (!debug(1, "Scanning $file ...\n") && $verbose) {
-		print "Scanning $file ...\n";
-	}
-	my $lnum = 0;
-	my $snum = 0;
-	my $line = '';
-	LINE: while (my $str = <IN>) {
-		$line .= $str;
-		$lnum++;
-		if (!debug(5,"$lnum:$line") && (($lnum % 5) == 0)) {
-			debug(1, "\tline:$lnum\n");
-		}
-
-		while ($line ne '') {
-			debug(5, "$lnum:$line");
-			if (!($line =~ s/.*?(?=_\()//s )) {
-				$line = '';
-				$snum = 0;
-				next LINE;
-			} elsif ($snum == 0) {
-				$snum = $lnum;
-			}
-
-			if ($line =~ s/^_\(\s*"(([^"]|\\")*)"\s*\)//s) {
-				my $msg = $1;
-				debug(5, "case: double quotes\n");
-				$msg =~ s/\t/\\t/g;
-				$msg =~ s/\n/\\n/g;
-				add_msg($msg, $file, $snum);
-				$snum = 0;
-			} elsif ($line =~ s/^_\(\s*'(([^']|\\')*)'\s*\)//s) {
-				my $msg = $1;
-				debug(5, "case: single quotes\n");
-				$msg =~ s/\\'/'/g;
-				$msg =~ s/\\/\\\\/g;
-				$msg =~ s/\t/\\t/g;
-				$msg =~ s/\n/\\n/g;
-				$msg =~ s/"/\\"/g;
-				add_msg($msg, $file, $snum);
-				$snum = 0;
-			} else {
-				# line-spanning string. ge
\ No newline at end of file
Index: CHANGELOG
===================================================================
--- CHANGELOG	(revision 6370)
+++ CHANGELOG	(working copy)
@@ -1,68 +0,0 @@
-Changes made by Franky:
-
-20071230
-- Version 2.0.2
-- Bugfix release: fixes a php notice people were seeing, also a small fix for managing admins and a fix for deleting a response for an active survey.
-
-20071210
-- Already on 2.0.1
-- Changed language detection so you can select the language also in the admin interface
-- some session cleanups
-
-20071126
-- bumped the version to 2.0.0 (long overdue)
-- Added the posibility to define conditions on a question. See the help page in the admin interface for more info. In short:
-A question is only shown when a condition is met.
-All conditions are "OR" conditions, so if one conditions is fullfilled, the question is shown.
-A question that has a condition must be an optional question. So, if you define a condition on a question, the "Required" parameter is set to "No".
-A question that has a condition must be on the next page than the question/value that is used to compare it with. Use the "Order tab" to insert a section break where wanted (this is NOT done automatically).
-
-- Discovered the page admin/manage.php?where=purge, to purge a survey
-- Added the possibility to purge a response from a survey (only superuser can do this): admin/manage.php?where=response_purge
-- You can now configure the mail address used by phpesp when sending mails
-
-20071107
-- Correct LDAP auth, authenticated users are no longer recreated in the DB
-- You can choose between LDAP authentication for respondents, designers or both
-- Fixed some session checks when already logged in
-- Fixed some typo's (why did nobody see these???)
-
-20070615
-Added option to disable automatic numbering of questions when showing the survey
-Reworked a bit the "!other" anwser for radio/checkbox answers
-The answer to numerical questions are now also checked (to see the answer is indeed numerical)
-
-20070412
-fixes for losing the session info when changing respondents or designers
-
-uptill 20061201
-- multiple fixes, see: http://sourceforge.net/tracker/index.php?func=detail&aid=1598273&group_id=8956&atid=308956
-
-I also added the possibility to choose the language in handler.php, either by GET option or by setting a $lang parameter. To do this, I added below the line
-
-> require_once(ESP_BASE . '/admin/phpESP.ini.php');
-the next lines:
-< if (isset($_REQUEST['lang'])) {
-< esp_setlocale_ex($_REQUEST['lang']);
-< }
-< if (isset($lang)) {
-< esp_setlocale_ex($lang);
-< }
-
-So now handler.php?lang=nl_NL works, as well as setting $lang="nl_NL" and including handler.php as always.
-
-20061202 (I think)
-- added cookie checks to disable double postings (variable limit_double_postings in admin/phpESP.ini.php). It is disabled by default but I recommend you use it.
-- You need to use public/phpESP.first.php in every php survey page now (at the beginning, because cookies and sessions are used)
-
-20061205
-- added a captcha as well, so no scripted answers are possible (variable use_captcha in admin/phpESP.ini.php). It is disabled by default but I recommend you use it.
-
-20061207 - version 1.8.2e
-- implemented captcha abuse prevention mechanism, and updated captcha.README. I'll probably release the captcha as a seperate program as well
-- included patch 1609284
-
-2006121011 - version 1.8.2f
-- cookies to prevent double posting are no longer set if the survey is in test
-- updated the help pages a bit
-- added the ability to change the format of the date field, according to http://be.php.net/manual/en/function.strftime.php (I hope this'll work for everybody)
Index: docs/BUGS
===================================================================
--- docs/BUGS	(revision 6370)
+++ docs/BUGS	(working copy)
@@ -1,21 +0,0 @@
-====================
-KNOWN BUGS IN PHPESP
-====================
-
-- If a question is required, it is possible to select an !other field,
-  and not fill in the box.
-  [ admin/include/lib/espresponse.inc:13:check_required() ]
-
-- Data export files are dumped in /tmp and owned by the web server
-  user.  A work around for this is to change the 'home' of a user in
-  the authentication library in use.
-  [ admin/include/lib/esppauth-default.inc:170 ]
-  [ admin/include/lib/esppauth-ldap.inc:229 ]
-
-- Cross analysis on '!other' options is a bit suspect.
-
-Please report any new bugs using the bug report form:
-  http://sourceforge.net/tracker/?func=add&group_id=8956&atid=108956
-
-----
-$Id: BUGS,v 1.1 2003/02/27 18:39:30 jimmerman Exp $
Index: docs/LDAP
===================================================================
--- docs/LDAP	(revision 6370)
+++ docs/LDAP	(working copy)
@@ -1,34 +0,0 @@
-See the parameter $ESPCONFIG['auth_type'] and the corresponding ldap parameters in the file admin/phpESP.ini.php:
-
-// Choose authentication type: { 'default', 'ldap_both', 'ldap_resp', 'ldap_des' }
-// ldap_resp: respondents in LDAP, ldap_des: designers in LDAP
-// ldap_both: both respondents and designers in LDAP
-// default: mysql
-$ESPCONFIG['auth_type'] = 'default';
-
-// LDAP connection information
-// (Set these values if you choose 'ldap' as the authentication type.)
-// if a user is not found in ldap, the DB is still searched as well
-// designer info is copied in the DB
-$ESPCONFIG['ldap_server'] = 'ldap://ldap.example.com';
-$ESPCONFIG['ldap_port']   = '389';
-$ESPCONFIG['ldap_dn']     = 'dc=example, dc=com';
-$ESPCONFIG['ldap_filter'] = 'uid=';
-// the LDAP attribute that is compared with the "group" when completing private
-// surveys
-$ESPCONFIG['ldap_realm_attr'] = 'objectClass';
-// the LDAP attribute/value needed to designate a LDAP user as a designer
-$ESPCONFIG['ldap_designer_filter'] = 'UserCategory=engineer';
-// the LDAP attribute needed to designate a LDAP user as a superuser
-$ESPCONFIG['ldap_superuser_attr'] = 'uid';
-// the LDAP attribute needed to designate a LDAP user as a superuser
-$ESPCONFIG['ldap_superuser_value'] = 'test';
-// most newer LDAP servers need protocol 3 to be able to bind successfully
-// if this doesn't work for you, turn it of
-$ESPCONFIG['ldap_force_proto_3'] = true;
-
-// Group to add responders to via the sign-up page
-// (Set to "null", without quotes, to disable the sign-up page.)
-// Please do disable this for LDAP auth for respondents
-$ESPCONFIG['signup_realm'] = 'auto';
-
Index: docs/TRANSLATIONS
===================================================================
--- docs/TRANSLATIONS	(revision 6370)
+++ docs/TRANSLATIONS	(working copy)
@@ -1,80 +0,0 @@
-==================
-TRANSLATING PHPESP
-==================
-
-This document contains a guide to using phpESP in a language other than
-English.
-
-
-USING TRANSLATIONS
-------------------
-
-The phpESP package uses GNU gettext to support multiple languages.  GNU
-gettext support must be available in PHP for this feature to be
-available.  PHP may either be compiled with gettext support, or the
-gettext extension may be loaded at run-time.  To compile PHP with
-gettext support you must use the --with-gettext configure option.  To
-load the gettext extension at run time, simply place the gettext
-extension in the PHP extension directory; phpESP will automatically
-load the extension.  Alternatively, you may edit the php.ini and have
-PHP load the extension when it starts; you may have to do this if PHP
-safe_mode is enabled.  The php.ini directive to load an extension is
-'extension,' for example, to load gettext on a Unix system you would
-need 'extension gettext.so' in the php.ini.  Refer to the PHP
-documentation for more details on the PHP gettext extension, and
-loading extensions.
-
-The phpESP system test page will indicate weather GNU gettext is
-available.  If the test reports GNU Gettext as 'Emulated,' then only
-the native language (English) will be available.  If it is reported as
-'Real' and the test is reported as 'Passed,' any existing translation
-will be available.  If the test fails, and support is 'Real,' please
-send a bug report along with the entire system test page.
-
-The language used for the administrative interface, and the survey
-designer is determined by your browser preferences.  phpESP will choose
-the closest language to the language preferences indicated by your
-browser.  You may also set the default language in the phpESP.ini.php,
-which will be used for browsers that do not indicate language
-preference, or when no matching translation is available.
-
-
-ADDING TRANSLATIONS
--------------------
-
-There are several tools to work with gettext message catalogs.  It may
-be worth investigating what tools are available for your platform
-before beginning the task of translation.  The message catalogs are
-plain text, so no tools other than your favorite editor are required.
-
-There is an experimental PHP script available for creating and
-maintaining the phpESP translations online, if you do not find any
-suitable tools for your platform.  Please contact the developers via
-the developer mailing list for more information.
-
-The message catalogs are stored in the phpESP/locale/ directory.  Here
-you will find a subdirectory for each locale to which phpESP has been
-translated.  In each locale directory, is a directory called
-LC_MESSAGES/ which contains two files: messages.po and messages.mo. 
-The 'po' file is the plain text message catalog, and the 'mo' file is a
-compiled, binary form of the former.  To edit or create translations,
-simply edit the appropriate messages.po file.  To start a new
-translation, make a copy of the English message catalog (the en_US
-locale), and proceed from there.  Completed or updated catalogs should
-be sent via email to the phpESP developer list, or sent as a patch
-thought the SourceForge tracker for phpESP.  Please include your name
-and email when sending catalogs so appropriate credit can be given.
-
-Locale names should consist of 'll_TT', where 'll' is the two letter
-language code [ISO 639], and 'TT' is the territory (country) code [ISO
-3166].
-
-
-TRANSLATION PROBLEMS
---------------------
-
-If you have translation problems or questions, please post a message to
-either of the phpESP mailing lists.
-
-----
-$Id: TRANSLATIONS,v 1.2 2003/03/06 00:08:32 jimmerman Exp $
Index: docs/HACKING
===================================================================
--- docs/HACKING	(revision 6370)
+++ docs/HACKING	(working copy)
@@ -1,147 +0,0 @@
-===================================
-HACKING PHPESP: A Developer's Guide
-===================================
-
-This document contains a guide to the phpESP source code, and how to
-get started as a developer.
-
-
-INTRODUCTION
-------------
-
-If you are interested in working on or contributing to phpESP, please
-read this entire document.  First of all, it is highly recommended that
-you join the phpESP developer mailing list (follow the link on the
-phpESP web site).  Please direct all discussion to this list.  Do _not_
-send email to developers directly, you will probably be ignored.
-
-OBTAINING PHPESP FROM CVS
--------------------------
-
-phpESP comes in three flavors: there are stable release versions,
-development (or beta) release versions, and the phpESP cvs tree.  Most
-developers work directly with the most current sources in the cvs
-tree.  In order to check out a working copy from the cvs tree, you must
-have a cvs client.  You can login to the cvs server as "anonymous" to
-get read-only access with the following command (all one line):
-
-  $ cvs -d :pserver:anonymous@cvs.sourceforge.net:/cvshome/phpesp
-        login
-
-The password is empty, so just press enter at the prompt.  Once you are
-logged in, you can obtain a working copy of phpESP with the following
-command (also all on one line):
-
-  $ cvs -d :pserver:anonymous@cvs.sourceforge.net:/cvshome/phpesp
-        co phpESP
-
-This will create a directory called "phpESP", which will contain the 
-current sources.  You may work with these files by whatever means you
-wish.  You may also use cvs commands within this directory to interact
-with the cvs tree.  For example, to generate a patch including all
-changes you have made to the source locally, you would execute (from
-the "phpESP" directory):
-
-  $ cvs diff -u
-
-The output, called a unified diff, is the preferred format for sending
-patches to the development team.  If you are not familiar with cvs, you
-may read more about it at the following web site:
-
-  http://www.cvshome.org/
-
-
-SOURCE CODE LAYOUT
-------------------
-
-The layout of non-code files should be pretty self-explanatory, if you
-have any questions about where to add a file please ask on the
-developer mailing list.
-
-The majority of the the code for phpESP is under the admin/include/
-directory.  There are four subdirectories in include/ which divide the
-code into four categories.  The function/ subdirectory contains files
-that essentially define one function.  You should consider adding a
-file here if you are defining a new function that is very long.  The
-lib/ subdirectory contains files which contain several related
-functions.  For example, lib/espresponse.inc contains several functions
-that are used for the manipulation of survey responses.  The tab/
-subdirectory contains files responsible for the presentation and layout
-of each of the tabs in the survey editor.  Finally, the where/
-directory contains files responsible for the presentation and layout of
-each of the pages available in the administration interface.  Files
-from this directory are loaded and executed according the the form
-variable 'where'.  For example, when you open the following URL
-
-  http://localhost/phpESP/admin/manage.php?where=status
-
-The phpESP framework will load all the support functions from the
-function/ and the lib/ directories, then pass execution off to
-where/status.inc.
-
-In general, if you are adding a new page to the administration
-interface, the code should go into the where/ directory.  If you are
-adding a support function, the code belongs in the function/ or lib/
-directory.  The goal of this layout is to keep as much code out of the
-where/ directory as possible to help separate code and content.
-
-
-CODING STANDARDS
-----------------
-
-Please follow the PEAR Coding Standards as closely as possible when
-contributing code to phpESP.  These standards are available at
-
-  http://pear.php.net/manual/en/standards.php
-
-You may ignore the PEAR standard for 'Header Comment Blocks,' please do
-not add any License comments to the source without approval.
-
-Please refrain from reformatting existing code, except in areas very
-close to where you are making changes.  Reformatting code makes merging
-changes from other branches much more difficult.  Under certain
-circumstances, it may be appropriate (or necessary) to reformat code;
-please consult the developer mailing list before any significant
-reformatting.
-
-
-PATCHES, FEATURES, AND BUGS
----------------------------
-
-All patches should be sent to the developer mailing list, with a
-subject beginning with '[patch]', and the patch included as an
-attachment (not in-line).  Please include a description of your patch,
-and any other pertinent information in the body of your email.
-
-All features and bugs should be reported by using the SourceForge
-trackers.  Any transaction in either of these trackers is posted to the
-developer mailing list, so there is no need to announce them
-separately.  Also note that any additions to tracker items should be
-made via the web interface, because the replication is one way (changes
-on the web are sent to the list, but not vice versa).
-
-
-ETIQUETTE
----------
-
-phpESP is a volunteer based project; please remember this, and remember
-that the developers all have 'day jobs.'  Please try to keep all
-correspondence courteous and professional.  Also, please keep relevant
-discussions on the mailing lists; email directly to one of the
-developers is likely to be ignored.  If you do not get a reply on the
-mailing list, try finding one of the developers on IRC (refer to the
-phpESP web site for IRC channel information), or repost your email.
-
-
-BECOMING AN "OFFICIAL" DEVELOPER
---------------------------------
-
-If you have major changes or enhancements to make, or have submitted
-several accepted patches, you may be considered to become an "official"
-developer.  This status grants one commit access to the phpESP cvs
-repository.  Anyone who wishes to become an official developer should
-send a request to the developer mailing list with a short
-justification.
-
-----
-$Id: HACKING,v 1.3 2005/11/22 18:46:32 greggmc Exp $
Index: docs/THEMES
===================================================================
--- docs/THEMES	(revision 6370)
+++ docs/THEMES	(working copy)
@@ -1,102 +0,0 @@
-====================
-PHPESP SURVEY THEMES
-====================
-
-Written by Kon Angelopoulos <angekproductions@iprimus.com.au>
-08/06/2002
-
-The ability to create themes for surveys is accomplished through the
-use of css (cascading style sheets). A theme is made possible by
-copying and then editing the template.css style sheet located in the
-css directory. This "template" consists of the following class
-definitions. Before we examine the classes it is worth noting that you
-should not change the names of the actual classes nor add additional
-classes without editing the way that surveys are rendered. However you
-are free to add, delete, modify any of the classes' attributes.
-
-THE CLASSES:
-1/ headerGraphic: allows for the inclusion of a graphic at the top of
-   your survey and works in conjunction with the 2/image class. If you
-   do not wish to include such a graphic you may simply omit these two
-   classes from your css file.
-3/ surveyTitle: allows for the formatting of the survey's title.
-4/ surveySubtitle: allows for the formatting of the survey's subtitle.
-5/ addInfo: allows for the formatting of the "additional Information"
-   that can be included just after the survey's subtitle.
-6/ message: allows for the formatting of the messages that appear at
-   the top of the survey when a user tries to submit a survey without
-   completing all required questions.
-7/ reqQuestion: allows for the formatting of the required Question
-   string that appears near the top of the survey when the survey
-   contains required questions.
-8/ mainTable: allows for the formatting of the main table. This is the
-   table that contains all other survey elements.
-9/ preQuestionBorder: allows for the formatting of the row that appears
-   just before each survey question.
-
-each question is now contained within a nested table structure which
-consists of an outer table and an inner table. This structure allows
-the theme creator to add a border around each question if so desired.
-The class for this outer table is 10/ qnOuterTable.
-
-The inner table class 11/ qnInnerTable: is required if such borders are
-to be created. To create a border the qnOuterTable class should have a
-background-color attribute set. This color will form the border. To
-complete the border effect the qnInnerTable class should also have a
-background-color attribute set.
-
-12/ qnInnerTd: allows for the formatting of the question number.
-13/ qnInner: allows for the formatting of the column that contains the
-    question text.
-14/ qnType: allows for the formatting of the column that contains the
-    question type (radio buttons, check boxes, etc..).
-15/ thankHead: allows for the formatting of the thank you heading that
-    appears after a user has successfully submitted a survey.
-16/ thankBody: allows for the formatting of the thank you text that
-    appears just under the thank you heading.
-17/ returnLink: allows for the formatting of the "return" link that
-    appears on the thank you page.
-
-Finally there exists one further definition which is 18/ body: This is
-not a class but a redefinition of the body HTML tag. This can be used
-to format the survey's background color, background image, left, right,
-top margins etc.
-
-To ensure that survey themes work correctly you must ensure:
-1/ that a css directory exists, preferably within your phpESP
-   directory, and that: a/its path is indicated in the phpESP.ini file.
-   and b/ it is readable by the web server.
-2/ that all the survey css files are contained within this directory
-   and created prior to creating the survey that will require it.
-3/ that any header graphics used are contained in a directory
-   recognized by the web server. It would be preferable to keep these
-   images in a subdirectory within phpESP's image directory.
-4/ that you do not use attributes that are known to cause major
-   problems in some browsers. for example: the cell-spacing, rowspan
-   attributes do not work in many browsers, and the width attribute is
-   not handled properly by Netscape 4.78 Linux, other css properties
-   that NN4.xx browsers cannot render include background-attachment,
-   background-position, border-top, border-left, border-bottom,
-   bottom-right, display (except display:none), font-variant,
-   letter-spacing, list-style-image, list-style-position,
-   vertical-align, word-spacing, white-space:nowrap, first-line and
-   first-letter pseudo-elements.
-
-Finally, if you do not wish to apply a theme to a survey it is
-recommended that you use the default.css style.
-
-The "template" css file that has been provided has been tested with the
-following browsers:
-Linux:
-  a/ Opera 6.0 - no problems.
-  b/ Konqueror 2.2-11 - no problems.
-  c/ Mozilla 0.9.2.1 - no problems.
-  d/ Netscape Navigator 4.78 - does not like the width attribute and I
-     was unable to get the headerGraphic and image classes to work.
-Windows:
-  a/ Internet Explorer 6.0 - no problems.
-  b/ Netscape 4.78 - as mentioned above.
-  c/ Netscape 6 - no problems.
-
-----
-$Id: THEMES,v 1.1 2003/02/27 18:39:31 jimmerman Exp $
Index: docs/TODO
===================================================================
--- docs/TODO	(revision 6370)
+++ docs/TODO	(working copy)
@@ -1,22 +0,0 @@
-================
-PHPESP TODO LIST
-================
-
-SOON:
- * new GUI
- * themes for management interface
- * expand the "Results" page into "Analysis"
- * "sub"-questions of other questions
- * "forked" surveys (subsequent pages dependent on previous question)
- * question groups (questions that share a Q#)
- * check boxes with a fixed number (pick N items...)
- * spell checking support (use spell checking from IMP?)
- * "Archive" management
-
-JAVASCRIPTS: (please contribute)
- * Limit number of check boxes checked to N.
- * "Grey out" a field(s) when a box is/is not checked.
- * Numeric only text fields (Denis HAVLIK <denis at mandrakesoft.com>)
-
-----
-$Id: TODO,v 1.1 2003/02/27 18:39:31 jimmerman Exp $
Index: docs/INSTALL
===================================================================
--- docs/INSTALL	(revision 6370)
+++ docs/INSTALL	(working copy)
@@ -1,301 +0,0 @@
-****** NOTICE ******
-You should backup your production phpESP database before upgrading to this release.
-We are now using ADODB and have made significant changes to the database API which
-may cause unknown data corruption.
-
-Also if you are upgrading mySQL to version 4.1 or above, on an existing phpESP 
-installation you need to read the UPDATING document in this directory, especially
-the UPDATING DATABASE section.
-****** NOTICE ******
-
-=================
-INSTALLING PHPESP
-=================
-
-This document contains instructions for installing phpESP on your
-system.
-
-
-OBTAINING PHPESP
-----------------
-
-phpESP can be obtained from the phpESP web site, at
-
-   http://phpesp.sourceforge.net/
-
-The most current release version and the most current development
-version are listed on the main page.  Older releases are available from
-the "Files" section of the Source Forge project page.  All distribution
-files can be unpacked using tar+gunzip (see INSTALLING PHPESP, below). 
-
-Bleeding-edge development versions of phpESP are available via CVS; see
-the file docs/HACKING for information on accessing the phpESP CVS
-repository.
-
-
-PREREQUISITES
--------------
-
-The following prerequisites are REQUIRED for phpESP to function
-properly.
-
-  1. A web server that supports PHP.
-
-     phpESP is developed under the Apache web server, which we
-     recommend.  Apache is available from
-
-        http://httpd.apache.org/
-
-     phpESP may work under Microsoft IIS, but is known to have certain
-     problems.
-
-  2. PHP 4.2.1 or above.
-
-     PHP is the interpreted language in which phpESP is written.  You
-     can obtain PHP at
-
-        http://www.php.net/
-
-     Follow the instructions in the PHP package to build PHP for your
-     system.  If you use Apache, be sure to build PHP as a library with
-     the
-
-         --with-apache
-     or
-         --with-apxs
-
-     options to ./configure.
-
-     The following PHP options are REQUIRED by phpESP (listed with
-     their own prerequisites and configure options).  In many cases,
-     the required libraries and tools can be obtained as packages from
-     your operating system vendor.
-
-       a. MySQL support.  (--with-mysql)
-
-          phpESP uses a MySQL database to store survey information,
-          responses to surveys, and user information.  Information on
-          obtaining MySQL is available at
-
-            http://www.mysql.com/
-        
-          (Future versions may allow the use of any database supported
-          by the PEAR database abstraction class.)
-
-     The following PHP options are RECOMMENDED to enable advanced
-     features in phpESP:
-
-       a. Gettext support.  (--with-gettext)
-
-          Gettext is the GNU Translation Project's localization
-          library.  phpESP uses gettext to provide local translations
-          of text displayed by the designer interface.  Information on
-          obtaining the gettext package is available at
-
-             http://www.gnu.org/software/gettext/gettext.html
-
-          (See also note below on configuring translations.)
-
-  3. Additional PEAR Modules
-
-     PEAR is short for "PHP Extension and Application Repository".  The
-     goal of PEAR is to provide a means of distributing reusable code.
-
-     For more information, see http://pear.php.net/
-
-     At this time, phpESP does not use any PEAR modules.  Future
-     versions of phpESP will take advantage of PEAR.
-
-
-INSTALLING PHPESP
------------------
-
-phpESP is written in PHP, and must be installed in a web-accessible
-directory.  The precise location of this directory will differ from
-system to system.  If you have no idea where you should be installing
-phpESP, install it directly under the root of your web server's
-document tree.
-
-Since phpESP is written in PHP, there is no compilation necessary;
-simply expand the distribution where you want it to reside and rename
-the root directory of the distribution to whatever you wish to appear
-in the URL.  For example, with the Apache web server's default document
-root of '/usr/local/apache/htdocs', you would type:
-
-   cd /usr/local/apache/htdocs
-   tar zxvf /path/to/phpESP-1.6.tar.gz
-   mv phpESP-1.6 phpESP
-
-and would then find phpESP at the URL
-
-   http://your-server/phpESP/
-
-The default user name is "root" and has a password of "esp".  You
-should login and change this password immediately after you configure
-phpESP.  This user name and password are for logging into phpESP, do
-not confuse them with the database user name and password below.
-
-
-CONFIGURING PHPESP
-------------------
-
-1. Configuring the web server
-
-   phpESP requires the following web server settings.  Examples shown
-   are for Apache; other web servers' configurations will differ.
-
-   a. PHP interpretation for files matching "*.php"
-
-         AddType application/x-httpd-php .php
-
-   Note: The above instructions may not work if you have specified PHP
-         as an output filter with SetOutputFilter directive  in Apache
-         2.x versions.  In particular, RedHat 8.0 Apache 2.x RPMS have
-         the output filter set, and MUST NOT have the above AddType
-         directive added.
-
-   b. "index.php" as an index file (brought up when a user requests a
-      URL for a directory)
-
-         DirectoryIndex index.php
-
-2. Creating databases
-
-   If you are upgrading an existing version of phpESP please read
-   "docs/UPDATING" for instructions on updating your database.
-
-   a. Database and User
-
-      First, look at the "scripts/db/mysql_create.sql" file.  This
-      script, when run as the root user in mysql, will create a
-      database and user for phpESP.  Be sure to change the default
-      password, "phpesp", to something else before executing the
-      script!  (Remember to use this password when you configure phpESP
-      in the next step.)
-
-      Alternatively, you may create the database and user for phpESP on
-      your own.  This can easily be done with a tool like phpMyAdmin.
-
-   b. Tables and Data
-   
-      Once a database and user have been created for phpESP, you must
-      create and populate the tables for phpESP.  You will find a
-      script names "mysql_populate.sql" in the same location as the 
-      last script.  This script should be executed on the new phpESP
-      database as the root user in mysql.  As above, you may run this
-      script using an administration tool of your choosing.
-
-   Note: The recommended and supported method of executing these
-         scripts is via the mysql CLI (command line interface).  For
-         example, to run these scripts you would execute the following
-         commands:
-
-         $ mysql -u root -p < scripts/db/mysql_create.sql
-         $ mysql -u root -p phpesp < scripts/db/mysql_populate.sql
-         
-         If you use a database name other than "phpesp", substitute
-         that name on the second command line.
-
-3. Configuring phpESP
-
-   To configure phpESP, change to the admin/ directory of the installed
-   distribution, and edit "phpESP.ini.php".  Most users will only have
-   to change a few settings in this file.  The most common changes are
-   to the 'base_url', and to the database username and password
-   ('db_user' and 'db_pass').
-
-   Note for international users:  phpESP uses GNU gettext to provide
-   local translations of text displayed by applications; the
-   translations are found in the locale/ directory.  If a translation
-   is not yet available for your locale (and you wish to create one),
-   or if you are having trouble using a provided translation, please
-   see the "docs/TRANSLATIONS" file for instructions.
-
-4. Securing phpESP
-
-   a. Passwords
-
-      phpESP's configuration file contains passwords which local users
-      could use to access your database.  It is recommended to ensure
-      that at least the phpESP configuration file (admin/phpESP.ini.php)
-      is not readable to system users.
-
-      An additional approach is to make phpESP's configuration file
-      owned by the user 'root' and by a group which only the web server
-      user belongs to, and then making it readable only to owner and
-      group.  For example, if your web server runs as www.www, do as
-      follows:
-
-         chown root.www admin/phpESP.ini.php
-         chmod 0440 admin/phpESP.ini.php
-
-   b. Sessions
-
-      Session data -- including hashed versions of your users'
-      passwords, in some applications -- may not be stored as securely
-      as necessary.
-
-      If you are using file-based PHP sessions (which are the default),
-      be sure that session files are not being written into /tmp with
-      permissions that allow other users to read them.  Ideally, change
-      the 'session.save_path' setting in php.ini to a directory only
-      readable and writeable by your web server.
-
-      Additionally, if phpESP is deployed at a hosting service that
-      uses a server farm you may have problems with sessions.  If all
-      servers do not share a common 'session.save_path', sessions will
-      break.  The solution to this problem is to use the php function
-      session_save_path(), to change the path to a shared location. 
-      Please make use of one of the support channels (below) if you
-      encounter this problem.
-
-
-5. Testing phpESP
-
-   Once you have configured your web server, PHP, and phpESP, bring up
-   the included test page in your Web browser to ensure that all
-   necessary prerequisites have been met.  If you installed phpESP as
-   described above, the URL to the test page would be
-
-      http://your-server/phpESP/admin/test.php
-
-   Check that your PHP and PEAR versions are acceptably recent, and
-   that all required module capabilities are present.  Then note the
-   "Session counter: 1" line under "PHP Sessions", and reload the page.
-   The session counter should increment.
-
-
-OBTAINING SUPPORT
------------------
-
-If you encounter problems with phpESP, help is available!
-
-The phpESP Frequently Asked Questions List (FAQ), available on the Web
-at
-
-  http://phpesp.sourceforge.net/docs/faq.html
-
-A few mailing lists are run for phpESP.  Information, archives, and
-subscription information can be found at
-
-  http://phpesp.sourceforge.net/
-
-Finally, phpESP developers, contributors and users also make occasional
-appearances on IRC, on the channel #phpesp on freenode.
-(irc.freenode.net).
-
-Please keep in mind that phpESP is free software written by volunteers.
-
-Thanks for using phpESP!
-
-The phpESP team
-
-----
-$Id: INSTALL,v 1.5 2005/03/09 19:01:04 greggmc Exp $
-
-------------------------------------------------------------------------
-This document was obtained from the Horde project, and modified for
-phpESP.  We would like to thank the Horde project for providing such
-clean documentation.  You may learn more about the Horde project at
-  http://www.horde.org/
-------------------------------------------------------------------------
Index: docs/CHANGES
===================================================================
--- docs/CHANGES	(revision 6370)
+++ docs/CHANGES	(working copy)
@@ -1,280 +0,0 @@
-=================
-PHPESP CHANGE LOG
-=================
-1.8.1 => 1.8.2
-* FIXED problems with adding/deleting respondents/designers
-* FIXED display issues when previewing surveys.
-* FIXED ADODB SQL INJECT issue.
-
-1.8 => 1.8.1
-* FIXED Export/Download problem for IE.
-  (from Aaron Axelsen <lists at frozenpc.net>)
-* FIXED Expiration data formatted incorrectly.
-
-1.8-rc1 => 1.8
-=========================
-* FIXED multi-paged surveys only storing last page results.
-  (from <merlot02 at users.sourceforge.net>)
-* FIXED qnType not showing on questions with tables
-  (from <merlot02 at users.sourceforge.net>)
-
-1.7.5 => 1.8-rc1
-=========================
-* ADDED support for PHP5
-  (from Kon Angelopoulos) 
-* FIXED several XSS and SQL injection bugs
-  (from Gavin Hicking <in dot garv at mail>)
-* ADDED new management interface layout 
-  (from Aaron Axelsen <lists at frozenpc.net>)
-
-1.7.5-dev2 => 1.7.5-dev3
-=========================
-* FIXED register_globals being on dependancy
-
-1.7.5-dev => 1.7.5-dev2
-=========================
-* FIXED form login problem
-
-1.7.2 => 1.7.5-dev
-=========================
-* Added form based login
-
-v1.7.1 => 1.7.2
-=========================
-* FIXED missing javascript funtion
-
-v1.7 ==> 1.7.1
-=========================
-* FIXED mysql create scripts support mySQL > 4.0
-* ADDED password check/upgrade for mySQL > 4.0
-* FIXED problem resuming surveys
-* FIXED survey copying
-
-v1.7-rc1 ==> v1.7-rc2
-=========================
-* FIXED quoting problem with array_to_insql function.
-
-v1.7-dev ==> v1.7-rc1
-=========================
-* FIXED !other Checkbox questions not recording.
-* FIXED bad javascript path in head.inc. (Reported by
-  <beachbum_boy AT users.sourceforge.net>).
-* ADDED a check for unsupported web server 
-  configuration(sapi, cgi, etc..) 
-* FIXED CSV export so duplicate question names and question 
-  answers are supported. 
-
-v1.6.1 final ==> v1.7-dev
-=========================
-* FIXED invalid CSS comments.
-* FIXED bugus CSS link background image link.
-* FIXED surveys created in 1.5 fail to CSV exported properly
-  (Reported by Hakan Kuecuekyilmaz).
-* FIXED legend text on "change status page" (Reported by
-  Daniel Buchmann).
-* FIXED Section text set to required causes survey to be
-  invalid. (Based on patch by Paul Jackson - 
-  <beachbum_boy AT users.sourceforge.net>.
-* FIXED crosstab grand total incorrect.
-* FIXED questions that have the same name cause CSV export
-  to "explode".  Question now are forced to be unique.
-  (Reported by Paul Jackson - 
-  <beachbum_boy AT users.sourceforge.net>.
-* FIXED mysql create script failed on mysql >= 4. (Based on
-  patch by Kevin Hawkins - jedihawk AT users.sourceforge.net>).
-* FIXED permission problems in admin pages. (Reported by
-  Leonard Chan - <wotg AT users.sourceforge.net>).
-* FIXED single quotes in question names cause bogus question 
-  names. Reported by (Elie De Brauwer -
-  <amo-ej1 AT users.sourceforge.net>).
-* FIXED quotes in essay questions cause extra escapes.
-  (Reported by Elie De Brauwer - 
-  <amo-ej1 AT users.sourceforge.net>).
-* FIXED removed duplicate call to survey_generate_csv in
-  download.inc.  Based on patch from (Rodolfo Cossalter -
-  <rcoss at users.sourceforge.net>).
-* FIXED allow https urls.
-* FIXED groups limited to one assignment for access.
-* FIXED 0 interpreted as a non-response in Text questions.
-  (Reported by <ude.csum [AT] adin>).
-* NEW FEATURE: Prefix can be assigned to DB tables.
-* ADDED support for databases other than mySQL.  ADOdb now
-  required by and shipping with phpESP.
-* ADDED new css tags for error/info text.
-* ADDED new help page (Based on a submission from Aaron Axelsen).
-* ADDED javascript popup to warn users of the non-reversibilty of
-  activating a survey.
-* ADDED javascript popup to warn users when canceling a new survey.
-* ADDED check for web server running in unsupported(CGI, etc..), mode.
-
-v1.6 final ==> v1.6.1 final
-===========================
-* FIXED redirects so that the server port is used.  (Reported by
-  <rcoss AT dm.uba.ar>.)
-* FIXED CSV export bug on rank questions.  (Based on Patch by Paul
-  Jackson <beachbum_boy AT users.sourceforge.net>.)
-* FIXED slash bug on question choices.  (Reported by Eric Bont.)
-* FIXED purge function for non en-US locales.
-* FIXED bug with the return link at the end of surveys when
-  using the auto-publish page.
-
-v1.6 RC3 ==> v1.6 final
-=======================
-* FIXED windows bug with LC_MESSAGES.  (Reported by Terry Black
-  <tblac AT doh.health.nsw.gov.au>.)
-* FIXED an E_ALL warning for HTTP_ACCEPT_LANGUAGES.
-* LANGUAGE: Update of German translation (de_DE)
-  (Robert <HEConsulting AT t-online.de>)
-* LANGUAGE: Update of Dutch translation (nl_NL)
-  (Klaas Chielens <klaas AT chielens.net>)
-* LANGUAGE: Translation into Greek (el_GR)
-  (armandos <armandos AT hol.gr>)
-* LANGUAGE: Translation into Swedish (sv_SE)
-  (Mats Landstedt <mats.landstedt AT tuesday.se>)
-
-v1.6 RC2 ==> v1.6 RC3
-=====================
-* NEW FEATURE: System test script.
-* FIXED compatibility with older PHP versions and settype(). 
-  (Submitted by Emmett Bearden <chadb AT beardendesigns.com>.)
-* FIXED bug with querying the database before it was opened.  (Noticed
-  by James P. Dugal <jpd AT louisiana.edu>.)
-* FIXED gettext support, again.  Hopefully for the last time.
-* ADDED redirector to admin page in main phpESP directory.
-* LANGUAGE: Translation into Japanese (ja)
-  (IYODA Atsushi <iyoda AT users.sourceforge.net>)
-
-v1.6 RC1 ==> v1.6 RC2
-=====================
-* FIXED a bug which caused non-resumable responses to be stored
-  incorrectly.  (Only affected multipage surveys.)
-* FIXED missing "help" link and title display on cross-tab interface. 
-* FIXED display of selected theme on general tab. (Noticed by Eric Bont
-  <kanven AT fhi.nl>.)
-
-v1.5 final ==> v1.6 RC1
-=======================
-* NEW FEATURE: Ability to navigate (back/forward) a survey response.
-* NEW FEATURE: Ability to save/resume a survey response.
-* NEW FEATURE: Ability to view individual survey responses.
-* NEW FEATURE: Graphical interface for cross analysis.
-* NEW FEATURE: Response id, response time, and username included in CSV
-  export.
-* NEW FEATURE: Self sign-up form for respondents.
-* ADDED a new default group 'auto' to database, used for self
-  registered respondents.
-* ADDED two new fields to the 'access' table to enable navigation and
-  save/resume on authenticated surveys.
-* CHANGED 'thank you' redirection to use 'Location:' header when
-  possible.
-* CHANGED code to automatically determine the install location.
-* CHANGED database connection to a support function so it is no longer
-  in phpESP.ini.
-* CHANGED handling of '!other' fields for more consistent behavior.
-* CHANGED length of username fields from 16 to 64 characters in the
-  database.
-* CHANGED lib/espresponse.inc.  Re-written several times.
-* CHANGED render_survey() to survey_render() for consistency.
-* CHANGED support function DESLASH() to _stripslashes().
-* CHANGED support function XADDSLASHES() to _addslashes().
-* CHANGED the configuration file to have a '.php' extension to avoid
-  potential security problems.
-* CHANGED use of include() to require_once(), and removed 'if
-  defined()' check.
-* FIXED access control list when authentication is disabled.
-* FIXED bug with counting number of users per group.
-* FIXED dependencies on register_globals finally.
-* FIXED lots of warnings with E_ALL.
-* FIXED some HTML tags.  Lower case tag name and XHTML nits.
-* FIXED warnings when DEBUG is enabled when open_basedir is in effect.
-
-v1.5 RC3 ==> v1.5 final
-=======================
-* FIXED a typo in phpESP.ini.
-
-v1.5 RC2 ==> v1.5 RC3
-=====================
-* FIXED bug that was causing !other results to be lost on
-  checkbox questions.
-
-v1.5 RC1 ==> v1.5 RC2
-=====================
-* FIXED Bug with new lines in exported CSV files.
-* FIXED Font sizes in some of the themes.
-* FIXED Spelling mistakes.
-* LANGUAGE: Translation into Italian (it)
-  (<info at cawi.it>)
-* LANGUAGE: Translation into Portuguese (pt)
-  (Lopo Pizarro <lopopizarro at users.sourceforge.net>)
-
-v1.4 final ==> v1.5 RC1
-=======================
-* NEW FEATURE: Survey Themes. See README_SURVEYTHEMES.
-  (Kon Angelopoulos <angekproductions at iprimus.com.au>)
-* NEW FEATURE: Bulk import of accounts.
-  (Matthew Gregg <greggmc at musc.edu>)
-* NEW FEATURE: Option to send Human Readable email for
-  each survey submission.
-  (Kon Angelopoulos <angekproductions at iprimus.com.au>)
-* NEW FEATURE: Display of number of responses to surveys
-  when listing of surveys.
-  (Gary Ashton-Jones <gashtonjones at f2network.com.au>)
-* NEW FEATURE: Javascript auto checks radio/checkbox
-  when data is entered into !other text fields.
-* FIXED Javascript behavior for IE on OS X.
-* CHANGED format of phpESP.ini a little bit to simplify it.
-* CHANGED results to show all question choices even if
-  count is zero.
-* LANGUAGE: Translation into Spanish (es)
-  (RAUL PITTI <rpitti at netmasters.com.pa>)
-* LANGUAGE: Translation into Brazilian Portuguese (pt-br)
-  (Ricardo Cavallini <ricardo at cavallini.com.br>)
-
-v1.4 beta 3 ==> v1.4 final
-==========================
-* NEW FEATURE: Automatic survey template added. This lets
-  you use a survey without having to create a HTML template
-  file yourself and insert the PHP tag.
-* NEW FEATURE: Added CSV (comma separated values) download
-  of collected data.
-* NEW FEATURE: Added LDAP authentication.
-  (Christopher Zorn <zorncj at musc.edu>)
-* FIXED problems with newlines and quotes in CSV data files.
-* FIXED inclusion of "Other" data in CSV files.
-* FIXED problem with zero (0) in req'd numeric fields.
-* FIXED namespace conflict on temporary variables. Was
-  causing Language preference to be ignored and results to be
-  improperly stored.
-* CHANGED name from 'phpESP -- Easy Survey Package' to
-  'phpESP -- php Easy Survey Package' (for TM# 1,721,621)
-* LANGUAGE: Translation into Danish (da)
-  (Henrik <henrik at hornhaver.dk>)
-* LANGUAGE: Translation into French (fr)
-  (Cedric Levasseur <cedric.levasseur at linux-at-business.com>,
-  Olivier Sevin <cjanson at ifrance.com>)
-
-v1.4 beta 2 ==> v1.4 beta 3
-===========================
-* NEW FEATURE: Section Text, allows free form text to be
-  placed inside a survey. (REQ: Database update!)
-  (Kon Angelopoulos <angekgabiel at iprimus.com.au>)
-* NEW FEATURE: Added a configuration variable to globally
-  disable email functions.
-* LANGUAGE: Translation into German (de)
-  (<flo.bee at web.de>)
-* LANGUAGE: Translation into Dutch (nl)
-  (Sipke Overbeeke <sipke at 8a.nl>)
-
-v1.4 beta 1 ==> v1.4 beta 2 (not released)
-==========================================
-* CHANGED results to store IP address if no other ID
-  available.
-* FIXED status page to omit archived surveys.
-* FIXED more spelling mistakes.
-
-v1.3 final ==> v1.4 beta 1
-==========================
-* FIXED spelling mistakes.
-
-----
-$Id: CHANGES,v 1.41 2007/07/09 12:58:18 liedekef Exp $
Index: docs/faq.html
===================================================================
--- docs/faq.html	(revision 6370)
+++ docs/faq.html	(working copy)
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><title>phpESP - Frequently Asked Questions</title>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-<style>
-h1 {
-    font-weight: bold;
-    font-size: 120%;
-}
-.indented {
-    margin-left: 20px;
-}
-</style>
-</head>
-<body>
-<div><p align="center" ><b>FREQUENTLY ASKED QUESTIONS (FAQs)</b></p>
-<ul>
-<li><h1>Installation</h1>
-    <ul>
-        <li><a href="#ipermissions"><b>What are the correct permission settings for phpESP files?</b></a></li>
-	<li><a href="#iunsupported"><b>I'm getting an error that says PHP is running in a unsupported mode.</a></b></li>
-	<li><a href="#idisableauth"><b>Can I disable authentication for the management interface?</a></b></li>
-        <li><a href="#iglobals"><b>Does register globals need to be on?</b></a></li>
-        <li><a href="#iblank"><b>I'm running Windows and keep getting a blank screen - Help!</b></a></li>
-        <li><a href="#ipasswd"><b>Where do I set the MySQL login passwords?</b></a></li>
-        <li><a href="#iotherdb"><b>Does phpESP support databases other than MySQL?</b></a></li>
-        <li><a href="#ilanguage"><b>I'm having trouble changing the default language, what should I do?</b></a></li>
-    </ul>
-</li>
-<li><h1>Survey Management</h1>
-    <ul>
-        <li><a href="#mdelete"><b>Can I delete old surveys?</b></a></li>
-        <li><a href="#monequestion"><b>How can I display only 1 question per page?</b></a></li> 
-        <li><a href="#mrank"><b>Can I change the number of options on a rank question?</b></a></li>
-        <li><a href="#mmultiple"><b>Can I prevent multiple votes (ballot stuffing)?</b></a></li>
-        <li><a href="#mlogin"><b>Can I limit the number of times someone takes a survey if they have to login?</b></a></li>
-        <li><a href="#mpart"><b>Can a respondent complete part of a survey, log out, then log back in later to finish?</b></a></li>
-    </ul>
-</li>
-<li><h1>Survey Deployment</h1>
-    <ul>
-        <li><a href="#dhandler"><b>What are handler.php and phpESP.first.php, and how do I use them?</b></a></li>
-	<li><a href="#dresults"><b>How do I publish survey results?</b></a></li>
-    </ul>
-</li>
-<li><h1>General Questions</h1>
-    <ul>
-        <li><a href="#glarge"><b>Can phpESP support large numbers of respondents?</b></a></li>
-    </ul>
-</li>
-</ul>
-<hr>
-<ul>
-<li><h1>Installation</h1>
-<p><a name="ipermissions"><b>What are the correct permission settings for phpESP files?</b></a>
-<p class="indented">In a Unix environment, phpESP files should be set as 644 to be readable by Apache. For tighter security, phpESP.ini.php should be set 640, owner root and it's group set to the Apache process's group.</p>
-<a href="#top">Top</a>
-<p><a name="iunsupported"><b>I'm getting an error that says PHP is running in a unsupported mode.</b></a>
-<p class="indented">This error is an indication that your web server is running PHP in CGI mode instead of SAPI.
-phpESP can function in this configuration but authentication must be disabled. (<a href="#idisableauth">See disabling authentication in this FAQ.</a>) (<a href="http://us4.php.net/manual/en/install.general.php">See the PHP manual for more information on CGI VS SAPI.</a>)</p>
-<a href="#top">Top</a> 
-<p><a name="idisableauth"><b>Can I disable authentication for the management interface?</b></a>
-<p class="indented">Authentication can be disabled by setting auth_design to false in phpESP.ini.php. Warning, makeing this change could pose a security risk.<br /><br />
-Change this:<br />
-<tt>$ESPCONFIG['auth_response'] = true;</tt><br />
-and
-<tt>$ESPCONFIG['auth_design'] = true;</tt><br /><br />
-To this:<br />
-<tt>$ESPCONFIG['auth_response'] = false;</tt><br /></p>
-and
-<tt>$ESPCONFIG['auth_design'] = false;</tt><br /><br />
-<a href="#top">Top</a> 
-<p><a name="iglobals"><b>Does register globals need to be on? </b></a>
-<p class="indented">No.</p>
-<a href="#top">Top</a> 
-<p><a name="iblank"><b>I'm running Windows and keep getting a blank screen - Help! </b></a>
-<p class="indented">If is is not a path problem in phpESP.ini.php, then copy gnu_gettext.dll (or libintl-1.dll) and 
-php_gettext.dll (both usually found in the PHP install directory) into the system directory of windows.  For
-Win95/98 the system directory is something like <tt>c:\windows\system</tt> and on WinNT/2000/XP the system 
-directory is something like <tt>c:\windows\system32</tt>.<br>
-<br>After you have copied these dll's to the proper place, edit your php.ini file and comment out the 
-line "extension=php_gettext.dll". <br>
-<br>Then stop and restart the web server.</p>
-<a href="#top">Top</a> 
-<p><a name="ipasswd"><b>Where do I set the MySQL login password?</b></a>
-<p class="indented">The MySQL server name, user, and password that phpESP will use are
-set in the file phpESP.ini.php -- further details are in the INSTALL file.</p>
-<a href="#top">Top</a> 
-<p><a name="iotherdb"><b>Does phpESP support databases other than MySQL?</b></a>
-<p class="indented">As of version 1.7 database abstraction has been implemented using the 
-<a href="http://adodb.sourceforge.net/">ADOdb</a> library. MySQL is the most fully tested,
-Postgres has not been fully tested and SQLite has some known issues. 
-We would welcome help makeing Postgres and SQLite support as strong as MySQL.</p>
-<a href="#top">Top</a> 
-<p><a name="ilanguage"><b>I'm having trouble changing the default language, what should I do?</b></a>
-<p class="indented">Check the results of the phpESP system test page, then see the TRANSLATIONS file.</p>
-<a href="#top">Top</a>
-</li>
-<hr>
-<li><h1>Survey Management</h1>
-<p><a name="mdelete"><b>Can I delete old surveys? </b></a>
-<p class="indented">Yes, there is an unlisted function http://......./phpESP/admin/manage.php?where=purge<br>
-Be <em>very</em> careful when using it, you cannot recover from it.</p>
-<a href="#top">Top</a> 
-<p><a name="monequestion"><b>How can I display only 1 question per page? </b></a>
-<p class="indented">You can put a section break between each question to emulate this behavior.</p>
-<a href="#top">Top</a> 
-<p><a name="mrank"><b>Can I change the number of options on a rank question? </b></a>
-<p class="indented">Yes, change the length field.</p>
-<a href="#top">Top</a> 
-<p><a name="mmultiple"><b>Can I prevent multiple votes (ballot stuffing)? </b></a>
-<p class="indented">Well, if you give each respondent a username and password and have them login, you can limit 
-multiple voting.  If you don't force respondents to log in, it becomes more difficult (e.g., you could 
-analyze the data by IP.)</p>
-<a href="#top">Top</a> 
-<p><a name="mlogin"><b>Can I limit the number of times someone takes a survey if they have to login? </b></a>
-<p class="indented">Yes, set max login to the number of times you want to allow someone to take the survey.
-This may be done from the <em>Survey Access</em> page.</p>
-<a href="#top">Top</a> 
-<p><a name="mpart"><b>Can a respondent complete part of a survey, log out, then log back in later to finish? </b></a>
-<p class="indented">Yes, see the <em>Save/Restore</em> option on the <em>Survey Access</em> page.</p>
-<a href="#top">Top</a> 
-</li>
-<hr>
-<li><h1>Survey Deployment</h1>
-<p><a name="dhandler"><b>What are handler.php and phpESP.first.php, and how do I use them?</b></a>
-<p class="indented">They are used to embed a survey in another block of html/php code. You should always include phpESP.first.php at the top of your html code, before any output begins. Look at the examples in the example dir for usage.
-</p>
-<a href="#top">Top</a>
-<p><a name="dresults"><b>How do I publish survey results?</b></a>
-<p class="indented">
-You can make public results by doing the following, though note that it
-will make all results public.  Make a copy of public/survey.php then edit
-your copy to uncomment approximately on line 48:<br /><br />
-<tt> //$results = 1; </tt><br /><br />
-then use your copied/edited page just like the survey.php page.  It should then display
-results instead of the survey.  The same applies to custom
-survey templates, setting $results to one before calling handler.php  
-will switch to results mode.
-</p>
-<a href="#top">Top</a>
-</li>
-<hr>
-<li><h1>General Questions</h1>
-<p><a name="glarge"><b>Can phpESP support large numbers of respondents?</b></a>
-<p class="indented">Yes, large surveys (100 questions) and large respondent groups (4,000+) can be 
-handled without a problem.  Throughput issues are generally a function of the speed of the web server, 
-the speed of the MySQL server, and available network bandwidth.</p>
-<a href="#top">Top</a> 
-</li>
-</ul>
-<!-- faq  end -->
-</body></html>
Index: docs/UPDATING
===================================================================
--- docs/UPDATING	(revision 6370)
+++ docs/UPDATING	(working copy)
@@ -1,69 +0,0 @@
-****** IMPORTANT ******
-This is a developmental release.  Do not use this on your production phpESP database.
-We are now using ADODB and have made significant changes to the database API which
-may cause unknown data corruption.  Please create a fresh phpESP database instance and
-help us workout any remaining bugs.
-******IMPORTANT ******
-
-===============
-UPDATING PHPESP
-===============
-
-This document contains instructions for updating an existing
-installation of phpESP to a more recent version.  Please see the
-INSTALL guide for instructions on obtaining phpESP.
-
-
-GETTING STARTED
----------------
-
-As of version 1.6, phpESP no longer requires editing paths as previous
-versions did.  The recommended upgrade path is to  rename the old
-install directory, and install the new version in the old location
-(following the directions in INSTALL).  The database creation and
-population steps should be skipped, and in place follow the
-instructions below on updating the database.  Once the new version is
-installed and running, you may delete the old install directory.
-
-For example if you had phpESP 1.5 installed in
-
-  /usr/local/www/htdocs/phpESP
-
-You should do something like this
-
-  $ cd /usr/local/www/htdocs
-  $ mv phpESP phpESP.old
-  $ tar -zxf /path/to/phpESP-1.6.tar.gz
-  $ mv phpESP-1.6 phpESP
-  ... configure phpESP 1.6 ...
-  ... update database ...
-  ... test phpESP 1.6 ...
-  $ rm -rf phpESP.old
-
-
-BACKING UP OLD DATABASE
------------------------
-
-Before updating, it is recommended that you dump a copy of the phpESP
-database.  Please consult the MySQL documentation on how to dump a
-database.
-
-
-UPDATING DATABASE
------------------
-
-Go into the dir scripts/db and run the following mysql statements on your database (run all updates that are needed in the correct sequence):
-
-mysql_update-1.5-1.6.sql (if still running 1.5)
-mysql_update-1.8.2h-1.8.2i.sql (if running a version <= 1.8.2h and going to 1.8.2i)
-mysql_update-1.8.2k-2.0.0.sql (if running a version 1.8.2i-1.8.2k and going to 2.0.0)
-
-Please execute the update script as follows:
-  $ mysql -u root -p phpesp < scripts/db/mysql_update-1.8.2h-1.8.2i.sql
-  $ mysql -u root -p phpesp < scripts/db/mysql_update-1.8.2k-2.0.0.sql
-Change "root" by the correct DB user and "phpesp" by the correct DB name.
-
-Once you move to mySQL 4.1 you cannot downgrade your mySQL back to 4.0 
-or below and expect phpESP to function.
-----
-$Id: UPDATING,v 1.5 2007/12/10 10:09:13 liedekef Exp $
Index: docs/CREDITS
===================================================================
--- docs/CREDITS	(revision 6370)
+++ docs/CREDITS	(working copy)
@@ -1,45 +0,0 @@
-==============
-PHPESP CREDITS
-==============
-
-This software was initially written for eGrad.com.  I would like to
-thank everyone there and the company's commitment to open source
-software.
-
-Further development past version 1.0 has been a product of my "spare
-time".  I would like to thank college for all the spare time and the
-bandwidth. ;-)
-
-Additional help in ideas, criticism, testing, and code from Romans
-Jasins <roma at latnet.lv>.  Thanks Roma, especially for the Javascript
-and HTML help. Get some sleep!
-
-Authentication enhancements and CSV export additions were sponsored by
-The University of Vermont <www.uvm.edu>.
-
-The "Section Text" enhancements, survey themes, and cross analysis GUI
-were provided by Kon Angelopoulos <angekgabiel at iprimus.com.au>.
-
-Additional development by The ITLab <www.itlab.musc.edu>
-
-The save and resume, navigation, and self sign-up enhancements were
-sponsored by Neon Cowboy Design <www.neoncowboy.com>.
-
-If you have made any significant enhancements or changes to phpESP
-please contribute back.
-
-Language Translations
-=====================
-Danish     (da)    Henrik <henrik at hornhaver.dk>
-German     (de)    <flo.bee at web.de>
-Spanish    (es)    RAUL PITTI <rpitti at netmasters.com.pa>
-French     (fr)    Cedric Levasseur
-                   <cedric.levasseur at linux-at-business.com>,
-                   Olivier Sevin <cjanson at ifrance.com>
-Italian    (it)    <info at cawi.it>
-Dutch      (nl)    Sipke Overbeeke <sipke at 8a.nl>
-Portuguese (pt)    Lopo Pizarro <lopopizarro at users.sourceforge.net>
-Portuguese (pt-br) Ricardo Cavallini <ricardo at cavallini.com.br>
-
-----
-$Id: CREDITS,v 1.1 2003/02/27 18:39:31 jimmerman Exp $
Index: docs/GUIDE
===================================================================
--- docs/GUIDE	(revision 6370)
+++ docs/GUIDE	(working copy)
@@ -1,157 +0,0 @@
-============
-PHPESP GUIDE
-============
-
-GETTING STARTED GUIDE
----------------------
-
-This document is divided into two main sections. The first section is
-for general users. It explains how to use this tool to create a survey,
-test it, and incorporate it into a web page. The second section is for
-administrators. It explains how to manage a group of related users, and
-to use the access control system.
-
-,-------------.
-| USERS GUIDE |
-`-------------'
-
-There are three basic things that users do: make surveys, deploy
-surveys, and retrieve or export the data.
-
-Making Surveys:
----------------
-This is a straight forward procedure. Begin with
-    * Create a New Survey
-and follow the forms and prompts through the procedure. When you have
-made a survey you can use
-    * Change the Status of a Survey
-to put the survey in ``Test'' mode, or go right on to deploying it.
-
-Deploying Surveys:
-----------------
-After a survey is made (and tested), you can deploy it. This is as
-simple as going to
-    * Change the Status of a Survey
-and clicking on ``Activate''. There are two options for the deployment
-of a survey: one is to embed it in a customized HTML page, or to use
-the automatic template (which is very plain and simple). To use the
-automatic template, simply use the URL that was given to you on the
-``Finish'' tab. If you want to have the survey embedded on some custom
-web page insert the PHP tag that was given on the ``Finish'' tab in the
-desired place in your HTML file. Please make sure the HTML file you put
-that code in has a ``.php'' extension!
-
-Retrieving Data:
-----------------
-For any survey that is in Testing, Active or Ended you can go to
-    * Export Data to CSV
-and download a copy of the data from your survey. The ``download''
-option will allow you to save the data on the computer your web browser
-is running on, otherwise the data is saved to a file on the web server
-(typically in the /tmp directory). It is recommended that you use the
-``download'' option.
-
-Other Actions:
---------------
-You can also make copies of surveys, which is very handy if you want to
-change a survey that has already left the Edit/Test phase. Copying
-copies the survey questions, none of the collected data is copied. A
-copy of a survey is placed in ``Editing'' mode.
-
-You can test a survey, which just lets you collect data and make sure
-it works as desired.
-
-You can view tabulated results in a ``pretty'' format.
-
-You can also view a survey report, which may be useful to help
-interpreting the data collected.
-
-,----------------------.
-| ADMINISTRATORS GUIDE |
-`----------------------'
-
-Before beginning administration you must understand the user/group
-relationship. There are three classes of users. ``Superusers'' (that is
-you, the Administrator) have complete control in the Administration
-Mode. Designers are the users who will be creating, deploying, and
-analyzing surveys. The third class is the ``Respondents'', these
-accounts are for private surveys (surveys which require a user to login
-before entering data). Each of the Designers and the Respondents is
-associated with a group. It is expected that a group will contain
-members of a similar area. For example there may be a group for a
-department, or a club, or just for some arbitrary group of people who
-are working on a similar subject. There may exists an unlimited number
-of groups.
-
-There are two main levels of administration. The highest level
-(``superuser'' level) lets you control all users, and all surveys. The
-second level of administration is a group manager. A group manager has
-similar control to the superuser(s), but limited to the subset of users
-(and their surveys) in their group.
-
-Superusers:
------------
-The ``superusers'' are users who are a member of the special group
-``superuser''. As a superuser, your responsibility should only be to
-create new groups and create group managers. Once a group manager has
-been created for a group, that user should be able to control all
-aspects of that group. However any action that is described below in
-the group manager section can be performed by a superuser, but a
-superuser is not restricted to actions in a group.
-
-The superuser(s) will see the following administration options on the
-main menu:
-    * Manage Designer Accounts
-    * Manage Respondent Accounts
-    * Manage Groups
-
-Manage Groups is very simple. This option simply lists the existing
-groups and has a form to add a new group. Group names should be short,
-and should not have spaces. Good examples of group names are: ITS,
-ProjectX, WebTeam, etc. The description of the group is free form; you
-may enter any text you wish but please make it understandable.
-
-Manage Designer Accounts lets you add and remove users from groups, and
-change their permissions in each group. The page for this option lists
-all the existing user accounts. You can sort by Name or Group by
-clicking on the column heading. By clicking on a username, you can edit
-that entry.
-
-Superusers should read the next section as well to learn the permission
-levels.
-
-Group Managers:
----------------
-Group managers have full control over a group. This means that they
-have permission to perform all user functions, such as editing,
-testing, releasing and archiving. A group manager also can add and
-remove users from their groups.
-
-There are four basic user permission options, and two administration
-permission options. The user options are:
-    * Design Surveys
-        Allow the user to create, edit and test surveys. This option is
-        on by default, and is probably desired for most situations.
-    * Change Survey Status
-        This lets a user change the status of a survey. Essentially
-        this gives them the ability to release, end, and archive
-        surveys.
-    * Export Survey Data
-        Users with this flag, have the option to download the data
-        collected from a survey.
-    * Group Editor
-        By default, users can only perform any of the three actions
-        above on their own surveys. If the Group Editor flag is on, the
-        above permissions are widened to include all surveys created by
-        members of the group.
-
-The other two options set administration flags:
-    * Administer Designers
-        This grants the user permission to change flags on users in
-        their group, and to add new users to the group.
-    * Administer Respondents
-        Allows a user to add users to the list of allowed respondents,
-	within their group.
-
-----
-$Id: GUIDE,v 1.2 2004/02/21 21:23:25 greggmc Exp $
Index: admin/config.localhost.php
===================================================================
--- admin/config.localhost.php	(revision 6370)
+++ admin/config.localhost.php	(working copy)
@@ -1,63 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-	
-/// Options to Change
-
-	# database configuration
-	$db['main']['host'] = 'localhost';
-	$db['main']['dbname'] = 'vulab_vulab';
-	$db['main']['user'] = 'dbUser';
-	$db['main']['pass'] = 'dbPass';
-	$db['main']['link'] = dbConnect('main');
-
-	# http or https?
-	$CONFIG['url']['proto'] = 'http://';
-	
-	
-	# If you have installed OpenVuLab in a subdirectory (ex. domain.com/folder/vulab) enter it below:
-	# - DO NOT ADD A TRAILING SLASH
-	# - If its installed in the root of the domain (ex. domain.com/index.php) leave this blank.
-	$CONFIG['url']['subdir'] = '';
-
-	# base URL
-	$CONFIG['url']['base'] = $CONFIG['url']['proto'] . $server['HTTP_HOST'] . $CONFIG['url']['subdir'];
-	
-	# url of the images directory (for <img src='...'> tags)
-	$CONFIG['url']['images'] = $CONFIG['url']['base'] . $CONFIG['url']['subdir'] . '/images/';
-
-	# url for logo
-	$CONFIG['url']['logo'] = $CONFIG['url']['images'] . 'OpenVULab.png';
-	
-	# url of the css directory (for themes)
-	$CONFIG['url']['css'] = $CONFIG['url']['base'] . '/public/css/';
-
-
-	$CONFIG['path']['include'] = CORE_BASE . '/admin/include/';
-	$CONFIG['path']['css'] = CORE_BASE . '/public/css/';
-	$CONFIG['path']['locale'] = CORE_BASE . '/locale';
-
-	# url for management javascript
-	$CONFIG['url']['js'] = $CONFIG['url']['base'] . '/js/';
-	
-	$CONFIG['version'] = '0.3 alpha';
-	
-/// Site Options
-	$SITE['name'] = 'OpenVULab';
-	$SITE['slogan'] = 'Remote Usability Testing Suite';
-	# HTML page title
-	$SITE['title'] = $SITE['name'] .', v('. $CONFIG['version'].')';
-
-
-//// Options for the Experienced
-
-	include (CORE_BASE.'admin/phpESP.ini-local.php');
- ?>
\ No newline at end of file
Index: admin/include/foot.inc
===================================================================
--- admin/include/foot.inc	(revision 6370)
+++ admin/include/foot.inc	(working copy)
@@ -1,28 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-/* $Id: foot.inc,v 1.5 2005/04/14 17:51:13 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-?>
-      </div>
-      </form>
-   </div>
-  </div> <!-- end body div -->
-  
-  <div class="clear"></div>
-  <div id="footer">
-  Powered By <?php echo($SITE['title']); ?>
-  </div> <!-- end footer div -->
-<br/>
-</div> <!-- end main div -->
Index: admin/include/function/survey_copy.inc
===================================================================
--- admin/include/function/survey_copy.inc	(revision 6370)
+++ admin/include/function/survey_copy.inc	(working copy)
@@ -1,133 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: survey_copy.inc,v 1.18 2007/11/26 11:36:17 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-/* {{{ proto void add_squotes(string* value, string key)
-   Adds single quotes to value. */
-function add_squotes (&$val, $key) {
-	$val = _addslashes($val);
-}
-/* }}} */
-
-/* {{{ proto bool survey_copy(int survey_id)
-   Creates an editable copy of a survey. */
-function survey_copy($sid) {
-	$survey_fields = array('name','realm','title','subtitle','email','theme','thanks_page','thank_head','thank_body','info','auto_num');
-	$sql = "SELECT ". join(', ',$survey_fields)." FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${sid}";
-	$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-	if(record_count($result) != 1)
-		return(false);
-	$survey = fetch_row($result);
-	db_close($result);
-
-	// clear the sid,  change the name, and clear the status
-	$survey['owner'] = $_SESSION['acl']['username'];
-	$survey['name'] .= '_'. _('copy');
-	$survey['status'] = 0;
-
-	// check for 'name' conflict, and resolve
-	$sql = "SELECT COUNT(*) FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE name=". _addslashes($survey['name']);
-	$i=0;
-	$result = execute_sql($sql);
-	while($result->fields[0] > 0) {
-		$result->MoveNext();
-		$sql = "SELECT COUNT(*) FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE name=". _addslashes($survey['name'].++$i);
-		$result = execute_sql($sql);
-	}
-	if($i)
-		$survey['name'] .= $i;
-
-	// create new survey
-	array_walk($survey, 'add_squotes');
-	$survey['changed'] = sys_time_stamp();
-	$sql  = "INSERT INTO ".$GLOBALS['ESPCONFIG']['survey_table']." ";
-	$sql .= '('. join(',',array_keys($survey)) .') ';
-	$sql .= 'VALUES ( '. join(',',array_values($survey)) .' )';
-	$result = execute_sql($sql);
-	if(!$result)
-		return(false);
-	$new_sid = insert_id('survey_id_seq');
-
-	$has_choices = esp_type_has_choices();
-
-	// make copies of all the questions
-	$question_fields = array('id', 'survey_id', 'name', 'type_id', 'result_id', 'length', 'precise', 
-			'position', 'content', 'required', 'deleted', 'public');
-	$sql = "SELECT ". join(', ',$question_fields)." FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-		WHERE survey_id=${sid} AND deleted='N'
-		ORDER by position, id";
-	$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-	$pos=1;
-	array_shift($question_fields);
-	while($question = fetch_row($result)) {
-		$result->MoveNext();
-		$tid = $question['type_id'];
-		$qid = $question['id'];
-		// fix some fields first
-		$question['survey_id'] = $new_sid;
-		$question['position'] = $pos++;
-
-		// copy question to new survey
-		array_shift($question);
-		if(!isset($question['result_id'])) {
-			$question['result_id'] = 'NULL';
-		}
-		$question['name'] = _addslashes($question['name']);
-		$question['content'] = _addslashes($question['content']);
-		$question['required'] = _addslashes($question['required']);
-		$question['deleted'] = _addslashes($question['deleted']);
-		$question['public'] = _addslashes($question['public']);
-		$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['question_table']." ";
-		$sql .= '('. join(',', $question_fields) .') ';
-		$sql .= 'VALUES ( '. join(',',array_values($question)) .' )';
-		if(!execute_sql($sql))
-			return(false);
-		$new_qid = insert_id('question_id_seq');
-
-		// make copies of all the question choices (if exist)
-		if($has_choices[$tid]) {
-			$question_choice_fields = array('question_id', 'content', 'value');
-			$sql = "SELECT ". join(', ',$question_choice_fields)."
-				FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']."
-				WHERE question_id=${qid}
-				ORDER BY id";
-			$result2 = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-			while($choice = fetch_row($result2)) {
-				$result2->MoveNext();
-				$choice['question_id'] = $new_qid;
-				$choice['content'] = _addslashes($choice['content']);
-				$choice['value'] = _addslashes($choice['value']);
-
-				$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['question_choice_table']." ";
-				$sql .= '('. join(',',$question_choice_fields) .') ';
-				$sql .= 'VALUES ( '. join(',',array_values($choice)) .' )';
-				if(!execute_sql($sql))
-					return(false);
-			}
-			db_close($result2);
-		}
-	}
-	db_close($result);
-
-	return(true);
-}
-/* }}} */
-
-?>
Index: admin/include/function/survey_report.inc
===================================================================
--- admin/include/function/survey_report.inc	(revision 6370)
+++ admin/include/function/survey_report.inc	(working copy)
@@ -1,133 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: survey_report.inc,v 1.13 2007/07/09 12:58:09 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-/* {{{ proto string survey_report(int survey_id, bool details, string format)
-    Build a description of a survey, including all unique ids.
-	Rerturns an empty string on success, else an error message. */
-function survey_report($sid, $details = 0, $format = '') {
-	if(empty($sid)) return;
-	$bg = '';
-	// build associative array holding weather each question
-	// type has answer choices or not and the table the answers are in
-	$has_choices = array();
-	$response_table = array();
-	$sql = 'SELECT id,has_choices,response_table
-			  FROM '.$GLOBALS['ESPCONFIG']['question_type_table'].'
-			 ORDER BY id';
-	if(!($result = execute_sql($sql))) {
-		$errmsg = _('Error system table corrupt.') ." [ ". _('Table') .": question_type ]";
-		return($errmsg);
-	}
-	while($row = fetch_row($result)) {
-        $result->MoveNext();
-		$has_choices[$row[0]]=$row[1];
-		$response_table[$row[0]]=$row[2];
-	}
-	db_close($result);
-
-	// load survey title (and other globals)
-	$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=$sid";
-	if(!($result = execute_sql($sql,"",ADODB_FETCH_ASSOC))) {
-		$errmsg = _('Error opening survey.') ." [ ID:${sid} R:" . record_count($result) ."]";
-		return($errmsg);
-	}
-	$survey = fetch_row($result);
-	db_close($result);
-
-	// load survey questions
-	$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-			 WHERE survey_id=$sid AND deleted='N'
-			 ORDER BY position";
-	if(!($questions_result = execute_sql($sql,"",ADODB_FETCH_ASSOC))) {
-		$errmsg = _('Error opening survey.') .' '. _('No questions found.') ." [ ID:${sid} ]";
-		return($errmsg);
-	}
-?>
-<h2><?php echo(_('Report for') .': '. $survey["title"] .' ['. _('ID') .': '. $survey['id'] .']'); ?></h2>
-<h3><?php echo($survey["subtitle"]); ?></h3>
-<blockquote><?php echo($survey["info"]); ?></blockquote>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-<tr>
-	<th align="left"><?php echo(_('#')); ?></th>
-	<th align="left"><?php echo(_('ID')); ?></th>
-	<th align="left"><?php echo(_("Req'd")); ?></th>
-	<th align="left"><?php echo(_('Public')); ?></th>
-	<th align="center" colspan="2"><?php echo(_('Content')); ?></th>
-</tr>
-<?php
-	$i = 0;
-	while($question = fetch_row($questions_result)) {
-        $questions_result->MoveNext();
-		// process each question
-		$qid   = &$question['id'];
-		$tid   = &$question['type_id'];
-		$reqd  = ($question['required'] == 'Y') ?
-					_('Yes') : _('No');
-		$publ  = ($question['public'] == 'Y') ?
-					_('Yes') : _('No');
-		$table = &$response_table[$tid];
-
-		if($tid == 99) {
-			echo("<tr><td colspan=\"6\"><hr></td></tr>\n");
-			continue;
-		}
-
-		if($bg != '#ffffff')	$bg = '#ffffff';
-		else					$bg = '#eeeeee';
-
-?>
-<tr bgcolor="<?php echo($bg); ?>">
- 	<td align="left"><?php if ($tid < 50) echo(++$i); ?></td>
-	<th align="left"><?php echo($qid); ?></th>
-	<td align="left"><?php echo($reqd); ?></td>
-	<td align="left"><?php echo($publ); ?></td>
-	<td colspan="2"><?php echo($question["content"]); ?></td>
-</tr>
-<?php
-		if($has_choices[$tid]) {
-			$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']."
-					 WHERE question_id = $qid
-					 ORDER BY id";
- 			$choices_result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-			while($choice = fetch_row($choices_result)) {
-                $choices_result->MoveNext();
-?>
-<tr bgcolor="<?php echo($bg); ?>"><th align="left"></th>
-	<td></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<th align="right"><?php echo($choice['id']); ?></th>
-	<td><?php echo($choice['content']); ?></td>
-</tr>
-<?php
-			}
-			db_close($choices_result);
-		} // end if has_choices
-	} // end while
-	db_close($questions_result);
-?>
-</table>
-<?php
-	return;
-}
-/* }}} */
-
-?>
Index: admin/include/function/survey_export_csv.inc
===================================================================
--- admin/include/function/survey_export_csv.inc	(revision 6370)
+++ admin/include/function/survey_export_csv.inc	(working copy)
@@ -1,481 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-    /* $Id: survey_export_csv.inc,v 1.19 2006/03/27 23:10:41 greggmc Exp $ */
-
-    /* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-    // Written by James Flemer
-    // <jflemer@alum.rpi.edu>
-
-    /* {{{ proto array survey_generate_results(int format, int survey_id)
-    Exports the results of a survey to an array.
-    */
-    function survey_generate_results($format, $sid) {
-        $output = array();
-        $id_to_csv_map = array(
-            '0',	// 0: unused
-            '1',	// 1: bool -> boolean
-            '1',	// 2: text -> string
-            '1',	// 3: essay -> string
-            '1',	// 4: radio -> string
-            '1',	// 5: check -> string
-            '1',	// 6: dropdn -> string
-            '0',	// 7: rating -> number
-            '0',	// 8: rate -> number
-            '1',	// 9: date -> string
-            '0' 	// 10: numeric -> number
-        );
-        $types = array(
-            0,
-            0,
-            1,
-        );
-
-        //Generate Columns:
-        $columns = array(
-            'RESPONSE',
-            'SUBMITTED',
-            'USERNAME',
-        );
-        switch ($format) {
-            case 'spss_csv':
-                // SPSS Output
-                $numcols = 3;
-                $columns2 = $columns;
-                $sql = "SELECT q.id, q.type_id FROM {$GLOBALS['ESPCONFIG']['question_table']} q
-                WHERE q.survey_ID = $sid AND q.deleted = 'N' and q.type_id < 50 ORDER BY position";
-                $result = execute_sql($sql);
-                $qcount = 0; // rating and multiple select (checkbox) count as one
-                while ( list ($qid, $type) = fetch_row($result)) {
-                    $result->MoveNext();
-                    if($type == '8' || $type == '5') { //rating question or multiple select (checkbox)
-                    $sql = "SELECT c.id FROM ".$GLOBALS['ESPCONFIG']['question_table']." q,
-                    ".$GLOBALS['ESPCONFIG']['question_choice_table']." c WHERE q.id = $qid
-                    AND q.id = c.question_id ORDER BY c.id ASC";
-                    $result2 = execute_sql($sql);
-                    $ratecols=0;
-                    $qcount++;
-                    while( list($cid) = fetch_row($result2) ) {
-                        $result2->MoveNext();
-                        $ratecols++;
-                        array_push($columns, array("Q".$qcount."_".$ratecols));
-                        array_push($columns2, $qid."_".$cid);
-                        array_push($types, $id_to_csv_map[$type]);
-                    }
-                    $numcols=$numcols+$ratecols;
-                    db_close($result2);
-                    } else {
-                        $numcols++;
-                        $qcount++;
-                        array_push($columns, array("Q".$qcount));
-                        array_push($columns2, $qid);
-                        array_push($types, $id_to_csv_map[$type]);
-                    }
-                }
-                db_close($result);
-
-                // Generate Data (This could get tricky)
-                $sql = "SELECT r.id,r.submitted,r.username
-                FROM ".$GLOBALS['ESPCONFIG']['response_table']." r
-                WHERE r.survey_id=$sid AND r.complete='Y'
-                ORDER BY r.submitted";
-                $result = execute_sql($sql);
-
-                $columns[0] = array('RESPONSE');
-                $columns[1] = array('SUBMITTED');
-                $columns[2] = array('USERNAME');
-
-                while ($row = fetch_row($result)) {
-                    $result->MoveNext();
-
-                    //Get the Response
-                    $response = response_select($sid, $row[0], 'type_id,name');
-                    array_push($columns[0], $row[0]);
-                    array_push($columns[1], $row[1]);
-                    array_push($columns[2], $row[2]);
-
-                    // Merge Repsonse into output array
-                    for($i = 3; $i < $numcols; $i++) {
-                        $key = split("_",$columns2[$i]);
-
-                        if(isset($response[$columns2[$i]]) || isset($response[$key[0]])){
-                            // This is a hack for multiple select,
-                            // seems easier than modifying response_select
-                            if (isset($response[$key[0]][0]) && is_array($response[$key[0]][0])){
-                                // check box (only question type that returns an array)
-                                $match = 0;
-                                for ($j = 0; $j < sizeof ($response[$key[0]]); $j++) {
-                                    if ($response[$key[0]][$j][3] == 'other'.'_'.$key[1]) {
-                                        array_push($columns[$i],"Other: ".$response[$key[0].'_'.$key[1]][2]);
-                                        $match = 1;
-                                    } else if ($response[$key[0]][$j][3] == $key[1]) {
-                                        array_push($columns[$i],$response[$key[0]][$j][2]);
-                                        $match = 1;
-                                    }
-                                }
-                                if ($match == 0)
-                                array_push($columns[$i], " ");
-                            } elseif (isset($response[$columns2[$i]][0]) && $response[$columns2[$i]][0] == 8) {
-                                // rating
-                                array_push($columns[$i], $response[$columns2[$i]][3]);
-                            } elseif(isset($response[$columns2[$i]][0]) && ($response[$columns2[$i]][0]==4 || $response[$columns2[$i]][0]==6)){
-                                /* radio or dropdown*/
-                                if($response[$columns2[$i]][2] == "!other"){
-                                    list(,$c)=split("_", $response[$columns2[$i]][3]);
-                                    array_push($columns[$i], "Other: ".$response[$columns2[$i].'_'.$c][2]);
-                                } else {
-                                    array_push($columns[$i], $response[$columns2[$i]][2]);
-                                }
-                            } else {
-                                array_push($columns[$i], $response[$columns2[$i]][2]);
-                            }
-                        } else {
-                            array_push($columns[$i], " ");
-                        }
-                    }
-
-                }
-                db_close($result);
-
-                $output = array();
-                for($i = 0; $i < $numcols; $i++) {
-                    $x = 0;
-                    $temp_val = "";
-                    foreach($columns[$i] as $key=>$value) {
-                        if (!isset($output[$x])) {
-                            $output[$x] = array();
-                        }
-                        if (is_array($value)) {
-                            $temp_val = join(',', $value);
-                        }
-                        else {
-                            $temp_val = $value;
-                        }
-                        switch ($types[$i]) {
-                            case 1: /* string */
-                                /* Excel seems to allow "\n" inside a quoted string, but
-                                * "\r\n" is used as a record separator and so "\r" may
-                                * not occur within a cell. So if one would like to preserve
-                                * new-lines in a response, remove the "\n" from the
-                                * regex below.
-                                */
-                                $temp_val = ereg_replace("[\r\n\t]", ' ', $temp_val);
-                                $temp_val = ereg_replace('"', '""', $temp_val);
-                                $temp_val = '"'. $temp_val .'"';
-                                /* fall through */
-                                break;
-                        }
-                        $output[$x][$i] = $temp_val;
-                        $x++;
-                    }
-                }
-                return $output;
-                break;
-                //NOT IMPLEMENTED YET
-                break;
-
-            case 'xml':
-                //NOT IMPLEMENTED YET
-                break;
-
-            case 'csv_short_header':
-                //pass through
-            case 'tab':
-                $columns2=$columns;  	//columns2 is used to relate columns to data returned from response_select() 
-                $numcols = 3;		//total columns
-                $qcount=0;		//total questions (rating questions count as 1)
-                $sql = "SELECT q.id, q.type_id
-                FROM ".$GLOBALS['ESPCONFIG']['question_table']." q
-                WHERE q.survey_id = $sid AND
-                q.deleted = 'N' AND q.type_id < 50
-                ORDER BY position";
-                $result = execute_sql($sql);
-                while( list( $qid, $type ) = fetch_row($result) ) {
-                    $result->MoveNext();
-                    if($type == '8') { //rating question
-                    $sql = "SELECT c.id FROM ".$GLOBALS['ESPCONFIG']['question_table']." q,
-                    ".$GLOBALS['ESPCONFIG']['question_choice_table']." c WHERE q.id = $qid AND q.id = c.question_id
-                    ORDER BY position";
-                    $result2 = execute_sql($sql);
-                    $ratecols=0;
-                    $qcount++;
-                    while( list($cid) = fetch_row($result2) ) {
-                        $result2->MoveNext();
-                        $ratecols++;
-                        array_push($columns, $qcount."_".$ratecols);
-                        array_push($columns2, $qid."_".$cid);
-                        array_push($types, $id_to_csv_map[$type]);
-                    }
-                    $numcols=$numcols+$ratecols;
-                    db_close($result2);
-                    } else {
-                        $numcols++;
-                        $qcount++;
-                        array_push($columns, $qcount);
-                        array_push($columns2, $qid);
-                        array_push($types, $id_to_csv_map[$type]);
-                    }
-                }
-                array_push($output, $columns);
-                db_close($result);
-
-                //Generate data:
-                $sql = "SELECT r.id,r.submitted,r.username FROM ".$GLOBALS['ESPCONFIG']['response_table']." r
-                WHERE r.survey_id=$sid AND r.complete='Y'
-                ORDER BY r.submitted";
-                $result = execute_sql($sql);
-                while($row = fetch_row($result)) {
-                    $result->MoveNext();
-                    // get the response
-                    $response = response_select($sid, $row[0], 'type_id,name');
-                    $arr = array();
-                    array_push($arr, $row[0]);
-                    array_push($arr, $row[1]);
-                    array_push($arr, $row[2]);
-                    // merge it
-                    for($i = 3; $i < $numcols; $i++) {
-                        if(isset($response[$columns2[$i]])){
-                            if(isset($response[$columns2[$i]][0]) && is_array($response[$columns2[$i]][0])){
-                                /* check box */
-                                $tempresult=array();
-                                foreach ($response[$columns2[$i]] as $checkboxdata) {
-                                    if($checkboxdata[2]=="!other"){
-                                        list(,$c)=split("_", $checkboxdata[3]);
-                                        array_push($tempresult,"Other: ".$response[$columns2[$i].'_'.$c][2]);
-
-                                    }
-                                    else{
-                                        array_push($tempresult,$checkboxdata[2]);
-                                    }
-                                }
-                                $thisresult=implode(",",$tempresult);
-                            }
-                            elseif(isset($response[$columns2[$i]][0]) && $response[$columns2[$i]][0]==8 ){
-                                /* rating */
-                                $thisresult=$response[$columns2[$i]][3]; //db has these as 0 to N-1, lets add 1
-                            }
-                            elseif(isset($response[$columns2[$i]][0]) && ($response[$columns2[$i]][0]==4 || $response[$columns2[$i]][0]=6)){
-                                /* radio or dropdown*/
-                                if($response[$columns2[$i]][2]=="!other"){
-                                    list(,$c)=split("_", $response[$columns2[$i]][3]);
-                                    $thisresult="Other: ".$response[$columns2[$i].'_'.$c][2];
-                                }
-                                else{
-                                    $thisresult=$response[$columns2[$i]][2];
-                                }
-                            }
-                            else{
-                                $thisresult=$response[$columns2[$i]][3];
-                            }
-                        }
-                        else{
-                            $thisresult="";
-                        }
-                        switch ($types[$i]) {
-                            case 2: /* special */
-                                break;
-                            case 1: /* string */
-                                if (isset($response[$columns2[$i]])) {
-                                    /* Excel seems to allow "\n" inside a quoted string, but
-                                    * "\r\n" is used as a record separator and so "\r" may
-                                    * not occur within a cell. So if one would like to preserve
-                                    * new-lines in a response, remove the "\n" from the
-                                    * regex below.
-                                    */
-                                    $thisresult = ereg_replace("[\r\n\t]", ' ', $thisresult);
-                                    $thisresult = ereg_replace('"', '""', $thisresult);
-                                    $thisresult = '"'. $thisresult .'"';
-                                }
-                                /* fall through */
-                            case 0: /* number */
-                                if (isset($response[$columns2[$i]])) {
-                                    array_push($arr, $thisresult);
-                                }
-                                else {
-                                    array_push($arr, '');
-                                }
-                                break;
-                        }
-                    }
-                    array_push($output, $arr);
-                }
-                db_close($result);
-                break;
-
-            default:	
-                //csv_full_header
-                $numcols = 3;
-
-                $sql = "SELECT q.id, q.name, q.type_id
-                FROM ".$GLOBALS['ESPCONFIG']['question_table']." q
-                WHERE q.survey_id = $sid AND
-                q.deleted = 'N' AND q.type_id < 50
-                ORDER BY position";
-                $result = execute_sql($sql);
-                $numcols += record_count($result);
-                while( list( $qid, $col, $type ) = fetch_row($result) ) {
-                    $result->MoveNext();
-                    if ($type == 8) {
-                        /* rate */
-                        $sql = "SELECT ".$GLOBALS['ESPCONFIG']['adodb_conn']->Concat("q.name", "' '", "c.content").", c.id FROM ".$GLOBALS['ESPCONFIG']['question_table']." q, ".$GLOBALS['ESPCONFIG']['question_choice_table']." c WHERE q.id = $qid AND q.id = c.question_id";
-                        $result2 = execute_sql($sql);
-                        $numcols += record_count($result2) - 1;
-                        while( list($col, $rid) = fetch_row($result2) ) {
-                            $result2->MoveNext();
-                            $str1 = $col;
-                            do {
-                                $str2 = $str1;
-                                $str1 = eregi_replace(
-                                    "(^| )(what|which|why|how|who|where|how|is|are|were|the|a|it|of|do|you|your|please|enter)[ ?]",
-                                    " ", $str2);
-                            } while ($str1 != $str2);
-                            $col = $str1;
-                            $col = trim(strtoupper(eregi_replace(
-                                "[^A-Z0-9]+", " ", $col)));
-                                $col = ereg_replace(' +','_',$col);
-                                array_push($columns, array($qid."_".$rid=>$col));
-                                array_push($types, $id_to_csv_map[$type]);
-                        }
-                        db_close($result2);
-                    } else {
-                        array_push($columns, array($qid=>$col));
-                        array_push($types, $id_to_csv_map[$type]);
-                    }
-                }
-                db_close($result);
-                $num = 0;
-
-                $sql = "SELECT r.id,r.submitted,r.username FROM ".$GLOBALS['ESPCONFIG']['response_table']." r
-                WHERE r.survey_id=$sid AND r.complete='Y'
-                ORDER BY r.submitted";
-                $result = execute_sql($sql);
-                $y = 0;
-                if (record_count($result) == 0) {
-                    $columns[0] = array('RESPONSE');
-                    $columns[1] = array('SUBMITTED');
-                    $columns[2] = array('USERNAME');
-                }
-                while($row = fetch_row($result)) {
-                    $result->MoveNext();
-                    if ($y == 0) {
-                        $columns[0] = array($row[0]=>'RESPONSE');
-                        $columns[1] = array($row[0]=>'SUBMITTED');
-                        $columns[2] = array($row[0]=>'USERNAME');
-                        $y = 1;
-                    }
-                    // get the response
-                    $response = response_select_name($sid, $row[0]);
-                    // merge it
-                    for($i = 0; $i < $numcols; $i++) {
-                        $match = 0;
-                        foreach ($response as $key=>$value) {
-                            if ($key === key($columns[$i])){
-                                $match = 1;
-                                array_push($columns[$i], $value[key($value)]);
-                            }
-                        }
-                        if (($match == 0) and ($i > 2)) {
-                            array_push($columns[$i], "");
-                        }
-                        if ($i <= 2) {
-                            array_push($columns[$i],$row[$i]);
-                        }
-                    }
-                }
-                db_close($result);
-                $output = array();
-                for($i = 0; $i < $numcols; $i++) {
-                    $x = 0;
-                    $temp_val = "";
-                    foreach($columns[$i] as $key=>$value) {
-                        if (!isset($output[$x])) {
-                            $output[$x] = array();
-                        }
-                        if (is_array($value)) {
-                            $temp_val = join(',', $value);
-                        }
-                        else {
-                            $temp_val = $value;
-                        }
-                        switch ($types[$i]) {
-                            case 1: /* string */
-                                /* Excel seems to allow "\n" inside a quoted string, but
-                                * "\r\n" is used as a record separator and so "\r" may
-                                * not occur within a cell. So if one would like to preserve
-                                * new-lines in a response, remove the "\n" from the
-                                * regex below.
-                                */
-                                $temp_val = ereg_replace("[\r\n\t]", ' ', $temp_val);
-                                $temp_val = ereg_replace('"', '""', $temp_val);
-                                $temp_val = '"'. $temp_val .'"';
-                                /* fall through */
-                                break;
-                        }
-                        $output[$x][$i] = $temp_val;
-                        $x++;
-                    }
-                }
-        }
-        return $output;
-    }
-    /* }}} */
-
-    /* {{{ proto bool survey_export_results(int type, int survey_id, string filename)
-    Exports the results of a survey to a file.
-    Returns true on success.
-    */
-    function survey_export_results($type, $sid, $filename) {
-        $umask = umask(0077);
-        $fh = fopen($filename, 'w');
-        umask($umask);
-        if(!$fh) {
-            return 0;
-        }
-        switch ($type) {
-            case 'spss_csv':
-                $data = survey_generate_results($type, $sid);
-                //do something with $data
-                foreach ($data as $row) {
-                    fputs($fh, implode(',', $row) . "\r\n");
-                }
-                break;
-
-            case 'xml':
-                //Not fully implemented yet
-                $data = survey_generate_results($type, $sid);
-                //do something with $data
-                break;
-
-            case 'tab':
-                $data = survey_generate_results($type, $sid);
-                foreach ($data as $row) {
-                    fputs($fh, implode("\t", $row) . "\r\n");
-                }
-                break;
-
-            default: //csv_full_header, csv_short_header
-                $data = survey_generate_results($type, $sid);
-                foreach ($data as $row) {
-                    fputs($fh, implode(',', $row) . "\r\n");
-                }
-        }
-
-        fflush($fh);
-        fclose($fh);
-
-        return 1;
-    }
-    /* }}} */
-?>
Index: admin/include/function/question_conditioncheck.inc
===================================================================
--- admin/include/function/question_conditioncheck.inc	(revision 6370)
+++ admin/include/function/question_conditioncheck.inc	(working copy)
@@ -1,70 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: question_conditioncheck.inc,v 1.2 2007/11/26 16:03:56 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-/* {{{ proto bool question_render(int $question_id, int respnse_number)
-   Checks if conditions for qid are met */
-  function isequal (&$val1,&$val2) {
-     return $val1==$val2;
-  }
-  function isnequal (&$val1,&$val2) {
-     return $val1!=$val2;
-  }
-  function issmallerthan (&$val1,&$val2) {
-     return $val1<$val2;
-  }
-  function isbiggerthan (&$val1,&$val2) {
-     return $val1>$val2;
-  }
-function question_conditioncheck($sid,$qid,$rid) {
-
-  $conditions[0]="isequal";
-  $conditions[1]="isnequal";
-  $conditions[2]="issmallerthan";
-  $conditions[3]="isbiggerthan";
-
-  $return_result=TRUE;
-
-  $sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['condition_table']." WHERE q1_id='$qid'";
-  $result = execute_sql($sql);  
-  # If there are no conditions, we need to show the question, so we return true
-  if (record_count($result)==0) {
-     return true;
-  }
-  while(list($id,$sid,$q1_id,$q2_id,$cond,$cond_val) = fetch_row($result)) {
-     $result->MoveNext();
-     if ($rid>0) {
-	$resp=array();
-        $resp=response_select($sid, $rid, $col = null, array($q2_id));
-	if (isset($resp[$q2_id])) {
-	   $resp_val=$resp[$q2_id][0];
-	   // for dropdown and some other types, this value is an array
-	   // we take the value (for now) and not the index ...
-	   if (is_array($resp_val)) {
-		$resp_val=$resp_val[0];
-	   }
-	   if (call_user_func($conditions[$cond],$resp_val,$cond_val) == TRUE) {
-	      # the condition is fullfilled, so we need to show the question
-  	      return true;
-	   }
-	}
-     }
-  }
-  return false;
-}
-/* }}} */
-?>
Index: admin/include/function/survey_merge.inc
===================================================================
--- admin/include/function/survey_merge.inc	(revision 6370)
+++ admin/include/function/survey_merge.inc	(working copy)
@@ -1,383 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: survey_merge.inc,v 1.14 2004/04/29 17:27:33 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-if(empty($GLOBALS['ESPCONFIG']['DEBUG_MERGE']))
-	$GLOBALS['ESPCONFIG']['DEBUG_MERGE'] = $GLOBALS['ESPCONFIG']['DEBUG'];
-
-/* {{{ proto string survey_merge(array survey_ids, int precision, bool show_totals)
-   Builds a HTML result page after merging the results from
-   each of the survey ids.
-   Return an empty string on sucess, else a string with an
-   error message. */
-function survey_merge($sids, $precision = 1, $showTotals = 1) {
-	// sanity check arguments
-	if(!is_array($sids)) {
-		$errmsg = _('Invalid argument.') ." [ ${sids} ]";
-		return($errmsg);
-	}
-	$num = count($sids);
-	if($num < 1) {
-		$errmsg = _('Invalid argument.') .' [ '. join(',',$sids) .' ]';
-		return($errmsg);
-	}
-
-	// set defaults
-	if(empty($precision))	$precision  = 1;
-	if(empty($showTotals))	$showTotals = 1;
-
-	// convert arguments to alternate forms
-	$sidstr = array_to_insql($sids);
-
-	$response_table = esp_type_response_table();
-
-	// load survey title (and other globals) from 1st surveyId
-	$sid = $sids[0];
-	$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${sid}";
-	if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-	if(!($result = execute_sql($sql,"", ADODB_FETCH_ASSOC))) {
-		$errmsg = _('Error opening survey.') ." [ ID:${sid} R:" . record_count($result) ."] [ ".ErrorMsg()."]";
-		return($errmsg);
-	}
-	$survey = fetch_row($result);
-	db_close($result);
-
-	// find total number of survey responses
-	$sql = "SELECT R.id
-			  FROM ".$GLOBALS['ESPCONFIG']['response_table']." R
-			 WHERE R.survey_id ${sidstr} AND
-				   R.complete='Y'";
-	if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-	if(!($result = execute_sql($sql))) {
-		$errmsg = _('Error opening surveys.') ." [ ID: ${sidstr} ] [ ".ErrorMsg()."]";
-		return($errmsg);
-	}
-	$total = record_count($result);
-	if($total < 1) {
-		$errmsg = _('Error opening surveys.') ." ".
-			_('No responses found.') ." [ ID: ${sidstr} ] [ ". _('TOTAL') .": ${total} ]";
-		db_close($result);
-		return($errmsg);
-	}
-	// and the desired response id's
-	$rids = array();
-	while($row = fetch_row($result)) {
-        $result->MoveNext();
-		array_push($rids, $row[0]);
-	}
-	db_close($result);
-	$ridstr = array_to_insql($rids);
-
-	// load survey questions
-	for($i=0; $i<$num; $i++) {
-		$sid = $sids[$i];
-		$sql = "SELECT *
-				  FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-				 WHERE survey_id=${sid} AND
-					   deleted='N'
-				 ORDER BY position,id";
-		if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-		$questions[$i] = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-		if(!$questions[$i]) {
-			$errmsg = _('Error opening surveys.') .' '. _('No questions found.') . " [ ID:${sid} ] [ ".ErrorMsg()."]";
-			return($errmsg);
-		}
-	}
-
-?>
-<h2><?php echo($survey["title"]); ?></h2>
-<h3><?php echo($survey["subtitle"]); ?></h3>
-<blockquote><?php echo($survey["info"]); ?></blockquote>
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-<?php
-	$q=0; // question number counter
-	while(1) {
-		// get next question from each of SIDs (lock-step)
-		$qids = array();
-		for($i=0; $i<$num; $i++) {
-			if(!($question[$i] = fetch_row($questions[$i]))) {
-				for($j=0; $j<$num; $j++) {
-					db_close($questions[$j]);
-				}
-				echo("</table>\n");
-				return;
-			}
-            $questions[$i]->MoveNext();
-			if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$i = $i; \$question[\$i]['id'] = ".$question[$i]['id']." -->\n");
-			array_push($qids, $question[$i]['id']);
-		}
-		$qidstr = array_to_insql($qids);
-		if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$qidstr = $qidstr -->\n");
-
-		// now -- we assume the surveys are identical, and there is a
-		// one-to-one relation between the questions of each
-		// we take the first element of the SIDs array to be the "master"
-
-		$tid = $question[0]['type_id'];
-		$table = $response_table[$tid];
-		if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$table = $table -->\n");
-
-		if($tid == 99) {
-			echo("<tr><td><hr></td></tr>\n");
-			continue;
-		}
-		if($tid == 100) {
-			echo("<tr><td>". $question[0]['content'] ."</td></tr>\n");
-			continue;
-		}
-
-		++$q;
-        $bg = "";
-		if($bg != '#eeeeee')	$bg = '#eeeeee';
-		else                	$bg = '#ffffff';
-?>
-	<tr xbgcolor="<?php echo($bg); ?>">
- 		<td>
-			<A NAME="Q<?php echo($q); ?>"><?php echo($q); ?>.</A>
-			<?php echo($question[0]['content']); ?>
-
-			<blockquote>
-<?php
-		$counts = array();
-
-		switch($table) {
-// -------------------------------- response_bool --------------------------------
-		case 'response_bool':
-			$sql = "SELECT A.choice_id, COUNT(A.response_id)
-					  FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-					 WHERE A.question_id ${qidstr} AND
-						   A.response_id ${ridstr}
-					 GROUP BY A.choice_id";
-			if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-			$result = execute_sql($sql);
-			while(list($text,$count) = fetch_row($result)) {
-                $result->MoveNext();
-				$counts[$text] = $count;
-			}
-			db_close($result);
-
-			if(empty($question[0]['result_id']))
-				$question[0]['result_id'] = 1;	// default to percentages for yes/no
-
-			break;
-
-// -------------------------------- response_single ----------------------------------
-// -------------------------------- response_multiple --------------------------------
-		case 'response_multiple':
-			$showTotals = 0;
-		case 'response_single':
-			for($i=0; $i<$num; $i++) {
-				$sid = $sids[$i];
-				$qid = $question[$i]['id'];
-				$sql = "SELECT id
-					      FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']."
-						 WHERE question_id=${qid} AND
-							   content NOT LIKE '!other%'
-						 ORDER BY id";
-				if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-				$result = execute_sql($sql);
-				$cids[$i] = array();
-				while(list($cid) = fetch_row($result)) {
-                    $result->MoveNext();
-					array_push($cids[$i],$cid);
-				}
-				db_close($result);
-			}
-			$content = array();
-			foreach($cids[0] as $cid) {
-				$sql = "SELECT content FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE id=${cid}";
-				if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-				$result = get_one($sql);
-				array_push($content, $result);
-			}
-			$cnum = count($content);
-			for($j=0; $j<$cnum; $j++) {
-				$mycids = array();
-				for($i=0; $i<$num; $i++) {
-					array_push($mycids, $cids[$i][$j]);
-				}
-				$mycidstr = array_to_insql($mycids);
-
-				$sql = "SELECT COUNT(*)
-						  FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-						 WHERE A.choice_id ${mycidstr} AND
-							   A.response_id ${ridstr}";
-				if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-				$result=get_one($sql);
-				$counts[$content[$j]] = $result;
-			}
-
-			// handle 'other...'
-			for($i=0; $i<$num; $i++) {
-				$sid = $sids[$i];
-				$qid = $question[$i]['id'];
-				$sql = "SELECT id
-					      FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']."
-						 WHERE question_id ${qidstr} AND
-							   content LIKE '!other%'
-						 ORDER BY id";
-				if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-				$result = execute_sql($sql);
-				$cids[$i] = array();
-				while(list($cid) = fetch_row($result)) {
-                    $result->MoveNext();
-					array_push($cids[$i],$cid);
-				}
-				db_close($result);
-			}
-			$content = array();
-			foreach($cids[0] as $cid) {
-				$sql = "SELECT content FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE id=${cid}";
-				if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-				$result=get_one($sql);
-				$text = ereg_replace("!other=?", "", $result);
-				if(!empty($text))
-					$text .= ': ';
-				array_push($content, $text);
-			}
-			$cnum = count($content);
-			for($j=0; $j<$cnum; $j++) {
-				$mycids = array();
-				for($i=0; $i<$num; $i++) {
-					array_push($mycids, $cids[$i][$j]);
-				}
-				$mycidstr = array_to_insql($mycids);
-
-				$sql = "SELECT A.response, COUNT(A.response_id)
-						  FROM ".$GLOBALS['ESPCONFIG']['response_other_table']." A
-						 WHERE A.choice_id ${mycidstr} AND
-							   A.response_id ${ridstr}
-						 GROUP BY A.response";
-				if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-				$result=execute_sql($sql);
-				while(list($response,$count) = fetch_row($result)) {
-                    $result->MoveNext();
-					if(!empty($response)) {
-						$text = $content[$j] . htmlspecialchars($response);
-						$counts[$text] = $count;
-					}
-				}
-				db_close($result);
-			}
-
-			if(empty($question[0]['result_id']))
-				$question[0]['result_id'] = 1;	// default to percentages
-
-			break;
-// -------------------------------- response_text --------------------------------
-		case 'response_text':
-			$sql = "SELECT A.response, COUNT(A.response_id)
-					  FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-					 WHERE A.question_id ${qidstr} AND
-						   A.response_id ${ridstr}
-					 GROUP BY A.response";
-			if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-			$result = execute_sql($sql);
-			while(list($response, $count) = fetch_row($result)) {
-                $result->MoveNext();
-				if(!empty($response))
-					$counts[htmlspecialchars($response)] = $count;
-			}
-			db_close($result);
-
-			$question[0]['result_id'] = 4;	// force "list" type response for text fields
-
-			break;
-// -------------------------------- response_rank --------------------------------
-		case 'response_rank':
-			if($tid == 8) { //Rank
-				for($i=0; $i<$num; $i++) {
-					$sid = $sids[$i];
-					$qid = $question[$i]['id'];
-					$sql = "SELECT id
-					          FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']."
-							 WHERE question_id ${qidstr}
-							 ORDER BY id";
-					if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-					$result = execute_sql($sql);
-					$cids[$i] = array();
-					while(list($cid) = fetch_row($result)) {
-                        $result->MoveNext();
-						array_push($cids[$i],$cid);
-					}
-					db_close($result);
-				}
-				$content = array();
-				foreach($cids[0] as $cid) {
-					$sql = "SELECT content FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE id=${cid}";
-					if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-					$result=get_one($sql);
-					array_push($content, $result);
-				}
-				$cnum = count($content);
-				for($j=0; $j<$cnum; $j++) {
-					$mycids = array();
-					for($i=0; $i<$num; $i++) {
-						array_push($mycids, $cids[$i][$j]);
-					}
-					$mycidstr = array_to_insql($mycids);
-
-					$sql = "SELECT AVG(A.rank)
-							  FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-							 WHERE A.choice_id ${mycidstr} AND
-								   A.response_id ${ridstr} AND
-								   A.rank>0";
-					if($GLOBALS['ESPCONFIG']['DEBUG_MERGE'])	echo("<!-- \$sql = ${sql} -->\n");
-					$result=get_one($sql);
-					$counts[$content[$j]] = $result;
-				}
-
-				$question[0]['result_id'] = 99;	// force to rank
-			} else {
-				// deprecated ... I am not going to write this
-				// code. If you need it email me or write it yourself.
-			}
-			break;
-		}
-// ---------------------------------------------------------------------------
-		switch($question[0]['result_id']) {
-			case '1':	// Percentages
-				mkrespercent($counts,$total,$precision,$showTotals);
-				break;
-			case '2':	// Rank
-				mkresrank($counts,$total,$precision,$showTotals);
-				break;
-			case '3':	// Count
-				mkrescount($counts,$total,$precision,$showTotals);
-				break;
-			case '4':	// List
-				mkreslist($counts,$total,$precision,$showTotals);
-				break;
-			case '99':	// Average
-				mkresavg($counts,$total,$precision,$showTotals,0);
-				break;
-		} // end switch
-?>
-			</blockquote>
-		</td>
-	</tr>
-<?php	} // end while -- execution should never pass this point ?>
-</table>
-<?php
-	return;
-}
-/* }}} */
-
-?>
Index: admin/include/function/survey_render.inc
===================================================================
--- admin/include/function/survey_render.inc	(revision 6370)
+++ admin/include/function/survey_render.inc	(working copy)
@@ -1,117 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: survey_render.inc,v 1.31 2007/11/26 16:03:56 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-/* {{{ proto bool survey_render(int survey_id, int section, int resonse_id, string message)
-   Reads current form variables from $_POST.
-   Builds HTML for the survey (prefixed w/ message). */
-function survey_render($sid, $section = 1, $rid=0, $message = '') {
-	//global $_POST;
-	@reset($_POST);
-
-	if(empty($section))
-		$section = 1;
-
-// load survey title (and other globals)
-	$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${sid}";
-	$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-	if(record_count($result) != 1)
-		return(false);
-	$survey = fetch_row($result);
-	db_close($result);
-
-	$sections = survey_get_sections($sid);
-	$num_sections = count($sections);
-	if($section-- > $num_sections)
-		return(false);	// invalid section
-
-	$section_questions = survey_get_section_questions($sid);
-
-// load survey questions
-	$sec_sql = array_to_insql($sections[$section]);
-	$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE id $sec_sql ORDER BY position,id";
-	$questions_result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-	if(record_count($questions_result) < 1)
-		return(false);
-
-// check to see if there are required questions
-	$sql = "SELECT COUNT(*) FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE id $sec_sql AND required='Y'";
-	$has_required = get_one($sql);
-
-// find out what question number we are on $i
-	$i=0;
-	for($j=0;$j<$section;$j++)
-		$i += count($section_questions[$j]);
-?>
-<table class="headerGraphic">
-<tr>
-	<td class="image"></td>
-</tr>
-</table>
-<h2 class="surveyTitle"><?php echo($survey["title"]); ?></h2>
-<h3 class="surveySubtitle"><?php echo($survey["subtitle"]); ?></h3>
-<?php if($num_sections>1) { ?>
-	<font size="-1" class="surveyPage"><?php printf(_('Page %d of %d'), $section+1, $num_sections); ?></font>
-<?php } ?>
-<blockquote class="addInfo"><?php if ($section==0) echo($survey["info"]); ?></blockquote>
-<blockquote class="message"><?php echo($message); ?></blockquote>
-<?php if($has_required) { ?>
-    <p class="reqQuestion"><font size="-1">
-    <?php printf(_('Questions marked with a %s are required.'), '<font color="#FF0000">*</font>'); ?></font></p>
-<?php } ?>
-<table class="mainTable">
-<?php
-	$questions_shown=0;
-	while($question = fetch_row($questions_result)) {
-		$questions_result->MoveNext();
-		$i++;
-		// process each question
-		$qid  = &$question['id'];
-		$tid  = &$question['type_id'];
-		if ($tid == 100) {
-			// this type should not increase the question number
-			$i--;
-		}
-		#if (!question_conditioncheck($sid,$qid,$_POST['rid'])) {
-		if (question_conditioncheck($sid,$qid,$rid)) {
-		   $questions_shown=1;
-		   question_render($question,$i,$survey['auto_num']);
-		} elseif (isset($_POST['tab']) && ($_POST['tab']=="preview")) {
-		   // also show in preview
-		   $questions_shown=1;
-		   question_render($question,$i,$survey['auto_num']);
-		}
-	}
-	if ($questions_shown==0) {
-		print(_('Sorry, no questions for you to answer in this section.'));
-		print "<br /><br />";
-	}
-?>
-</table>
-<?php if($num_sections>1) { ?>
-	<font size="-1" class="surveyPage"><?php printf(_('Page %d of %d'), $section+1, $num_sections); ?></font><br />
-<?php } ?>
-<?php
-	return;
-}
-/* }}} */
-
-?>
Index: admin/include/function/survey_results.inc
===================================================================
--- admin/include/function/survey_results.inc	(revision 6370)
+++ admin/include/function/survey_results.inc	(working copy)
@@ -1,553 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-
-/* $Id: survey_results.inc,v 1.38 2007/07/09 12:58:09 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-if(empty($GLOBALS['ESPCONFIG']['DEBUG_RESULTS']))
-	$GLOBALS['ESPCONFIG']['DEBUG_RESULTS'] = $GLOBALS['ESPCONFIG']['DEBUG'];
-
-/* {{{ proto void survey_results_navbar(int survey_id, int response_id)
-   Builds HTML for a response navigation bar to move between individual
-   responses.
- */
-function survey_results_navbar($sid, $curr_rid) {
-	$sql = "SELECT R.id
-		FROM ".$GLOBALS['ESPCONFIG']['response_table']." R
-		WHERE R.survey_id='${sid}' AND
-		R.complete = 'Y'
-		ORDER BY R.id";
-	$result = execute_sql($sql);
-	$total = record_count($result);
-	if ($total < 1)
-		return;
-
-	$rids = array();
-	$i = 0;
-	$curr_pos = -1;
-	while ($row = fetch_row($result)) {
-        $result->MoveNext();
-		array_push($rids, $row[0]);
-		if ($row[0] == $curr_rid)
-			$curr_pos = $i;
-		$i++;
-	}
-	db_close($result);
-
-	$prev_rid = ($curr_pos > 0) ? $rids[$curr_pos - 1] : null;
-	$next_rid = ($curr_pos < $total - 1) ? $rids[$curr_pos + 1] : null;
-	$rows_per_page = 1;
-	$pages = ceil($total / $rows_per_page);
-
-	$url = $GLOBALS['ESPCONFIG']['ME'] . "?where=results&sid=$sid";
-
-	$mlink = create_function('$i,$r', 'return "<a href=\"'.$url.'&rid=$r\">$i</a>";');
-
-	$linkarr = array();
-
-	$display_pos = 1;
-	if ($prev_rid != null)
-		array_push($linkarr, "<a href=\"$url&rid=$prev_rid\">"._('Previous').'</a>');
-	for ($i = 0; $i < $curr_pos; $i++) {
-		array_push($linkarr, "<a href=\"$url&rid=".$rids[$i]."\">$display_pos</a>");
-		$display_pos++;
-	}
-	array_push($linkarr, "<a href=\"$url&rid=$curr_rid\"><b>$display_pos</b></a>");
-	for (++$i; $i < $total; $i++) {
-		$display_pos++;
-		array_push($linkarr, "<a href=\"$url&rid=".$rids[$i]."\">$display_pos</a>");
-	}
-	if ($next_rid != null)
-		array_push($linkarr, "<a href=\"$url&rid=$next_rid\">"._('Next').'</a>');
-
-	?>
-	<?php
-	global $_GET;
-	?>
-		<center>
-		<h2><a href='?where=view&pid=<?php echo $_GET[pid]; ?>'>Back to Project</a> - <?php echo _('Browsing Responses'); ?></h2>
-		<br />
-		<?php echo implode(' | ', $linkarr); ?>
-		<br />
-		</center>
-		<?php
-}
-/* }}} */
-
-/* {{{ proto string survey_results(int survey_id, int precision, bool show_totals, int question_id, array choice_ids, int response_id)
-	Builds HTML for the results for the survey. If a
-	question id and choice id(s) are given, then the results
-	are only calculated for respodants who chose from the
-	choice ids for the given question id.
-	Returns empty string on sucess, else returns an error
-	string. */
-function survey_results($sid, $precision = 1, $showTotals = 1, $qid = '', $cids = '', $rid = '', $guicross='') {
-	$bg = '';
-	if(empty($precision))	$precision  = 1;
-	if($showTotals === '')	$showTotals = 1;
-		
-    if(is_int($cids)) {
-        $cids = array($cids);
-    }
-    if(is_string($cids)) {
-        $cids = split(" ",$cids); // turn space seperated list into array
-    }
-	// set up things differently for cross analysis
-	$cross = !empty($qid);
-	if($cross) {
-		if(is_array($cids) && count($cids)>0) {
-			$cidstr = array_to_insql($cids);
-		} else {
-			$cidstr = '';
-		}
-	}
-
-	// build associative array holding whether each question
-	// type has answer choices or not and the table the answers are in
-	$has_choices = array();
-	$response_table = array();
-	$sql = 'SELECT id,has_choices,response_table
-			  FROM '.$GLOBALS['ESPCONFIG']['question_type_table'].'
-			 ORDER BY id';
-	if(!($result = execute_sql($sql))) {
-        $errmsg = sprintf('%s [ %s: question_type ]',
-                _('Error system table corrupt.'), _('Table'));
-		return($errmsg);
-	}
-	while($row = fetch_row($result)) {
-        $result->MoveNext();
-		$has_choices[$row[0]]=$row[1];
-		$response_table[$row[0]]=$row[2];
-	}
-	db_close($result);
-
-	// load survey title (and other globals)
-	$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id='${sid}'";
-	if(!($result = execute_sql($sql,"",ADODB_FETCH_ASSOC))) {
-		$errmsg = _('Error opening survey.') ." [ ID:${sid} R:" . record_count($result) ."]";
-		return($errmsg);
-	}
-	$survey = fetch_row($result);
-	db_close($result);
-
-	// load survey questions
-	$sql = "SELECT *
-			  FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-			 WHERE survey_id='${sid}' AND
-				   deleted='N'
-			 ORDER BY position,id";
-	if(!($questions_result = execute_sql($sql,"",ADODB_FETCH_ASSOC))) {
-		$errmsg = _('Error opening survey.') .' '. _('No questions found.') ." [ ID:${sid} ]";
-		return($errmsg);
-	}
-
-	// find out more about the question we are cross analyzing on (if any)
-	if($cross) {
-        $sql = "SELECT type_id FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE id=${qid}";
-		$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-        while($content = fetch_row($result)){
-            $result->MoveNext();
-            $crossTable = $response_table[$content['type_id']];
-            $q_content = $content['type_id'];
-        }
-		db_close($result);
-		if(!in_array($crossTable, array('response_single','response_bool','response_multiple'))) {
-			$errmsg = _('Error cross-analyzing. Question not valid type.') .' [ '. _('Table') .": ${crossTable} ]";
-			return($errmsg);
-		}
-	}
-
-// find total number of survey responses
-// and relevant response ID's
-	if (!empty($rid)) {
-		$ridstr = "= '${rid}'";
-        $total = 1;
-	}
-    else {
-        $sql = "";
-        if($cross) {
-            if(!empty($cidstr)) {
-                $sql = "SELECT A.response_id
-					      FROM ".$GLOBALS['ESPCONFIG'][$crossTable.'_table']." A,
-						       ".$GLOBALS['ESPCONFIG']['response_table']." R
-					     WHERE A.response_id=R.id AND
-						       R.complete='Y' AND
-						       A.question_id='${qid}' AND
-				    	       A.choice_id ${cidstr}
-					     ORDER BY A.response_id";
-            }
-            else {
-                $sql = "SELECT A.response_id
-					      FROM ".$GLOBALS['ESPCONFIG'][$crossTable.'_table']." A,
-						       ".$GLOBALS['ESPCONFIG']['response_table']." R
-					     WHERE A.response_id=R.id AND
-						       R.complete='Y' AND
-						       A.question_id='${qid}' AND
-				    	       A.choice_id = 0
-					     ORDER BY A.response_id";
-            }
-        }
-        else {
-		    $sql = "SELECT R.id
-				      FROM ".$GLOBALS['ESPCONFIG']['response_table']." R
-				     WHERE R.survey_id='${sid}' AND
-					       R.complete='Y'
-				     ORDER BY R.id";
-	    }
-	    if(!($result = execute_sql($sql))) {
-		    $errmsg = _('Error opening survey.') ." [ ID:${sid} ] [ ".ErrorMsg()."]";
-		    return($errmsg);
-	    }
-		
-	    $total = record_count($result);
-	    if($total < 1) {
-		    $errmsg = _('Error opening survey.') .' '. _('No responses found.') ." [ ID:${sid} ]";
-			    return($errmsg);
-            if ($GLOBALS['ESPCONFIG']['DEBUG'])
-                echo("<!-- \$errmsg = '$errmsg' -->\n");
-	    }
-
-		$rids = array();
-		while($row = fetch_row($result)) {
-			$result->MoveNext();
-			array_push($rids, $row[0]);
-		}
-		db_close($result);
-		// create a string suitable for inclusion in a SQL statement
-		// containing the desired Response IDs
-		// ex: "('304','311','317','345','365','370','403','439')"
-		$ridstr = array_to_insql($rids);
-	}
-    
-    if (!empty($rid)) {
-        // show response navigation bar
-        survey_results_navbar($sid, $rid);
-        # lets get video id.
-	    $Rsql = "SELECT * FROM `response` WHERE `id`='$rid'";        
-	    $Rresult = execute_sql($Rsql);
-	    $RCount = 0;
-	    while ($Rrow = fetch_row($Rresult)) {
-	    	if ($RCount > 0) {
-	    		break;
-	    	}
-		    $Rresult->MoveNext();
-		    if ($Rrow[6]) {
-			    $vidid = $Rrow[6];
-			    ++$RCount;
-			}
-		    
-	    }
-	    
-    }
-?>
-<h2><?php echo($survey["title"]); ?></h2>
-<h3><?php echo($survey["subtitle"]); ?></h3>
-<blockquote><?php echo($survey["info"]); ?></blockquote>
-<?php
-if ($vidid) {
-?>
-<h3 style='margin:10px;'>Video Capture: <a href="http://files.rascal.xymbo.com/<?php echo $vidid; ?>.avi" target="_blank">http://files.rascal.xymbo.com/<?php echo $vidid; ?>.avi</a><br /></h3>
-<?php } ?>
-<?php
-	if($cross) {
-		echo("<blockquote>" ._('Cross analysis on QN:') ." ${q_content}</blockquote>\n");
-	}
-?>
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-<?php
-	$i=0; // question number counter
-	while($question = fetch_row($questions_result)) {
-        $questions_result->MoveNext();
-		// process each question
-		$qid = $question['id'];
-		$tid = $question['type_id'];
-		$table = $response_table[$tid];
-		$totals = $showTotals;
-
-		if ($tid == 99) {
-			echo("<tr><td><hr></td></tr>\n");
-			continue;
-		}
-		if ($tid == 100) {
-			echo("<tr><td>". $question['content'] ."</td></tr>\n");
-			continue;
-		}
-
-		if($bg != '#eeeeee')	$bg = '#eeeeee';
-		else                	$bg = '#ffffff';
-
-?>
-		<tr xbgcolor="<?php echo($bg); ?>">  
- 		<td>
-<?php
-		if ($tid < 50) {
-			if (!empty($guicross)){
-				echo ('<input type="hidden" name="where" value="results" />');
-				echo ('<input type="hidden" name="sid" value="'.$sid.'" />');
-				echo ("\n<table width=\"90%\" border=\"0\">\n");
-				echo ("<tbody>\n");
-				echo ("   <tr>\n");
-				echo ("      <td width=\"34\" height=\"31\" bgcolor=\"khaki\">\n");
-				if ($tid==1 || $tid==4 || $tid==5 || $tid==6){
-					echo ("<div align=\"center\">\n");
-					echo ("   <input type=\"radio\" name=\"qid\" value=\"".$qid."\" />\n");
-					echo ("</div>\n");
-				}
-				echo ("</td>\n");
-				echo ("<td width=\"429\" bgcolor=\"#CCCCCC\">\n");
-			} //end if empty($guicross)
-			echo ("<A NAME=\"Q".++$i."\"><b>".$i.".</b></A>\n");
-			echo ("<b>".$question['content']."</b>\n");
-			if (!empty($guicross)){
-				echo ("</td>\n");
-				echo ("<td width=\"33\" bgcolor=\"#CC0000\">\n");
-				if ($tid==1 || $tid==4 || $tid==5 || $tid==6){
-					echo ("<div align=\"center\">\n");
-					echo ("<input type=\"radio\" name=\"qidr\" value=\"".$qid."\" />\n");
-					echo ("</div>\n");
-				}
-				echo ("</td>\n");
-				echo ("<td width=\"32\" bgcolor=\"#0099FF\">\n");
-				if ($tid==1 || $tid==4 || $tid==5 || $tid==6){
-					echo ("<div align=\"center\">\n");
-					echo ("<input type=\"radio\" name=\"qidc\" value=\"".$qid."\" />\n");
-					echo ("</div>\n");
-				}
-				echo ("</td>\n");
-				echo ("</tr>\n");
-				echo ("</tbody>\n");
-				echo ("</table>\n");
-			} //end if empty($guicross)
-		} //end if ($tid < 50)
-
-$counts = array();
-switch ($table) {
-// -------------------------------- response_bool --------------------------------
-		case 'response_bool':
-			$counts = array(_('Yes') => 0, _('No') => 0);
-			$sql = "SELECT A.choice_id, COUNT(A.response_id)
-					  FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-					 WHERE A.question_id='${qid}' AND
-						   A.response_id ${ridstr} AND
-						   A.choice_id != ''
-					 GROUP BY A.choice_id";
-			if ($GLOBALS['ESPCONFIG']['DEBUG_RESULTS'])
-				echo("<!-- \$sql = '$sql' -->\n");
-			if ($result = execute_sql($sql)) {
-				while(list($ccontent,$count) = fetch_row($result)) {
-					$result->MoveNext();
-					$ccontent = htmlspecialchars($ccontent);
-					if ($ccontent == 'Y')
-						$ccontent = _('Yes');
-					else
-						$ccontent = _('No');
-					$counts[$ccontent] = $count;
-				}
-				db_close($result);
-			}
-
-			if (empty($question["result_id"]))
-				$question["result_id"] = 1;	// default to percentages for yes/no
-			break;
-// -------------------------------- response_single --------------------------------
-// -------------------------------- response_multiple --------------------------------
-		case 'response_multiple':
-			$totals = 0;
-		case 'response_single':
-			$sql = "SELECT C.content FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." C
-				WHERE C.question_id='${qid}' AND C.content NOT LIKE '!other%'
-				ORDER BY C.id";
-			if ($result = execute_sql($sql)) {
-				for ($j = 0; $j < record_count($result); $j++) {
-					$result->Move($j);
-					$counts[htmlspecialchars($result->fields[0])] = 0;
-				}
-				db_close($result);
-			}
-
-			$sql = "SELECT C.content, COUNT(A.response_id) AS num
-					  FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." C,
-						   ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-					 WHERE C.question_id='${qid}' AND
-						   C.content NOT LIKE '!other%' AND
-						   A.question_id=C.question_id AND
-						   A.choice_id=C.id AND
-						   A.response_id ${ridstr}
-					 GROUP BY C.id, C.content";
-			if ($GLOBALS['ESPCONFIG']['DEBUG_RESULTS'])
-				echo("<!-- \$sql = '$sql' -->\n");
-			if ($result = execute_sql($sql)) {
-				while (list($ccontent,$count) = fetch_row($result)) {
-					$result->MoveNext();
-					$ccontent = htmlspecialchars($ccontent);
-					$counts[$ccontent] = $count;
-				}
-				db_close($result);
-			}
-
-			// handle 'other...'
-			$sql = "SELECT A.response, C.content
-					  FROM ".$GLOBALS['ESPCONFIG']['response_other_table']." A, ".$GLOBALS['ESPCONFIG']['question_choice_table']." C
-					 WHERE A.question_id='${qid}' AND
-						   A.choice_id=C.id AND
-    					   A.response_id ${ridstr}
-					 ORDER BY C.id, A.response";
-			if ($GLOBALS['ESPCONFIG']['DEBUG_RESULTS'])	echo("<!-- \$sql = '$sql' -->\n");
-			if ($result = execute_sql($sql)) {
-				while(list($answer,$ccontent) = fetch_row($result)) {
-					$result->MoveNext();
-					$ccontent = htmlspecialchars($ccontent);
-					$content = preg_replace(array('/^!other=/', '/^!other/'),
-								array('', 'Other:'), $ccontent);
-					$content .= ' ' . htmlspecialchars($answer);
-					$counts[$content] = (isset($counts[$content]) ? $counts[$content] : 0)+1;
-				}
-				db_close($result);
-			}
-			if (empty($question["result_id"]))
-				$question["result_id"] = 1;	// default to percentages
-			break;
-// -------------------------------- response_text --------------------------------
-		case 'response_text':
-			$sql = "SELECT A.response, COUNT(A.response_id) AS num
-					  FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-					 WHERE A.question_id='${qid}' AND
-    					   A.response_id ${ridstr}
-					 GROUP BY A.response";
-			if($GLOBALS['ESPCONFIG']['DEBUG_RESULTS'])	echo("<!-- \$sql = '$sql' -->\n");
-			if($result = execute_sql($sql)) {
-				while(list($text, $num) = fetch_row($result)) {
-					$result->MoveNext();
-					if(!empty($text))
-						$counts[htmlspecialchars($text)] = $num;
-				}
-				db_close($result);
-			}
-			$question["result_id"] = 4;	// force "list" type response for text fields
-			break;
-// -------------------------------- response_date --------------------------------
-		case 'response_date':
-			$sql = "SELECT DATE_FORMAT(A.response,'".$GLOBALS['ESPCONFIG']['date_format']."'), COUNT(A.response_id) AS num
-					  FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-					 WHERE A.question_id='${qid}' AND
-    					   A.response_id ${ridstr}
-					 GROUP BY A.response";
-			if($GLOBALS['ESPCONFIG']['DEBUG_RESULTS'])	echo("<!-- \$sql = '$sql' -->\n");
-			if($result = execute_sql($sql)) {
-				while(list($text, $num) = fetch_row($result)) {
-					$result->MoveNext();
-					if(!empty($text))
-						$counts[htmlspecialchars($text)] = $num;
-				}
-				db_close($result);
-			}
-			$question["result_id"] = 4;	// force "list" type response for date fields
-			break;
-// -------------------------------- response_rank --------------------------------
-		case 'response_rank':
-			if($tid == 8) { //Rank
-                $sql = "SELECT C.content FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." C
-                        WHERE C.question_id='${qid}' AND C.content NOT LIKE '!other%'
-                        ORDER BY C.id";
-                if ($result = execute_sql($sql)) {
-                    for ($j = 0; $j < record_count($result); $j++) {
-                        $result->Move($j);
-                        $counts[htmlspecialchars($result->fields[0])] = null;
-                    }
-                    db_close($result);
-                }
-				$sql = "SELECT C.content, AVG(A.rank+1) AS average
-						  FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." C, ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-						 WHERE C.question_id='${qid}' AND
-    						   A.question_id='${qid}' AND
-							   A.choice_id=C.id AND
-							   A.rank>=0 AND
-							   A.response_id ${ridstr}
-						 GROUP BY C.id, C.content";
-				if($GLOBALS['ESPCONFIG']['DEBUG_RESULTS'])	echo("<!-- \$sql = '$sql' -->\n");
-				if($result = execute_sql($sql)) {
-					while(list($ccontent,$avg) = fetch_row($result)) {
-						$result->MoveNext();
-						$ccontent = htmlspecialchars($ccontent);
-						$counts[$ccontent] = $avg;
-					}
-					db_close($result);
-				}
-				$question["result_id"] = 99;	// force to rank
-			} else {
-				$sql = "SELECT A.rank, COUNT(A.response_id) AS num
-						  FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." A
-						 WHERE A.question_id='${qid}' AND
-    						   A.response_id ${ridstr}
-						 GROUP BY A.rank";
-				if($result = execute_sql($sql)) {
-					while(list($rank, $num) = fetch_row($result)) {
-						$result->MoveNext();
-						if($rank == -1) { $rank = "N/A"; }
-						$counts[_($rank)] += $num;
-					}
-					db_close($result);
-				}
-				if(empty($question["result_id"]))
-					$question["result_id"] = 2;	// default to rank
-			}
-			break;
-		}
-// ---------------------------------------------------------------------------
-	if (!empty($guicross) && $question["result_id"] == 1){
-		mkcrossformat($counts,$qid,$tid);
-	} else {
-		$responses_sql = "
-SELECT *
-FROM `response`
-WHERE `survey_id` ='$sid'";
-$responses_res = execute_sql($responses_sql);
-while (!$responses_res->EOF) {
-	$fields = $responses_res->fields;
-	if ($fields[6]) { $vids[] = $fields[6]; }
-	$responses_res->MoveNext();
-}
-
-		switch($question["result_id"]) {
-			case "1":	// Percentages
-				mkrespercent($counts,$total,$precision,$totals,$vids);
-				break;
-			case "2":	// Rank
-				mkresrank($counts,$total,$precision,$totals,$vids);
-				break;
-			case "3":	// Count
-				mkrescount($counts,$total,$precision,$totals,$vids);
-				break;
-			case "4":	// List
-				mkreslist($counts,$total,$precision,$totals,$vids);
-				break;
-			case "99":	// Average
-				mkresavg($counts,$total,$precision,$totals,$question['length'],$vids);
-				break;
-		} // end switch
-	} //end if
-?>
-		</td>
-	</tr>
-<?php } // end while ?>
-</table>
-<?php
-	db_close($questions_result);
-	return;
-}
-/* }}} */
-
-?>
Index: admin/include/function/survey_purge.inc
===================================================================
--- admin/include/function/survey_purge.inc	(revision 6370)
+++ admin/include/function/survey_purge.inc	(working copy)
@@ -1,77 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: survey_purge.inc,v 1.9 2007/11/26 11:36:17 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-/* {{{ proto void survey_purge(array survey_ids)
-   Purges all traces of survey(s) from the database.
-   Returns void. */
-function survey_purge($sids) {
-	if(is_int($sids)) {
-		$sidstr = '='.$sids;
-	} else if (is_string($sids)) {
-		$sids = split(" ",$sids);
-	}
-	if(is_array($sids)) {
-		$sidstr = array_to_insql($sids);
-	}
-
-	// make a list of question IDs
-	$sql = "SELECT id FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE survey_id ${sidstr}";
-	$result = execute_sql($sql);
-	$qids = array();
-	while(list($qid) = fetch_row($result)) {
-        $result->MoveNext();
-		array_push($qids, $qid);
-	}
-	db_close($result);
-	$qidstr = array_to_insql($qids);
-	
-	// work from the bottom up...
-	// start with the survey results
-	$tables = array('response_bool','response_date','response_multiple','response_other','response_rank','response_single','response_text');
-	foreach($tables as $table) {
-		$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." WHERE question_id ${qidstr}";
-		$result = execute_sql($sql);
-	}
-	// then responses
-	$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['response_table']." WHERE survey_id ${sidstr}";
-	execute_sql($sql);
-
-	// then question choices
-	$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE question_id ${qidstr}";
-	execute_sql($sql);
-
-	// then questions
-	$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE survey_id ${sidstr}";
-	execute_sql($sql);
-
-	// then conditions
-	$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['condition_table']." WHERE survey_id ${sidstr}";
-	execute_sql($sql);
-
-	// and finally the survey(s)
-	$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id ${sidstr}";
-	execute_sql($sql);
-
-	return;
-}
-/* }}} */
-
-?>
Index: admin/include/function/survey_update.inc
===================================================================
--- admin/include/function/survey_update.inc	(revision 6370)
+++ admin/include/function/survey_update.inc	(working copy)
@@ -1,422 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: survey_update.inc,v 1.30 2007/11/27 12:10:07 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-/* {{{ proto bool survey_update(int* survey_id, string* tab, string old_tab)
-   Reads current form variables from _POST.
-   Returns an true on sucess, else returns false and
-   sets global $errstr with an error message. */
-function survey_update(&$survey_id, &$tab, $old_tab) {
-
-	global $errstr;
-	global $_SESSION;
-	
-	// do not need update
-	if(empty($old_tab))
-		return(1);
-
-	$f_arr = array();
-	$v_arr = array();
-
-	// clean up survey and question names
-	if (isset($_POST['name'])) {
-		$_POST['name'] = preg_replace("/[^A-Z0-9]+/i","_", trim($_POST['name']));
-		$_POST['name'] = preg_replace("/(^_|_$)/i","", $_POST['name']);
-	}
-	// new survey
-	if(empty($survey_id)) {
-		// need to fill out at least some info on 1st tab before proceeding
-		if(empty($_POST['name']) || empty($_POST['title']) || empty($_POST['realm'])) {
-			$tab = "general";
-			$errstr = _('Sorry, please fill out the name, group, and title before proceeding.');
-			return(0);
-		}
-
-		// create a new survey in the database
-		$fields = array('name','realm','title','subtitle','email','theme','thanks_page','thank_head','thank_body','info','auto_num');
-		foreach($fields as $f) {
-			if(isset($_POST[$f])) {
-				array_push($f_arr,$f);
-				array_push($v_arr, _addslashes($_POST[$f]));
-			}
-		}
-		array_push($f_arr, 'owner');
-		array_push($v_arr, _addslashes($_SESSION['acl']['username']));
-		array_push($f_arr, 'changed');
-		array_push($v_arr, sys_time_stamp());
-		$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['survey_table']." (" . join(',',$f_arr) . ") VALUES (" . join(',',$v_arr) . ")";
-		$result = execute_sql($sql);
-		if(!$result) {
-			$tab = "general";
-			$errstr = _('Sorry, name already in use. Pick a new name.') .' [ ' .ErrorNo().': '.ErrorMsg().' ]';
-			return(0);
-		}
-		$sql = "SELECT id FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE name=".  _addslashes($_POST['name']);
-		$result = execute_sql($sql);
-		$survey_id = $result->fields[0];
-		unset($_SESSION['survey_id']);
-		$_SESSION['survey_id'] = $survey_id;
-		if ($_SESSION['dupeQuestions']) {
-			$oldID = $_SESSION['dupeQuestions'];
-			$_SESSION['dupeQuestions'] = '';
-			$questionSQL = "SELECT * FROM `question` WHERE `survey_id` =$oldID";
-			$questionResult = execute_sql($questionSQL);
-			while(list($question['id'],$question['survey_id'],$question['name'],$question['type_id'],$question['result_id'],$question['length'],$question['precise'],$question['position'],$question['content'],$question['required'],$question['deleted'],$question['public']) = fetch_row($questionResult)) {
-			
-            	$questionResult->MoveNext();
-				array_reverse($question);	
-				
-				$addQuestionSQL = "INSERT INTO ".$GLOBALS['ESPCONFIG']['question_table']." (id,survey_id,name,type_id,length,precise,position,content,required,deleted,public) VALUES ('','$survey_id','$question[name]','$question[type_id]','$question[length]','$question[precise]','$question[required]','$question[deleted]','$question[public]')";
-				if ($addQuestionSQL) { 
-					#echo "$addQuestionSQL <br/>";
-					execute_sql($addQuestionSQL);
-					unset($newQuestionID);
-					$newQuestionID = mysql_insert_id();
-					$newQuestionID = 666;
-				}
-				if ($newQuestionID) {
-					# now duplicate choices
-					$choiceSQL = "SELECT * FROM `question_choice` WHERE `question_id`=$question[id]";
-					$choiceResult = execute_sql($choiceSQL);
-					while (list($choice['id'],$choice['question_id'],$choice['content'],$choice['value']) = fetch_row($choiceResult)) {
-	            		$choiceResult->MoveNext();
-	            		$addChoiceSQL = "INSERT INTO `question_choice` (id,question_id,content,value) VALUES ('','$newQuestionID','$choice[content]','$choice[value]')";
-	            		execute_sql($addChoiceSQL);
-					}
-				}
-			}
-		}
-		return(1);
-	}
-
-	// survey already started
-	switch($old_tab) {
-		// coming from the general tab ...
-		case "general":
-			if(empty($_POST['name']) || empty($_POST['title']) || empty($_POST['realm'])) {
-				$tab = "general";
-				$errstr = _('Sorry, please fill out the name, group, and title before proceeding.');
-				return(0);
-			}
-
-		$fields = array('name','realm','title','subtitle','email','theme','thanks_page','thank_head','thank_body','info','auto_num');
-		$sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${survey_id}";
-		$name = get_one($sql);
-
-		// trying to change survey name
-		if($name != $_POST['name']) {
-			$sql = "SELECT COUNT(*) FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE name=" . _addslashes($_POST['name']);
-			$count = get_one($sql);
-			if($count != 0) {
-				$tab = "general";
-				$errstr = _('Sorry, that name is already in use.');
-				return(0);
-			}
-		}
-
-		// UPDATE the row in the DB with current values
-		array_push($f_arr, 'changed='.sys_time_stamp());
-		foreach($fields as $f) {
-			array_push($f_arr,$f ."=" . _addslashes($_POST[$f]));
-		}
-		$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['survey_table']." SET " . join(', ',$f_arr) . " WHERE id=${survey_id}";
-		$result = execute_sql($sql);
-		if(!$result) {
-			$tab = "general";
-			$errstr = _('Warning, error encountered.') .' [ '.ErrorNo().': '.ErrorMsg().' ]';
-			return(0);
-		}
-		return(1);
-
-		// coming from the questions tab ...
-		case "questions":
-			// if the question box is empty ... ignore everything else
-			if(empty($_POST['content']) && empty($_POST['name']))
-				return(1);
-
-		if(empty($_POST['content'])) {
-			$tab = 'questions';
-			$dont_clear = 1;
-			$errstr = _('Please enter text for this question.');
-			return(0);
-		}
-
-		// constraint: fieldname must be not empty
-		//   generate it from the content if empty
-		//   validate/repair fieldname
-		if(empty($_POST['name'])) {
-			$str1 = $_POST['content'];
-			do {
-				$str2 = $str1;
-				$str1 = eregi_replace(
-						"(^| )(what|which|why|how|who|where|how|is|are|were|the|a|it|of|do|you|your|please|enter)[ ?]",
-						" ", $str2);
-			} 
-			while ($str1 != $str2);
-			$_POST['name'] = $str1;
-		}
-		$_POST['name'] = strtoupper(preg_replace("/[^A-Z0-9]+/i","_", trim($_POST['name'])));
-		$_POST['name'] = preg_replace("/(^_|_$)/i","", $_POST['name']);
-
-		// constraint: question type required
-		if(empty($_POST['type_id'])) {
-			$tab = 'questions';
-			$dont_clear = 1;
-			$errstr= _('Sorry, you must select a type for this question.');
-			return(0);
-		}
-
-		$_POST['type_id'] = intval($_POST['type_id']);
-		// constraint: qid must be int or empty
-		if($_POST['id'] == _('New Field'))
-			$qid = '';
-		$qid = intval($_POST['id']);	# curr_q_id
-
-			// constraint: can not change between question w/ answer choices and one w/o
-			$has_choices = esp_type_has_choices();
-		if(!empty($qid)) {
-			$sql =  "SELECT Q.type_id FROM ".$GLOBALS['ESPCONFIG']['question_table']." Q WHERE Q.survey_id=${survey_id} AND Q.id=${qid}";
-			$old_type_id = get_one($sql);
-			if($has_choices[$_POST['type_id']] != $has_choices[$old_type_id]) { // trying to change between incompatible question types
-				$tab = "questions";
-				$_POST['type_id'] = $old_type_id;
-				$dont_clear = 1;
-				$errstr = _('Sorry, you cannot change between those types of question. Create a new question instead.');
-				return(0);
-			}
-		}
-
-		// constraint: length must be int
-		$_POST['length']  = intval($_POST['length']) or 0;
-
-		// constraint: precise must be int
-		$_POST['precise'] = intval($_POST['precise']) or 0;
-
-		// defaults for length field
-		if(empty($_POST['length']) && $_POST['type_id'] < 50) {
-			$arr = array(
-					0,		// 0: unused
-					0,		// 1: Yes/No
-					20,		// 2: Text Box  (width)
-					60,		// 3: Essay Box (width)
-					0,		// 4: Radio Buttons
-					0,		// 5: Check Boxes (minumum)
-					0,		// 6: Dropdown Box (length)
-					5,		// 7: Rating (# cols)
-					5,		// 8: Rate (# cols)
-					0,		// 9: Date
-					10		// 10: Numeric (digits)
-				    );
-			$_POST['length'] = $arr[$_POST['type_id']];
-		}
-
-		// defaults for precision field
-		if(empty($_POST['precise']) && $_POST['type_id'] < 50) {
-			$arr = array(
-					0,		// 0: unused
-					0,		// 1: Yes/No
-					0,		// 2: Text Box
-					5,		// 3: Essay Box (height)
-					10,		// 4: Radio Buttons
-					0,		// 5: Check Boxes (maximum)
-					0,		// 6: Dropdown Box
-					0,		// 7: Rating (use N/A)
-					0,		// 8: Rate (use N/A)
-					0,		// 9: Date
-					0		// 10: Numeric (decimal)
-				    );
-			$_POST['precise'] = $arr[$_POST['type_id']];
-		}
-
-
-		// UPDATE row in the DB for the current question
-		if($qid != '') {
-			// conditional questions can't be required
-			$sql = "SELECT COUNT(*) FROM ".$GLOBALS['ESPCONFIG']['condition_table']." WHERE q1_id='$qid'";
-			$count = get_one($sql);
-			if($count != 0) {
-			   $_POST['required']='N';
-			}
-
-			$fields = array('name','type_id','length','precise','required','content');
-			foreach($fields as $f) {
-				if(isset($_POST[$f]))
-					array_push($f_arr,$f."="._addslashes($_POST[$f]));
-			}
-			$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['question_table']." SET " . join(', ',$f_arr) . " WHERE id=${qid}";
-
-			// INSERT row in the DB for new question
-		} else {
-			// set the position to the end
-			$sql = "SELECT MAX(position)+1 FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE survey_id=${survey_id}";
-			$_POST['position'] = get_one($sql);
-
-			$_POST['survey_id'] = $survey_id;
-
-			$fields = array('survey_id','name','type_id','length','precise','required','content','position');
-			foreach($fields as $f) {
-				if(isset($_POST[$f])) {
-					array_push($f_arr, $f);
-					array_push($v_arr,  _addslashes($_POST[$f]));
-				}
-			}
-			$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['question_table']." (" . join(', ',$f_arr) . ") VALUES (" . join(', ',$v_arr) .")";
-		}
-		$result = execute_sql($sql);
-		if($qid == '')
-			$qid = insert_id('question_id_seq');
-		$_POST['id'] = $qid;
-		if(!$result) {
-			$tab = 'questions';
-			$dont_clear = 1;
-			$errstr = _('Warning, error encountered.') .' [ '.ErrorNo().': '.ErrorMsg().' ]';
-			return(0);
-		}
-
-		// UPDATE or INSERT rows for each of the question choices for this question
-		if($has_choices[$_POST['type_id']]) {
-			$cids = array();
-			$sql = "SELECT c.id FROM ".$GLOBALS['ESPCONFIG']['question_table']." q, ".$GLOBALS['ESPCONFIG']['question_choice_table']." c WHERE q.id=c.question_id AND q.survey_id=${survey_id}";
-			$result = execute_sql($sql);
-			for ($i = 0; $i < record_count($result); ++$i) {
-				$result->Move($i);
-				array_push($cids, $result->fields[0]);
-			}
-			db_close($result);
-			$count = 0;
-			for($i=1;$i<$_POST['num_choices']+1;$i++) {
-				$sql='';
-				$choice_id      = intval($_POST["choice_id_${i}"]);
-				$choice_content = $_POST["choice_content_${i}"];
-				if ($choice_content != '') {
-					$choice_content = _addslashes($choice_content);
-				}
-				// each of the submitted choices
-				if($choice_id=='' && $choice_content!='') {
-					// insert (new)
-					$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['question_choice_table']." (question_id,content) VALUES (${qid},${choice_content})";
-					++$count;
-				} elseif($choice_id!='' && $choice_content=='') {
-					// delete (old)
-					$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE id=${choice_id}";
-				} elseif($choice_id!='' && $choice_content!='' && in_array($choice_id, $cids)) {
-					// update (old)
-					$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['question_choice_table']." SET content=${choice_content} WHERE id=${choice_id}";
-					++$count;
-				}
-				if($sql != '') {
-					$result = execute_sql($sql);
-					if(!$result) {
-						$tab = 'questions';
-						$dont_clear = 1;
-						$errstr = _('Warning, error encountered.') .' [ '.ErrorNo().': '.ErrorMsg().' ]';
-						return(0);
-					}
-				}
-			}
-			if(!$count && !isset($_POST['extra_choices'])) {
-				$tab = 'questions';
-				$dont_clear = 1;
-				$errstr = _('Sorry, you need at least one answer option for this question type.') .
-					' [ '. _('ID') .': '. $_POST['type_id'] .' ]';
-				return(0);
-			}
-		}
-		return(1);
-
-		case "preview":
-			// can not change anything here yet, so no need to update DB.
-			return(1);
-
-		case "order":
-			if(isset($_POST['questions_order']))
-				$questions_order = $_POST['questions_order'];
-
-		$sid = $survey_id;
-
-		if (isset($_POST['questions_order'])) {
-			$sql = "SELECT id, position FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-				WHERE survey_id=$sid AND deleted='N'
-				ORDER BY position";
-			$result = execute_sql($sql);
-			$max = record_count($result);
-			$order = split('\|', $questions_order);
-			for($i = 0; $i < count($order); $i++) {
-				$ord = _addslashes($order[$i]);
-				$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['question_table']." SET position=$i WHERE id=$ord AND survey_id=$sid";
-				execute_sql($sql);
-			}
-		}
-		if (isset($_POST['removeit'])) {
-			if ($_POST['removeit'] == 1) {
-				if(isset($_POST['questions'])) {
-					$qid = intval($_POST['questions']); 
-					$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['question_table']." SET deleted='Y' WHERE id=$qid AND survey_id=$sid";
-					execute_sql($sql);
-				} 
-			}
-		}
-		if(isset($_POST['addbreak'])) {
-			$sql = "SELECT MAX(position)+1 FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE survey_id=$sid";
-			$pos = get_one($sql);
-
-			$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['question_table']." (survey_id,name,type_id,position,content)
-				VALUES ($sid, 'break', 99, $pos, 'break')";
-			execute_sql($sql);
-		}
-		db_close($result);
-		return(1);
-
-		case "conditions":
-		$sid = $survey_id;
-		if(isset($_POST['addcondition']) && ($_POST['addcondition']=='go')) {
-			$id1=$_POST['q1_id'];
-			$id2=$_POST['q2_id'];
-			if ($id1==$id2) {
-				$errstr = _('Please select two different questions.');
-				return(0);
-			}
-			$cond=$_POST['cond'];
-			$cond_val=_addslashes($_POST['cond_value']);
-			$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['condition_table']." (survey_id,q1_id,q2_id,cond,cond_value)
-				VALUES ($sid, $id1, $id2, $cond, $cond_val)";
-			$result=execute_sql($sql);
-			if (!$result)
-			   $errstr = _('Warning, error encountered.') .' [ '.ErrorNo().': '.ErrorMsg().' ]';
-			# Conditional questions can't be required questions as well
-			$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['question_table']." SET required='N' WHERE id=$id1";
-			$result=execute_sql($sql);
-			if (!$result)
-			   $errstr = _('Warning, error encountered.') .' [ '.ErrorNo().': '.ErrorMsg().' ]';
-		}
-		if(isset($_POST['deletecondition'])) {
-			$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['condition_table']." WHERE id=".key($_POST['deletecondition']);
-			$result=execute_sql($sql);
-			if (!$result)
-			   $errstr = _('Warning, error encountered.') .' [ '.ErrorNo().': '.ErrorMsg().' ]';
-		}
-		return(1);
-	}
-	return(1);
-}
-/* }}} */
-
-?>
Index: admin/include/function/account_upload.inc
===================================================================
--- admin/include/function/account_upload.inc	(revision 6370)
+++ admin/include/function/account_upload.inc	(working copy)
@@ -1,327 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: account_upload.inc,v 1.11 2004/05/18 21:05:28 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-// account_upload written by Matthew Gregg
-// <greggmc@musc.edu>
-// Upload Bulk Respondents from Tab Delimited text file.
-
-/* {{{ proto array parse_file_tab(string group, array file)
-	Parse uploaded tab delimited text file
-	into an array.
-	*/
-function parse_file_tab($group, $file) {
-	$tab_array = array();
-	foreach($file as $row) {
-		array_push($tab_array, explode("\t", rtrim($row)));
-	}
-	return $tab_array;
-
-}
-
-function parse_file_csv(){}
-
-function parse_file_xml(){}
-
-/* {{{ proto bool account_upload(array* exceptions, string upload_type,
-	string account_type, array group_acl, file upload_file)
-	exceptions array is populated with failed SQL inserts.
-	Returns a true on success, else returns false.
-	*/
-function account_upload(&$exceptions, $upload_type, $account_type, $group_acl, $upload_file) {
-
-	$error = 0;
-	$bool_validate = array('Y', 'N');
-	switch($upload_type) {
-		case 'tab':
-			$arr = parse_file_tab($group_acl, $upload_file);
-			break;
-		case 'csv':
-			$arr = parse_file_csv();
-			break;
-		case 'xml':
-			$arr = parse_file_xml();
-			break;
-		default:
-			$error=1;
-			break;
-		}
-
-	switch($account_type) {
-		case 'respondents':
-			array_push($exceptions, array("Username", "Password", "Group", "First Name",
-				"Last Name", "Email", "Disabled", "Expir.", "Error"));
-
-			foreach($arr as $row) {
-				/* check for data in required fields */
-				if($row[0]) {
-					$username = $row[0];
-				}
-				else {
-					$error=1;
-					break;
-				}
-				if($row[1]) {
-					$password = $row[1];
-				}
-				else {
-					$error=1;
-					break;
-				}
-				if($row[2]) {
-					$realm = $row[2];
-					if(isset($row[3]))
-						$fname = $row[3];
-					else
-						$fname = '';
-					if(isset($row[4]))
-						$lname = $row[4];
-					else
-						$lname = '';
-					if(isset($row[5]))
-						$email = $row[5];
-					else
-						$email = '';
-					if(isset($row[6]))
-						$expir = $row[6];
-					else
-						$expir = '';
-					if(isset($row[7]))
-						$disabled = $row[7];
-					else
-						$disabled = '';
-					/* validate email address.  */
-                    if ($email != '') {
-					    if(!eregi( "^[a-z0-9]+([_\\.-][a-z0-9]+)*@" .
-					    	"([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$", $email)) {
-					    	array_push($exceptions, array($username, $password,
-					    		$realm, $fname, $lname, $email,
-					    		$expir, $disabled,  "Invalid Email Addr."));
-					    	continue;
-					    }
-                    }
-					if($expir) {
-						$year = substr($expir, 0, 4);
-						$month = substr($expir, 4, 2);
-						$day = substr($expir, 6, 2);
-						if(!checkdate($month, $day, $year)) {
-							array_push($exceptions, array($username, $password,
-								$realm, $fname, $lname, $email,
-								$expir, $disabled,  "Invalid Expir. Date"));
-							continue;
-						}
-					}
-					else
-						$expir = "0";
-;
-					if(!in_array($disabled, $bool_validate))
-						$disabled = 'N';
-					/* Make sure user is authorized to upload this realm */
-					if(!in_array($realm, $group_acl)) {
-						array_push($exceptions, array($username, $password,
-							$realm, $fname, $lname, $email, $expir,
-							 $disabled, "Invalid Group"));
-						continue;
-					}
-				}
-				else {
-					$error=1;
-					break;
-				}
-                $username = _addslashes($username);
-                $password = _addslashes($password);
-                $realm = _addslashes($realm);
-                $fname = _addslashes($fname);
-                $lname = _addslashes($lname);
-                $email = _addslashes($email);
-                $expir = _addslashes($expir);
-                $disabled = _addslashes($disabled);
-                $changed = sys_time_stamp();
-				$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['respondent_table']." ";
-				$sql .= "(username, password, realm, fname, lname, ";
-				$sql .= "email, expiration, disabled, changed) ";
-				$sql .= "VALUES ($username, ".db_crypt($password).", ";
-				$sql .= "$realm, $fname, $lname, $email, ";
-				$sql .= "$expir, $disabled, $changed)";
-
-				if(!execute_sql($sql)) {
-					/* insert failed -- stuff record into failed array */
-					array_push($exceptions, array($username, $password,
-						$realm, $fname, $lname, $email, $expir,
-						 $disabled, ErrorMsg()));
-		}
-			}
-			break;
-		case 'designers':
-			array_push($exceptions, array("Username", "Password", "Group", "First Name",
-						"Last Name", "Email", "PDesign", "PStatus", "PData",
-						"PAll", "PGroup", "PUser", "Expir", "Disabled", "Error"));
-
-			foreach($arr as $row) {
-				/* check for data in required fields */
-				if($row[0]) {
-					$username = $row[0];
-				}
-				else {
-					$error=1;
-					break;
-				}
-				if($row[1]) {
-					$password = $row[1];
-				}
-				else {
-					$error=1;
-					break;
-				}
-				if($row[2]) {
-					$realm = $row[2];
-					if(isset($row[3]))
-						$fname = $row[3];
-					else
-						$fname = '';
-					if(isset($row[4]))
-						$lname = $row[4];
-					else
-						$lname = '';
-					if(isset($row[5]))
-						$email = $row[5];
-					else
-						$email = '';
-					if(isset($row[6]))
-						$pdesign = $row[6];
-					else
-						$pdesign = '';
-					if(isset($row[7]))
-						$pstatus = $row[7];
-					else
-						$pstatus = '';
-					if(isset($row[8]))
-						$pdata = $row[8];
-					else
-						$pdata = '';
-					if(isset($row[9]))
-						$pall = $row[9];
-					else
-						$pall = '';
-					if(isset($row[10]))
-						$pgroup = $row[10];
-					else
-						$pgroup = '';
-					if(isset($row[11]))
-						$puser = $row[11];
-					else
-						$puser = '';
-					if(isset($row[12]))
-						$expir = $row[12];
-					else
-						$expir = '';
-					if(isset($row[13]))
-						$disabled = $row[13];
-					else
-						$disabled = '';
-					/* validate email address.  */
-                    if($email != '') {
-					    if(!eregi( "^[a-z0-9]+([_\\.-][a-z0-9]+)*@" .
-						    "([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$", $email)) {
-						    array_push($exceptions, array($username, $password,
-							    $realm, $fname, $lname, $email, $pdesign,
-							    $pstatus, $pdata, $pall, $pgroup, $puser,
-							    $expir, $disabled,  "Invalid Email Addr."));
-						    continue;
-                        }
-					}
-					if(!in_array($pdesign, $bool_validate))
-						$pdesign = 'Y';
-					if(!in_array($pstatus, $bool_validate))
-						$pstatus = 'N';
-					if(!in_array($pdata, $bool_validate))
-						$pdata = 'N';
-					if(!in_array($pall, $bool_validate))
-						$pall = 'N';
-					if(!in_array($pgroup, $bool_validate))
-						$pgroup = 'N';
-					if(!in_array($puser, $bool_validate))
-						$puser = 'N';
-					if($expir) {
-						$year = substr($expir, 0, 4);
-						$month = substr($expir, 4, 2);
-						$day = substr($expir, 6, 2);
-						if(!checkdate($month, $day, $year)) {
-							array_push($exceptions, array($username, $password,
-								$realm, $fname, $lname, $email, $pdesign,
-								$pstatus, $pdata, $pall, $pgroup, $puser,
-								$expir, $disabled,  "Invalid Expir. Date"));
-							continue;
-						}
-					}
-					else
-						$expir = "0";
-					if(!in_array($disabled, $bool_validate))
-						$disabled = 'N';
-					/* Make sure user is authorized to upload this realm */
-					if(!in_array($realm, $group_acl)) {
-						array_push($exceptions, array($username, $password,
-							$realm, $fname, $lname, $email, $pdesign,
-							$pstatus, $pdata, $pall, $pgroup, $puser,
-							$expir, $disabled,  "Invalid Group"));
-						continue;
-					}
-				}
-                $username = _addslashes($username);
-                $password = _addslashes($password);
-                $realm = _addslashes($realm);
-                $fname = _addslashes($fname);
-                $lname = _addslashes($lname);
-                $email = _addslashes($email);
-                $pdesign = _addslashes($pdesign);
-                $pstatus = _addslashes($pstatus);
-                $pdata = _addslashes($pdata);
-                $pall = _addslashes($pall);
-                $pgroup = _addslashes($pgroup);
-                $puser = _addslashes($puser);
-                $expir = _addslashes($expir);
-                $disabled = _addslashes($disabled);
-                $changed = sys_time_stamp();
-				$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['designer_table']." ";
-				$sql .= "(username, password, realm, fname, lname, ";
-				$sql .= "email, pdesign, pstatus, pdata, pall, pgroup,";
-				$sql .= "puser, expiration, disabled, changed) ";
-				$sql .= "VALUES ($username, ".db_crypt($password).", ";
-				$sql .= "$realm, $fname, $lname, $email, ";
-				$sql .= "$pdesign, $pstatus, $pdata, $pall, ";
-				$sql .= "$pgroup, $puser, $expir, $disabled, $changed)";
-				if(!execute_sql($sql)) {
-					/* insert failed -- stuff record into failed array */
-					array_push($exceptions, array($username, $password,
-						$realm, $fname, $lname, $email, $pdesign,
-						$pstatus, $pdata, $pall, $pgroup, $puser,
-						$expir, $disabled,  ErrorMsg()));
-				}
-			}
-			break;
-
-	}
-	if(count($exceptions) > 1 or $error)
-		return 0;
-	else
-		return 1;
-}
-?>
Index: admin/include/function/response_purge.inc
===================================================================
--- admin/include/function/response_purge.inc	(revision 6370)
+++ admin/include/function/response_purge.inc	(working copy)
@@ -1,49 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: response_purge.inc,v 1.2 2007/12/28 14:33:34 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-/* {{{ proto void response_purge(array/int response_id)
-   Purges all traces of response_id from the database.
-   Returns void. */
-function response_purge($qids) {
-	if(is_int($qids)) {
-		$qidstr = '='.$qids;
-	} else if (is_string($qids)) {
-		$qids = split(" ",$qids);
-	}
-	if(is_array($qids)) {
-		$qidstr = array_to_insql($qids);
-	}
-
-	// work from the bottom up...
-	// start with the survey results
-	$tables = array('response_bool','response_date','response_multiple','response_other','response_rank','response_single','response_text');
-	foreach($tables as $table) {
-		$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG'][$table.'_table']." WHERE response_id ${qidstr}";
-		$result = execute_sql($sql);
-	}
-	$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['response_table']." WHERE id ${qidstr}";
-	$result = execute_sql($sql);
-
-	return;
-}
-/* }}} */
-
-?>
Index: admin/include/function/question_render.inc
===================================================================
--- admin/include/function/question_render.inc	(revision 6370)
+++ admin/include/function/question_render.inc	(working copy)
@@ -1,309 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: question_render.inc,v 1.2 2007/12/07 15:15:04 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-/* {{{ proto bool question_render($question, int question_number)
-   Builds HTML for the question */
-function question_render($question,$question_number,$auto_num,$on_one_line=0) {
-		// process each question
-		$qid  = &$question['id'];
-		$tid  = &$question['type_id'];
-		$size = &$question['length'];
-		$prec = &$question['precise'];
-
-		if ($tid == 100) {
-
-?>
-<tr>
-    <td class="preQuestionBorder">&nbsp;</td>
-</tr>
-<tr>
-    <td height="35" vAlign="top">
-        <table class="qnOuterTable" width="100%" border="0" cellpadding="0" cellspacing="1">
-        <tr>
-            <td width="100%" height="35" valign="top" align="left">
-                <table class="qnInnerTable" width="100%" border="0" cellpadding="10" cellspacing="1">
-                <tr>
-        	        <td class="qnInner" width="100%" height="35"><?php echo $question['content']; ?></td>
-                </tr>
-                </table>
-            </td>
-        </tr>
-        </table>
-    </td>
-</tr>
-<?php
-
-			return;
-		}
-
-		$has_choices = esp_type_has_choices();
-		if($has_choices[$tid]) {
-			$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE question_id=$qid AND content NOT LIKE '!other%' ORDER BY id";
-			$choices_result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-			$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE question_id=$qid AND content LIKE '!other%' ORDER BY id";
-			$others_result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-			$others = record_count($others_result);
-		} else { $choices_result = ''; }
-?>
-<tr>
-        <td class="preQuestionBorder" >&nbsp;</td>
-      </tr>
-      <tr>
-        <td height="62" valign=top>
-                <table class="qnOuterTable" width="100%" cellspacing="1">
-            <tr>
-              <td width="100%" height="60" valign="top">
-                 <table class="qnInnerTable" width="100%" cellPadding="10"  cellSpacing="1">
-                  <tr>
-                    <td class="qnInnerTd" valign="top" width=5%>
-			<?php if($question['required']=='Y') { echo('<font color="#FF0000">*</font>'); } ?><A NAME="Q<?php echo($question_number); ?>"><?php if($auto_num=='Y') {echo $question_number.".";} ?></A></td>
-		     <td class="qnInner" width=100% align=left>
-			<?php echo($question['content']); ?>
-		    </td>
-<?php
-		if ($on_one_line==0) {
-                     echo "</tr><tr>";
-		}
-?>
-
-		    <td></td>
-                    <td class="qnType">
-<?php
-		switch($tid) {
-			case '1':	// Yes/No
-?>
-				<table cellSpacing="0" cellPadding="0">
-                        	<tbody>
-                          	<tr>
-                            		<td class="qnType"><?php echo(mkradio($qid,'Y')); ?></td>
-                            		<td class="qnType"><?php echo(_('Yes')); ?></td>
-                          	</tr>
-                          	<tr>
-                            		<td class="qnType"><?php echo(mkradio($qid,'N')); ?></td>
-                            		<td class="qnType"><?php echo(_('No')); ?></td>
-                          	</tr>
-                        	</tbody>
-                      		</table>
-<?php
-				break;
-			case '2':	// single text line
-?>
-					<?php echo(mktext($qid, $size, $prec)); ?>
-<?php
-				break;
-			case '3':	// essay
-?>
-					<?php echo(mktextarea($qid, $prec, $size, 'VIRTUAL')); ?>
-<?php
-				break;
-			case '4':	// radio
-?>
-					<table border="0" cellspacing="0" cellpadding="0">
-					<tbody>
-<?php			while($choice = fetch_row($choices_result)) {	
-                    		$choices_result->MoveNext();
-                    ?>
-						<tr>
-							<td class="qnType"><?php echo(mkradio($qid,$choice['id'])); ?></td>
-							<td class="qnType"><?php echo($choice['content']); ?></td>
-						</tr>
-<?php			}
-				$j=0;
-				while($other = fetch_row($others_result)) {
-					$others_result->MoveNext();
-					$cid = $other['id'];
-					if (!strcmp($other['content'],"!other")) {
-					   $other_text = 'Other:';
-					} else {
-					   $other_text = preg_replace(
-							array("/^!other=/","/^!other/"),
-							array('',''),
-							$other['content']);
-					}
-?>
-						<tr>
-							<td class="qnType"><?php echo(mkradio($qid,"other_$cid")); ?></td>
-							<td class="qnType">
-<?php
-                    $cid = "${qid}_${cid}";
-                    echo("$other_text&nbsp;<input type=\"text\" size=\"20\" name=\"$cid\" onKeyPress=\"other_check(this.name)\"");
-                	if (isset($_POST[$cid]))
-                        echo(' value="'. _stripslashes(htmlspecialchars($_POST[$cid])) .'"');
-                    echo(" />");
-?>
-                            </td>
-						</tr>
-<?php
-					$j++;
-				}
-?>
-					</tbody>
-					</table>
-<?php
-				break;
-			case '5':	// check boxes
-?>
-					<table border="0" cellspacing="0" cellpadding="0">
-					<tbody>
-<?php			while($choice = fetch_row($choices_result)) {
-                    $choices_result->MoveNext();
-                    ?>
-						<tr>
-							<td class="qnType"><?php echo(mkcheckbox($qid,$choice['id'])); ?></td>
-							<td class="qnType"><?php echo($choice['content']); ?></td>
-						</tr>
-<?php			}
-				$j=0;
-				while($other = fetch_row($others_result)) {
-					$others_result->MoveNext();
-					$cid = $other['id'];
-					if (!strcmp($other['content'],"!other")) {
-					   $other_text = 'Other:';
-					} else {
-					   $other_text = preg_replace(
-							array("/^!other=/","/^!other/"),
-							array('',''),
-							$other['content']);
-					}
-?>
-						<tr>
-							<td class="qnType"><?php echo(mkcheckbox($qid,"other_$cid")); ?></td>
-							<td class="qnType">
-<?php
-                    $cid = "${qid}_${cid}";
-                    echo("$other_text&nbsp;<input type=\"text\" size=\"20\" name=\"$cid\" onKeyPress=\"other_check(this.name)\"");
-                	if (isset($_POST[$cid]))
-                        echo(' value="'. _stripslashes(htmlspecialchars($_POST[$cid])) .'"');
-                    echo(" />");
-?>
-                            </td>
-
-						</tr>
-<?php
-					$j++;
-				}
-?>
-					</tbody>
-					</table>
-<?php
-				break;
-			case '6':	// dropdown box
-				$options = array();
-?>
-<?php				while($choice = fetch_row($choices_result)) {
-					$choices_result->MoveNext();
-					$options[$choice['id']] = $choice['content'];
-				}
-?>
-					<?php echo(mkselect($qid,$options)); ?>
-<?php
-				break;
-			case '7':	// rating
-?>
-					<table border="0" cellspacing="0" cellpadding="0">
-					<tbody>
-						<tr>
-							<td width="60" class="qnType"><?php echo(mkradio($qid,1)); ?> <?php echo(_('1')); ?></td>
-							<td width="60" class="qnType"><?php echo(mkradio($qid,2)); ?> <?php echo(_('2')); ?></td>
-							<td width="60" class="qnType"><?php echo(mkradio($qid,3)); ?> <?php echo(_('3')); ?></td>
-							<td width="60" class="qnType"><?php echo(mkradio($qid,4)); ?> <?php echo(_('4')); ?></td>
-							<td width="60" class="qnType"><?php echo(mkradio($qid,5)); ?> <?php echo(_('5')); ?></td>
-							<td width="60" class="qnType"><?php echo(mkradio($qid,'N/A')); ?> <?php echo(_('N/A')); ?></td>
-						</tr>
-					</tbody>
-					</table>
-<?php
-				break;
-			case '8':	// ranking
-?>
-					<table border="0" cellspacing="1" cellpadding="0">
-						<tbody>
-						<tr>
-							<td class="qnType"></td>
-<?php
-				$bg = '#eeeeee';
-				for ($j = 0; $j < $size; $j++) {
-?>
-							<td width="40" align="center" bgcolor="<?php echo($bg); ?>" class="qnType"><?php echo($j+1); ?></td>
-<?php
-					if ($bg == '#eeeeee')   $bg = '#dddddd';
-					else                    $bg = '#eeeeee';
-				}
-				if ($prec) {
-?>
-							<td width="40" align="center" bgcolor="<?php echo($bg); ?>" class="qnType"><?php echo(_('N/A')); ?></td>
-<?php
-				}
-?>
-						</tr>
-<?php
-				while($choice = fetch_row($choices_result)) {
-					$choices_result->MoveNext();
-					$cid = $choice['id'];
-					$str = "${qid}_$cid";
-?>
-						<tr>
-							<td align="right" class="qnType"><?php echo($choice['content']); ?></td>
-<?php
-					$bg = '#eeeeee';
-					for ($j = 0; $j < $size; $j++) {
-?>
-							<td width="40" align="center" bgcolor="<?php echo($bg); ?>" class="qnType"><?php echo(mkradio($str,$j)); ?></td>
-<?php
-						if ($bg == '#eeeeee')   $bg = '#dddddd';
-						else                    $bg = '#eeeeee';
-					}
-					if ($prec) {
-?>
-							<td width="40" align="center" bgcolor="<?php echo($bg); ?>" class="qnType"><?php echo(mkradio($str,'-1')); ?></td>
-<?php
-					}
-?>
-						</tr>
-<?php			} ?>
-					</tbody>
-					</table>
-<?php
-				break;
-			case '9':	// date
-?>
-					<?php echo(mktext($qid, 10, 10)); ?> <em>(e.g. <?php echo strftime ($GLOBALS['ESPCONFIG']['date_format'],strtotime("09/21/2003")) ;?>)</em>
-<?php
-				break;
-			case '10':	// numeric
-					$size++; // for sign
-					if($prec)
-						$size += 1 + $prec;
-?>
-					<?php echo(mktext($qid, $size, $size)); ?>
-<?php
-				break;
-		}
-		// end of select
-?>
-                         </td>
-                  </tr>
-                </table></td>
-            </tr>
-          </table></td>
-      </tr>
-<?php
-	return;
-}
-/* }}} */
-?>
Index: admin/include/lib/espmerge.inc
===================================================================
--- admin/include/lib/espmerge.inc	(revision 6370)
+++ admin/include/lib/espmerge.inc	(working copy)
@@ -1,97 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: espmerge.inc,v 1.7 2004/04/29 17:27:34 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-/* {{{ proto array merge_expand_qids(int target_qid, array surveys)
-   Returns an array of question ids spanning the given
-   survey ids. */
-function merge_expand_qids($targetq, $surveys) {
-	$sql = "SELECT survey_id FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE id ". array_to_insql($targetq);
-	$targets = get_one($sql);
-
-	$sidstr = array_to_insql($surveys);
-	$sql = "
-SELECT Q.survey_id, Q.id
-FROM ".$GLOBALS['ESPCONFIG']['question_table']." Q
-WHERE Q.survey_id ${$sidstr} AND deleted='N'
-ORDER BY Q.survey_id, Q.position, Q.id";
-	$result = execute_sql($sql);
-	foreach($surveys as $sid) {
-		$i[$sid] = 0;
-	}
-	while(list($sid, $qid) = fetch_row($result)) {
-		$$sid[$i[$sid]++] = $qid;
-	}
-	db_close($result);
-	foreach($surveys as $sid) {
-		$num = $i[$sid];
-	}
-	$qids = array();
-	for($j=0;$j<$num;$j++) {
-		if(in_array($$targets[$j],$targetq)) {
-			foreach($surveys as $sid) {
-				array_push($qids, $$sid[$j]);
-			}
-		}
-	}
-	return($qids);
-}
-/* }}} */
-
-/* {{{ proto array merge_expand_cids(int target_cid, array questions)
-   Returns an array of choice ids spanning the given
-   question ids. */
-function merge_expand_cids($targetc, $questions) {
-	$sql = "SELECT question_id FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE id ". array_to_insql($targetc);
-	$result = execute_sql($sql);
-	$targetq = $result->fields[0];
-	db_close($result);
-
-	array_push($questions,$targetq);
-	$qidstr = array_to_insql($questions);
-	$sql = "
-SELECT C.question_id, C.id
-FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." C
-WHERE C.question_id ${$qidarr}
-ORDER BY C.question_id, C.id";
-	$result = execute_sql($sql);
-	foreach($questions as $qid) {
-		$i[$qid] = 0;
-	}
-	while(list($qid, $cid) = fetch_row($result)) {
-		$$qid[$i[$qid]++] = $cid;
-	}
-	db_close($result);
-	foreach($questions as $qid) {
-		$num = $i[$qid];
-	}
-	$cids = array();
-	for($j=0;$j<$num;$j++) {
-		if(in_array($$targetq[$j],$targetc)) {
-			foreach($questions as $qid) {
-				array_push($cids, $$qid[$j]);
-			}
-		}
-	}
-	return($cids);
-}
-/* }}} */
-	
-?>
Index: admin/include/lib/espsql.inc
===================================================================
--- admin/include/lib/espsql.inc	(revision 6370)
+++ admin/include/lib/espsql.inc	(working copy)
@@ -1,174 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: espsql.inc,v 1.13 2007/11/26 16:03:56 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-/* {{{ proto string array_to_insql(array elements)
-   Returns a string of a SQL fragment to klugde around
-   mysql's lack of nested SELECTS. */
-	function array_to_insql($array) {
-		if (count($array))
-			return("IN (".ereg_replace("([^,]+)","\\1",join(",",array_map("_addslashes", $array))).")");
-		return 'IS NULL';
-	}
-/* }}} */
-
-/* {{{ proto int survey_num_sections(int survey_id)
-   Returns the number of sections in the survey. */
-function survey_num_sections($sid) {
-	$sql = "
-		SELECT COUNT(*) + 1
-		FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-		WHERE survey_id=${sid} AND
-		type_id='99' AND
-		deleted='N'";
-	$result = execute_sql($sql);
-	$count = $result->fields[0];
-	db_close($result);
-	return($count);
-}
-/* }}} */
-
-/* {{{ proto array survey_get_sections(int survey_id)
-   Returns 2D-array with question id's of sections. */
-	function survey_get_sections($sid, $field = 'id') {
-		if (empty($field))
-			$field = 'id';
-
-		$sql = "SELECT $field, type_id FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-			WHERE survey_id = $sid AND deleted = 'N'
-			ORDER BY position";
-		if (!($result = execute_sql($sql)))
-			return array();
-		$ret = array();
-		$sec = array();
-		while (list($key, $type) = fetch_row($result)) {
-			$result->MoveNext();
-			if ($type != 99) {
-				array_push($sec, $key);
-			} else {
-				array_push($ret, $sec);
-				$sec = array();
-			}
-		}
-		array_push($ret, $sec);
-		db_close($result);
-		return $ret;
-	}
-/* }}} */
-
-/* {{{ proto array survey_get_section_questions(int survey_id)
-   Returns 2D-array with question id's of sections, excludes
-   the section text question type. */
-	function survey_get_section_questions($sid, $field = 'id') {
-		if (empty($field))
-			$field = 'id';
-
-		$sql = "SELECT $field, type_id FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-			WHERE survey_id = $sid AND deleted = 'N'
-			ORDER BY position";
-		if (!($result = execute_sql($sql)))
-			return array();
-		$ret = array();
-		$sec = array();
-		while (list($key, $type) = fetch_row($result)) {
-			$result->MoveNext();
-			if ($type != 100) {
-				if ($type != 99) {
-					array_push($sec, $key);
-				} else {
-					array_push($ret, $sec);
-					$sec = array();
-				}
-			}
-		}
-		array_push($ret, $sec);
-		db_close($result);
-		return $ret;
-	}
-/* }}} */
-
-
-/* {{{ proto string survey_select_section_sql(int survey_id, int section)
-   Returns a string of a SQL fragment to limit questions to
-   specified section. */
-	function survey_select_section_sql($sid, $section, $table = '') {
-		if(!empty($table))
-			$table .= '.';
-		$sql = "SELECT position FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-			WHERE survey_id=${sid} AND
-			type_id='99' AND
-			deleted='N'
-			ORDER BY position,id";
-		$result = execute_sql($sql);
-		$num_sections = record_count($result) + 1;
-
-		if($section > $num_sections)
-			return('');	// invalid section
-
-		$ret = array("${table}survey_id='${sid}'", "${table}deleted='N'");
-		if($section>1 && $num_sections>1) {
-			$result->Move($section-2);
-			array_push($ret, "${table}position>" . $result->fields[0]);
-		}
-		if($section<$num_sections && $num_sections>1) {
-			$result->Move($section-1);
-			array_push($ret, "${table}position<" . $result->fields[0]);
-		}
-		db_close($result);
-		return('WHERE ' . join(' AND ',$ret) . ' ');
-	}
-/* }}} */
-
-/* {{{ proto array esp_type_has_choices()
-   Returns an associative array of bools indicating if each
-   question type has answer choices. */
-function esp_type_has_choices() {
-	$has_choices = array();
-	$sql = 'SELECT id, has_choices FROM '.$GLOBALS['ESPCONFIG']['question_type_table'].' ORDER BY id';
-	$result = execute_sql($sql);
-	while(list($tid,$answ) = fetch_row($result)) {
-		$result->MoveNext();
-		if($answ == 'Y')
-			$has_choices[$tid]=1;
-		else
-			$has_choices[$tid]=0;
-	}
-	db_close($result);
-	return($has_choices);
-}
-/* }}} */
-
-/* {{{ proto array esp_type_response_table()
-   Returns an associative array of bools indicating the
-   table the responses are stored in. */
-function esp_type_response_table() {
-	$sql = 'SELECT id, response_table FROM '.$GLOBALS['ESPCONFIG']['question_type_table'].' ORDER BY id';
-	$result = execute_sql($sql);
-	$response_table = array();
-	while(list($tid,$answ) = fetch_row($result)) {
-		$result->MoveNext();
-		$response_table[$tid]=$answ;
-	}
-	db_close($result);
-	return($response_table);
-}
-/* }}} */
-
-?>
Index: admin/include/lib/vulabdatalib.php
===================================================================
--- admin/include/lib/vulabdatalib.php	(revision 6370)
+++ admin/include/lib/vulabdatalib.php	(working copy)
@@ -1,201 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-function get_surveys() {
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-		FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status = 0 ORDER BY s.id DESC";
-	} else {
-		$realms = array_to_insql(
-		array_intersect(
-		$_SESSION['acl']['pall'],
-		$_SESSION['acl']['pdesign']));
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status = 0 AND (s.owner = ".
-		_addslashes($_SESSION['acl']['username']) ." || s.realm $realms) ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-
-	$survey_opts = "";
-
-	
-	return $result;
-}
-///////////
-// MOD - GET ALL SURVEYS
-///////////
-function get_surveys_all() {
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-		FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s ORDER BY s.id DESC";
-	} else {
-		$realms = array_to_insql(
-		array_intersect(
-		$_SESSION['acl']['pall'],
-		$_SESSION['acl']['pdesign']));
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status = 0 AND (s.owner = ".
-		_addslashes($_SESSION['acl']['username']) ." || s.realm $realms) ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-
-	$survey_opts = "";
-
-	
-	return $result;
-}
-///////////
-// - MOD END - GET ALL SURVEYS
-///////////
-///////////
-// MOD - GET ALL ASSIGNED/COMPLETE (AKA ACTIVE) SURVEYS
-///////////
-function get_surveys_assigned() {
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-		FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status != 0 ORDER BY s.id DESC";
-	} else {
-		$realms = array_to_insql(
-		array_intersect(
-		$_SESSION['acl']['pall'],
-		$_SESSION['acl']['pdesign']));
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status = 0 AND (s.owner = ".
-		_addslashes($_SESSION['acl']['username']) ." || s.realm $realms) ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-
-	$survey_opts = "";
-
-	
-	return $result;
-}
-///////////
-// - MOD END - GET ALL ASSIGNED/COMPLETE (AKA ACTIVE) SURVEYS
-///////////
-function get_projects() {
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql2 = "SELECT p.id, p.name, p.presurvey, p.postsurvey, 
-		p.action_intro_msg, p.action_outro_msg, p.action_url 
-		FROM ".$GLOBALS['ESPCONFIG']['project_table']." p";
-	} else {
-//		$realms = array_to_insql(
-//		array_intersect(
-//		$_SESSION['acl']['pall'],
-//		$_SESSION['acl']['pdesign']));
-//		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-//			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status = 0 AND (s.owner = ".
-//		_addslashes($_SESSION['acl']['username']) ." || s.realm $realms) ORDER BY id DESC";
-		$sql = "SELECT * FROM `userprojectrel` WHERE `userid` = '".$_SESSION['acl']['userid']."' AND `admin` = 'Y'";
-		$result = execute_sql($sql);
-		
-		if ($result->RecordCount() > 1)
-		{
-			$sql2Suffix = "`id` = '".$result->fields[2]."'";
-			$result->MoveNext();
-			while (!$result->EOF) {
-				$sql2Suffix .= " OR `id` = '".$result->fields[2]."'";;
-				$result->MoveNext();
-			}
-		}
-		else
-			$sql2Suffix = "`id` = '".$result->fields[2]."'";
-		$sql2 = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['project_table']." WHERE ".$sql2Suffix;
-	}
-	$project_result = execute_sql($sql2);
-	$survey_opts = "";
-	
-	return $project_result;
-}
-
-///////////
-// MOD - Delete Project(s)
-///////////
-function rm_projects($projects = array(),$options=NULL) {
-//	if($_SESSION['acl']['superuser'] == 'Y') {
-	
-		//Lets remove any empty fields from $projects array
-		foreach ($projects as $key=>$val)
-		{
-			if (!$projects[$key]) { unset($projects[$key]); }
-		}
-		//Make sure a project was submitted
-		if (!$projects[0]) { return false; }
-		
-		//Create all of the sql statements for each project and save in $rm_projects_sql[]
-		foreach ($projects as $project) {
-			$rm_projects_sql[] = "DELETE FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id='$project[id]' AND status";
-		}
-		echo '<pre>';
-		print_r($rm_projects_sql);
-		echo '</pre>';
-//	}
-
-}
-// - MOD END - Delete Project(s)
-
-///////////
-// MOD - Delete Surveys(s)
-function rm_surveys($surveys = array(),$options=NULL) {
-
-//	if($_SESSION['acl']['superuser'] == 'Y') {
-	
-		//Lets remove any empty fields from $surveys array
-		foreach ($surveys as $key=>$val)
-		{
-			if (!$surveys[$key]) { unset($surveys[$key]); }
-		}
-		//Make sure a project was submitted
-		if (!$surveys[0]) { return false; }
-		
-		//Create all of the sql statements for each project and save in $rm_projects_sql[]
-		foreach ($projects as $project) {
-			$rm_projects_sql[] = "DELETE FROM ".$GLOBALS['ESPCONFIG']['project_table']." WHERE id='$project[id]'";
-		}
-		echo '<pre>';
-		print_r($rm_projects_sql);
-		echo '</pre>';
-//	}
-
-}
-// - MOD END - Delete Surveys(s)
-///////////
-function get_tests() {
-	/*if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql2 = "SELECT p.id, p.name, p.presurvey, p.postsurvey, 
-		p.action_intro_msg, p.action_outro_msg, p.action_url 
-		FROM ".$GLOBALS['ESPCONFIG']['project_table']." p";
-	} else {*/
-		$sql = "SELECT * FROM `userprojectrel` WHERE `userid` = '".$_SESSION['acl']['userid']."' AND `admin` = 'N'";
-		$result = execute_sql($sql);
-		
-		if ($result->RecordCount() > 1)
-		{
-			$sql2Suffix = "`id` = '".$result->fields[2]."'";
-			$result->MoveNext();
-			while (!$result->EOF) {
-				$sql2Suffix .= " OR `id` = '".$result->fields[2]."'";;
-				$result->MoveNext();
-			}
-		}
-		else
-			$sql2Suffix = "`id` = '".$result->fields[2]."'";
-		$sql2 = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['project_table']." WHERE ".$sql2Suffix;
-	//}
-	$project_result = execute_sql($sql2);
-	$survey_opts = "";
-	
-	return $project_result;
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/espdatalib.inc
===================================================================
--- admin/include/lib/espdatalib.inc	(revision 6370)
+++ admin/include/lib/espdatalib.inc	(working copy)
@@ -1,254 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-                                                                                                                                         
-/* $Id: espdatalib.inc,v 1.5 2007/07/09 12:58:10 liedekef Exp $ */
-                                                                                                                                         
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-                                                                                                                                              
-/* {{{ proto adodb_recordset execute_sql(string message, integer limit, string assoc)
-   Executes $command and Returns a adodb_recordset */
-function execute_sql($command, $limit=null, $assoc=ADODB_FETCH_NUM) {
-
-    $cfg =& $GLOBALS['ESPCONFIG'];
-    $cfg['adodb_conn']->SetFetchMode($assoc);
-    if ($limit) {
-        $result = $cfg['adodb_conn']->SelectLimit($command,$limit);
-    }
-    else {   
-        $result = $cfg['adodb_conn']->Execute($command);
-    }
-
-    if ($result) {
-        return $result;
-    }
-    else {
-        return 0;
-    }
-}
-/* }}} */
-
-/* {{{ proto integer affected_rows()
-   Returns number of rows effected by last update/insert */
-function affected_rows() {
-
-    $cfg =& $GLOBALS['ESPCONFIG']; 
-    $result = $cfg['adodb_conn']->Affected_Rows();
-
-    if ($result) {
-        return $result;
-    }
-    else {
-        return 0;
-    }
-}
-/* }}} */
-
-/* {{{ proto adodb_row fetch_row(adodb_recordset &$recordset)
-    Returns a adodb_row from a adodb_recordset */
-function fetch_row(&$recordset) {
-    $result = $recordset->fields;
-
-    if ($result) {
-        return $result;
-    }
-    else {
-        return 0;
-    }
-}
-/* }}} */
-
-/* {{{ proto adodb_recordset_row get_row(string $command)
-    Executes $command and Returns the first row of a 
-    adodb_recordset*/
-function get_row($command) {
-    $cfg =& $GLOBALS['ESPCONFIG'];
-    $result = $cfg['adodb_conn']->GetRow("$command");
-
-    if ($result) {
-        return $result;
-    }
-    else {
-        return 0;
-    }
-}
-/* }}} */
-
-/* {{{ proto adodb_recordset_field get_one(string $command)
-    Executes $command and Returns the first field of the first row of
-    a adodb_recordset  */
-function get_one($command) {
-    $cfg =& $GLOBALS['ESPCONFIG'];
-    $result = $cfg['adodb_conn']->GetOne($command);
-
-    if ($result) {
-        return $result;
-    }
-    else {
-        return 0;
-    }
-}
-/* {{{ proto integer record_count( adodb_recordset &$recordset)
-    Returns the number of rows in &$recordset */
-function record_count(&$recordset) {
-    $result = $recordset->RecordCount();
-
-    if ($result > 0) {
-        return $result;
-    }
-    else {
-        return 0;
-    }
-}
-/* }}} */
-
-/* {{{ proto integer insert_id(string $sequence)
-    Returns the last auto-incremented value.
-    $sequence is required for Postgres.*/
-function insert_id($sequence="") {
-    $cfg =& $GLOBALS['ESPCONFIG'];
-    switch ($cfg['adodb_database_type']) {
-        case "mysql":
-            return $cfg['adodb_conn']->Insert_ID(); 
-        case "postgres":
-            $sql = "select currval('".$sequence."')";
-            return $cfg['adodb_conn']->GetOne($sql); 
-        case "sqlite":
-            return $cfg['adodb_conn']->Insert_ID();
-    }
-}
-/* }}} */
-
-/* {{{ proto db_close(adodb_recordset &$recordset)
-    Closes &$recordset */
-function db_close(&$recordset) {
-    $recordset->Close();
-}
-/* }}} */
-
-/* {{{ proto string db_qstr(string $data)
-    Returns a string properly quoted for the 
-    active database. */
-function db_qstr($data) {
-    $cfg =& $GLOBALS['ESPCONFIG'];
-    $result = $cfg['adodb_conn']->qstr($data);
-    return $result;
-}
-/* }}} */
-
-/* {{{ proto string db_bin(string $status, string $code)
-    Returns a string properly formated for the active database
-    to handle bitwse comparisons. */
-function db_bin($status, $code) {
-    $cfg =& $GLOBALS['ESPCONFIG'];
-    switch ($cfg['adodb_database_type']) {
-        case "mysql":
-            return "($status & $code)";
-        case "postgres":
-            return "bin_compare($status, $code)";
-        case "sqlite":
-            return "($status & $code)";
-    }
-}
-/* }}} */
-
-/* {{{ proto string db_date(string $data)
-    Returns a string properly formated for the active database's
-    date format. */
-function db_date($data) {
-    $cfg =& $GLOBALS['ESPCONFIG'];
-    $result = $cfg['adodb_conn']->DBDate($data);
-    return $result;
-}
-/* }}} */
-
-/* {{{ proto adodb_time_stamp sys_time_stamp()
-    Returns a adodb_time_stamp suitable for use with the active
-    database. */
-function sys_time_stamp() {
-    $cfg =& $GLOBALS['ESPCONFIG'];
-    
-    return $cfg['adodb_conn']->sysTimeStamp;
-}
-/* }}} */
-
-/* {{{ proto string db_crypt(string $password)
-    Returns a string properly formated for the active database's
-    password format. */
-function db_crypt($password) {
-    $cfg =& $GLOBALS['ESPCONFIG'];
-    switch ($cfg['adodb_database_type']) {
-        case "mysql":
-            return "PASSWORD($password)";
-        case "postgres":
-            return "md5($password)";
-        case "sqlite":
-            return _addslashes(md5($password));
-        default: 
-            return "PASSWORD($password)";
-    }
-}
-/* }}} */
-
-/* {{{ proto integer ErrorNo()
-    Returns the number for the last error of the active database. */
-function ErrorNo() {
-   $cfg =& $GLOBALS['ESPCONFIG'];
-
-   return $cfg['adodb_conn']->ErrorNo();
-}
-/* }}} */
-
-/* {{{ proto string ErrorMsg()
-    Returns the message for the last error of the active database. */
-function ErrorMsg() {
-   $cfg =& $GLOBALS['ESPCONFIG'];
-
-   return $cfg['adodb_conn']->ErrorMsg();
-}
-/* }}} */
-
-/* {{{ proto password_upgrade(string $username, string $password, string $table) {
-    Migrates passwords from mySQL pre 4.1 to 4.1 crypt.
-    */
-function password_upgrade($username, $password, $table) {
-    $cfg =& $GLOBALS['ESPCONFIG'];
-
-    if ($cfg['adodb_database_type'] == "mysql") {
-        $info = $cfg['adodb_conn']->ServerInfo();
-        $version = $info['version'];
-        if ($version > 4.0) {
-            $username = _addslashes($username);
-            $sql = "SELECT * FROM ".$table." WHERE
-            username = ".$username." AND
-            password = OLD_PASSWORD($password) AND
-            disabled = 'N' AND
-            (expiration = '0000-00-00 00:00:00' OR expiration > ". sys_time_stamp().")";
-            $accres = execute_sql( $sql, "", ADODB_FETCH_ASSOC );
-            if (!$accres) {
-                echo(ErrorMsg());
-            }
-            if (record_count($accres) == 1) {
-			// A matching row was found - upgrade his password.
-                $sql = "UPDATE $table SET password = PASSWORD($password) WHERE username = $username";
-                $accres = execute_sql( $sql, "", ADODB_FETCH_ASSOC );
-                if (!$accres) {
-                    echo(ErrorMsg());
-                }
-            
-            }
-        }
-    }
-}
-/* }}} */
Index: admin/include/lib/espauth.inc
===================================================================
--- admin/include/lib/espauth.inc	(revision 6370)
+++ admin/include/lib/espauth.inc	(working copy)
@@ -1,42 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: espauth.inc,v 1.14 2007/11/26 11:36:17 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-//  phpESP Authentication Library Chooser
-//  By: James Flemer <jflemer@alum.rpi.edu>
-
-	$auth_type = $GLOBALS['ESPCONFIG']['auth_type'];
-	if (empty($auth_type))
-		$auth_type = 'default';
-	if (ereg("manage.php",$ESPCONFIG['ME']) &&
-	    ($auth_type == 'ldap_both' || $auth_type == 'ldap_des')) {
-		$auth_type = 'ldap';
-	} else if (!ereg("manage.php",$ESPCONFIG['ME']) &&
-		($auth_type == 'ldap_both' || $auth_type == 'ldap_resp')) {
-		$auth_type = 'ldap';
-	} else {
-		$auth_type = 'default';
-	}
-
-	if (!file_exists($GLOBALS['ESPCONFIG']['include_path']."/lib/espauth-$auth_type".$ESPCONFIG['extension'])) {
-		echo("<b>FATAL: Unable to set up authentication for type $auth_type. Aborting.</b>");
-		exit;
-	}
-
-	require($ESPCONFIG['include_path']."/lib/espauth-$auth_type".$ESPCONFIG['extension']);
-
-?>
Index: admin/include/lib/vulab.surveys.class.php
===================================================================
--- admin/include/lib/vulab.surveys.class.php	(revision 6370)
+++ admin/include/lib/vulab.surveys.class.php	(working copy)
@@ -1,137 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-class Survey {
-
-
-function __construct($survey_id,$data=NULL) { //a.k.a Get Project
-	if (!$survey_id OR strtolower($survey_id) == 'new') {
-		//echo "<pre>";print_r($data);echo "</pre>";
-		if ($data) {
-			$newsurvey = $this->create_survey($data);
-			if (!$newsurvey) { echo "Error creating surey!:".$errstr; }
-		}
-	}
-	$this->id = $survey_id;
-	
-		
-}
-function create_survey($data) {
-	$f_arr = array();
-	$v_arr = array();
-// need to fill out at least some info on 1st tab before proceeding
-		if(empty($data['name']) || empty($data['title']) || empty($data['realm'])) {
-			$tab = "general";
-			$errstr = _('Sorry, please fill out the name, group, and title before proceeding.');
-			return(0);
-		}
-
-		// create a new survey in the database
-		$fields = array('name','realm','title','subtitle','email','theme','thanks_page','thank_head','thank_body','info','auto_num');
-		foreach($fields as $f) {
-			if(isset($data[$f])) {
-				array_push($f_arr,$f);
-				array_push($v_arr, _addslashes($data[$f]));
-			}
-		}
-		array_push($f_arr, 'owner');
-		array_push($v_arr, _addslashes($_SESSION['acl']['username']));
-		array_push($f_arr, 'changed');
-		array_push($v_arr, sys_time_stamp());
-		$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['survey_table']." (" . join(',',$f_arr) . ") VALUES (" . join(',',$v_arr) . ")";
-		$result = execute_sql($sql);
-		if(!$result) {
-			$errstr = _('Sorry, name already in use. Pick a new name.') .' [ ' .ErrorNo().': '.ErrorMsg().' ]';
-			return(0);
-		}
-
-		$sql = "SELECT id FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE name=".  _addslashes($data['name']);
-		$result = execute_sql($sql);
-		$survey_id = $result->fields[0];
-		return(1);
-}
-function get_survey($id) {
-	
-	$getSQL = 'SELECT * FROM '.$GLOBALS['ESPCONFIG']['survey_table']." WHERE id='".$id."'";
-	$survey_result = execute_sql($getSQL);
-	$s = array();
-	list(	$s['id'],
-			$s['name'],
-			$s['owner'],
-			$s['realm'],
-			$s['publicx'],
-			$s['status'],
-			$s['title'],
-			$s['email'],
-			$s['subtitle'],
-			$s['info'],
-			$s['theme'],
-			$s['thanks_url'],
-			$s['thanks_head'],
-			$s['thanks_body']) = $survey_result->fields;
-			
-	return array_reverse($s);
-}
-function update($data,$options=null) {
-
-	global $ESPCONFIG;
-
-	$sid = $this->id;
-
-	if ($data['status']) { $s[status] = $data['status']; }
-	if ($data['owner']) { $s[owner] = $data['owner']; }
-	if ($data['name']) { $s[name] = $data['name']; }
-	if ($data['realm']) { $s[realm] = $data['realm']; }
-	if ($data['public']) { $s[owner] = $data['public']; }
-	if ($data['title']) { $s[title] = $data['title']; }
-	if ($data['email']) { $s[email] = $data['email']; }
-	if ($data['subtitle']) { $s[subtitle] = $data['subtitle']; }
-	if ($data['info']) { $s[info] = $data['info']; }	
-	if ($data['theme']) { $s[theme] = $data['theme']; }
-	if ($data['thanks_page']) { $s[thanks_page] = $data['thanks_page']; }
-	if ($data['thank_head']) { $s[thank_head] = $data['thank_head']; }
-	if ($data['thank_body']) { $s[thank_body] = $data['thank_body']; }
-	if ($data['changed']) { $s[changed] = $data['changed']; }
-	if ($data['auto_num']) { $s[auto_num] = $data['audo_num']; }
-	if ($data['userid']) { $s[userid] = $data['userid']; }
-	if ($data['pid']) { $s[pid] = $data['pid']; }
-	if ($data['history']) { $s[history] = $data['history']; }
-	
-	foreach ($s as $key=>$value) {
-		if ($value == 'delete') {
-			$s[$key] = '';
-		}
-	}
-/*	$s[editstamp] = time();
-	
-	if ($u[status] == '2') {
-		$u[activestamp] = time();
-	}
-*/
-	//Generate the Update sql
-	$setsql = "SET ";
-	foreach ($s as $key=>$d) {
-		$setsql .= "$key = '$d', ";
-	}
-	$setsql = substr($setsql,0,-2);
-	
-	$usql = "UPDATE ".$ESPCONFIG[survey_table]." ".$setsql." WHERE id='".$sid."'";
-	//echo $usql;
-	$result = execute_sql($usql);
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	return true;
-}
-
-}//Class END
-?>
\ No newline at end of file
Index: admin/include/lib/vulab.debugger.php
===================================================================
--- admin/include/lib/vulab.debugger.php	(revision 6370)
+++ admin/include/lib/vulab.debugger.php	(working copy)
@@ -1,24 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-//Vulab debugging
-
-session_start();
-
-if ($_GET[debug]) {
-	$_SESSION[debug] = true;
-}
-if ($_GET[debug] == 'off') {
-	unset($_SESSION[debug]);
-}
-?>
\ No newline at end of file
Index: admin/include/lib/vulab.users.function.php
===================================================================
--- admin/include/lib/vulab.users.function.php	(revision 6370)
+++ admin/include/lib/vulab.users.function.php	(working copy)
@@ -1,127 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-/*
-File: 		vulab.users.function.php \\v 1.0
-Info:		- handle some common user functionality (not relating to one specific user)
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-<?php
-
-//General Users Functions
-
-
-function getUsers($usertype = 'tester',$number = NULL) {
-	
-	if ($usertype == 'tester') {
-		$usertype_sql = "WHERE `isresearcher` = 'N' AND `disabled` = 'N'";
-	} elseif ($usertype == 'researcher') {
-		$usertype_sql = "WHERE `isresearcher` = 'Y' AND `disabled` = 'N'";
-	} elseif ($usertype == 'all') {
-		$usertype_sql = "";
-	} elseif ($usertype == 'disabled') {
-		$usertype_sql = "WHERE `disabled` = 'Y'";
-	}
-	$limit_sql = ($number ? "LIMIT $number" : '');
-	$sql = "SELECT *
-			FROM `user`
-			$usertype_sql
-			$limit_sql
-			";
-	$testers_result = execute_sql($sql);
-	if (!$testers_result) {
-		$err = $testers_result;
-	}
-
-	while (!$testers_result->EOF) {
-		$testers_result->MoveNext();
-		++$count;
-		unset($u);
-		list(	$u['userid'],
-				$u['username'],
-				$u['passowrd'],
-				$u['fname'],
-				$u['lname'],
-				$u['email'],
-				$u['isresearcher'],
-				$u['disabled']) = $testers_result->fields;	
-		
-		unset($u['password']);
-		unset($u['researcher']);
-		unset($u['disabled']);
-//		$testers[] = array_reverse($u);
-		$testers[] = new User($u['userid']);
-	}
-	if ($err) return $err;
-	return $testers;
-}
-function userFilterPerm($users,$pid,$perm='N') {
-
-	//Get Project Users
-	$psql = "SELECT *
-			FROM `userprojectrel`
-			WHERE projectid = '$pid' AND admin='$perm'
-			";
-	$pres = execute_sql($psql);
-	$project_users = $pres->GetAll();
-	print_r($project_users);
-	
-
-}
-//- Takes array of Project Objects
-//- Returns HTML table of Project Fields
-function display_users_table($fields,$users,$options=null) {
-
-
-	if (!is_array($fields)) { return "no fields"; }
-	$HTML = '<table class="display padded">'."\n";
-	
-	if ($options['titles']) {
-		$HTML .= '	<tr>';
-		foreach ($fields as $field) {
-		
-			if ($field == 'option_checkbox') {
-				$HTML .= "<th class='slim center'>select <br/><a href='#checkall' class='options0'>all</a> | <a href='#checknone' class='options0'>none</a>";
-			} else {
-			
-				$field_name = ($options['aliases'][$field] ? $options['aliases'][$field] : $field );
-				$HTML .= "<th>$field_name</th>";
-			}
-		}
-		//if ($options['action_set']) { echo "<th>Actions</th>"; }
-		$HTML .= '</tr>'."\n";
-	}
-	foreach ($users as $user) {
-		
-		//Setup Links
-		$plink = "?where=users&uid=".$user->details[userid];
-			
-		$HTML .= '<tr>';
-		foreach ($fields as $field) {
-			if ($field == 'option_checkbox') {
-				$HTML .= "<td class='center'><input type='checkbox' name='users[$user->id]' id='users[$user->id]' value='$user->id' class='options0'></td>";
-			} else { 
-				$HTML .= "<td><a href='$plink'>".$user->details[$field]."</a></td>";
-			}
-		}
-		if ($options['action_set']) { $HTML .= "<td>".render_actions_html($options['action_set'],$user->details[id])."</td>"; }
-		$HTML .= '</tr>'."\n";
-	}
-	$HTML .= '</table>'."\n";
-	return $HTML;
-}
-?>
\ No newline at end of file
Index: admin/include/lib/vulab.responses.class.php
===================================================================
--- admin/include/lib/vulab.responses.class.php	(revision 6370)
+++ admin/include/lib/vulab.responses.class.php	(working copy)
@@ -1,89 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-/*
-File: 		vulab.responses.class.php \\v 1.0
-Info:		- the Response: $response = new Response($responseid);
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-
-<?php
-class Response {
-
-function __construct($rid=NULL) { //a.k.a Get Project
-	$this->id = $rid;
-	$getSQL = 'SELECT * FROM '.$GLOBALS['ESPCONFIG']['response_table']." WHERE id='$this->id'";
-
-	$response_result = execute_sql($getSQL);
-	//print_r($proj_result->fields);
-	
-	list(	$r['id'],
-			$r['survey_id'],
-			$r['submitted'],
-			$r['complete'],
-			$r['username'],
-			$r['ip'],
-			$r['vid']) = $response_result->fields;	
-
-	
-	$r = array_reverse($r);
-	
-	//load details
-	$this->details = $r;
-
-}
-
-function update($data,$options=null) {
-	require ESP_BASE.'admin/sanitize.php';
-	global $ESPCONFIG;
-	$pid = $this->id;
-	if (@$data['id']) { $r[id] = sanitize($data['id']); }
-	if (@$data['survey_id']) { $r[survey_id] = sanitize($data['survey_id']); }
-	if (@$data['submitted']) { $r[submitted] = sanitize($data['submitted']); }
-	if (@$data['complete']) { $r[complete] = sanitize($data['complete']); }
-	if (@$data['username']) {$r[username] = sanitize($data['username']); }
-	if (@$data['ip']) { $r[ip] = sanitize($data['ip']); }
-	if (@$data['vid']) { @$r[vid] = sanitize(@$data['vid']); }
-	
-	
-	foreach ($r as $key=>$value) {
-		if ($value == 'delete') {
-			$r[$key] = '';
-		}
-	}
-/*	$r[editstamp] = time();
-	
-	if ($r[status] == '2') {
-		$r[activestamp] = time();
-	}*/
-	//Generate the Update sql
-	$setsql = "SET ";
-	foreach ($r as $key=>$d) {
-		$setsql .= "$key = '$d', ";
-	}
-	$setsql = substr($setsql,0,-2);
-	
-	$rsql = "UPDATE ".@$ESPCONFIG[response_table]." ".$setsql." WHERE id='".$this->id."'";
-	//echo $rsql;
-	$result = execute_sql($rsql);
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if (@$err) return $err;
-	return true;
-}
-
-}//Class END
-?>
\ No newline at end of file
Index: admin/include/lib/esphtml.results.inc
===================================================================
--- admin/include/lib/esphtml.results.inc	(revision 6370)
+++ admin/include/lib/esphtml.results.inc	(working copy)
@@ -1,256 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: esphtml.results.inc,v 1.14 2007/07/09 12:58:10 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-// void		mkrespercent(int[char*] counts, int total, bool showTotals);
-// void		mkresrank(int[char*] counts, int total, bool showTotals);
-// void		mkrescount(int[char*] counts, int total, bool showTotals);
-// void		mkreslist(int[char*] counts, int total, bool showTotals);
-// void		mkresavg(int[char*] counts, int total, bool showTotals);
-
-/* {{{ proto void mkrespercent(array weights, int total, int precision, bool show_totals)
-  Builds HTML showing PERCENTAGE results. */
-function mkrespercent($counts,$total,$precision,$showTotals,$vids=nul) {
-	$i=0;
-	$bg='';
-?>
-<table width="90%" border="0">
-<?php
-	while(list($content,$num) = each($counts)) {
-		if($num>0) { $percent = $num/$total*100.0; }
-		else { $percent = 0; }
-		if($percent > 100) { $percent = 100; }
-
-		if($bg != $GLOBALS['ESPCONFIG']['bgalt_color1'])
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-		else
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color2'];
-?>
-	<tr bgcolor="<?php echo($bg); ?>">
-		<td><?php echo($content); ?></td>
-		<td align="left">
-<?php
-		if($num) {
-			echo("&nbsp;<img src=\"" .$GLOBALS['ESPCONFIG']['image_url'] ."hbar_l.gif\" height=9 width=4>");
-			printf("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url'] ."hbar.gif\" height=9 width=%d>",$percent*2);
-			echo("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url'] ."hbar_r.gif\" height=9 width=4>");
-			printf("&nbsp;%.${precision}f%%",$percent);
-		}
-?></td>
-		<td align="right">(<?php echo($num); ?>)</td>
-	</tr>
-<?php
-		$i += $num;
-	} // end while
-	if($showTotals) {
-		if($i>0) { $percent = $i/$total*100.0; }
-		else { $percent = 0; }
-		if($percent > 100) { $percent = 100; }
-
-		if($bg != $GLOBALS['ESPCONFIG']['bgalt_color1'])
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-		else
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color2'];
-?>
-	<tr bgcolor="<?php echo($bg); ?>">
-		<td><b><?php echo(_('TOTAL')); ?></b></td>
-		<td width="40%"><b>&nbsp;<?php
-			echo("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url'] ."hbar_l.gif\" height=9 width=4>");
-			printf("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url'] ."hbar.gif\" height=9 width=%d>",$percent*2);
-			echo("<img src=\"" .$GLOBALS['ESPCONFIG']['image_url'] ."hbar_r.gif\" height=9 width=4>");
-			printf("&nbsp;%.${precision}f%%",$percent); ?></b></td>
-		<td width="10%" align="right"><b><?php print "$i ($total)"; ?></b></td>
-	</tr>
-<?php } ?>
-</table>
-<?php
-}
-/* }}} */
-
-
-/* {{{ proto void mkresrank(array weights, int total, int precision, bool show_totals)
-   Builds HTML showing RANK results. */
-function mkresrank($counts,$total,$precision,$showTotals,$vids=null) {
-	$bg='';
-?>
-<table border="0">
-	<tr>
-		<td align="right"><b><?php echo(_('Rank')); ?></b></td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	</tr>
-<?php
-	arsort($counts);
-	$i=0; $pt=0;
-	while(list($content,$num) = each($counts)) {
-		if($num)
-			$p = $num/$total*100.0;
-		else
-			$p = 0;
-		$pt += $p;
-
-		if($bg != $GLOBALS['ESPCONFIG']['bgalt_color1'])
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-		else
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color2'];
-?>
-	<tr bgcolor="<?php echo($bg); ?>">
-		<td align="right"><b><?php echo(++$i); ?></b></td>
-		<td><?php echo($content); ?></td>
-		<td align="right" width="60"><?php if($p) printf("%.${precision}f%%",$p); ?></td>
-		<td align="right" width="60">(<?php echo($num); ?>)</td>
-	</tr>
-<?php
-	} // end while
-	if($showTotals) {
-		if($bg != $GLOBALS['ESPCONFIG']['bgalt_color1'])
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-		else
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color2'];
-?>
-	<tr bgcolor="<?php echo($bg); ?>">
-		<td colspan=2 align="left"><b><?php echo(_('TOTAL')); ?></b></td>
-		<td align="right"><b><?php printf("%.${precision}f%%",$pt); ?></b></td>
-		<td align="right"><b><?php print "$i ($total)"; ?></b></td>
-	</tr>
-<?php } ?>
-</table>
-<?php
-}
-/* }}} */
-
-/* {{{ proto void mkrescount(array weights, int total, int precision, bool show_totals)
-   Builds HTML showing COUNT results. */
-function mkrescount($counts,$total,$precision,$showTotals,$vids=null) {
-	$i=0;
-?>
-<table width="90%" border="0">
-<?php
-    $bg = '';
-	while(list($content,$num) = each($counts)) {
-		if($bg != $GLOBALS['ESPCONFIG']['bgalt_color1'])
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-		else
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color2'];
-?>
-	<tr bgcolor="<?php echo($bg); ?>">
-		<td><?php echo($content); ?></td>
-		<td align="right" width="60"><?php echo($num); ?></td>
-		<td align="right" width="60">(<?php if($num) printf("%.${precision}f",$num/$total*100.0); ?>%)</td>
-	</tr>
-<?php
-		$i += $num;
-	} // end while
-	if($showTotals) {
-		if($bg != $GLOBALS['ESPCONFIG']['bgalt_color1'])
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-		else
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color2'];
-?>
-	<tr bgcolor="<?php echo($bg); ?>">
-		<td><b><?php echo(_('TOTAL')); ?></b></td>
-		<td align="right"><b><?php print "$i ($total)"; ?></b></td>
-		<td align="right"><b>(<?php if($i) printf("%.${precision}f",$i/$total*100.0); ?>%)</b></td>
-	</tr>
-<?php	} ?>
-</table>
-<?php
-}
-/* }}} */
-
-/* {{{ proto void mkreslist(array weights, int total, int precision, bool show_totals)
-	Builds HTML showing LIST results. */
-function mkreslist($counts,$total,$precision,$showTotals,$vids=null) {
-	if($total==0)	return;
-	$bg='';
-?>
-<table width="90%" border="0" cellpadding="1">
-	<tr><th align="left"><?php echo(_('#')); ?></th><th><?php echo(_('Response')); ?></th></tr>
-<?php
-	$responsenumber = '0';
-	while(list($text,$num) = each($counts)) {
-		$vidid = $vids[$responsenumber].'.avi';
-		if($bg != $GLOBALS['ESPCONFIG']['bgalt_color1'])
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-		else
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color2'];
-			if (count($vids) > 0) { $vid = "<td align='left'><a href='http://filedump.silkwire.com/$vidid' target='_blank'>View Video</a></td>"; }
-		echo("<tr bgcolor=\"$bg\"><th align=\"left\" valign=\"top\" width='10'>$num</th><td align='left' width='300'>$text</td>$vid</tr>\n");
-		$responsenumber += 1;
-	}
-?>
-</table>
-<?php
-}
-/* }}} */
-
-/* {{{ proto void mkresavg(array weights, int total, int precision, bool show_totals)
-	Builds HTML showing AVG results. */
-function mkresavg($counts,$total,$precision,$showTotals,$length,$vids=null) {
-	if (!$length)
-		$length = 5;
-	$width = 200 / $length;
-?>
-<table cellspacing="0" cellpadding="0">
-	<tr>
-		<td></td>
-		<td colspan="<?php echo($length+2); ?>"><?php echo(_('Average rank')); ?></td>
-	</tr>
-	<tr>
-		<td></td>
-		<?php
-			for ($i = 0; $i < $length; )
-				echo( "<td align=\"right\" width=\"$width\">". ++$i ."</td>\n");
-		?>
-		<td width="20"></td>
-		<td></td>
-	</tr>
-<?php
-    $bg = '';
-	while(list($content,$avg) = each($counts)) {
-		if($bg != $GLOBALS['ESPCONFIG']['bgalt_color1'])
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-		else
-			$bg = $GLOBALS['ESPCONFIG']['bgalt_color2'];
-?>
-	<tr bgcolor="<?php echo($bg); ?>">
-		<td><?php echo($content); ?>&nbsp;</td>
-		<td colspan="<?php echo($length+1); ?>">
-<?php
-		if($avg) {
-			echo('<img src="'. $GLOBALS['ESPCONFIG']['image_url'] .'hbar_l.gif" height="9" width="4">');
-			if (($j = $avg * $width - 11) > 0)
-				printf('<img src="'. $GLOBALS['ESPCONFIG']['image_url'] .'hbar.gif" height="9" width="%d">', $j);
-			echo('<img src="'. $GLOBALS['ESPCONFIG']['image_url'] .'hbar_r.gif" height="9" width="4">');
-		}
-?>
-		</td>
-		<td width="60">(<?php printf("%.${precision}f",$avg); ?>)</td>
-	</tr>
-<?php
-	} // end while
-?>
-</table>
-<?php
-}
-/* }}} */
-
-?>
Index: admin/include/lib/vulab.databases.php
===================================================================
--- admin/include/lib/vulab.databases.php	(revision 6370)
+++ admin/include/lib/vulab.databases.php	(working copy)
@@ -1,75 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-
-class DB {
-	
-	function __construct($databaseKey = 'main'){
-		global $db;
-		$this->dbkey = $databaseKey;
-		$this->db = $db[$this->dbkey];
-	}
-	function setTable($tablename){
-		$this->table = $tablename;
-		$this->fields = getFields();
-	}
-	function getFields(){
-		$fields = mysql_list_fields($this->db['dbname'], $this->table, $this->db['link']);
-		$columns = mysql_num_fields($fields);
-		for ($i = 0; $i < $columns; $i++) {
-		   	$fields[] =  mysql_field_name($fields, $i) . "\n";
-		}
-		return $fields;
-	}
-	function setKey($key){
-		$this->key = $key;
-	}
-	function update($data,$where,$options=array()){
-		 $updateQuery .= "UPDATE ".$this->table." SET ";
-        
-        foreach ($fields as $field) {
-          # update each field
-          $updateQuery .= "`". $field ."` = '". $data[$field] ."', ";
-        }
-        
-        # remove the last comma
-        $updateQuery = substr($updateQuery, 0, -2);
-        
-        # finish the query
-        $updateQuery .= " WHERE `".$this->key."` = '". $where ."'";
-		
-		# execute the query
-        mysql_query($updateQuery, $this->db['link']) or die(mysql_error());
-		return true;
-	}
-	
-	function delete($where){
-		if (!is_array($where)){
-			$deleteQuery = 'DELETE FROM '.$this->table.' WHERE '.$this->key.'='."'$where'";
-		}
-		mysql_query($deleteQuery,$this->db['link']) or die(mysql_error());
-		return true;
-	}
-	function add($values,$options=array()){
-		
-	}
-}
-function dbConnect($key){
-  # include database information
-  global $db;
-  
-  # create a connection to the database
-  $link = mysql_connect($db[$key]['host'], $db[$key]['user'], $db[$key]['pass'], true) or die("$key Database Connection Failed!");
-  mysql_select_db($db[$key]['dbname'], $link) or die($db[$key][dbname] . " Database Does Not Exist!");
-  
-  return $link;
-}
-?>
Index: admin/include/lib/vulab.projects.class.php
===================================================================
--- admin/include/lib/vulab.projects.class.php	(revision 6370)
+++ admin/include/lib/vulab.projects.class.php	(working copy)
@@ -1,200 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-class Project {
-
-
-function init($project_id) { //a.k.a Get Project
-	$this->id = $project_id;
-	
-	$this->id = ereg_replace("/[^0-9]/i","",$this->id);
-	$this->id = str_replace("'",'',$this->id);
-	
-	
-	$getSQL = 'SELECT * FROM '.$GLOBALS['ESPCONFIG']['project_table']." WHERE id='$this->id'";
-	$proj_result = execute_sql($getSQL);
-	
-	# if (!$proj_result) { echo mysql_error(); }
-	# print_r($proj_result->fields);
-	
-	list(	$p['id'],
-			$p['name'],
-			$p['pre_id'],
-			$p['post_id'],
-			$p['intro'],
-			$p['outro'],
-			$p['goal'],
-			$p['url'],
-			$p['start'],
-			$p['end'],
-			$p['status'],
-			$p['createstamp'],
-			$p['editstamp'],
-			$p['activestamp'],
-			$p['completestamp'],
-			$p['pre_source'],
-			$p['post_source'] ) = $proj_result->fields;	
-	
-	$p = array_reverse($p);
-	
-	//load details
-	$this->details = $p;
-	//load surveys
-	if ($this->details['pre_id']) $this->pre_survey = $this->get_survey($this->details['pre_id']);
-	if ($this->details['post_id']) $this->post_survey = $this->get_survey($this->details['post_id']);
-		
-}
-function create_project($data) {
-	global $ESPCONFIG;
-
-	require ESP_BASE.'admin/sanitize.php';
-	$pname = sanitize($data['pname']);
-	$ppre = sanitize($data['ppre']);
-	$ppost = sanitize($data['ppost']);
-	$pintro = sanitize($data['pintro']);
-	$pthanks = sanitize($data['pthanks']);
-	$pgoal = sanitize($data['pgoal']);
-	$purl = sanitize($data['purl']);
-	$pstart = sanitize($data['pstart']);
-	$pend = sanitize($data['pend']);
-	$pstatus = 1;
-	
-	if (!$pname) { $err[] = "You must enter a project name to continue."; }
-	if ($err) return $err;
-	
-	$sql = execute_sql("SELECT * FROM `".$ESPCONFIG[project_table]."` WHERE `name` = '".$pname."'");
-	
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	
-	if ($sql->RecordCount() > 0) {
-		// Project already exists
-		$err[] = "Project name '$pname' already exists.";
-	}
-	if ($err) return $err;
-	
-	
-	$sqlins = 'insert into '.$ESPCONFIG[project_table].
-	 ' (name,presurvey,postsurvey,action_intro_msg,action_outro_msg,goal,action_url,start,`end`,status,createstamp,editstamp) values ( '.
-	"'$pname', ".
-	"'$ppre', ".
-	"'$ppost', ".
-	"'$pintro', ".
-	"'$pthanks', ".
-	"'$pgoal', ".
-	"'$purl', ".
-	"'$pstart', ".
-	"'$pend', ".
-	"'$pstatus', ".
-	"'".time()."', ".
-	"'".time()."') ";
-	
-	$result = execute_sql($sqlins);
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	$_SESSION[pid] = mysql_insert_id();
-	$projectid = $_SESSION[pid];
-	
-	// Insert into userprojectrel table
-	$sqlins = "insert into userprojectrel values ('','".$_SESSION['acl']['userid']."','".$projectid."','Y')";
-	
-	$result = execute_sql($sqlins);
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	
-	// Insert the root user record
-	$sqlins = "insert into userprojectrel values ('','6','".$projectid."','Y')";
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	
-	return $pname;
-}
-function delete() {
-	require ESP_BASE.'admin/sanitize.php';
-	global $ESPCONFIG;
-	
-	$dsql = "DELETE FROM $ESPCONFIG[project_table] WHERE id=".$this->id;
-	$result = execute_sql($dsql);
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	return true;
-}
-function update($data,$options=null) {
-	require ESP_BASE.'admin/sanitize.php';
-	global $ESPCONFIG;
-	$pid = $this->id;
-	if ($data['pname']) { $u[name] = sanitize($data['pname']); }
-	if ($data['ppre']) { $u[presurvey] = sanitize($data['ppre']); }
-	if ($data['ppost']) { $u[postsurvey] = sanitize($data['ppost']); }
-	if ($data['pintro']) { $u[action_intro_msg] = sanitize($data['pintro']); }
-	if ($data['pthanks']) {$u[action_outro_msg] = sanitize($data['pthanks']); }
-	if ($data['pgoal']) {$u[goal] = sanitize($data['pgoal']); }
-	if ($data['purl']) { $u[action_url] = sanitize($data['purl']); }
-	if ($data['pstart']) { $u[start] = sanitize($data['pstart']); }
-	if ($data['pend']) { $u[end] = sanitize($data['pend']); }
-	if ($data['status']) { $u[status] = sanitize($data['status']); }
-	if ($data['pre_source']) { $u[pre_source] = sanitize($data['pre_source']); }
-	if ($data['post_source']) { $u[post_source] = sanitize($data['post_source']); }
-	
-	
-	foreach ($u as $key=>$value) {
-		if ($value == 'delete') {
-			$u[$key] = '';
-		}
-	}
-	$u[editstamp] = time();
-	
-	if ($u[status] == '2') {
-		$u[activestamp] = time();
-	}
-	if ($u[status] == '3') {
-		$u[completestamp] = time();
-	}
-	//Generate the Update sql
-	$setsql = "SET ";
-	foreach ($u as $key=>$d) {
-		$setsql .= "$key = '$d', ";
-	}
-	$setsql = substr($setsql,0,-2);
-	
-	$usql = "UPDATE ".$ESPCONFIG[project_table]." ".$setsql." WHERE id='".$pid."'";
-	//echo $usql;
-	$result = execute_sql($usql);
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	return true;
-}
-function get_survey($id) {
-	
-	$getSQL = 'SELECT * FROM '.$GLOBALS['ESPCONFIG']['survey_table']." WHERE id='".$id."'";
-	$survey_result = execute_sql($getSQL);
-	$s = array();
-	list(	$s['id'],
-			$s['name'],
-			$s['owner'],
-			$s['realm'],
-			$s['publicx'],
-			$s['status'],
-			$s['title'],
-			$s['email'],
-			$s['subtitle'],
-			$s['info'],
-			$s['theme'],
-			$s['thanks_url'],
-			$s['thanks_head'],
-			$s['thanks_body']) = $survey_result->fields;
-			
-	return array_reverse($s);
-}
-}//Class END
-?>
\ No newline at end of file
Index: admin/include/lib/vulab.permissions.function.php
===================================================================
--- admin/include/lib/vulab.permissions.function.php	(revision 6370)
+++ admin/include/lib/vulab.permissions.function.php	(working copy)
@@ -1,114 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-/*
-File: 		vulab.users.function.php \\v 1.0
-Info:		- handle some common user functionality (not relating to one specific user)
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-<?php
-
-//General Users Functions
-
-
-function getUsers($usertype = 'tester',$number = NULL) {
-	
-	if ($usertype == 'tester') {
-		$usertype_sql = "WHERE `isresearcher` = 'N' AND `disabled` = 'N'";
-	} elseif ($usertype == 'researcher') {
-		$usertype_sql = "WHERE `isresearcher` = 'Y' AND `disabled` = 'N'";
-	} elseif ($usertype == 'all') {
-		$usertype_sql = "";
-	} elseif ($usertype == 'disabled') {
-		$usertype_sql = "WHERE `disabled` = 'Y'";
-	}
-	$limit_sql = ($number ? "LIMIT $number" : '');
-	$sql = "SELECT *
-			FROM `user`
-			$usertype_sql
-			$limit_sql
-			";
-	$testers_result = execute_sql($sql);
-	if (!$testers_result) {
-		$err = $testers_result;
-	}
-
-	while (!$testers_result->EOF) {
-		$testers_result->MoveNext();
-		++$count;
-		unset($u);
-		list(	$u['userid'],
-				$u['username'],
-				$u['passowrd'],
-				$u['fname'],
-				$u['lname'],
-				$u['email'],
-				$u['isresearcher'],
-				$u['disabled']) = $testers_result->fields;	
-		
-		unset($u['password']);
-		unset($u['researcher']);
-		unset($u['disabled']);
-//		$testers[] = array_reverse($u);
-		$testers[] = new User($u['userid']);
-	}
-	if ($err) return $err;
-	return $testers;
-}
-//- Takes array of Project Objects
-//- Returns HTML table of Project Fields
-function display_users_table($fields,$users,$options=null) {
-
-
-	if (!is_array($fields)) { return "no fields"; }
-	$HTML = '<table class="display padded">'."\n";
-	
-	if ($options['titles']) {
-		$HTML .= '	<tr>';
-		foreach ($fields as $field) {
-		
-			if ($field == 'option_checkbox') {
-				$HTML .= "<th class='slim center'>select <br/><a href='#checkall' class='options0'>all</a> | <a href='#checknone' class='options0'>none</a>";
-			} else {
-			
-				$field_name = ($options['aliases'][$field] ? $options['aliases'][$field] : $field );
-				$HTML .= "<th>$field_name</th>";
-			}
-		}
-		//if ($options['action_set']) { echo "<th>Actions</th>"; }
-		$HTML .= '</tr>'."\n";
-	}
-	foreach ($users as $user) {
-		
-		//Setup Links
-		$plink = "?where=users&uid=".$user->details[userid];
-			
-		$HTML .= '<tr>';
-		foreach ($fields as $field) {
-			if ($field == 'option_checkbox') {
-				$HTML .= "<td class='center'><input type='checkbox' name='users[$user->id]' id='users[$user->id]' value='$user->id' class='options0'></td>";
-			} else { 
-				$HTML .= "<td><a href='$plink'>".$user->details[$field]."</a></td>";
-			}
-		}
-		if ($options['action_set']) { $HTML .= "<td>".render_actions_html($options['action_set'],$user->details[id])."</td>"; }
-		$HTML .= '</tr>'."\n";
-	}
-	$HTML .= '</table>'."\n";
-	return $HTML;
-}
-?>
\ No newline at end of file
Index: admin/include/lib/espi18n.inc
===================================================================
--- admin/include/lib/espi18n.inc	(revision 6370)
+++ admin/include/lib/espi18n.inc	(working copy)
@@ -1,179 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: espi18n.inc,v 1.9 2007/12/10 13:30:45 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-/**
- * Load the GNU Gettext module if it is not loaded.
- * If it cannot be loaded, define the NOP wrapper.
- * If the wrapper is defined, English will be the only
- * language available.
- *
- * See:
- *  http://www.php.net/manual/en/ref.gettext.php
- */
-
-if (!function_exists('gettext')) {
-    if (!ini_get('safe_mode') && ini_get('enable_dl')) {
-        $_ext = 'gettext.so';
-        if (substr(PHP_OS, 0, 3) == 'WIN') {
-            if (function_exists('version_compare') &&
-                    version_compare(phpversion(), "4.2.3", ">="))
-            {
-                $_ext = 'libintl-1.dll';
-            } else {
-                $_ext = 'php_gettext.dll';
-            }
-        }
-        @dl($_ext);
-        unset($_ext);
-    }
-}
-
-if (!function_exists('gettext')) {
-    function bind_textdomain_codeset() {return null;}
-    function bindtextdomain() {return null;}
-    function dcgettext($d,$s,$c) {return $s;}
-    function dgettext($d,$s) {return $s;}
-    function gettext($s) {return($s);}
-    function textdomain() {return null;}
-    function _($s) {return($s);}
-
-    $ESPCONFIG['gettext'] = false;
-
-//    function dcngettext($d,...) {return null;}
-//    function dngettext() {return null;}
-//    function ngettext(...) {return null;}
-}
-
-function esp_setlocale_ex($str = null)
-{
-    global $ESPCONFIG;
-
-    if (isset($_SERVER))  $server =& $_SERVER;
-    else                  $server =& $HTTP_SERVER_VARS;
-
-    $lang = null;
-
-    if ($str == null && isset($server['HTTP_ACCEPT_LANGUAGE']))
-        $str = $server['HTTP_ACCEPT_LANGUAGE'];
-
-    if (!empty($str)) {
-        $_langs = preg_replace('(;q=[0-9.]*|\*)', '', $str);
-        $_langs = preg_replace('/-([A-Z]*)/ie', "'_'.strtoupper('\\1')", $_langs);
-        $_langs = split(' *, *', $_langs);
-
-        $_locales = esp_getlocales();
-        $_map = esp_getlocale_map();
-
-        foreach ($_langs as $_lang) {
-            if (empty($_lang) || ereg('[./\\]', $_lang))
-                continue;
-            if (isset($_locales[$_lang])) {
-                $lang = $_lang;
-                break;
-            }
-            if (isset($_map[$_lang])) {
-                $lang = $_map[$_lang];
-                break;
-            }
-            if (($pos = strpos($_lang, '_')) !== false) {
-                $_lang = substr($_lang, 0, $pos);
-                if (isset($_locales[$_lang])) {
-                    $lang = $_lang;
-                    break;
-                }
-                if (isset($_map[$_lang])) {
-                    $lang = $_map[$_lang];
-                    break;
-                }
-            }
-        }
-    }
-    if ($lang == null) {
-        $lang = $ESPCONFIG['default_lang'];
-    }
-
-    return esp_setlocale($lang);
-}
-
-function esp_setlocale($lang)
-{
-    global $ESPCONFIG;
-
-    $ESPCONFIG['lang'] = $lang;
-    $lang .= ".UTF-8";
-    setlocale(LC_ALL, $lang);
-    if (defined('LC_MESSAGES'))
-        setlocale(LC_MESSAGES, $lang);
-    bindtextdomain('messages', $ESPCONFIG['locale_path']);
-    textdomain('messages');
-    @putenv('LANG=' . $lang);
-    @putenv('LANGUAGE=' . $lang);
-
-}
-
-function esp_getlocales()
-{
-    global $ESPCONFIG;
-
-    static $locales = null;
-
-    if ($locales == null) {
-        $locales = array();
-        $dir = @opendir($ESPCONFIG['locale_path']);
-        if ($dir === false)
-            return $locales;
-
-        while (($file = readdir($dir)) !== false) {
-            if (@is_readable($ESPCONFIG['locale_path']."/$file/LC_MESSAGES/messages.mo"))
-                array_push($locales, $file);
-        }
-        closedir($dir);
-    }
-
-    return $locales;
-}
-
-function esp_getlocale_map()
-{
-    global $ESPCONFIG;
-
-    static $map = null;
-
-    if ($map == null) {
-        $map = array();
-        if (is_readable($ESPCONFIG['locale_path'] . '/map'))
-        {
-            // get 2-letter mappings
-            $arr = file($ESPCONFIG['locale_path'] . '/map');
-            foreach ($arr as $line) {
-                $line = trim(preg_replace("/[ \t]*#.*/", '', $line));
-                if  (empty($line))
-                    continue;
-                list($a, $b) = preg_split("/\s+/", $line);
-                $map[$a] = $b;
-            }
-        }
-    }
-
-    return $map;
-}
-
-?>
Index: admin/include/lib/espauth-ldap.inc
===================================================================
--- admin/include/lib/espauth-ldap.inc	(revision 6370)
+++ admin/include/lib/espauth-ldap.inc	(working copy)
@@ -1,433 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: espauth-ldap.inc,v 1.27 2007/11/26 11:36:17 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-//  phpESP LDAP Authentication Library
-//  By: Christopher Zorn <zorncj@musc.edu>
-//      James Flemer <jflemer@alum.rpi.edu>
-
-	$_ext = 'ldap.so';
-	if (substr(PHP_OS, 0, 3) == 'WIN') {
-		$_ext = 'php_ldap.dll';
-	}
-	if (!extension_loaded('ldap') && !ini_get('safe_mode')
-		&& ini_get('enable_dl') && !@dl($_ext)) {
-		echo "<b>FATAL: Unable to load the PHP ldap extension ($_ext). Aborting.</b>";
-		exit;
-	}
-	unset($_ext);
-
-/* {{{ proto bool survey_auth(int survey_id, string username, string password)
-   Returns true if the supplied username/password is allowed
-   access to the survey. */
-function survey_auth($sid, $username, $password, $raw_password, $css, $title) {
- 	$ldap_password = $raw_password;
-	// Default to _unauthorized_
-	$auth_ldap_accept = $auth = false; // default to unauthorized
-	//if (isset($GLOBALS['HTTP_GET_VARS']['auth_options']) || isset($GLOBALS['HTTP_POST_VARS']['auth_options'])) {
-	if (isset($_GET['auth_options']) || isset($_POST['auth_options'])) {
-		$GLOBALS['errmsg'] = mkerror(_('Error processing survey: Security violation.'));
-		return(FALSE);
-	}
-   
-	$GLOBALS['auth_options'] = array();
-
-    // make sure database is opened
-    esp_init_adodb();
-
-	// Formulate the query and check whether survey requires authentication
-	$sql = "SELECT realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id = $sid AND public = 'N'";
-
-	// Execute the query and put results in $accres
-    $accres = execute_sql($sql);
-	if(!$accres) {
-		$GLOBALS['errmsg'] = mkerror(_('Unable to execute query for access.'));
-		return(false);
-	}
-
-	// Get number of rows in $accres.
-	if(record_count($accres) < 1) {
-		// no matching rows ... no authorization required
-		return(true);
-	}
-
-    $realm = $accres->fields[0];
-    db_close($accres);
-
-	// A matching row was found - the survey requires authentication.
-	if (!empty($username) && !empty($password)) {
-         // if we are running mysql >4.0 need to check/upgrade passwords
-        password_upgrade($username, $password, $GLOBALS['ESPCONFIG']['respondent_table']);
-
-		// Add configuration for ldap server and other things
-		#$tmp_ldap_filter = "(&(".$GLOBALS['ESPCONFIG']['ldap_filter'] .$username.")(".$GLOBALS['ESPCONFIG']['ldap_realm_attr']."=".$realm."))";
-		$tmp_ldap_filter = $GLOBALS['ESPCONFIG']['ldap_filter'].$username;
-
-		$ds = ldap_connect($GLOBALS['ESPCONFIG']['ldap_server'],
-				$GLOBALS['ESPCONFIG']['ldap_port']);
-
-		if ($ds) {
-			$search_result = @ldap_search($ds, $GLOBALS['ESPCONFIG']['ldap_dn'], $tmp_ldap_filter);
-			if (@ldap_count_entries($ds,$search_result)==1) {
-				$entry_id=ldap_first_entry($ds, $search_result);
-				if ($GLOBALS['ESPCONFIG']['ldap_force_proto_3']) {
-					ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
-				}
-				$auth_bind = @ldap_bind($ds, ldap_get_dn($ds,$entry_id), $ldap_password);
-				if ($auth_bind) {
-					$auth_ldap_accept = true;
-					$values = @ldap_get_values($ds, $entry_id,$GLOBALS['ESPCONFIG']['ldap_realm_attr']);
-					$ldap_realm=$values[0];
-				}
-			}
-		}
-		ldap_close($ds);
-
-        if ($auth_ldap_accept) {
-		   $sql = "SELECT a.maxlogin, a.realm, a.resume, a.navigate
-			FROM ".$GLOBALS['ESPCONFIG']['access_table']." a
-			WHERE a.survey_id = $sid
-			AND a.realm='".$ldap_realm."'";
-        } else {
-		   // Formulate the query check whether user is authorized
-		   $sql = "SELECT a.maxlogin, a.realm, a.resume, a.navigate
-			FROM ".$GLOBALS['ESPCONFIG']['access_table']." a, ".$GLOBALS['ESPCONFIG']['respondent_table']." r
-			WHERE a.survey_id = $sid AND
-				r.username = "._addslashes($username)." AND
-				r.password = ".db_crypt($password) ." AND
-				r.realm = a.realm AND
-				r.disabled = 'N' AND
-				(r.expiration = '0000-00-00 00:00:00' OR r.expiration > ".sys_time_stamp().")";
-        }
-
-		// Execute the query and put results in $usrres
-		$usrres = execute_sql( $sql );
-		if(!$usrres) {
-			$GLOBALS['errmsg'] = mkerror(_('Unable to execute query respondents.' ));
-			return(false);
-		}
-
-        if (record_count( $usrres ) > 0) {
-			// A matching row was found - the user is authorized.
-			$auth = true;
-			list($maxlogin, $arealm, $aresume, $anavigate) = $usrres->fields;
-			db_close($usrres);
-			$GLOBALS['auth_options'] = array('resume' => $aresume, 'navigate' => $anavigate);
-		}
-	}
-
-	// no matching authorization ... send a 401
-	if ( ! $auth ) {
-        if ($GLOBALS['ESPCONFIG']['auth_mode'] == 'basic') {
-            header( "WWW-Authenticate: Basic realm=\"$realm\"" );
-            header( 'HTTP/1.0 401 '. _('Unauthorized'));
-            $GLOBALS['errmsg'] = mkerror(_('Incorrect User ID or Password, or your account has been disabled/expired.'));
-            return(false);
-        }
-        elseif ( $GLOBALS['ESPCONFIG']['auth_mode'] == 'form') {
-            if (!isset($survey_name)) {
-                $survey_name = "";
-            }
-            if (isset($GLOBALS['_GET']['name'])) {
-                $survey_name = $GLOBALS['_GET']['name'];
-            }
-            elseif (isset($GLOBALS['HTTP_POST_VARS']['name'])) {
-                $survey_name = $GLOBALS['HTTP_POST_VARS']['name'];
-            }
-
-            $error_message = "";
-            //if ($GLOBALS['HTTP_SERVER_VARS']['REQUEST_METHOD'] == 'POST') {
-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                $error_message = "Incorrect User ID or Password, or your account has been disabled/expired.";
-            }
-            echo show_login($survey_name, $error_message, $css, $title);
-            exit;
-            return(false);
-        }
-    }
-
-
-	if ( $maxlogin > 0 ) {
-		// see if user is over the MAX # of responses
-		$sql = "SELECT COUNT(*) < $maxlogin FROM ".$GLOBALS['ESPCONFIG']['response_table']." WHERE
-		survey_id = ${sid} AND
-		complete = 'Y' AND
-		username = "._addslashes($username);
-
-		$auth = get_one($sql);
-	}
-	if( !$auth ) {
-        if ($GLOBALS['ESPCONFIG']['auth_mode'] == 'basic') {
-            header( "WWW-Authenticate: Basic realm=\"$realm\"" );
-            header( 'HTTP/1.0 401 '. _('Unauthorized'));
-            $GLOBALS['errmsg'] = mkerror(_('Your account has been disabled or you have already completed this survey.'));
-            return(false);
-        }
-        elseif ( $GLOBALS['ESPCONFIG']['auth_mode'] == 'form') {
-            if (!isset($survey_name)) {
-                $survey_name = "";
-            }
-            //if (isset($GLOBALS['_GET']['name'])) {
-            if (isset($_GET['name'])) {
-              //  $survey_name = $GLOBALS['_GET']['name'];
-                $survey_name = $_GET['name'];
-            }
-            elseif (isset($_POST['name'])) {
-                $survey_name = $_POST['name'];
-            }
-            $error_message = "";
-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                $error_message = "Your account has been disabled or you have already completed this survey.";
-            }
-            echo show_login($survey_name, $error_message, $css, $title);
-            exit;
-            return(false);
-        }
-    }
-    return(true);
-}
-/* }}} */
-
-/* {{{ proto bool manage_auth(string username, string password)
-   Returns true if the supplied username/password is allowed
-   access to the management interface. This sets/clears
-   access control related session variables. */
-function manage_auth($username, $password, $raw_password="") {
-    $ldap_password = $raw_password;
-
-	// see if session is expired, or has been logged out
-	if(isset($_SESSION['acl']) &&
-	   isset($_SESSION['acl']['expired'])) {
-		if($_SESSION['acl']['expired']-- > 0) {
-			$username = ''; $password = '';
-		}
-	}
-
-	// see if ACL is cached
-	if (!empty($username) &&
-			!empty($password) &&
-			isset($_SESSION['acl']) &&
-			isset($_SESSION['acl']['username']) &&
-			$_SESSION['acl']['username'] == $username) {
-		return(true);
-		#$sql = "SELECT ".db_crypt($password) ."= ". $_SESSION['acl']['password'];
-		#$auth = get_one($sql);
-		#if($auth)
-		#	return(true);
-	}
-
-	$auth_ldap_accept = $auth = false; // default to unauthorized
-	$_SESSION['acl'] = array();
-
-	if (!empty($username) && !empty($password) && !empty($ldap_password)) {
-		// Formulate the query check whether user is authorized
-		// This only gives authorization for use of the survey.
-		// Information is entered into the database after authorization.
-
-		// Add configuration for ldap server and other things
-		$tmp_ldap_filter = "(&(".$GLOBALS['ESPCONFIG']['ldap_filter'] .$username.")(".$GLOBALS['ESPCONFIG']['ldap_designer_filter']."))";
-
-		$ds = ldap_connect($GLOBALS['ESPCONFIG']['ldap_server'],
-				$GLOBALS['ESPCONFIG']['ldap_port']);
-
-		if ($ds) {
-			$search_result = @ldap_search($ds, $GLOBALS['ESPCONFIG']['ldap_dn'], $tmp_ldap_filter);
-			if (@ldap_count_entries($ds,$search_result)==1) {
-				//$user_info = ldap_get_entries($ds, $search_result);
-				$entry_id=ldap_first_entry($ds, $search_result);
-				if ($GLOBALS['ESPCONFIG']['ldap_force_proto_3']) {
-					ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
-				}
-				//$auth_bind = @ldap_bind($ds, $user_info[0]['dn'], $ldap_password);
-				$auth_bind = @ldap_bind($ds, ldap_get_dn($ds,$entry_id), $ldap_password);
-				if ($auth_bind) {
-					$auth_ldap_accept = true;
-					$values = @ldap_get_values($ds, $entry_id,$GLOBALS['ESPCONFIG']['ldap_realm_attr']);
-					$ldap_realm=$values[0];
-					$values = @ldap_get_values($ds, $entry_id,$GLOBALS['ESPCONFIG']['ldap_superuser_attr']);
-					$ldap_superuser_value=$values[0];
-				}
-			}
-		}
-		ldap_close($ds);
-
-		if ($auth_ldap_accept) {
-			$auth = true;
-		}
-	}
-
-	// no matching authorization ... send a 401
-	if ( ! $auth ) {
-          if ($GLOBALS['ESPCONFIG']['auth_mode'] == 'basic') {
-             header( 'WWW-Authenticate: Basic realm="'. _('Management Interface') .'"' );
-             header( 'HTTP/1.0 401 '. _('Unauthorized'));
-             echo("<html>\n<head><title>401 ". _('Unauthorized') ."</title></head>\n".
-             "<body><h1>401 ". _('Unauthorized') ."</h1>\n".
-             mkerror(_('Incorrect User ID or Password, or your account has been disabled/expired.')) .
-             "</body>\n</html>\n");
-             exit;
-             return(false);
-          } elseif ( $GLOBALS['ESPCONFIG']['auth_mode'] == 'form') {
-             echo show_login();
-             exit;
-             return(false);
-          }
- 	}
-
-	// All tests passed ... create ACL array,
-	// and stick it in the session
-	$acl = array(
-		'username'  => $username,
-		'superuser' => 'N',
-		'home' => '/tmp'
-	);
-	// all the fields for the ACL
-	$fields = array('pdesign', 'pstatus', 'pdata', 'pall', 'pgroup', 'puser');
-	// the fields that a LDAP user gets
-	$fields_Y = array('pdesign', 'pstatus', 'pdata', 'pall');
-	foreach($fields as $f) {
-		$$f = array();
-	}
-	if ($ldap_superuser_value == $GLOBALS['ESPCONFIG']['ldap_superuser_value'])
-		$acl['superuser'] = 'Y';
-	foreach($fields_Y as $f) {
-		array_push($$f, $ldap_realm);
-	}
-
-	foreach($fields as $f) {
-		$acl[$f] =& $$f;
-	}
-
-	$_SESSION['acl'] =& $acl;
-
-	// if one were to want login accounting (logs) this
-	// would be the ideal place to do so...
-
-	return(true);
-}
-/* }}} */
-
-/* {{{ proto void manage_logout()
-   Clears the current ACL, and will cause HTTP-Auth
-   to be redisplayed. This is not fool proof; common browsers
-   will continue to retry cached username & password for
-   HTTP-Auth. So if the browser is not closed after logout,
-   it still may be possible to get back in w/o knowing a
-   valid username & password. */
-function manage_logout() {
-    $_SESSION['acl'];
-    $_SESSION['username'] = "";
-    $_SESSION['raw_password'] = "";
-    session_destroy();
-	$acl = array('expired' => 2);
-	$_SESSION['acl'] = array('expired' => 2);
-}
-/* }}} */
-
-/* {{{ proto boolean auth_is_owner(int surveyId, string user)
-   Returns true if user owns the survey. */
-function auth_is_owner($sid, $user) {
-	$val = false;
-	$sql = "SELECT s.owner = "._addslashes($user)." FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.id=$sid";
-    $result = execute_sql($sql);
-	if(!(list($val) = fetch_row($result)))
-		$val = false;
-    db_close($result);
-	return $val;
-}
-/* }}} */
-
-/* {{{ proto string auth_get_survey_realm(int surveyId)
-   Returns the realm of the survey. */
-function auth_get_survey_realm($sid) {
-	$val = '';
-	$sql = "SELECT s.realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.id=$sid";
-    $result = execute_sql($sql);
-	list($val) = fetch_row($result);
-    db_close($result);
-	return $val;
-}
-/* }}} */
-
-/* {{{ proto boolean auth_no_access(string description)
-   Handle a user trying to access an unauthorised area.
-   Returns true if user should be allowed to continue.
-   Returns false (or exits) if access should be denied. */
-function auth_no_access($description) {
-	echo(mkerror(sprintf(_('This account does not have permission %s.'), $description)));
-	echo("\n<br>\n");
-	echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n");
-	return false;
-}
-/* }}} */
-
-/* {{{ proto boolean auth_change_manager_passwd(string user, string old, string new)
-   Change a managers password. If old password does not match
-   or if there is an error, return false. Return true if
-   password changed. */
-function auth_change_manager_passwd($user,$old,$new) {
-	$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['designer_table']." SET password=".db_crypt($new) ."
-		WHERE username="._addslashes($user)." AND password=".db_crypt($old);
-        return(execute_sql($sql) && affected_rows() > 0);
-}
-/* }}} */
-
-/* {{{ proto boolean auth_get_option(string option)
-   Returns the value of the given option. Valid options include:
-   { resume, navigate } */
-function auth_get_option($opt) {
-	return (isset($GLOBALS['auth_options'][$opt]) && $GLOBALS['auth_options'][$opt] == 'Y');
-}
-/* }}} */
-
-/* {{{ proto int auth_get_rid (int survey_id, string username, int response_id)
-   Returns the RID to use for this user. */
-function auth_get_rid($sid, $username, $rid = 0) {
-	$rid = intval($rid);
-	if (isset($rid) && $rid != 0) {
-		// check for valid rid
-		$sql = "SELECT (r.username = "._addslashes($username)." && r.complete = 'N') AS valid
-			FROM ".$GLOBALS['ESPCONFIG']['response_table']." r
-			WHERE r.id = $rid AND
-			r.survey_id = $sid";
-		$res = execute_sql($sql);
-		$valid = FALSE;
-        if ($res && record_count($res) > 0 && $res->fields[0])
-			$valid = TRUE;
-		if ($res)
-			db_close($res);
-		return ($valid) ? $rid : '';
-	} elseif (auth_get_option('resume')) {
-		// find latest in progress rid
-		$sql = "SELECT r.id FROM ".$GLOBALS['ESPCONFIG']['response_table']." r
-			WHERE r.survey_id = $sid AND
-			r.complete = 'N' AND
-			r.username = "._addslashes($username)."
-			ORDER BY submitted DESC";
-		$res = execute_sql($sql,1);
-        if ($res && record_count($res) > 0)
-			$rid = $res->fields[0];
-		if ($res)
-			db_close($res);
-		return ($rid != 0) ? $rid : '';
-	} else {
-		return '';
-	}
-}
-/* }}} */
-
-?>
Index: admin/include/lib/vulabformatlib.php
===================================================================
--- admin/include/lib/vulabformatlib.php	(revision 6370)
+++ admin/include/lib/vulabformatlib.php	(working copy)
@@ -1,83 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-// OpenVuLab Data Formatting Library
-// - A YorkU Project
-// Written by: Blake Edwards
-// blake@electBlake.com
-
-function format_projects($projects = array(),$view = 'table-basic',$option=null) {
-
-	if (count($projects) <= 0) { return 'No Projects Supplied to Format!'; }
-	
-	switch($view) {
-		
-		case 'table-basic':
-		default:
-		
-			$output = '<table cellspacing="0" cellpadding="4">';
-			while(list($id,$pname,$pre, $post,$premsg,$postmsg, $url) = fetch_row($projects))
-			{
-        		$projects->MoveNext();
-				if($bg != $ESPCONFIG['bgalt_color1'])
-					$bg = $ESPCONFIG['bgalt_color1'];
-				else
-					$bg = $ESPCONFIG['bgalt_color2'];
-			
-			
-			//Lets Prepare the Action Links
-			$newuser_url = htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=tab&newid=${id}")
-			$edit_url = htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=viewresults&project=${id}");
-			$remove_url = htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=rmproject&id=${id}");
-			$results_url = htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=viewresults&project=${id}");
-			
-			$output .= '<tr style="background-color:'.$bg.'">';
-			
-			
-//	<!-- Alternating Colors are set in the phpESP.ini.php file -->
-	
-<td>
-			<!--<a href="<?php echo(); ?>"><?php echo($pname); ?></a>-->
-			<table style="background-color: <?php echo($bg); ?>;">
-			<tr><td align="left" width="70%">
-			<a href="<?php echo(); ?>"><?php echo($pname); ?></a>
-			</td>
-			<td>
-<a href="<?php echo(htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=testersproject&project=${id}")); ?>"><img src="../images/user.png" title="Manage Users"/></a>
-
-			
-			</td>
-			<td>
-			<a href="<?php echo(htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=editproject&id=${id}")); ?>"><img src="../images/edit.png" title="Edit"/></a>
-			</td>
-			<td>
-			<a href="<?php echo(htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=rmproject&id=${id}")); ?>"><img src="../images/delete.png" title="Delete -- UNDER CONSTR."/></a>
-			</td>
-			<td>
-<a href="<?php echo(htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=viewresults&project=${id}")); ?>"><img src="../images/checkmark.png" title="View Results of <?php echo($pname); ?>" /></a>
-				
-			</td>
-			</tr>
-			</table>
-		</td>
-	</tr>
-<?php
-	} // end while
-?>
-</table>
-		
-		break;
-	}
-} // End format_projets()
-
-?>
\ No newline at end of file
Index: admin/include/lib/vulab.surveys.function.php
===================================================================
--- admin/include/lib/vulab.surveys.function.php	(revision 6370)
+++ admin/include/lib/vulab.surveys.function.php	(working copy)
@@ -1,107 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-function get_surveys_byowner($ownerid,$options=null) {
-	
-	if (!isset($ownerid)) { return 0; }
-	if ($options['limit']) { $suffix = "LIMIT = '$options[limit]' "; }
-	$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['userprojectrel_table']." WHERE "."userid='$ownerid' ".$suffix;
-
-	$result = execute_sql($sql);
-	while (!$result->EOF) {
-		$result->MoveNext();
-		$p = array();
-		unset($p);
-		list(	$p['id'],
-				$p['userid'],
-				$p['projectid'],
-				$p['admin']) = $result->fields;
-				
-		if ($p['id']) { $projects[] = array_reverse($p); }
-	}
-	return $projects;
-}
-//Takes a list of projects and returns only those that are active.
-function filter_surveys_bystatus($surveys,$status,$operator) {
-	$active = array();
-	foreach ($projects as $p) {
-		if (isset($p['id'])) {	
-	
-			unset($project);
-			$project = new Project;
-			$project->init($p['id']);
-			if ($operator == '==') {
-				if ($project->pre_survey['status'] == $status OR $project->post_survey['status'] == $status)
-				{
-					$active[] = $project;
-				}
-			} elseif ($operator == '!=') {
-				if ($project->pre_survey['status'] != $status OR $project->post_survey['status'] != $status)
-				{
-					$active[] = $project;
-				}		
-			}
-		}
-	}
-	return $active;
-}
-function clean_cut_parray($projects) {
-	$i = 0;
-	while (count($cleaned_projects) <= 4)
-	{
-		if ($projects[$i]->details[id]) { $cleaned_projects[] = $projects[$i]; }
-		++$i;
-	}
-	return $cleaned_projects;
-}
-function display_surveys_table($fields,$projects,$options=null) {
-
-	
-	if (!is_array($fields)) { return "no fields"; }
-	$HTML = '<table class="data_nice">'."\n";
-	
-	if ($options['titles']) {
-		$HTML .= '	<tr>';
-		foreach ($fields as $field) {
-			$HTML .= "<th>$field</th>";
-		}
-		//if ($options['action_set']) { echo "<th>Actions</th>"; }
-		$HTML .= '</tr>'."\n";
-	}
-	foreach ($projects as $project) {
-		
-		if ($project->details[id]) {
-			$HTML .= '<tr>';
-			foreach ($fields as $field) {
-				$HTML .= "<td><a href=?where=viewproject&id=".$project->details[id].">".$project->details[$field]."</a></td>";
-			}
-			if ($options['action_set']) { $HTML .= "<td>".render_actions_html($options['action_set'])."</td>"; }
-			$HTML .= '</tr>'."\n";
-		}
-	}
-	$HTML .= '</table>'."\n";
-	return $HTML;
-}
-function render_survey_actions_html($type) {
-switch($type) {
-case 'drafts':
-	return "<input type='button' value='Activate' />";
-break;
-case 'active':
-	return "<input type='button' value='Results' /> <input type='button' value='Extend Date' /> <input type='button' value='Complete' />";
-break;
-
-}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/espauth-default.inc
===================================================================
--- admin/include/lib/espauth-default.inc	(revision 6370)
+++ admin/include/lib/espauth-default.inc	(working copy)
@@ -1,400 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-error_reporting(0);
-/* $Id: espauth-default.inc,v 1.24 2007/11/26 11:36:17 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-//  phpESP Default Authentication Library
-//  By: Romans Jasins <roma@latnet.lv>
-//      James Flemer <jflemer@alum.rpi.edu>
-
-/* {{{ proto bool survey_auth(int survey_id, string username, string password)
-   Returns true if the supplied username/password is allowed
-   access to the survey. */
-function survey_auth($sid, $username, $password, $raw_password, $css, $title) {
-	// Default to _unauthorized_
-	$auth = false;
-
-	if (isset($_GET['auth_options']) || isset($_POST['auth_options'])) {
-		$GLOBALS['errmsg'] = mkerror(_('Error processing survey: Security violation.'));
-		return(false);
-	}
-	
-	$GLOBALS['auth_options'] = array();
-
-    // make sure database is opened
-    esp_init_adodb();
-
-	// Formulate the query and check whether survey requires authentication
-	$sql = "SELECT realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id = $sid AND public = 'N'";
-
-    $accres = execute_sql($sql);
-	if(!$accres) {
-		$GLOBALS['errmsg'] = mkerror(_('Unable to execute query for access.'));
-		return(false);
-	}
-
-	// Get number of rows in $accres.
-	if(record_count($accres) < 1) {
-		// no matching rows ... no authorization required
-		return(true);
-	}
-
-    $realm = $accres->fields[0];
-    db_close($accres);
-
-	// A matching row was found - the survey requires authentication.
-	if (!empty($username) && !empty($password)) {
-        // if we are running mysql >4.0 need to check/upgrade passwords
-        password_upgrade($username, $password, $GLOBALS['ESPCONFIG']['respondent_table']);
-        password_upgrade($username, $password, $GLOABLS['ESPCONFIG']['user_table']);
-
-		// Formulate the query check whether user is authorized
-		$sql = "SELECT a.maxlogin, a.realm, a.resume, a.navigate
-			FROM ".$GLOBALS['ESPCONFIG']['access_table']." a, ".$GLOBALS['ESPCONFIG']['respondent_table']." r
-			WHERE a.survey_id = $sid AND
-				r.username = "._addslashes($username)." AND
-				r.password = ".db_crypt($password) ." AND
-				r.realm = a.realm AND
-				r.disabled = 'N' AND
-				(r.expiration = '0000-00-00 00:00:00' OR r.expiration > ". sys_time_stamp().")";
-		// Execute the query assign record set to $usrres
-		$usrres = execute_sql( $sql );
-		if(!$usrres) {
-			$GLOBALS['errmsg'] = mkerror(_('Unable to execute query respondents.' ));
-			return(false);
-		}
-
-		if (record_count($usrres) > 0) {
-			// A matching row was found - the user is authorized.
-			$auth = true;
-			list($maxlogin, $arealm, $aresume, $anavigate) = $usrres->fields;
-			db_close($usrres);
-			$GLOBALS['auth_options'] = array('resume' => $aresume, 'navigate' => $anavigate);
-		}
-	}
-
-	// no matching authorization ... send a 401
-	if ( ! $auth ) {
-        if ($GLOBALS['ESPCONFIG']['auth_mode'] == 'basic') {
-            header( "WWW-Authenticate: Basic realm=\"$realm\"" );
-            header( 'HTTP/1.0 401 '. _('Unauthorized'));
-            $GLOBALS['errmsg'] = mkerror(_('Incorrect User ID or Password, or your account has been disabled/expired.'));
-            return(false);
-        }
-        elseif ( $GLOBALS['ESPCONFIG']['auth_mode'] == 'form') {
-            if (!isset($survey_name)) {
-                $survey_name = "";
-            }
-            if (isset($_GET['name'])) {
-                $survey_name = $GLOBALS['_GET']['name'];
-            }
-            elseif (isset($_POST['name'])) {
-                $survey_name = $_POST['name'];
-            }
-            $error_message = "";
-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                $error_message = "Incorrect User ID or Password, or your account has been disabled/expired.";
-            }
-            echo show_login($survey_name, $error_message, $css, $title);
-            exit;
-            return(false);
-        }
-    }
-
-
-	if ( $maxlogin > 0 ) {
-		// see if user is over the MAX # of responses
-		$sql = "SELECT COUNT(*) < $maxlogin FROM ".$GLOBALS['ESPCONFIG']['response_table']." WHERE
-		survey_id = ${sid} AND
-		complete = 'Y' AND
-		username = "._addslashes($username);
-
-		$auth = get_one($sql);
-	}
-    if( !$auth ) {
-        if ($GLOBALS['ESPCONFIG']['auth_mode'] == 'basic') {
-            header( "WWW-Authenticate: Basic realm=\"$realm\"" );
-            header( 'HTTP/1.0 401 '. _('Unauthorized'));
-            $GLOBALS['errmsg'] = mkerror(_('Your account has been disabled or you have already completed this survey.'));
-            return(false);
-        }
-        elseif ( $GLOBALS['ESPCONFIG']['auth_mode'] == 'form') {
-            if (!isset($survey_name)) {
-                $survey_name = "";
-            }
-            if (isset($GLOBALS['_GET']['name'])) {
-                $survey_name = $GLOBALS['_GET']['name'];
-            }
-            elseif (isset($_POST['name'])) {
-                $survey_name = $_POST['name'];
-            }
-            $error_message = "";
-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                $error_message = "Your account has been disabled or you have already completed this survey.";
-            }
-            echo show_login($survey_name, $error_message, $css, $title);
-            exit;
-            return(false);
-        }
-    }
-    return(true);
-}
-/* }}} */
-
-/* {{{ proto bool manage_auth(string username, string password)
-   Returns true if the supplied username/password is allowed
-   access to the management interface. This sets/clears
-   access control related session variables. */
-function manage_auth($username, $password, $raw_password="") {
-	// see if session is expired, or has been logged out
-	if(isset($_SESSION['acl']) &&
-	   isset($_SESSION['acl']['expired'])) {
-		if($_SESSION['acl']['expired']-- > 0) {
-			$username = ''; $password = '';
-		}
-	}
-
-	// see if ACL is cached
-	if (!empty($username) &&
-			!empty($password) &&
-			isset($_SESSION['acl']) &&
-			isset($_SESSION['acl']['username']) &&
-			$_SESSION['acl']['username'] == $username) {
-		#$sql = "SELECT ".db_crypt($password)." = ". $_SESSION['acl']['password'];
-		#$auth = get_one($sql);
-		#if($auth)
-			return(true);
-	}
-
-	$auth = false; // default to unauthorized
-	$_SESSION['acl'] = array();
-
-    if (!empty($username) && !empty($password)) {
-        // if we are running mysql >4.0 need to check/upgrade passwords
-        password_upgrade($username, $password, $GLOBALS['ESPCONFIG']['designer_table']);
-
-        // Formulate the query check whether user is authorized
-/**Old code which references the designer method
-        $sql = "(SELECT username, 0 as type, realm, pdesign, pstatus, pdata, pall, pgroup, puser FROM ".$GLOBALS['ESPCONFIG']['designer_table']." WHERE
-        username = "._addslashes($username)." AND
-        password = ".db_crypt($password) ."AND
-        disabled = 'N' AND
-        (expiration = '0000-00-00 00:00:00' OR expiration > ". sys_time_stamp()."))".
-        "UNION (select username, 1 as type, realm, pdesign, pstatus, pdata, pall, pgroup, puser from ".$GLOBALS['ESPCONFIG']['respondent_table']." WHERE
-        username = "._addslashes($username)." AND
-        password = ".db_crypt($password) ."AND
-        disabled = 'N' AND
-        (expiration = '0000-00-00 00:00:00' OR expiration > ". sys_time_stamp()."))"
-        ;
-**/
-		$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['user_table']." WHERE
-        username = "._addslashes($username)." AND
-        password = ".db_crypt($password)
-        ;
-
-        // Execute the query and put recordset in $accres
-        $accres = execute_sql( $sql, "", ADODB_FETCH_ASSOC );
-        if(!$accres) {
-            header( 'HTTP/1.0 503 '. _('Service Unavailable'));
-            echo('<html><head><title>'. _('Service Unavailable') .
-            '</title></head><body><h1>HTTP 503 '.
-            _('Service Unavailable') .'</h1>'.
-            mkerror(_('Unable to load ACL.') .' ('. ErrorMsg() .')') .
-            '</body></html>');
-            return(false);
-        }
-
-        // Get number of rows in $accres.
-        if (record_count($accres) > 0) {
-            // A matching row was found - the user is authorized.
-            $auth = true;
-            @$type = $accres->fields['type'];
-        }
-        
-    }
-    if ( ! $auth ) {
-        if ($GLOBALS['ESPCONFIG']['auth_mode'] == 'basic') {
-            // no matching authorization ... send a 401
-            header( 'WWW-Authenticate: Basic realm="'. _('Management Interface') .'"' );
-            header( 'HTTP/1.0 401 '. _('Unauthorized'));
-            echo("<html>\n<head><title>401 ". _('Unauthorized') ."</title></head>\n".
-            "<body><h1>401 ". _('Unauthorized') ."</h1>\n".
-            mkerror(_('Incorrect User ID or Password, or your account has been disabled/expired.')) .
-            "</body>\n</html>\n");
-            exit;
-            return(false);
-        }
-        elseif ( $GLOBALS['ESPCONFIG']['auth_mode'] == 'form') {
-            $error_message = "";
-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                $error_message = "Incorrect User ID or Password, or your account has been disabled/expired.";
-            }
-            echo show_login(null, $error_message, null, "phpESP Management Login");
-            exit;
-            return(false);
-        }
-    }
-
-	// All tests passed ... create ACL array,
-	// and stick it in the session
-	$acl = array(
-		'username'  => $username,
-		'superuser' => 'N',
-		'home' => '/tmp'
-	);
-	//$fields = array('pdesign', 'pstatus', 'pdata', 'pall', 'pgroup', 'puser');
-	//foreach($fields as $f) {
-	//	$$f = array();
-	//}
-	while( !$accres->EOF ) {
-		if(@($accres->fields['realm'] == 'superuser'))
-			$acl['superuser'] = 'Y';
-		$acl['userid'] = $accres->fields['userid'];
-	//	foreach($fields as $f) {
-	//		if($accres->fields[$f] == 'Y')
-	//			array_push($$f, $accres->fields['realm']);
-	//	}
-        $accres->MoveNext();
-	}
-	db_close($accres);
-	
-	$er = error_reporting();
-	error_reporting(0);
-	foreach($fields as $f) {
-		$acl[$f] =& $$f;
-	}
-	error_reporting($er);
-	$_SESSION['acl'] =& $acl;
-	
-	// if one were to want login accounting (logs) this
-	// would be the ideal place to do so...
-	
-	return(true);
-}
-/* }}} */
-
-/* {{{ proto void manage_logout()
-   Clears the current ACL, and will cause HTTP-Auth
-   to be redisplayed. This is not fool proof; common browsers
-   will continue to retry cached username & password for
-   HTTP-Auth. So if the browser is not closed after logout,
-   it still may be possible to get back in w/o knowing a
-   valid username & password. */
-function manage_logout() {
-	// clear existing ACL, and set the expired flag
-    $_SESSION['acl'];
-    $_SESSION['username'] = "";
-    $_SESSION['raw_password'] = "";
-    session_destroy();
-	$acl = array('expired' => 2);
-	////angek: $GLOBALS['HTTP_SESSION_VARS']['acl'] = array('expired' => 2);
-	$_SESSION['acl'] = array('expired' => 2);
-}
-/* }}} */
-
-/* {{{ proto boolean auth_is_owner(int surveyId, string user)
-   Returns true if user owns the survey. */
-function auth_is_owner($sid, $user) {
-	$val = false;
-	$sql = "SELECT s.owner = "._addslashes($user)."FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.id=$sid";
-    $result = execute_sql($sql);
-	if(!(list($val) = fetch_row($result)))
-		$val = false;
-    db_close($result);
-	return $val;
-}
-/* }}} */
-
-/* {{{ proto string auth_get_survey_realm(int surveyId)
-   Returns the realm of the survey. */
-function auth_get_survey_realm($sid) {
-	$val = '';
-	$sql = "SELECT s.realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.id=$sid";
-    $result = execute_sql($sql);
-	list($val) = fetch_row($result);
-    db_close($result);
-	return $val;
-}
-/* }}} */
-
-/* {{{ proto boolean auth_no_access(string description)
-   Handle a user trying to access an unauthorised area.
-   Returns true if user should be allowed to continue.
-   Returns false (or exits) if access should be denied. */
-function auth_no_access($description) {
-	echo(mkerror(_('This account does not have permission') .' '. $description .'.'));
-	echo("\n<br>\n");
-	echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n");
-	return false;
-}
-/* }}} */
-
-/* {{{ proto boolean auth_change_manager_passwd(string user, string old, string new)
-   Change a managers password. If old password does not match
-   or if there is an error, return false. Return true if
-   password changed. */
-function auth_change_manager_passwd($user,$old,$new) {
-	$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['designer_table']." SET password=".db_crypt($new) ."
-		WHERE username="._addslashes($user)." AND password=".db_crypt($old);
-	return(execute_sql($sql) && affected_rows() > 0);
-}
-/* }}} */
-
-/* {{{ proto boolean auth_get_option(string option)
-   Returns the value of the given option. Valid options include:
-   { resume, navigate } */
-function auth_get_option($opt) {
-	return (isset($GLOBALS['auth_options'][$opt]) && $GLOBALS['auth_options'][$opt] == 'Y');
-}
-/* }}} */
-
-/* {{{ proto int auth_get_rid (int survey_id, string username, int response_id)
-   Returns the RID to use for this user. */
-function auth_get_rid($sid, $username, $rid = 0) {
-	$rid = intval($rid);
-	if (isset($rid) && $rid != 0) {
-		// check for valid rid
-		$sql = "SELECT (r.username = "._addslashes($username)." && r.complete = 'N') AS valid
-				FROM ".$GLOBALS['ESPCONFIG']['response_table']." r
-				WHERE r.id = $rid AND
-					r.survey_id = $sid";
-		$res = execute_sql($sql);
-		$valid = false;
-		if ($res && record_count($res) > 0 && $res->fields[0])
-			$valid = true;
-		if ($res)
-			db_close($res);
-		return ($valid) ? $rid : '';
-	} elseif (auth_get_option('resume')) {
-		// find latest in progress rid
-		$sql = "SELECT r.id FROM ".$GLOBALS['ESPCONFIG']['response_table']." r
-				WHERE r.survey_id = $sid AND
-					r.complete = 'N' AND
-					r.username = "._addslashes($username)."
-				ORDER BY submitted DESC";
-		$res = execute_sql($sql,1);
-		if ($res && record_count($res) > 0)
-			$rid = $res->fields[0];
-		if ($res)
-			db_close($res);
-		return ($rid != 0) ? $rid : '';
-	} else {
-		return '';
-	}
-}
-/* }}} */
-
-?>
Index: admin/include/lib/vulab.users.class.php
===================================================================
--- admin/include/lib/vulab.users.class.php	(revision 6370)
+++ admin/include/lib/vulab.users.class.php	(working copy)
@@ -1,136 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-/*
-File: 		vulab.users.class.php \\v 1.0
-Info:		- the User object: $user = new User($userid);
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-class User {
-
-function __construct($userid=NULL) { //a.k.a Get Project
-	$this->id = $userid;
-	$getSQL = 'SELECT * FROM '.$GLOBALS['ESPCONFIG']['user_table']." WHERE userid='$this->id'";
-
-	$user_result = execute_sql($getSQL);
-	//print_r($proj_result->fields);
-	
-	list(	$u['userid'],
-				$u['username'],
-				$u['password'],
-				$u['fname'],
-				$u['lname'],
-				$u['email'],
-				$u['researcher'],
-				$u['disabled']) = $user_result->fields;	
-
-	
-	$u = array_reverse($u);
-	
-	//load details
-	$this->details = $u;
-
-}
-
-function email($subject,$message,$options = NULL) {
-	
-	global $CONFIG;
-	global $SITE;
-	
-	$from 	 = ($options['from'] ? $options['from'] : 'mail@vulab.yorku.ca');
-	$reply 	 = ($options['reply'] ? $options['reply'] : 'no-reply@vulab.yorku.ca');
-	$pid	 = $options['pid'];
-
-	if (strtolower($options['type']) == 'welcome') {
-		global $_POST;
-		$password = $_POST['password'];
-		$subject = 'Welcome to '.$SITE['name'];
-		$message = 'Welcome to '.$SITE['name']."\n\n";
-		$message .= "Username: ".$this->details[username]."\n";
-		$message .= "Passowrd: ".$password."\n";
-		$message .= "\n \n You have been signed up on ".$CONFIG[url][base]."\n\n";
-	}
-	
-	$emailid = explode('@',$this->details['email']);
-	
-	$toName  = ($this->details['fname'] ? $this->details['fname'] : $emailid[0]);
-	$to      = $toName." <".$this->details['email'].">";
-	$headers = 'From: '.$from. "\r\n" .
-	    'Reply-To: '.$reply ."\r\n" .
-	    'X-Mailer: PHP/' . phpversion();
-	    
-	    
-	//Replace Variables in Message
-	foreach ($this->details as $key=>$value) {
-		$message = str_replace("<user-$key>",$value,$message);
-	}
-	
-	if ($pid) {
-		$project = new Project;
-		$project->init($pid);
-		if ($project->details) {
-			foreach ($project->details as $key=>$value) {
-				$message = str_replace("<project-$key>",$value,$message);
-			}
-		}
-	}
-	
-	return mail($to, $subject, $message, $headers);
-	
-
-}
-function update($data,$options=null) {
-	require ESP_BASE.'admin/sanitize.php';
-	global $ESPCONFIG;
-	$pid = $this->id;
-	if ($data['pname']) { $u[name] = sanitize($data['pname']); }
-	if ($data['ppre']) { $u[presurvey] = sanitize($data['ppre']); }
-	if ($data['ppost']) { $u[postsurvey] = sanitize($data['ppost']); }
-	if ($data['pintro']) { $u[action_intro_msg] = sanitize($data['pintro']); }
-	if ($data['pthanks']) {$u[action_outro_msg] = sanitize($data['pthanks']); }
-	if ($data['purl']) { $u[action_url] = sanitize($data['purl']); }
-	if ($data['pstart']) { $u[start] = sanitize($data['pstart']); }
-	if ($data['pend']) { $u[end] = sanitize($data['pend']); }
-	if ($data['status']) { $u[status] = sanitize($data['status']); }
-	if ($data['pre_source']) { $u[pre_source] = sanitize($data['pre_source']); }
-	if ($data['post_source']) { $u[post_source] = sanitize($data['post_source']); }
-	
-	
-	foreach ($u as $key=>$value) {
-		if ($value == 'delete') {
-			$u[$key] = '';
-		}
-	}
-	$u[editstamp] = time();
-	
-	if ($u[status] == '2') {
-		$u[activestamp] = time();
-	}
-	//Generate the Update sql
-	$setsql = "SET ";
-	foreach ($u as $key=>$d) {
-		$setsql .= "$key = '$d', ";
-	}
-	$setsql = substr($setsql,0,-2);
-	
-	$usql = "UPDATE ".$ESPCONFIG[project_table]." ".$setsql." WHERE id='".$pid."'";
-	//echo $usql;
-	$result = execute_sql($usql);
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	return true;
-}
-
-}//Class END
-?>
\ No newline at end of file
Index: admin/include/lib/vulab.sessions.php
===================================================================
--- admin/include/lib/vulab.sessions.php	(revision 6370)
+++ admin/include/lib/vulab.sessions.php	(working copy)
@@ -1,15 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-
-session_start();
-
-?>
Index: admin/include/lib/vulab.functions.php
===================================================================
--- admin/include/lib/vulab.functions.php	(revision 6370)
+++ admin/include/lib/vulab.functions.php	(working copy)
@@ -1,29 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-function implode_get() {
-    $first = true;
-    $output = '';
-    foreach($_GET as $key => $value) {
-        if ($first) {
-            $output = '?'.$key.'='.$value;
-            $first = false;
-        } else {
-            $output .= '&'.$key.'='.$value;   
-        }
-    }
-    return $output;
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-php4.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-php4.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-php4.inc.php	(working copy)
@@ -1,16 +0,0 @@
-<?php
-
-/*
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Set tabs to 4.
-*/
-
-
-class ADODB_BASE_RS {
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-xmlschema.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-xmlschema.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-xmlschema.inc.php	(working copy)
@@ -1,2221 +0,0 @@
-<?php
-// Copyright (c) 2004 ars Cognita Inc., all rights reserved
-/* ******************************************************************************
-    Released under both BSD license and Lesser GPL library license. 
- 	Whenever there is any discrepancy between the two licenses, 
- 	the BSD license will take precedence. 
-*******************************************************************************/
-/**
- * xmlschema is a class that allows the user to quickly and easily
- * build a database on any ADOdb-supported platform using a simple
- * XML schema.
- *
- * Last Editor: $Author: liedekef $
- * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.2 $
- *
- * @package axmls
- * @tutorial getting_started.pkg
- */
- 
-function _file_get_contents($file) 
-{
- 	if (function_exists('file_get_contents')) return file_get_contents($file);
-	
-	$f = fopen($file,'r');
-	if (!$f) return '';
-	$t = '';
-	
-	while ($s = fread($f,100000)) $t .= $s;
-	fclose($f);
-	return $t;
-}
-
-
-/**
-* Debug on or off
-*/
-if( !defined( 'XMLS_DEBUG' ) ) {
-	define( 'XMLS_DEBUG', FALSE );
-}
-
-/**
-* Default prefix key
-*/
-if( !defined( 'XMLS_PREFIX' ) ) {
-	define( 'XMLS_PREFIX', '%%P' );
-}
-
-/**
-* Maximum length allowed for object prefix
-*/
-if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
-	define( 'XMLS_PREFIX_MAXLEN', 10 );
-}
-
-/**
-* Execute SQL inline as it is generated
-*/
-if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
-	define( 'XMLS_EXECUTE_INLINE', FALSE );
-}
-
-/**
-* Continue SQL Execution if an error occurs?
-*/
-if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
-	define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
-}
-
-/**
-* Current Schema Version
-*/
-if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_SCHEMA_VERSION', '0.2' );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
-	define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
-}
-
-/**
-* Include the main ADODB library
-*/
-if( !defined( '_ADODB_LAYER' ) ) {
-	require( 'adodb.inc.php' );
-	require( 'adodb-datadict.inc.php' );
-}
-
-/**
-* Abstract DB Object. This class provides basic methods for database objects, such
-* as tables and indexes.
-*
-* @package axmls
-* @access private
-*/
-class dbObject {
-	
-	/**
-	* var object Parent
-	*/
-	var $parent;
-	
-	/**
-	* var string current element
-	*/
-	var $currentElement;
-	
-	/**
-	* NOP
-	*/
-	function dbObject( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	function create() {
-		return array();
-	}
-	
-	/**
-	* Destroys the object
-	*/
-	function destroy() {
-		unset( $this );
-	}
-	
-	/**
-	* Checks whether the specified RDBMS is supported by the current
-	* database object or its ranking ancestor.
-	*
-	* @param string $platform RDBMS platform name (from ADODB platform list).
-	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
-	}
-	
-	/**
-	* Returns the prefix set by the ranking ancestor of the database object.
-	*
-	* @param string $name Prefix string.
-	* @return string Prefix.
-	*/
-	function prefix( $name = '' ) {
-		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
-	}
-	
-	/**
-	* Extracts a field ID from the specified field.
-	*
-	* @param string $field Field.
-	* @return string Field ID.
-	*/
-	function FieldID( $field ) {
-		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
-	}
-}
-
-/**
-* Creates a table object in ADOdb's datadict format
-*
-* This class stores information about a database table. As charactaristics
-* of the table are loaded from the external source, methods and properties
-* of this class are used to build up the table description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbTable extends dbObject {
-	
-	/**
-	* @var string Table name
-	*/
-	var $name;
-	
-	/**
-	* @var array Field specifier: Meta-information about each field
-	*/
-	var $fields = array();
-	
-	/**
-	* @var array List of table indexes.
-	*/
-	var $indexes = array();
-	
-	/**
-	* @var array Table options: Table-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var string Field index: Keeps track of which field is currently being processed
-	*/
-	var $current_field;
-	
-	/**
-	* @var boolean Mark table for destruction
-	* @access private
-	*/
-	var $drop_table;
-	
-	/**
-	* @var boolean Mark field for destruction (not yet implemented)
-	* @access private
-	*/
-	var $drop_field = array();
-	
-	/**
-	* Iniitializes a new table object.
-	*
-	* @param string $prefix DB Object prefix
-	* @param array $attributes Array of table attributes.
-	*/
-	function dbTable( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		$this->name = $this->prefix($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'INDEX':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addIndex( $attributes ) );
-				}
-				break;
-			case 'DATA':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addData( $attributes ) );
-				}
-				break;
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'FIELD':
-				// Add a field
-				$fieldName = $attributes['NAME'];
-				$fieldType = $attributes['TYPE'];
-				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
-				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
-				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
-				break;
-			case 'KEY':
-			case 'NOTNULL':
-			case 'AUTOINCREMENT':
-				// Add a field option
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			case 'DEFAULT':
-				// Add a field option to the table object
-				
-				// Work around ADOdb datadict issue that misinterprets empty strings.
-				if( $attributes['VALUE'] == '' ) {
-					$attributes['VALUE'] = " '' ";
-				}
-				
-				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
-				break;
-			case 'DEFDATE':
-			case 'DEFTIMESTAMP':
-				// Add a field option to the table object
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Table constraint
-			case 'CONSTRAINT':
-				if( isset( $this->current_field ) ) {
-					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
-				} else {
-					$this->addTableOpt( $cdata );
-				}
-				break;
-			// Table option
-			case 'OPT':
-				$this->addTableOpt( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			case 'FIELD':
-				unset($this->current_field);
-				break;
-
-		}
-	}
-	
-	/**
-	* Adds an index to a table object
-	*
-	* @param array $attributes Index attributes
-	* @return object dbIndex object
-	*/
-	function &addIndex( $attributes ) {
-		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] =& new dbIndex( $this, $attributes );
-		return $this->indexes[$name];
-	}
-	
-	/**
-	* Adds data to a table object
-	*
-	* @param array $attributes Data attributes
-	* @return object dbData object
-	*/
-	function &addData( $attributes ) {
-		if( !isset( $this->data ) ) {
-			$this->data =& new dbData( $this, $attributes );
-		}
-		return $this->data;
-	}
-	
-	/**
-	* Adds a field to a table object
-	*
-	* $name is the name of the table to which the field should be added. 
-	* $type is an ADODB datadict field type. The following field types
-	* are supported as of ADODB 3.40:
-	* 	- C:  varchar
-	*	- X:  CLOB (character large object) or largest varchar size
-	*	   if CLOB is not supported
-	*	- C2: Multibyte varchar
-	*	- X2: Multibyte CLOB
-	*	- B:  BLOB (binary large object)
-	*	- D:  Date (some databases do not support this, and we return a datetime type)
-	*	- T:  Datetime or Timestamp
-	*	- L:  Integer field suitable for storing booleans (0 or 1)
-	*	- I:  Integer (mapped to I4)
-	*	- I1: 1-byte integer
-	*	- I2: 2-byte integer
-	*	- I4: 4-byte integer
-	*	- I8: 8-byte integer
-	*	- F:  Floating point number
-	*	- N:  Numeric or decimal number
-	*
-	* @param string $name Name of the table to which the field will be added.
-	* @param string $type	ADODB datadict field type.
-	* @param string $size	Field size
-	* @param array $opts	Field options array
-	* @return array Field specifier array
-	*/
-	function addField( $name, $type, $size = NULL, $opts = NULL ) {
-		$field_id = $this->FieldID( $name );
-		
-		// Set the field index so we know where we are
-		$this->current_field = $field_id;
-		
-		// Set the field name (required)
-		$this->fields[$field_id]['NAME'] = $name;
-		
-		// Set the field type (required)
-		$this->fields[$field_id]['TYPE'] = $type;
-		
-		// Set the field size (optional)
-		if( isset( $size ) ) {
-			$this->fields[$field_id]['SIZE'] = $size;
-		}
-		
-		// Set the field options
-		if( isset( $opts ) ) {
-			$this->fields[$field_id]['OPTS'][] = $opts;
-		}
-	}
-	
-	/**
-	* Adds a field option to the current field specifier
-	*
-	* This method adds a field option allowed by the ADOdb datadict 
-	* and appends it to the given field.
-	*
-	* @param string $field	Field name
-	* @param string $opt ADOdb field option
-	* @param mixed $value Field option value
-	* @return array Field specifier array
-	*/
-	function addFieldOpt( $field, $opt, $value = NULL ) {
-		if( !isset( $value ) ) {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
-		// Add the option and value
-		} else {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
-		}
-	}
-	
-	/**
-	* Adds an option to the table
-	*
-	* This method takes a comma-separated list of table-level options
-	* and appends them to the table object.
-	*
-	* @param string $opt Table option
-	* @return array Options
-	*/
-	function addTableOpt( $opt ) {
-		$this->opts[] = $opt;
-		
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the table in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing table creation SQL
-	*/
-	function create( &$xmls ) {
-		$sql = array();
-		
-		// drop any existing indexes
-		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
-			foreach( $legacy_indexes as $index => $index_details ) {
-				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
-			}
-		}
-		
-		// remove fields to be dropped from table object
-		foreach( $this->drop_field as $field ) {
-			unset( $this->fields[$field] );
-		}
-		
-		// if table exists
-		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
-			// drop table
-			if( $this->drop_table ) {
-				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
-				return $sql;
-			}
-			
-			// drop any existing fields not in schema
-			foreach( $legacy_fields as $field_id => $field ) {
-				if( !isset( $this->fields[$field_id] ) ) {
-					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
-				}
-			}
-		// if table doesn't exist
-		} else {
-			if( $this->drop_table ) {
-				return $sql;
-			}
-			
-			$legacy_fields = array();
-		}
-		
-		// Loop through the field specifier array, building the associative array for the field options
-		$fldarray = array();
-		
-		foreach( $this->fields as $field_id => $finfo ) {
-			// Set an empty size if it isn't supplied
-			if( !isset( $finfo['SIZE'] ) ) {
-				$finfo['SIZE'] = '';
-			}
-			
-			// Initialize the field array with the type and size
-			$fldarray[$field_id] = array(
-				'NAME' => $finfo['NAME'],
-				'TYPE' => $finfo['TYPE'],
-				'SIZE' => $finfo['SIZE']
-			);
-			
-			// Loop through the options array and add the field options. 
-			if( isset( $finfo['OPTS'] ) ) {
-				foreach( $finfo['OPTS'] as $opt ) {
-					// Option has an argument.
-					if( is_array( $opt ) ) {
-						$key = key( $opt );
-						$value = $opt[key( $opt )];
-						@$fldarray[$field_id][$key] .= $value;
-					// Option doesn't have arguments
-					} else {
-						$fldarray[$field_id][$opt] = $opt;
-					}
-				}
-			}
-		}
-		
-		if( empty( $legacy_fields ) ) {
-			// Create the new table
-			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-			logMsg( end( $sql ), 'Generated CreateTableSQL' );
-		} else {
-			// Upgrade an existing table
-			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
-			switch( $xmls->upgrade ) {
-				// Use ChangeTableSQL
-				case 'ALTER':
-					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
-					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				case 'REPLACE':
-					logMsg( 'Doing upgrade REPLACE (testing)' );
-					$sql[] = $xmls->dict->DropTableSQL( $this->name );
-					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				// ignore table
-				default:
-					return array();
-			}
-		}
-		
-		foreach( $this->indexes as $index ) {
-			$sql[] = $index->create( $xmls );
-		}
-		
-		if( isset( $this->data ) ) {
-			$sql[] = $this->data->create( $xmls );
-		}
-		
-		return $sql;
-	}
-	
-	/**
-	* Marks a field or table for destruction
-	*/
-	function drop() {
-		if( isset( $this->current_field ) ) {
-			// Drop the current field
-			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
-			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
-			$this->drop_field[$this->current_field] = $this->current_field;
-		} else {
-			// Drop the current table
-			logMsg( "Dropping table '{$this->name}'" );
-			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
-			$this->drop_table = TRUE;
-		}
-	}
-}
-
-/**
-* Creates an index object in ADOdb's datadict format
-*
-* This class stores information about a database index. As charactaristics
-* of the index are loaded from the external source, methods and properties
-* of this class are used to build up the index description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbIndex extends dbObject {
-	
-	/**
-	* @var string	Index name
-	*/
-	var $name;
-	
-	/**
-	* @var array	Index options: Index-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var array	Indexed fields: Table columns included in this index
-	*/
-	var $columns = array();
-	
-	/**
-	* @var boolean Mark index for destruction
-	* @access private
-	*/
-	var $drop = FALSE;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		
-		$this->name = $this->prefix ($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'CLUSTERED':
-			case 'BITMAP':
-			case 'UNIQUE':
-			case 'FULLTEXT':
-			case 'HASH':
-				// Add index Option
-				$this->addIndexOpt( $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'COL':
-				$this->addField( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'INDEX':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $name ) {
-		$this->columns[$this->FieldID( $name )] = $name;
-		
-		// Return the field list
-		return $this->columns;
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addIndexOpt( $opt ) {
-		$this->opts[] = $opt;
-		
-		// Return the options list
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		if( $this->drop ) {
-			return NULL;
-		}
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->columns as $id => $col ) {
-			if( !isset( $this->parent->fields[$id] ) ) {
-				unset( $this->columns[$id] );
-			}
-		}
-		
-		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
-	}
-	
-	/**
-	* Marks an index for destruction
-	*/
-	function drop() {
-		$this->drop = TRUE;
-	}
-}
-
-/**
-* Creates a data object in ADOdb's datadict format
-*
-* This class stores information about table data.
-*
-* @package axmls
-* @access private
-*/
-class dbData extends dbObject {
-	
-	var $data = array();
-	
-	var $row;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbData( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'ROW':
-				$this->row = count( $this->data );
-				$this->data[$this->row] = array();
-				break;
-			case 'F':
-				$this->addField($attributes);
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'F':
-				$this->addData( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'DATA':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $attributes ) {
-		if( isset( $attributes['NAME'] ) ) {
-			$name = $attributes['NAME'];
-		} else {
-			$name = count($this->data[$this->row]);
-		}
-		
-		// Set the field index so we know where we are
-		$this->current_field = $this->FieldID( $name );
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addData( $cdata ) {
-		if( !isset( $this->data[$this->row] ) ) {
-			$this->data[$this->row] = array();
-		}
-		
-		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
-			$this->data[$this->row][$this->current_field] = '';
-		}
-		
-		$this->data[$this->row][$this->current_field] .= $cdata;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		$table = $xmls->dict->TableName($this->parent->name);
-		$table_field_count = count($this->parent->fields);
-		$sql = array();
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->data as $row ) {
-			$table_fields = $this->parent->fields;
-			$fields = array();
-			
-			foreach( $row as $field_id => $field_data ) {
-				if( !array_key_exists( $field_id, $table_fields ) ) {
-					if( is_numeric( $field_id ) ) {
-						$field_id = reset( array_keys( $table_fields ) );
-					} else {
-						continue;
-					}
-				}
-				
-				$name = $table_fields[$field_id]['NAME'];
-				
-				switch( $table_fields[$field_id]['TYPE'] ) {
-					case 'C':
-					case 'C2':
-					case 'X':
-					case 'X2':
-						$fields[$name] = $xmls->db->qstr( $field_data );
-						break;
-					case 'I':
-					case 'I1':
-					case 'I2':
-					case 'I4':
-					case 'I8':
-						$fields[$name] = intval($field_data);
-						break;
-					default:
-						$fields[$name] = $field_data;
-				}
-				
-				unset($table_fields[$field_id]);
-			}
-			
-			// check that at least 1 column is specified
-			if( empty( $fields ) ) {
-				continue;
-			}
-			
-			// check that no required columns are missing
-			if( count( $fields ) < $table_field_count ) {
-				foreach( $table_fields as $field ) {
-					if (isset( $field['OPTS'] ))
-						if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
-							continue(2);
-						}
-				}
-			}
-			
-			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
-		}
-		
-		return $sql;
-	}
-}
-
-/**
-* Creates the SQL to execute a list of provided SQL queries
-*
-* @package axmls
-* @access private
-*/
-class dbQuerySet extends dbObject {
-	
-	/**
-	* @var array	List of SQL queries
-	*/
-	var $queries = array();
-	
-	/**
-	* @var string	String used to build of a query line by line
-	*/
-	var $query;
-	
-	/**
-	* @var string	Query prefix key
-	*/
-	var $prefixKey = '';
-	
-	/**
-	* @var boolean	Auto prefix enable (TRUE)
-	*/
-	var $prefixMethod = 'AUTO';
-	
-	/**
-	* Initializes the query set.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-			
-		// Overrides the manual prefix key
-		if( isset( $attributes['KEY'] ) ) {
-			$this->prefixKey = $attributes['KEY'];
-		}
-		
-		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
-		// Enables or disables automatic prefix prepending
-		switch( $prefixMethod ) {
-			case 'AUTO':
-				$this->prefixMethod = 'AUTO';
-				break;
-			case 'MANUAL':
-				$this->prefixMethod = 'MANUAL';
-				break;
-			case 'NONE':
-				$this->prefixMethod = 'NONE';
-				break;
-		}
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'QUERY':
-				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
-				// current connection platform.
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->newQuery();
-				} else {
-					$this->discardQuery();
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Line of queryset SQL data
-			case 'QUERY':
-				$this->buildQuery( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'QUERY':
-				// Add the finished query to the open query set.
-				$this->addQuery();
-				break;
-			case 'SQL':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* Re-initializes the query.
-	*
-	* @return boolean TRUE
-	*/
-	function newQuery() {
-		$this->query = '';
-		
-		return TRUE;
-	}
-	
-	/**
-	* Discards the existing query.
-	*
-	* @return boolean TRUE
-	*/
-	function discardQuery() {
-		unset( $this->query );
-		
-		return TRUE;
-	}
-	
-	/** 
-	* Appends a line to a query that is being built line by line
-	*
-	* @param string $data Line of SQL data or NULL to initialize a new query
-	* @return string SQL query string.
-	*/
-	function buildQuery( $sql = NULL ) {
-		if( !isset( $this->query ) OR empty( $sql ) ) {
-			return FALSE;
-		}
-		
-		$this->query .= $sql;
-		
-		return $this->query;
-	}
-	
-	/**
-	* Adds a completed query to the query list
-	*
-	* @return string	SQL of added query
-	*/
-	function addQuery() {
-		if( !isset( $this->query ) ) {
-			return FALSE;
-		}
-		
-		$this->queries[] = $return = trim($this->query);
-		
-		unset( $this->query );
-		
-		return $return;
-	}
-	
-	/**
-	* Creates and returns the current query set
-	*
-	* @param object $xmls adoSchema object
-	* @return array Query set
-	*/
-	function create( &$xmls ) {
-		foreach( $this->queries as $id => $query ) {
-			switch( $this->prefixMethod ) {
-				case 'AUTO':
-					// Enable auto prefix replacement
-					
-					// Process object prefix.
-					// Evaluate SQL statements to prepend prefix to objects
-					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
-					// SELECT statements aren't working yet
-					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
-				case 'MANUAL':
-					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
-					// If prefixKey is not set, we use the default constant XMLS_PREFIX
-					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
-						// Enable prefix override
-						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
-					} else {
-						// Use default replacement
-						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
-					}
-			}
-			
-			$this->queries[$id] = trim( $query );
-		}
-		
-		// Return the query set array
-		return $this->queries;
-	}
-	
-	/**
-	* Rebuilds the query with the prefix attached to any objects
-	*
-	* @param string $regex Regex used to add prefix
-	* @param string $query SQL query string
-	* @param string $prefix Prefix to be appended to tables, indices, etc.
-	* @return string Prefixed SQL query string.
-	*/
-	function prefixQuery( $regex, $query, $prefix = NULL ) {
-		if( !isset( $prefix ) ) {
-			return $query;
-		}
-		
-		if( preg_match( $regex, $query, $match ) ) {
-			$preamble = $match[1];
-			$postamble = $match[5];
-			$objectList = explode( ',', $match[3] );
-			// $prefix = $prefix . '_';
-			
-			$prefixedList = '';
-			
-			foreach( $objectList as $object ) {
-				if( $prefixedList !== '' ) {
-					$prefixedList .= ', ';
-				}
-				
-				$prefixedList .= $prefix . trim( $object );
-			}
-			
-			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
-		}
-		
-		return $query;
-	}
-}
-
-/**
-* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
-* This class is used to load and parse the XML file, to create an array of SQL statements
-* that can be used to build a database, and to build the database using the SQL array.
-*
-* @tutorial getting_started.pkg
-*
-* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.2 $
-*
-* @package axmls
-*/
-class adoSchema {
-	
-	/**
-	* @var array	Array containing SQL queries to generate all objects
-	* @access private
-	*/
-	var $sqlArray;
-	
-	/**
-	* @var object	ADOdb connection object
-	* @access private
-	*/
-	var $db;
-	
-	/**
-	* @var object	ADOdb Data Dictionary
-	* @access private
-	*/
-	var $dict;
-	
-	/**
-	* @var string Current XML element
-	* @access private
-	*/
-	var $currentElement = '';
-	
-	/**
-	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
-	* @access private
-	*/
-	var $upgrade = '';
-	
-	/**
-	* @var string Optional object prefix
-	* @access private
-	*/
-	var $objectPrefix = '';
-	
-	/**
-	* @var long	Original Magic Quotes Runtime value
-	* @access private
-	*/
-	var $mgq;
-	
-	/**
-	* @var long	System debug
-	* @access private
-	*/
-	var $debug;
-	
-	/**
-	* @var string Regular expression to find schema version
-	* @access private
-	*/
-	var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
-	
-	/**
-	* @var string Current schema version
-	* @access private
-	*/
-	var $schemaVersion;
-	
-	/**
-	* @var int	Success of last Schema execution
-	*/
-	var $success;
-	
-	/**
-	* @var bool	Execute SQL inline as it is generated
-	*/
-	var $executeInline;
-	
-	/**
-	* @var bool	Continue SQL execution if errors occur
-	*/
-	var $continueOnError;
-	
-	/**
-	* Creates an adoSchema object
-	*
-	* Creating an adoSchema object is the first step in processing an XML schema.
-	* The only parameter is an ADOdb database connection object, which must already
-	* have been created.
-	*
-	* @param object $db ADOdb database connection object.
-	*/
-	function adoSchema( &$db ) {
-		// Initialize the environment
-		$this->mgq = get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);
-		
-		$this->db =& $db;
-		$this->debug = $this->db->debug;
-		$this->dict = NewDataDictionary( $this->db );
-		$this->sqlArray = array();
-		$this->schemaVersion = XMLS_SCHEMA_VERSION;
-		$this->executeInline( XMLS_EXECUTE_INLINE );
-		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
-		$this->setUpgradeMethod();
-	}
-	
-	/**
-	* Sets the method to be used for upgrading an existing database
-	*
-	* Use this method to specify how existing database objects should be upgraded.
-	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
-	* alter each database object directly, REPLACE attempts to rebuild each object
-	* from scratch, BEST attempts to determine the best upgrade method for each
-	* object, and NONE disables upgrading.
-	*
-	* This method is not yet used by AXMLS, but exists for backward compatibility.
-	* The ALTER method is automatically assumed when the adoSchema object is
-	* instantiated; other upgrade methods are not currently supported.
-	*
-	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
-	* @returns string Upgrade method used
-	*/
-	function SetUpgradeMethod( $method = '' ) {
-		if( !is_string( $method ) ) {
-			return FALSE;
-		}
-		
-		$method = strtoupper( $method );
-		
-		// Handle the upgrade methods
-		switch( $method ) {
-			case 'ALTER':
-				$this->upgrade = $method;
-				break;
-			case 'REPLACE':
-				$this->upgrade = $method;
-				break;
-			case 'BEST':
-				$this->upgrade = 'ALTER';
-				break;
-			case 'NONE':
-				$this->upgrade = 'NONE';
-				break;
-			default:
-				// Use default if no legitimate method is passed.
-				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
-		}
-		
-		return $this->upgrade;
-	}
-	
-	/**
-	* Enables/disables inline SQL execution.
-	*
-	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
-	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
-	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
-	* to apply the schema to the database.
-	*
-	* @param bool $mode execute
-	* @return bool current execution mode
-	*
-	* @see ParseSchema(), ExecuteSchema()
-	*/
-	function ExecuteInline( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->executeInline = $mode;
-		}
-		
-		return $this->executeInline;
-	}
-	
-	/**
-	* Enables/disables SQL continue on error.
-	*
-	* Call this method to enable or disable continuation of SQL execution if an error occurs.
-	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
-	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
-	* of the schema will continue.
-	*
-	* @param bool $mode execute
-	* @return bool current continueOnError mode
-	*
-	* @see addSQL(), ExecuteSchema()
-	*/
-	function ContinueOnError( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->continueOnError = $mode;
-		}
-		
-		return $this->continueOnError;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database described. 
-	* @see ParseSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function ParseSchema( $filename, $returnSchema = FALSE ) {
-		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
-	* and generate the SQL necessary to create the database described by the schema.
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*
-	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
-	* @see ParseSchema(), ParseSchemaString()
-	*/
-	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
-			return FALSE;
-		}
-		
-		if ( $returnSchema )
-		{
-			$xmlstring = '';
-			while( $data = fread( $fp, 100000 ) ) {
-				$xmlstring .= $data;
-			}
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
-				die( sprintf(
-					"XML error: %s at line %d",
-					xml_error_string( xml_get_error_code( $xmlParser) ),
-					xml_get_current_line_number( $xmlParser)
-				) );
-			}
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Converts an XML schema string to SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
-	* @see ParseSchema()
-	*
-	* @param string $xmlstring XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
-			return FALSE;
-		}
-		
-		if ( $returnSchema )
-		{
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
-			die( sprintf(
-				"XML error: %s at line %d",
-				xml_error_string( xml_get_error_code( $xmlParser) ),
-				xml_get_current_line_number( $xmlParser)
-			) );
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to uninstallation SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to remove the database described.
-	* @see RemoveSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function RemoveSchema( $filename, $returnSchema = FALSE ) {
-		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Converts an XML schema string to uninstallation SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
-	* @see RemoveSchema()
-	*
-	* @param string $schema XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
-	}
-	
-	/**
-	* Applies the current XML schema to the database (post execution).
-	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
-	* and executing other SQL specified in the schema) after parsing.
-	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
-	*
-	* @param array $sqlArray Array of SQL statements that will be applied rather than
-	*		the current schema.
-	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
-	* @returns integer 0 if failure, 1 if errors, 2 if successful.
-	*/
-	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
-		if( !is_bool( $continueOnErr ) ) {
-			$continueOnErr = $this->ContinueOnError();
-		}
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			$this->success = 0;
-		} else {
-			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
-		}
-		
-		return $this->success;
-	}
-	
-	/**
-	* Returns the current SQL array. 
-	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
-	*
-	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
-	* @return array Array of SQL statements or FALSE if an error occurs
-	*/
-	function PrintSQL( $format = 'NONE' ) {
-		$sqlArray = null;
-		return $this->getSQL( $format, $sqlArray );
-	}
-	
-	/**
-	* Saves the current SQL array to the local filesystem as a list of SQL queries.
-	*
-	* Call this method to save the array of SQL queries (generally resulting from a
-	* parsed XML schema) to the filesystem.
-	*
-	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
-	*/
-	function SaveSQL( $filename = './schema.sql' ) {
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		if( !isset( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		$fp = fopen( $filename, "w" );
-		
-		foreach( $sqlArray as $key => $query ) {
-			fwrite( $fp, $query . ";\n" );
-		}
-		fclose( $fp );
-	}
-	
-	/**
-	* Create an xml parser
-	*
-	* @return object PHP XML parser object
-	*
-	* @access private
-	*/
-	function &create_parser() {
-		// Create the parser
-		$xmlParser = xml_parser_create();
-		xml_set_object( $xmlParser, $this );
-		
-		// Initialize the XML callback functions
-		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
-		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
-		return $xmlParser;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->obj = new dbTable( $this, $attributes );
-				xml_set_object( $parser, $this->obj );
-				break;
-			case 'SQL':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->obj = new dbQuerySet( $this, $attributes );
-					xml_set_object( $parser, $this->obj );
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	* @internal
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	/**
-	* Converts an XML schema string to the specified DTD version.
-	*
-	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaFile()
-	*
-	* @param string $schema String containing XML schema that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = $schema;
-		} else {
-			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	// compat for pre-4.3 - jlim
-	function _file_get_contents($path)
-	{
-		if (function_exists('file_get_contents')) return file_get_contents($path);
-		return join('',file($path));
-	}
-	
-	/**
-	* Converts an XML schema file to the specified DTD version.
-	*
-	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaString()
-	*
-	* @param string $filename Name of XML schema file that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = _file_get_contents( $filename );
-			
-			// remove unicode BOM if present
-			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
-				$result = substr( $result, 3 );
-			}
-		} else {
-			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	function TransformSchema( $schema, $xsl, $schematype='string' )
-	{
-		// Fail if XSLT extension is not available
-		if( ! function_exists( 'xslt_create' ) ) {
-			return FALSE;
-		}
-		
-		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
-		// look for xsl
-		if( !is_readable( $xsl_file ) ) {
-			return FALSE;
-		}
-		
-		switch( $schematype )
-		{
-			case 'file':
-				if( !is_readable( $schema ) ) {
-					return FALSE;
-				}
-				
-				$schema = _file_get_contents( $schema );
-				break;
-			case 'string':
-			default:
-				if( !is_string( $schema ) ) {
-					return FALSE;
-				}
-		}
-		
-		$arguments = array (
-			'/_xml' => $schema,
-			'/_xsl' => _file_get_contents( $xsl_file )
-		);
-		
-		// create an XSLT processor
-		$xh = xslt_create ();
-		
-		// set error handler
-		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
-		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
-		xslt_free ($xh);
-		
-		return $result;
-	}
-	
-	/**
-	* Processes XSLT transformation errors
-	*
-	* @param object $parser XML parser object
-	* @param integer $errno Error number
-	* @param integer $level Error level
-	* @param array $fields Error information fields
-	*
-	* @access private
-	*/
-	function xslt_error_handler( $parser, $errno, $level, $fields ) {
-		if( is_array( $fields ) ) {
-			$msg = array(
-				'Message Type' => ucfirst( $fields['msgtype'] ),
-				'Message Code' => $fields['code'],
-				'Message' => $fields['msg'],
-				'Error Number' => $errno,
-				'Level' => $level
-			);
-			
-			switch( $fields['URI'] ) {
-				case 'arg:/_xml':
-					$msg['Input'] = 'XML';
-					break;
-				case 'arg:/_xsl':
-					$msg['Input'] = 'XSL';
-					break;
-				default:
-					$msg['Input'] = $fields['URI'];
-			}
-			
-			$msg['Line'] = $fields['line'];
-		} else {
-			$msg = array(
-				'Message Type' => 'Error',
-				'Error Number' => $errno,
-				'Level' => $level,
-				'Fields' => var_export( $fields, TRUE )
-			);
-		}
-		
-		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
-					   . '<table>' . "\n";
-		
-		foreach( $msg as $label => $details ) {
-			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
-		}
-		
-		$error_details .= '</table>';
-		
-		trigger_error( $error_details, E_USER_ERROR );
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the requested XML schema file.
-	*
-	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
-	* @see SchemaStringVersion()
-	*
-	* @param string $filename AXMLS schema file
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaFileVersion( $filename ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( preg_match( $this->versionRegex, $data, $matches ) ) {
-				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-			}
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the provided XML schema string.
-	*
-	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
-	* @see SchemaFileVersion()
-	*
-	* @param string $xmlstring XML schema string
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaStringVersion( $xmlstring ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
-			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Extracts an XML schema from an existing database.
-	*
-	* Call this method to create an XML schema string from an existing database.
-	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
-	*
-	* @param boolean $data Include data in schema dump
-	* @return string Generated XML schema
-	*/
-	function ExtractSchema( $data = FALSE ) {
-		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
-		$schema = '<?xml version="1.0"?>' . "\n"
-				. '<schema version="' . $this->schemaVersion . '">' . "\n";
-		
-		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
-			foreach( $tables as $table ) {
-				$schema .= '	<table name="' . $table . '">' . "\n";
-				
-				// grab details from database
-				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
-				$fields = $this->db->MetaColumns( $table );
-				$indexes = $this->db->MetaIndexes( $table );
-				
-				if( is_array( $fields ) ) {
-					foreach( $fields as $details ) {
-						$extra = '';
-						$content = array();
-						
-						if( $details->max_length > 0 ) {
-							$extra .= ' size="' . $details->max_length . '"';
-						}
-						
-						if( $details->primary_key ) {
-							$content[] = '<KEY/>';
-						} elseif( $details->not_null ) {
-							$content[] = '<NOTNULL/>';
-						}
-						
-						if( $details->has_default ) {
-							$content[] = '<DEFAULT value="' . $details->default_value . '"/>';
-						}
-						
-						if( $details->auto_increment ) {
-							$content[] = '<AUTOINCREMENT/>';
-						}
-						
-						// this stops the creation of 'R' columns,
-						// AUTOINCREMENT is used to create auto columns
-						$details->primary_key = 0;
-						$type = $rs->MetaType( $details );
-						
-						$schema .= '		<field name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
-						
-						if( !empty( $content ) ) {
-							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
-						}
-						
-						$schema .= '</field>' . "\n";
-					}
-				}
-				
-				if( is_array( $indexes ) ) {
-					foreach( $indexes as $index => $details ) {
-						$schema .= '		<index name="' . $index . '">' . "\n";
-						
-						if( $details['unique'] ) {
-							$schema .= '			<UNIQUE/>' . "\n";
-						}
-						
-						foreach( $details['columns'] as $column ) {
-							$schema .= '			<col>' . $column . '</col>' . "\n";
-						}
-						
-						$schema .= '		</index>' . "\n";
-					}
-				}
-				
-				if( $data ) {
-					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
-					if( is_object( $rs ) ) {
-						$schema .= '		<data>' . "\n";
-						
-						while( $row = $rs->FetchRow() ) {
-							foreach( $row as $key => $val ) {
-								$row[$key] = htmlentities($val);
-							}
-							
-							$schema .= '			<row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
-						}
-						
-						$schema .= '		</data>' . "\n";
-					}
-				}
-				
-				$schema .= '	</table>' . "\n";
-			}
-		}
-		
-		$this->db->SetFetchMode( $old_mode );
-		
-		$schema .= '</schema>';
-		return $schema;
-	}
-	
-	/**
-	* Sets a prefix for database objects
-	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
-	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
-	*
-	* @param string $prefix Prefix that will be prepended.
-	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
-	* @return boolean TRUE if successful, else FALSE
-	*/
-	function SetPrefix( $prefix = '', $underscore = TRUE ) {
-		switch( TRUE ) {
-			// clear prefix
-			case empty( $prefix ):
-				logMsg( 'Cleared prefix' );
-				$this->objectPrefix = '';
-				return TRUE;
-			// prefix too long
-			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
-			// prefix contains invalid characters
-			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
-				logMsg( 'Invalid prefix: ' . $prefix );
-				return FALSE;
-		}
-		
-		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
-			$prefix .= '_';
-		}
-		
-		// prefix valid
-		logMsg( 'Set prefix: ' . $prefix );
-		$this->objectPrefix = $prefix;
-		return TRUE;
-	}
-	
-	/**
-	* Returns an object name with the current prefix prepended.
-	*
-	* @param string	$name Name
-	* @return string	Prefixed name
-	*
-	* @access private
-	*/
-	function prefix( $name = '' ) {
-		// if prefix is set
-		if( !empty( $this->objectPrefix ) ) {
-			// Prepend the object prefix to the table name
-			// prepend after quote if used
-			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
-		}
-		
-		// No prefix set. Use name provided.
-		return $name;
-	}
-	
-	/**
-	* Checks if element references a specific platform
-	*
-	* @param string $platform Requested platform
-	* @returns boolean TRUE if platform check succeeds
-	*
-	* @access private
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
-		
-		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
-			logMsg( "Platform $platform is supported" );
-			return TRUE;
-		} else {
-			logMsg( "Platform $platform is NOT supported" );
-			return FALSE;
-		}
-	}
-	
-	/**
-	* Clears the array of generated SQL.
-	*
-	* @access private
-	*/
-	function clearSQL() {
-		$this->sqlArray = array();
-	}
-	
-	/**
-	* Adds SQL into the SQL array.
-	*
-	* @param mixed $sql SQL to Add
-	* @return boolean TRUE if successful, else FALSE.
-	*
-	* @access private
-	*/	
-	function addSQL( $sql = NULL ) {
-		if( is_array( $sql ) ) {
-			foreach( $sql as $line ) {
-				$this->addSQL( $line );
-			}
-			
-			return TRUE;
-		}
-		
-		if( is_string( $sql ) ) {
-			$this->sqlArray[] = $sql;
-			
-			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
-			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
-				$saved = $this->db->debug;
-				$this->db->debug = $this->debug;
-				$ok = $this->db->Execute( $sql );
-				$this->db->debug = $saved;
-				
-				if( !$ok ) {
-					if( $this->debug ) {
-						ADOConnection::outp( $this->db->ErrorMsg() );
-					}
-					
-					$this->success = 1;
-				}
-			}
-			
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Gets the SQL array in the specified format.
-	*
-	* @param string $format Format
-	* @return mixed SQL
-	*	
-	* @access private
-	*/
-	function getSQL( $format = NULL, $sqlArray = NULL ) {
-		if( !is_array( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		switch( strtolower( $format ) ) {
-			case 'string':
-			case 'text':
-				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
-			case'html':
-				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
-		}
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Destroys an adoSchema object.
-	*
-	* Call this method to clean up after an adoSchema object that is no longer in use.
-	* @deprecated adoSchema now cleans up automatically.
-	*/
-	function Destroy() {
-		set_magic_quotes_runtime( $this->mgq );
-		unset( $this );
-	}
-}
-
-/**
-* Message logging function
-*
-* @access private
-*/
-function logMsg( $msg, $title = NULL, $force = FALSE ) {
-	if( XMLS_DEBUG or $force ) {
-		echo '<pre>';
-		
-		if( isset( $title ) ) {
-			echo '<h3>' . htmlentities( $title ) . '</h3>';
-		}
-		
-		if( is_object( $this ) ) {
-			echo '[' . get_class( $this ) . '] ';
-		}
-		
-		print_r( $msg );
-		
-		echo '</pre>';
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/pear/Auth/Container/ADOdb.php
===================================================================
--- admin/include/lib/adodb/pear/Auth/Container/ADOdb.php	(revision 6370)
+++ admin/include/lib/adodb/pear/Auth/Container/ADOdb.php	(working copy)
@@ -1,413 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// |                                                                      |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Martin Jansen <mj@php.net>
-// |	Richard Tango-Lowy <richtl@arscognita.com>                                  |
-// +----------------------------------------------------------------------+
-//
-// $Id: ADOdb.php,v 1.1 2007/07/09 12:58:15 liedekef Exp $
-//
-
-require_once 'Auth/Container.php';
-require_once 'adodb.inc.php';
-require_once 'adodb-pear.inc.php';
-require_once 'adodb-errorpear.inc.php';
-
-/**
- * Storage driver for fetching login data from a database using ADOdb-PHP.
- *
- * This storage driver can use all databases which are supported
- * by the ADBdb DB abstraction layer to fetch login data.
- * See http://php.weblogs.com/adodb for information on ADOdb.
- * NOTE: The ADOdb directory MUST be in your PHP include_path!
- *
- * @author   Richard Tango-Lowy <richtl@arscognita.com>
- * @package  Auth
- * @version  $Revision: 1.1 $
- */
-class Auth_Container_ADOdb extends Auth_Container
-{
-
-    /**
-     * Additional options for the storage container
-     * @var array
-     */
-    var $options = array();
-
-    /**
-     * DB object
-     * @var object
-     */
-    var $db = null;
-    var $dsn = '';
-	
-    /**
-     * User that is currently selected from the DB.
-     * @var string
-     */
-    var $activeUser = '';
-
-    // {{{ Constructor
-
-    /**
-     * Constructor of the container class
-     *
-     * Initate connection to the database via PEAR::ADOdb
-     *
-     * @param  string Connection data or DB object
-     * @return object Returns an error object if something went wrong
-     */
-    function Auth_Container_ADOdb($dsn)
-    {
-        $this->_setDefaults();
-		
-        if (is_array($dsn)) {
-            $this->_parseOptions($dsn);
-
-            if (empty($this->options['dsn'])) {
-                PEAR::raiseError('No connection parameters specified!');
-            }
-        } else {
-        	// Extract db_type from dsn string.
-            $this->options['dsn'] = $dsn;
-        }
-    }
-
-    // }}}
-    // {{{ _connect()
-
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @access private
-     * @param  string DSN string
-     * @return mixed  Object on error, otherwise bool
-     */
-     function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-        	if(!$this->db) {
-	        	$this->db = &ADONewConnection($dsn);
-	    		if( $err = ADODB_Pear_error() ) {
-	   	    		return PEAR::raiseError($err);
-	    		}
-        	}
-        	
-        } else {
-            return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
-                                    41,
-                                    PEAR_ERROR_RETURN,
-                                    null,
-                                    null
-                                    );
-        }
-        
-        if(!$this->db) {
-        	return PEAR::raiseError(ADODB_Pear_error());
-        } else {
-        	return true;
-        }
-    }
-
-    // }}}
-    // {{{ _prepare()
-
-    /**
-     * Prepare database connection
-     *
-     * This function checks if we have already opened a connection to
-     * the database. If that's not the case, a new connection is opened.
-     *
-     * @access private
-     * @return mixed True or a DB error object.
-     */
-    function _prepare()
-    {
-    	if(!$this->db) {
-    		$res = $this->_connect($this->options['dsn']);  		
-    	}
-        return true;
-    }
-
-    // }}}
-    // {{{ query()
-
-    /**
-     * Prepare query to the database
-     *
-     * This function checks if we have already opened a connection to
-     * the database. If that's not the case, a new connection is opened.
-     * After that the query is passed to the database.
-     *
-     * @access public
-     * @param  string Query string
-     * @return mixed  a DB_result object or DB_OK on success, a DB
-     *                or PEAR error on failure
-     */
-    function query($query)
-    {
-        $err = $this->_prepare();
-        if ($err !== true) {
-            return $err;
-        }
-        return $this->db->query($query);
-    }
-
-    // }}}
-    // {{{ _setDefaults()
-
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    function _setDefaults()
-    {
-    	$this->options['db_type']	= 'mysql';
-        $this->options['table']       = 'auth';
-        $this->options['usernamecol'] = 'username';
-        $this->options['passwordcol'] = 'password';
-        $this->options['dsn']         = '';
-        $this->options['db_fields']   = '';
-        $this->options['cryptType']   = 'md5';
-    }
-
-    // }}}
-    // {{{ _parseOptions()
-
-    /**
-     * Parse options passed to the container class
-     *
-     * @access private
-     * @param  array
-     */
-    function _parseOptions($array)
-    {
-        foreach ($array as $key => $value) {
-            if (isset($this->options[$key])) {
-                $this->options[$key] = $value;
-            }
-        }
-
-        /* Include additional fields if they exist */
-        if(!empty($this->options['db_fields'])){
-            if(is_array($this->options['db_fields'])){
-                $this->options['db_fields'] = join($this->options['db_fields'], ', ');
-            }
-            $this->options['db_fields'] = ', '.$this->options['db_fields'];
-        }
-    }
-
-    // }}}
-    // {{{ fetchData()
-
-    /**
-     * Get user information from database
-     *
-     * This function uses the given username to fetch
-     * the corresponding login data from the database
-     * table. If an account that matches the passed username
-     * and password is found, the function returns true.
-     * Otherwise it returns false.
-     *
-     * @param   string Username
-     * @param   string Password
-     * @return  mixed  Error object or boolean
-     */
-    function fetchData($username, $password)
-    {
-        // Prepare for a database query
-        $err = $this->_prepare();
-        if ($err !== true) {
-            return PEAR::raiseError($err->getMessage(), $err->getCode());
-        }
-
-        // Find if db_fields contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
-            $sql_from = "*";
-        }
-        else{
-            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
-        }
-        
-        $query = "SELECT ".$sql_from.
-                " FROM ".$this->options['table'].
-                " WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
-        
-        $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-        $rset = $this->db->Execute( $query );
-        $res = $rset->fetchRow();
-
-        if (DB::isError($res)) {
-            return PEAR::raiseError($res->getMessage(), $res->getCode());
-        }
-        if (!is_array($res)) {
-            $this->activeUser = '';
-            return false;
-        }
-        if ($this->verifyPassword(trim($password, "\r\n"),
-                                  trim($res[$this->options['passwordcol']], "\r\n"),
-                                  $this->options['cryptType'])) {
-            // Store additional field values in the session
-            foreach ($res as $key => $value) {
-                if ($key == $this->options['passwordcol'] ||
-                    $key == $this->options['usernamecol']) {
-                    continue;
-                }
-                // Use reference to the auth object if exists
-                // This is because the auth session variable can change so a static call to setAuthData does not make sence
-                if(is_object($this->_auth_obj)){
-                    $this->_auth_obj->setAuthData($key, $value);
-                } else {
-                    Auth::setAuthData($key, $value);
-                }
-            }
-
-            return true;
-        }
-
-        $this->activeUser = $res[$this->options['usernamecol']];
-        return false;
-    }
-
-    // }}}
-    // {{{ listUsers()
-
-    function listUsers()
-    {
-        $err = $this->_prepare();
-        if ($err !== true) {
-            return PEAR::raiseError($err->getMessage(), $err->getCode());
-        }
-
-        $retVal = array();
-
-        // Find if db_fileds contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
-            $sql_from = "*";
-        }
-        else{
-            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
-        }
-
-        $query = sprintf("SELECT %s FROM %s",
-                         $sql_from,
-                         $this->options['table']
-                         );
-        $res = $this->db->getAll($query, null, DB_FETCHMODE_ASSOC);
-
-        if (DB::isError($res)) {
-            return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-            foreach ($res as $user) {
-                $user['username'] = $user[$this->options['usernamecol']];
-                $retVal[] = $user;
-            }
-        }
-        return $retVal;
-    }
-
-    // }}}
-    // {{{ addUser()
-
-    /**
-     * Add user to the storage container
-     *
-     * @access public
-     * @param  string Username
-     * @param  string Password
-     * @param  mixed  Additional information that are stored in the DB
-     *
-     * @return mixed True on success, otherwise error object
-     */
-    function addUser($username, $password, $additional = "")
-    {
-        if (function_exists($this->options['cryptType'])) {
-            $cryptFunction = $this->options['cryptType'];
-        } else {
-            $cryptFunction = 'md5';
-        }
-
-        $additional_key   = '';
-        $additional_value = '';
-
-        if (is_array($additional)) {
-            foreach ($additional as $key => $value) {
-                $additional_key .= ', ' . $key;
-                $additional_value .= ", '" . $value . "'";
-            }
-        }
-
-        $query = sprintf("INSERT INTO %s (%s, %s%s) VALUES ('%s', '%s'%s)",
-                         $this->options['table'],
-                         $this->options['usernamecol'],
-                         $this->options['passwordcol'],
-                         $additional_key,
-                         $username,
-                         $cryptFunction($password),
-                         $additional_value
-                         );
-
-        $res = $this->query($query);
-
-        if (DB::isError($res)) {
-           return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-          return true;
-        }
-    }
-
-    // }}}
-    // {{{ removeUser()
-
-    /**
-     * Remove user from the storage container
-     *
-     * @access public
-     * @param  string Username
-     *
-     * @return mixed True on success, otherwise error object
-     */
-    function removeUser($username)
-    {
-        $query = sprintf("DELETE FROM %s WHERE %s = '%s'",
-                         $this->options['table'],
-                         $this->options['usernamecol'],
-                         $username
-                         );
-
-        $res = $this->query($query);
-
-        if (DB::isError($res)) {
-           return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-          return true;
-        }
-    }
-
-    // }}}
-}
-
-function showDbg( $string ) {
-	print "
--- $string</P>";
-}
-function dump( $var, $str, $vardump = false ) {
-	print "<H4>$str</H4><pre>";
-	( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var ));
-	print "</pre>";
-}
-?>
Index: admin/include/lib/adodb/pear/readme.Auth.txt
===================================================================
--- admin/include/lib/adodb/pear/readme.Auth.txt	(revision 6370)
+++ admin/include/lib/adodb/pear/readme.Auth.txt	(working copy)
@@ -1,20 +0,0 @@
-From: Rich Tango-Lowy (richtl#arscognita.com)
-Date: Sat, May 29, 2004 11:20 am
-
-OK, I hacked out an ADOdb container for PEAR-Auth. The error handling's 
-a bit of a mess, but all the methods work.
-
-Copy ADOdb.php to your pear/Auth/Container/ directory.
-
-Use the ADOdb container exactly as you would the DB
-container, but specify 'ADOdb' instead of 'DB':
-
-$dsn = "mysql://myuser:mypass@localhost/authdb";
-$a = new Auth("ADOdb", $dsn, "loginFunction");
-
-
--------------------
-
-John Lim adds:
-
-See http://pear.php.net/manual/en/package.authentication.php
Index: admin/include/lib/adodb/adodb-csvlib.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-csvlib.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-csvlib.inc.php	(working copy)
@@ -1,312 +0,0 @@
-<?php
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-global $ADODB_INCLUDED_CSV;
-$ADODB_INCLUDED_CSV = 1;
-
-/* 
-
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for CSV serialization. This is used by the csv/proxy driver and is the 
-  CacheExecute() serialization format. 
-  
-  ==== NOTE ====
-  Format documented at http://php.weblogs.com/ADODB_CSV
-  ==============
-*/
-
-	/**
- 	 * convert a recordset into special format
-	 *
-	 * @param rs	the recordset
-	 *
-	 * @return	the CSV formated data
-	 */
-	function _rs2serialize(&$rs,$conn=false,$sql='')
-	{
-		$max = ($rs) ? $rs->FieldCount() : 0;
-		
-		if ($sql) $sql = urlencode($sql);
-		// metadata setup
-		
-		if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete
-			if (is_object($conn)) {
-				$sql .= ','.$conn->Affected_Rows();
-				$sql .= ','.$conn->Insert_ID();
-			} else
-				$sql .= ',,';
-			
-			$text = "====-1,0,$sql\n";
-			return $text;
-		}
-		$tt = ($rs->timeCreated) ? $rs->timeCreated : time();
-		
-		## changed format from ====0 to ====1
-		$line = "====1,$tt,$sql\n";
-		
-		if ($rs->databaseType == 'array') {
-			$rows =& $rs->_array;
-		} else {
-			$rows = array();
-			while (!$rs->EOF) {	
-				$rows[] = $rs->fields;
-				$rs->MoveNext();
-			} 
-		}
-		
-		for($i=0; $i < $max; $i++) {
-			$o =& $rs->FetchField($i);
-			$flds[] = $o;
-		}
-	
-		$savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
-		$class = $rs->connection->arrayClass;
-		$rs2 = new $class();
-		$rs2->sql = $rs->sql;
-		$rs2->oldProvider = $rs->dataProvider; 
-		$rs2->InitArrayFields($rows,$flds);
-		$rs2->fetchMode = $savefetch;
-		return $line.serialize($rs2);
-	}
-
-	
-/**
-* Open CSV file and convert it into Data. 
-*
-* @param url  		file/ftp/http url
-* @param err		returns the error message
-* @param timeout	dispose if recordset has been alive for $timeout secs
-*
-* @return		recordset, or false if error occured. If no
-*			error occurred in sql INSERT/UPDATE/DELETE, 
-*			empty recordset is returned
-*/
-	function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')
-	{
-		$false = false;
-		$err = false;
-		$fp = @fopen($url,'rb');
-		if (!$fp) {
-			$err = $url.' file/URL not found';
-			return $false;
-		}
-		@flock($fp, LOCK_SH);
-		$arr = array();
-		$ttl = 0;
-		
-		if ($meta = fgetcsv($fp, 32000, ",")) {
-			// check if error message
-			if (strncmp($meta[0],'****',4) === 0) {
-				$err = trim(substr($meta[0],4,1024));
-				fclose($fp);
-				return $false;
-			}
-			// check for meta data
-			// $meta[0] is -1 means return an empty recordset
-			// $meta[1] contains a time 
-	
-			if (strncmp($meta[0], '====',4) === 0) {
-			
-				if ($meta[0] == "====-1") {
-					if (sizeof($meta) < 5) {
-						$err = "Corrupt first line for format -1";
-						fclose($fp);
-						return $false;
-					}
-					fclose($fp);
-					
-					if ($timeout > 0) {
-						$err = " Illegal Timeout $timeout ";
-						return $false;
-					}
-					
-					$rs = new $rsclass($val=true);
-					$rs->fields = array();
-					$rs->timeCreated = $meta[1];
-					$rs->EOF = true;
-					$rs->_numOfFields = 0;
-					$rs->sql = urldecode($meta[2]);
-					$rs->affectedrows = (integer)$meta[3];
-					$rs->insertid = $meta[4];	
-					return $rs;
-				} 
-			# Under high volume loads, we want only 1 thread/process to _write_file
-			# so that we don't have 50 processes queueing to write the same data.
-			# We use probabilistic timeout, ahead of time.
-			#
-			# -4 sec before timeout, give processes 1/32 chance of timing out
-			# -2 sec before timeout, give processes 1/16 chance of timing out
-			# -1 sec after timeout give processes 1/4 chance of timing out
-			# +0 sec after timeout, give processes 100% chance of timing out
-				if (sizeof($meta) > 1) {
-					if($timeout >0){ 
-						$tdiff = (integer)( $meta[1]+$timeout - time());
-						if ($tdiff <= 2) {
-							switch($tdiff) {
-							case 4:
-							case 3:
-								if ((rand() & 31) == 0) {
-									fclose($fp);
-									$err = "Timeout 3";
-									return $false;
-								}
-								break;
-							case 2: 
-								if ((rand() & 15) == 0) {
-									fclose($fp);
-									$err = "Timeout 2";
-									return $false;
-								}
-								break;
-							case 1:
-								if ((rand() & 3) == 0) {
-									fclose($fp);
-									$err = "Timeout 1";
-									return $false;
-								}
-								break;
-							default: 
-								fclose($fp);
-								$err = "Timeout 0";
-								return $false;
-							} // switch
-							
-						} // if check flush cache
-					}// (timeout>0)
-					$ttl = $meta[1];
-				}
-				//================================================
-				// new cache format - use serialize extensively...
-				if ($meta[0] === '====1') {
-					// slurp in the data
-					$MAXSIZE = 128000;
-					
-					$text = fread($fp,$MAXSIZE);
-					if (strlen($text)) {
-						while ($txt = fread($fp,$MAXSIZE)) {
-							$text .= $txt;
-						}
-					}
-					fclose($fp);
-					$rs = unserialize($text);
-					if (is_object($rs)) $rs->timeCreated = $ttl;
-					else {
-						$err = "Unable to unserialize recordset";
-						//echo htmlspecialchars($text),' !--END--!<p>';
-					}
-					return $rs;
-				}
-				
-				$meta = false;
-				$meta = fgetcsv($fp, 32000, ",");
-				if (!$meta) {
-					fclose($fp);
-					$err = "Unexpected EOF 1";
-					return $false;
-				}
-			}
-
-			// Get Column definitions
-			$flds = array();
-			foreach($meta as $o) {
-				$o2 = explode(':',$o);
-				if (sizeof($o2)!=3) {
-					$arr[] = $meta;
-					$flds = false;
-					break;
-				}
-				$fld = new ADOFieldObject();
-				$fld->name = urldecode($o2[0]);
-				$fld->type = $o2[1];
-				$fld->max_length = $o2[2];
-				$flds[] = $fld;
-			}
-		} else {
-			fclose($fp);
-			$err = "Recordset had unexpected EOF 2";
-			return $false;
-		}
-		
-		// slurp in the data
-		$MAXSIZE = 128000;
-		
-		$text = '';
-		while ($txt = fread($fp,$MAXSIZE)) {
-			$text .= $txt;
-		}
-			
-		fclose($fp);
-		@$arr = unserialize($text);
-		//var_dump($arr);
-		if (!is_array($arr)) {
-			$err = "Recordset had unexpected EOF (in serialized recordset)";
-			if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!";
-			return $false;
-		}
-		$rs = new $rsclass();
-		$rs->timeCreated = $ttl;
-		$rs->InitArrayFields($arr,$flds);
-		return $rs;
-	}
-	
-
-	/**
-	* Save a file $filename and its $contents (normally for caching) with file locking
-	*/
-	function adodb_write_file($filename, $contents,$debug=false)
-	{ 
-	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
-	# So to simulate locking, we assume that rename is an atomic operation.
-	# First we delete $filename, then we create a $tempfile write to it and 
-	# rename to the desired $filename. If the rename works, then we successfully 
-	# modified the file exclusively.
-	# What a stupid need - having to simulate locking.
-	# Risks:
-	# 1. $tempfile name is not unique -- very very low
-	# 2. unlink($filename) fails -- ok, rename will fail
-	# 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs
-	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated
-		if (strncmp(PHP_OS,'WIN',3) === 0) {
-			// skip the decimal place
-			$mtime = substr(str_replace(' ','_',microtime()),2); 
-			// getmypid() actually returns 0 on Win98 - never mind!
-			$tmpname = $filename.uniqid($mtime).getmypid();
-			if (!($fd = @fopen($tmpname,'a'))) return false;
-			$ok = ftruncate($fd,0);			
-			if (!fwrite($fd,$contents)) $ok = false;
-			fclose($fd);
-			chmod($tmpname,0644);
-			// the tricky moment
-			@unlink($filename);
-			if (!@rename($tmpname,$filename)) {
-				unlink($tmpname);
-				$ok = false;
-			}
-			if (!$ok) {
-				if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
-			}
-			return $ok;
-		}
-		if (!($fd = @fopen($filename, 'a'))) return false;
-		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
-			$ok = fwrite( $fd, $contents );
-			fclose($fd);
-			chmod($filename,0644);
-		}else {
-			fclose($fd);
-			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");
-			$ok = false;
-		}
-	
-		return $ok;
-	}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/docs/docs-session.htm
===================================================================
--- admin/include/lib/adodb/docs/docs-session.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/docs-session.htm	(working copy)
@@ -1,336 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>ADODB Session Management Manual</title>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-  <style type="text/css">
-body, td {
-/*font-family: Arial, Helvetica, sans-serif;*/
-font-size: 11pt;
-}
-pre {
-font-size: 9pt;
-background-color: #EEEEEE; padding: .5em; margin: 0px;
-}
-.toplink {
-font-size: 8pt;
-}
-  </style>
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<h1>ADODB Session 2 Management Manual</h1>
-<p>
-V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my)
-</p>
-<p> <font size="1">This software is dual licensed using BSD-Style and
-LGPL. This means you can use it in compiled proprietary and commercial
-products. </font>
-<p>Useful ADOdb links: <a href="http://adodb.sourceforge.net/#download">Download</a>
-&nbsp; <a href="http://adodb.sourceforge.net/#docs">Other Docs</a>
-</p>
-<h2>Introduction</h2>
-<p> This document discusses the newer session handler adodb-session2.php. If
-  you have used the older adodb-session.php, then be forewarned that you will
-  need to alter your session table format. Otherwise everything is <a href="#compat">backward
-  compatible</a>.
-  Here are the <a href="docs-session.old.htm">older
-    docs</a> for
-  adodb-session.php.</p>
-<h2>Why Session Variables in a Database? </h2>
-<p>We store state information specific to a user or web
-    client in session variables. These session variables persist throughout a
-session, as the user moves from page to page. </p>
-<p>To use session variables, call session_start() at the beginning of
-your web page, before your HTTP headers are sent. Then for every
-variable you want to keep alive for the duration of the session, call
-session_register($variable_name). By default, the session handler will
-keep track of the session by using a cookie. You can save objects or
-arrays in session variables also.
-</p>
-<p>The default method of storing sessions is to store it in a file.
-However if you have special needs such as you:
-</p>
-<ul>
-  <li>Have multiple web servers that need to share session info</li>
-  <li>Need to do special processing of each session</li>
-  <li>Require notification when a session expires</li>
-</ul>
-<p>The ADOdb session handler provides you with the above
-additional capabilities by storing the session information as records
-in a database table that can be shared across multiple servers. </p>
-<p>These records will be garbage collected based on the php.ini [session] timeout settings. 
-You can register a notification function to notify you when the record has expired and 
-is about to be freed by the garbage collector.</p>
-<p>An alternative to using a database backed session handler is to use <a href="http://www.danga.com/memcached/">memcached</a>.
-  This is a distributed memory based caching system suitable for storing session
-  information.
-  </p>
-<h2> The Improved Session Handler</h2>
-<p>In ADOdb 4.91, we added a new session handler, in adodb-session2.php.
-It features the following improvements:
-<ul>
-<li>Fully supports server farms using a new database table format. The
-  previous version used the web server time for timestamps, which can cause problems
-  on a system with multiple web servers with possibly inconsistent
-  times. The new version uses the database server time instead for all timestamps.
-<li>The older database table format is obsolete. The database table must be modified
-  to support storage of the database server time mentioned above. Also the field
-  named DATA has been changed to SESSDATA. In some databases, DATA is a reserved
-  word.
-<li>The functions dataFieldName() and syncSeconds() is obsolete.
-</ul>
-
-<p>Usage is 
-
-<pre>
-include_once("adodb/session/adodb-session2.php");
-ADOdb_Session::config($driver, $host, $user, $password, $database,$options=false);
-session_start();
-
-<font
- color="#004040">#<br># Test session vars, the following should increment on refresh<br>#<br>$_SESSION['AVAR'] += 1;<br>print "&lt;p&gt;\$_SESSION['AVAR']={$_SESSION['AVAR']}&lt;/p&gt;";</font>
-</pre>
-
-<p>When the session is created in session_start( ), the global variable $<b>ADODB_SESS_CONN</b> holds
-the connection object.
-<p>The default name of the table is sessions2. If you want to override it:
-  
-<pre>
-include_once("adodb/session/adodb-session2.php");
-$options['table'] = 'mytablename';
-ADOdb_Session::config($driver, $host, $user, $password, $database,$options);
-session_start();
-</pre>
-
-
-<h3>ADOdb Session Handler Features</h3>
-<ul>
-  <li>Ability to define a notification function that is called when a
-session expires. Typically
-used to detect session logout and release global resources. </li>
-  <li>Optimization of database writes. We crc32 the session data and
-only perform an update
-to the session data if there is a data change. </li>
-  <li>Support for large amounts of session data with CLOBs (see
-adodb-session-clob2.php). Useful
-for Oracle. </li>
-  <li>Support for encrypted session data, see
-adodb-cryptsession2.php. Enabling encryption is simply a matter of
-including adodb-cryptsession2.php instead of adodb-session2.php. </li>
-</ul>
-<h3>Session Handler Files </h3>
-<p>There are 3 session management files that you can use:
-</p>
-<pre>adodb-session2.php        : The default<br>adodb-cryptsession2.php   : Use this if you want to store encrypted session data in the database<br>adodb-session-clob2.php   : Use this if you are storing DATA in clobs and you are NOT using oci8 driver</pre>
-<h2><strong>Usage Examples</strong></h2>
-<p>To force non-persistent connections, call <font color="#004040"><b>Persist</b></font>() first before session_start():
-
- 
-<pre>
- <font color="#004040">
-include_once("adodb/session/adodb-session2.php");
-$driver = 'mysql'; $host = 'localhost'; $user = 'auser'; $pwd = 'secret'; $database = 'sessiondb';
-ADOdb_Session::config($driver, $host, $user, $password, $database,$options=false);<b><br>ADOdb_session::Persist($connectMode=false);</b>
-session_start();<br> </font>
-</pre>
-<p> The parameter to the Persist( ) method sets the connection mode. You can
-  pass the following:</p>
-<table width="50%" border="1">
-  <tr>
-    <td><b>$connectMode</b></td>
-    <td><b>Connection Method</b></td>
-  </tr>
-  <tr>
-    <td>true</td>
-    <td><p>PConnect( )</p></td>
-  </tr>
-  <tr>
-    <td>false</td>
-    <td>Connect( )</td>
-  </tr>
-  <tr>
-    <td>'N'</td>
-    <td>NConnect( )</td>
-  </tr>
-  <tr>
-    <td>'P'</td>
-    <td>PConnect( )</td>
-  </tr>
-  <tr>
-    <td>'C'</td>
-    <td>Connect( )</td>
-  </tr>
-</table>
-<p>To use a encrypted sessions, simply replace the file adodb-session2.php:</p>
- <pre> <font
- color="#004040"><b><br>include('adodb/session/adodb-cryptsession2.php');</b><br>$driver = 'mysql'; $host = 'localhost'; $user = 'auser'; $pwd = 'secret'; $database = 'sessiondb';
-ADOdb_Session::config($driver, $host, $user, $password, $database,$options=false);<b><br>adodb_sess_open(false,false,$connectMode=false);</b>
-session_start();<br></font></pre>
- <p>And the same technique for adodb-session-clob2.php:</p>
- <pre>  <font
- color="#004040"><br><b>include('adodb/session/adodb-session2-clob2.php');</b><br>$driver = 'oci8'; $host = 'localhost'; $user = 'auser'; $pwd = 'secret'; $database = 'sessiondb';
-ADOdb_Session::config($driver, $host, $user, $password, $database,$options=false);<b><br>adodb_sess_open(false,false,$connectMode=false);</b>
-session_start();</font></pre>
- <h2>Installation</h2>
-<p>1. Create this table in your database. Here is the MySQL version:
-<pre> <a
- name="sessiontab"></a> <font color="#004040">
-CREATE TABLE sessions2(
-	  sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
-  	  expiry DATETIME NOT NULL ,
-	  expireref VARCHAR( 250 ) DEFAULT '',
-	  created DATETIME NOT NULL ,
-	  modified DATETIME NOT NULL ,
-	  sessdata LONGTEXT DEFAULT '',
-	  PRIMARY KEY ( sesskey ) ,
-	  INDEX sess2_expiry( expiry ),
-	  INDEX sess2_expireref( expireref )
-)</font></pre>
-
- <p> For PostgreSQL, use:
- <pre>CREATE TABLE sessions2(
- sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
- expiry TIMESTAMP NOT NULL ,
- expireref VARCHAR( 250 ) DEFAULT '',
- created TIMESTAMP NOT NULL ,
- modified TIMESTAMP NOT NULL ,
- sessdata TEXT DEFAULT '',
- PRIMARY KEY ( sesskey )
- );
-</pre>
- <pre>create INDEX sess2_expiry on sessions2( expiry );
-create INDEX sess2_expireref on sessions2 ( expireref );</pre>
- <p>Here is the Oracle definition, which uses a CLOB for the SESSDATA field:
- <pre>
-  <font
- color="#004040">CREATE TABLE SESSIONS2<br>(<br>   SESSKEY    VARCHAR2(48 BYTE)                  NOT NULL,<br>   EXPIRY     DATE                               NOT NULL,<br>   EXPIREREF  VARCHAR2(200 BYTE),<br>   CREATED    DATE                               NOT NULL,<br>   MODIFIED   DATE                               NOT NULL,<br>   SESSDATA   CLOB,<br>  PRIMARY KEY(SESSKEY)<br>);
-<br>CREATE INDEX SESS2_EXPIRY ON SESSIONS2(EXPIRY);
-CREATE INDEX SESS2_EXPIREREF ON SESSIONS2(EXPIREREF);</font></pre>
-<p> We need to use a CLOB here because for text greater than 4000 bytes long,
-  Oracle requires you to use the CLOB data type. If you are using the oci8 driver,
-  ADOdb will automatically enable CLOB handling. So you can use either adodb-session2.php
-  or adodb-session-clob2.php - in this case it doesn't matter. <br>    
-<h2>Notifications</h2>
-<p>You can receive notification when your session is cleaned up by the session garbage collector or
-when you call session_destroy().
-<p>PHP's session extension will automatically run a special garbage collection function based on
-your php.ini session.cookie_lifetime and session.gc_probability settings. This will in turn call
-adodb's garbage collection function, which can be setup to do notification.
-<p>
-<pre>
-	PHP Session --> ADOdb Session  --> Find all recs  --> Send          --> Delete queued
-	GC Function     GC Function        to be deleted      notification      records
-	executed at     called by                             for all recs
-	random time     Session Extension                     queued for deletion
-</pre>
-<p>When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically 
-the userid of the session. Later when the session has expired,  just before the record is deleted,
-we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which 
-is the userid of the person being logged off.
-<p>ADOdb uses a global variable $ADODB_SESSION_EXPIRE_NOTIFY that you must predefine before session
-start to store the notification configuration. 
-$ADODB_SESSION_EXPIRE_NOTIFY is an array with 2 elements, the
-first being the name of the session variable you would like to store in
-the EXPIREREF field, and the 2nd is the notification function's name. </p>
-<p>For example, suppose we want to be notified when a user's session has expired,
-based on the userid. When the user logs in, we store the id in the global session variable
-$USERID. The function name is 'NotifyFn'. 
-<p>
-So we define (before session_start() is called): </p>
-<pre> <font color="#004040">
-	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-</font></pre>
-And when the NotifyFn is called (when the session expires), the
-$USERID is passed in as the first parameter, eg. NotifyFn($userid, $sesskey). The
-session key (which is the primary key of the record in the sessions
-table) is the 2nd parameter.
-<p> Here is an example of a Notification function that deletes some
-records in the database and temporary files: </p>
-<pre><font color="#004040">
-	function NotifyFn($expireref, $sesskey)
-	{
-		global $ADODB_SESS_CONN; # the session connection object
-		$user = $ADODB_SESS_CONN-&gt;qstr($expireref);
-		
-		$ADODB_SESS_CONN-&gt;Execute("delete from shopping_cart where user=$user");          
-		system("rm /work/tmpfiles/$expireref/*");
-	}</font>  
-			  </pre>
-<p> NOTE 1: If you have register_globals disabled in php.ini, then you
-will have to manually set the EXPIREREF. E.g. </p>
-<pre> <font color="#004040">
-$GLOBALS['USERID'] = GetUserID();
-$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');</font>
-</pre>
-<p> NOTE 2: If you want to change the EXPIREREF after the session
-record has been created, you will need to modify any session variable
-to force a database record update.
-</p>
-<h3>Neat Notification Tricks</h3>
-<p><i>ExpireRef</i> normally holds the user id of the current session.
-</p>
-<p>1. You can then write a session monitor, scanning expireref to see
-who is currently logged on.
-</p>
-<p>2. If you delete the sessions record for a specific user, eg.
-</p>
-<pre>delete from sessions where expireref = '$USER'<br></pre>
-then the user is logged out. Useful for ejecting someone from a
-site.
-<p>3. You can scan the sessions table to ensure no user
-can be logged in twice. Useful for security reasons.
-</p>
-<h2>Compression/Encryption Schemes</h2>
-Since ADOdb 4.05, thanks to Ross Smith, multiple encryption and
-compression schemes are supported. Currently, supported are:
-<p>
-<pre>  MD5Crypt (crypt.inc.php)<br>  MCrypt<br>  Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)<br>  GZip<br>  BZip2<br></pre>
-<p>These are stackable. E.g.
-<pre>ADODB_Session::filter(new ADODB_Compress_Bzip2());<br>ADODB_Session::filter(new ADODB_Encrypt_MD5());<br></pre>
-will compress and then encrypt the record in the database.
-<h2>Session Cookie Regeneration: adodb_session_regenerate_id()</h2>
-<p>Dynamically change the current session id with a newly generated one and update
-  database. Currently only works with cookies. Useful to improve security by
-  reducing the risk of session-hijacking. See this article on <a href=http://shiflett.org/articles/security-corner-feb2004>Session
-  Fixation</a> for more info 
-on the theory behind this feature. Usage:<pre>
-	include('path/to/adodb/session/adodb-session2.php');
-	
-	session_start();
-	# Approximately every 10 page loads, reset cookie for safety.
-	# This is extremely simplistic example, better 
-	# to regenerate only when the user logs in or changes
-	# user privilege levels.
-	if ((rand()%10) == 0) adodb_session_regenerate_id(); 
-</pre>
-<p>This function calls session_regenerate_id() internally or simulates it if the function does not exist.
-<h2>Vacuum/Optimize Database</h2>
-<p>During session garbage collection, if postgresql is detected,
-  ADOdb can be set to run VACUUM. If mysql is detected, then optimize database
-  could be called.You can turn this on or off using:</p>
-<pre>$turnOn = true; # or false
-ADODB_Session::optimize($turnOn);
-</pre>
-<p>The default  is optimization is disabled.</p>
-<h2><a name=compat></a>Backwards Compatability </h2>
-<p>The older method of connecting to ADOdb using global variables is still supported:</p>
-<pre> $ADODB_SESSION_DRIVER='mysql';
- $ADODB_SESSION_CONNECT='localhost';
- $ADODB_SESSION_USER ='root';
- $ADODB_SESSION_PWD ='abc';
- $ADODB_SESSION_DB ='phplens';
- 
- include('path/to/adodb/session/adodb-<strong>session2</strong>.php'); </pre>
-<p>In the above example, the only things you need to change in your code to upgrade
-  is </p>
-<ul>
-  <li>your session table format to the new one.</li>
-  <li>the include file from adodb-session.php to adodb-session2.php. </li>
-</ul>
-<h2>More Info</h2>
-<p>Also see the <a href="docs-adodb.htm">core ADOdb documentation</a>. And if
-  you are interested in the obsolete adodb-session.php, see <a href="docs-session.old.htm">old
-    session documentation</a>. </p>
-</body>
-</html>
Index: admin/include/lib/adodb/docs/docs-oracle.htm
===================================================================
--- admin/include/lib/adodb/docs/docs-oracle.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/docs-oracle.htm	(working copy)
@@ -1,542 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<style>
-pre {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-.greybg {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-.style1 {color: #660000}
-</style>
-<title>ADOdb with PHP and Oracle</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</style>
-</head>
-
-<body>
-<table width=100%><tr><td>
-<h2>Using ADOdb with PHP and Oracle: an advanced tutorial</h2>
-</td><td><div align="right"><img src=cute_icons_for_site/adodb.gif width="88" height="31"></div></tr></table>
-<p><font size="1">(c)2004-2005 John Lim. All rights reserved.</font></p>
-<h3>1. Introduction</h3>
-<p>Oracle is the most popular commercial database used with PHP. There are many ways of accessing Oracle databases in PHP. These include:</p>
-<ul>
-  <li>The oracle extension</li>
-  <li>The oci8 extension</li>
-  <li>PEAR DB library</li>
-  <li>ADOdb library</li>
-</ul>
-<p>The wide range of choices is confusing to someone just starting with Oracle and PHP. I will briefly summarize the differences, and  show you the advantages of using <a href="http://adodb.sourceforge.net/">ADOdb</a>. </p>
-<p>First we have the C extensions which provide low-level access to Oracle functionality. These C extensions are precompiled into PHP, or linked in dynamically when the web server starts up. Just in case you need it, here's a <a href=http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html>guide to installing Oracle and PHP on Linux</a>.</p>
-<table width="75%" border="1" align="center">
-  <tr valign="top">
-    <td nowrap><b>Oracle extension</b></td>
-    <td>Designed for Oracle 7 or earlier. This is obsolete.</td>
-  </tr>
-  <tr valign="top">
-    <td nowrap><b>Oci8 extension</b></td>
-    <td> Despite it's name, which implies it is only for Oracle 8i, this is the standard method for accessing databases running Oracle 8i, 9i or 10g (and later).</td>
-  </tr>
-</table>
-<p>Here is an example of using the oci8 extension to query the <i>emp</i> table of the <i>scott</i> schema with bind parameters:
-<pre>
-$conn = OCILogon("scott","tiger", $tnsName); 
-
-$stmt = OCIParse($conn,"select * from emp where empno > :emp order by empno"); 
-$emp = 7900;
-OCIBindByName($stmt, ':emp', $emp);
-$ok = OCIExecute($stmt);
-while (OCIFetchInto($stmt,$arr)) {
-	print_r($arr);
-	echo "&lt;hr>";	
-} 
-</pre>
-<p>This generates the following output:
-<div class=greybg>
-Array ( [0] => 7902 [1] => FORD [2] => ANALYST [3] => 7566 [4] => 03/DEC/81 [5] => 3000 [7] => 20 ) 
-<hr />
-  Array ( [0] => 7934 [1] => MILLER [2] => CLERK [3] => 7782 [4] => 23/JAN/82 [5] => 1300 [7] => 10 )
-</div>
-<p>We also have  many higher level PHP libraries that allow you to simplify the above code. The most popular are <a href="http://pear.php.net/">PEAR DB</a> and <a href="http://adodb.sourceforge.net/">ADOdb</a>.  Here are some of the differences between these libraries:</p>
-<table width="75%" border="1" align="center">
-  <tr>
-    <td><b>Feature</b></td>
-    <td><b>PEAR DB 1.6</b></td>
-    <td><b>ADOdb 4.52</b></td>
-  </tr>
-  <tr valign="top">
-    <td>General Style</td>
-    <td>Simple, easy to use. Lacks Oracle specific functionality.</td>
-    <td>Has multi-tier design. Simple high-level design for beginners, and also lower-level advanced Oracle functionality.</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for Prepare</td>
-    <td>Yes, but only on one statement, as the last prepare overwrites previous prepares.</td>
-    <td>Yes (multiple simultaneous prepare's allowed)</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for LOBs</td>
-    <td>No</td>
-    <td>Yes, using update semantics</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for REF Cursors</td>
-    <td>No</td>
-    <td>Yes</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for IN Parameters</td>
-    <td>Yes</td>
-    <td>Yes</td>
-  </tr>
-  <tr valign="top">
-    <td>Support for OUT Parameters</td>
-    <td>No</td>
-    <td>Yes</td>
-  </tr>
-  <tr valign="top">
-    <td>Schema creation using XML</td>
-    <td>No</td>
-    <td>Yes, including ability to define tablespaces and constraints</td>
-  </tr>
-  <tr valign="top">
-    <td>Provides database portability features</td>
-    <td>No</td>
-    <td>Yes, has some ability to abstract features that differ between databases such as dates, bind parameters, and data types.</td>
-  </tr>
-  <tr valign="top">
-    <td>Performance monitoring and tracing</td>
-    <td>No</td>
-    <td>Yes. SQL can be traced and linked to web page it was executed on. Explain plan support included.</td>
-  </tr>
-  <tr valign="top">
-    <td>Recordset caching for frequently used queries</td>
-    <td>No</td>
-    <td>Yes. Provides great speedups for SQL involving complex <i>where, group-by </i>and <i>order-by</i> clauses.</td>
-  </tr>
-  <tr valign="top">
-    <td>Popularity</td>
-    <td>Yes, part of PEAR release</td>
-    <td>Yes, many open source projects are using this software, including PostNuke, Xaraya, Mambo, Tiki Wiki.</td>
-  </tr>
-  <tr valign="top">
-    <td>Speed</td>
-    <td>Medium speed.</td>
-    <td>Very high speed. Fastest database abstraction library available for PHP. <a href="http://phplens.com/lens/adodb/">Benchmarks are available</a>.</td>
-  </tr>
-  <tr valign="top">
-    <td>High Speed Extension available</td>
-    <td>No</td>
-    <td>Yes. You can install the optional ADOdb extension, which reimplements the most frequently used parts of ADOdb as fast C code. Note that the source code version of ADOdb runs just fine without this extension, and only makes use of the extension if detected.</td>
-  </tr>
-</table>
-<p> PEAR DB is good enough for simple web apps. But if you need more power, you can see ADOdb offers more sophisticated functionality. The rest of this article will concentrate on using ADOdb with Oracle. You can find out more about <a href="#connecting">connecting to Oracle</a> later in this guide.</p>
-<h4>ADOdb Example</h4>
-<p>In ADOdb, the above oci8 example querying the <i>emp</i> table could be written as:</p>
-<pre>
-include "/path/to/adodb.inc.php";
-$db = NewADOConnection("oci8");
-$db->Connect($tnsName, "scott", "tiger");
-
-$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
-                    array('emp' => 7900));
-while ($arr = $rs->FetchRow()) {
-    print_r($arr);
-	echo "&lt;hr>";
-}
-</pre>
-<p>The Execute( ) function returns a recordset object, and you can retrieve the rows returned using $recordset-&gt;FetchRow( ). </p>
-<p>If we ignore the initial connection preamble, we can see the ADOdb version is much easier and simpler:</p>
-<table width="100%" border="1">
-  <tr valign="top" bgcolor="#FFFFFF">
-    <td width="50%" bgcolor="#e0e0e0"><b>Oci8</b></td>
-    <td bgcolor="#e0e0e0"><b>ADOdb</b></td>
-  </tr>
-  <tr valign="top" bgcolor="#CCCCCC">
-    <td><pre><font size="1">$stmt = <b>OCIParse</b>($conn,
-       "select * from emp where empno > :emp"); 
-$emp = 7900;
-<b>OCIBindByName</b>($stmt, ':emp', $emp);
-$ok = <b>OCIExecute</b>($stmt);
-
-while (<b>OCIFetchInto</b>($stmt,$arr)) {
-	print_r($arr);
-	echo "&lt;hr>";	
-} </font></pre></td>
-    <td><pre><font size="1">$recordset = $db-><b>Execute</b>("select * from emp where empno>:emp", 
-                           array('emp' => 7900));
-
-while ($arr = $recordset-><b>FetchRow</b>()) {
-	print_r($arr);
-	echo "&lt;hr>";
-}</font></pre></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<h3>2. ADOdb Query Semantics</h3>
-<p>You can also query the database using the standard Microsoft ADO MoveNext( ) metaphor. The data array for the current row is stored in the <i>fields</i> property of the recordset object, $rs.
-MoveNext( ) offers the highest performance among all the techniques for iterating through a recordset:
-<pre>
-$rs = $db->Execute("select * from emp where empno>:emp", array('emp' => 7900));
-while (!$rs->EOF) {
-	print_r($rs->fields);
-	$rs->MoveNext();
-}
-</pre>
-<p>And if you are interested in having the data returned in a 2-dimensional array, you can use:
-<pre>
-$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
-</pre>
-<p>Now to obtain only the first row as an array:
-<pre>
-$arr = $db->GetRow("select * from emp where empno=:emp", array('emp' => 7900));
-</pre>
-<p>Or to retrieve only the first field of the first row:
-<pre>
-$arr = $db->GetOne("select ename from emp where empno=:emp", array('emp' => 7900));
-</pre>
-<p>For easy pagination support, we provide the SelectLimit function. The following will perform a select query, limiting it to 100 rows, starting from row 201 (row 1 being the 1st row):
-<pre>
-$offset = 200; $limitrows = 100;
-$rs = $db->SelectLimit('select * from table', $limitrows, $offset);
-</pre>
-<p>The $offset parameter is optional.
-<h4>Array Fetch Mode</h4>
-<p>When data is being returned in an array, you can choose the type of array the data is returned in. 
-<ol>
-  <li> Numeric indexes - use <font size="2" face="Courier New, Courier, mono">$connection-&gt;SetFetchMode(ADODB_FETCH_NUM).</font></li>
-  <li>Associative indexes - the keys of the array are the names of the fields (in upper-case). Use <font size="2" face="Courier New, Courier, mono">$connection-&gt;SetFetchMode(ADODB_FETCH_ASSOC)</font><font face="Courier New, Courier, mono">.</font></li>
-  <li>Both numeric and associative indexes - use <font size="2" face="Courier New, Courier, mono">$connection-&gt;SetFetchMode(ADODB_FETCH_BOTH).</font></li>
-</ol>
-<p>The default is ADODB_FETCH_BOTH for Oracle.</p>
-<h4><b>Caching</b></h4>
-<p>You can define a database cache directory using $ADODB_CACHE_DIR, and cache the results of frequently used queries that rarely change. This is particularly useful for SQL with complex where clauses and group-by's and order-by's. It is also good for relieving heavily-loaded database servers.</p>
-<p>This example will cache the following select statement for 3600 seconds (1 hour):</p>
-<pre>
-$ADODB_CACHE_DIR = '/var/adodb/tmp';
-$rs = $db->CacheExecute(3600, "select names from allcountries order by 1");
-</pre>
-There are analogous CacheGetArray(
-), CacheGetRow( ),  CacheGetOne( ) and CacheSelectLimit( )  functions. The first parameter is the number of seconds to cache. You can also pass a bind array as a 3rd parameter (not shown above).
-<p>There is an alternative syntax for the caching functions. The first parameter is omitted, and you set the cacheSecs
- property of the connection object:
-<pre>
-$ADODB_CACHE_DIR = '/var/adodb/tmp';
-$connection->cacheSecs = 3600;
-$rs = $connection->CacheExecute($sql, array('id' => 1));
-</pre>
-<h3>&nbsp;</h3>
-<h3>3. Using Prepare( ) For Frequently Used Statements</h3>
-<p>Prepare( ) is  for compiling frequently used  SQL statement for reuse. For example, suppose we have a large array which needs to be inserted into an Oracle database. The following will result in a massive speedup in query execution (at least 20-40%), as the SQL statement only needs to be compiled once:</p>
-<pre>
-$stmt = $db->Prepare('insert into table (field1, field2) values (:f1, :f2)');
-foreach ($arrayToInsert as $key => $value) {
-	$db->Execute($stmt, array('f1' => $key, 'f2' => $val);
-}
-</pre>
-<p>&nbsp;</p>
-<h3>4. Working With LOBs</h3>
-<p>Oracle treats data which is more than 4000 bytes in length specially. These are called Large Objects, or LOBs for short. Binary LOBs are BLOBs, and character LOBs are CLOBs. In most Oracle libraries, you need to do a lot of work to process LOBs, probably because Oracle designed it to work in systems with little memory. ADOdb tries to make things easy by assuming the LOB can fit into main memory. </p>
-<p>ADOdb will transparently handle LOBs  in <i>select</i> statements. The LOBs are automatically converted to PHP variables without any special coding.</p>
-<p>For updating records with LOBs, the functions UpdateBlob( ) and UpdateClob( ) are provided. Here's a BLOB example. The parameters should be self-explanatory:
-<pre>
-$ok = $db->Execute("insert into aTable (id, name, ablob) 
-                                values (aSequence.nextVal, 'Name', null)");
-if (!$ok) return LogError($db-&gt;ErrorMsg());
-<font color="#006600"># params: $tableName, $blobFieldName, $blobValue, $whereClause</font>
-$db->UpdateBlob('aTable', 'ablob', $blobValue, 'id=aSequence.currVal');
-</pre>
-<p>and the analogous CLOB example:
-<pre>
-$ok = $db->Execute("insert into aTable (id, name, aclob) 
-                                values (aSequence.nextVal, 'Name', null)");
-if (!$ok) return LogError($db-&gt;ErrorMsg());
-$db->UpdateClob('aTable', 'aclob', $clobValue, 'id=aSequence.currVal');
-</pre>
-<p>Note that LogError( ) is a user-defined function, and not part of ADOdb.
-<p>Inserting LOBs is more complicated. Since ADOdb 4.55, we allow you to do this
-  (assuming that the <em>photo</em> field is a BLOB, and we want to store $blob_data into
-  this field, and the primary key is the <em>id</em> field):
-<pre>
-	$sql = <span class="style1">"INSERT INTO photos ( ID, photo) ".
-			"VALUES ( :id, empty_blob() )".
-			" RETURNING photo INTO :xx"</span>;
-
- 		$stmt = $db->PrepareSP($sql);
-		$db->InParameter($stmt, $<strong>id</strong>, <span class="style1">'id'</span>);
-		$blob = $db->InParameter($stmt, $<strong>blob_data</strong>, <span class="style1">'xx'</span>,-1, OCI_B_BLOB);
-		$db->StartTrans();
-		$ok = $db->Execute($stmt);
-		$db->CompleteTrans();
-</pre> 
-<p>
-<h3>5. REF CURSORs</h3>
-<p>Oracle recordsets can be passed around as variables called REF Cursors. For example, in PL/SQL, we could define a function <i>open_tab</i> that returns a REF CURSOR in the first parameter:</p>
-<pre>
-TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
-
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
-	END open_tab;
-</pre>
-<p>In ADOdb, we could access this REF Cursor using the ExecuteCursor() function. The following will find
- all table names that begin with 'A' in the current schema:
-<pre>
-$rs = $db->ExecuteCursor("BEGIN open_tab(:refc,'A%'); END;",'refc');
-while ($arr = $rs->FetchRow()) print_r($arr);
-</pre>
-<p>The first parameter is the PL/SQL statement, and the second parameter is the name of the REF Cursor.
-</p>
-<p>&nbsp;</p>
-<h3>6. In and Out Parameters</h3>
-<p>The following PL/SQL
-stored procedure  requires an input  variable, and returns a result into an output variable:
-<pre>
-PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
-	BEGIN
-		output := 'I love '||input;
-	END;
-</pre>
-<p>The following ADOdb code allows you to call the stored procedure:</p>
-<pre>
-$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
-$input = 'Sophia Loren';
-$db->InParameter($stmt,$input,'a1');
-$db->OutParameter($stmt,$output,'a2');
-$ok = $db->Execute($stmt);
-if ($ok) echo ($output == 'I love Sophia Loren') ? 'OK' : 'Failed';
-</pre>
-<p>PrepareSP( ) is a special function that knows about bind parameters.
-The main limitation currently is that IN OUT parameters do not work.
-<h4>Bind Parameters and REF CURSORs</h4>
-<p>We could also rewrite the REF CURSOR example to use InParameter (requires ADOdb 4.53 or later):
-<pre>
-$stmt = $db->PrepareSP("BEGIN adodb.open_tab(:refc,:tabname); END;");
-$input = 'A%';
-$db->InParameter($stmt,$input,'tabname');
-$rs = $db->ExecuteCursor($stmt,'refc');
-while ($arr = $rs->FetchRow()) print_r($arr);
-</pre>
-<h4>Bind Parameters and LOBs</h4>
-<p>You can also operate on LOBs. In this example, we have IN and OUT parameters using CLOBs. 
-<pre>
-	$text = 'test test test';
-	$sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
-	$stmt = $conn -> PrepareSP($sql);
-	$conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB); # -1 means variable length
-	$rs = '';
-	$conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
-	$conn -> Execute($stmt);
-	echo "return = ".$rs."&lt;br>";
-</pre>
-<p>Similarly, you can use the constant OCI_B_BLOB to indicate that you are using BLOBs.
-<h4>Reusing Bind Parameters with CURSOR_SHARING=FORCE</h4>
-<p>Many web programmers do not care to use bind parameters, and prefer to enter the SQL directly. So instead of:</p>
-<pre>
-$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
-</pre>
-<p>They prefer  entering the values inside the SQL:
-<pre>
-$arr = $db->GetArray("select * from emp where empno>7900");
-</pre>
-<p>This reduces Oracle performance because Oracle will reuse compiled SQL which is identical to previously compiled SQL. The above example with the values inside the SQL
-is unlikely to be reused. As an optimization, from Oracle 8.1 onwards, you can set the following session parameter after you login:
-<pre>
-ALTER SESSION SET CURSOR_SHARING=FORCE
-</pre>
-<p>This will force Oracle to convert all such variables (eg. the 7900 value) into constant bind parameters, improving SQL reuse.</p>
-<p>More <a href="http://phplens.com/adodb/code.initialization.html#speed">speedup tips</a>.</p>
-<p>&nbsp;</p>
-<h3>7. Dates and Datetime in ADOdb</h3>
-<p>There are two things you need to know about dates in ADOdb. </p>
-<p>First, to ensure cross-database compability, ADOdb assumes that dates are returned in ISO format (YYYY-MM-DD H24:MI:SS).</p>
-<p>Secondly, since Oracle treats dates and datetime as the same data type, we decided not to display the time in the default date format. So on login, ADOdb will set the NLS_DATE_FORMAT to 'YYYY-MM-DD'. If you prefer to show the date and time by default, do this:</p>
-<pre>
-$db = NewADOConnection('oci8');
-$db->NLS_DATE_FORMAT =  'RRRR-MM-DD HH24:MI:SS';
-$db->Connect($tns, $user, $pwd);
-</pre>
-<p>Or execute:</p>
-<pre>$sql = &quot;ALTER SESSION SET NLS_DATE_FORMAT = 'RRRR-MM-DD HH24:MI:SS'&quot;;
-$db-&gt;Execute($sql);
-</pre>
-<p>If you are not concerned about date portability and do not use ADOdb's portability layer, you can use your preferred date format instead.
-<p>
-<h3>8. Database Portability Layer</h3>
-<p>ADOdb provides the following functions for portably generating SQL functions 
-  as strings to be merged into your SQL statements:</p>
-<table width="75%" border="1" align=center>
-  <tr> 
-    <td width=30%><b>Function</b></td>
-    <td><b>Description</b></td>
-  </tr>
-  <tr> 
-    <td>DBDate($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a date 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>DBTimeStamp($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>SQLDate($date, $fmt)</td>
-    <td>Portably generate a date formatted using $fmt mask, for use in SELECT 
-      statements.</td>
-  </tr>
-  <tr> 
-    <td>OffsetDate($date, $ndays)</td>
-    <td>Portably generate a $date offset by $ndays.</td>
-  </tr>
-  <tr> 
-    <td>Concat($s1, $s2, ...)</td>
-    <td>Portably concatenate strings. Alternatively, for mssql use mssqlpo driver, 
-      which allows || operator.</td>
-  </tr>
-  <tr> 
-    <td>IfNull($fld, $replaceNull)</td>
-    <td>Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.</td>
-  </tr>
-  <tr>
-    <td>Param($name)</td>
-    <td>Generates bind placeholders, using ? or named conventions as appropriate.</td>
-  </tr>
-  <tr><td>$db->sysDate</td><td>Property that holds the SQL function that returns today's date</td>
-</tr>
-<tr><td>$db->sysTimeStamp</td><td>Property that holds the SQL function that returns the current
-timestamp (date+time).
-</td>
-</tr>
-<tr>
-<td>$db->concat_operator</td><td>Property that holds the concatenation operator
-</td>
-</tr>
-<tr><td>$db->length</td><td>Property that holds the name of the SQL strlen function.
-</td></tr>
-
-<tr><td>$db->upperCase</td><td>Property that holds the name of the SQL strtoupper function.
-</td></tr>
-<tr><td>$db->random</td><td>Property that holds the SQL to generate a random number between 0.00 and 1.00.
-</td>
-</tr>
-<tr><td>$db->substr</td><td>Property that holds the name of the SQL substring function.
-</td></tr>
-</table>
-<p>ADOdb also provides multiple oracle oci8 drivers for different scenarios:</p>
-<table width="75%" border="1" align="center">
-  <tr>
-    <td nowrap><b>Driver Name</b></td>
-    <td><b>Description</b></td>
-  </tr>
-  <tr>
-    <td>oci805 </td>
-    <td>Specifically for Oracle 8.0.5. This driver has a slower SelectLimit( ).</td>
-  </tr>
-  <tr>
-    <td>oci8</td>
-    <td>The default high performance driver. The keys of associative arrays returned in a recordset are upper-case.</td>
-  </tr>
-  <tr>
-    <td>oci8po</td>
-    <td> The portable Oracle driver. Slightly slower than oci8. This driver uses ? instead of :<i>bindvar</i> for binding variables, which is the standard for  other databases. Also the keys of associative arrays are in lower-case like other databases.</td>
-  </tr>
-</table>
-<p>Here's an example of calling the <i>oci8po</i> driver. Note that the bind variables use question-mark:</p>
-<pre>$db = NewADOConnection('oci8po');
-$db-&gt;Connect($tns, $user, $pwd);
-$db-&gt;Execute(&quot;insert into atable (f1, f2) values (?,?)&quot;, array(12, 'abc'));</pre>
-<p>&nbsp;<a name=connecting></a>
-<h3>9. Connecting to Oracle</h3>
-<p>Before you can use ADOdb, you need to have the Oracle client installed and setup the oci8 extension. This extension comes pre-compiled for Windows (but you still need to enable it in the php.ini file). For information on compiling the oci8 extension for PHP and Apache on Unix, there is an excellent guide at <a href="http://www.oracle.com/technology/tech/opensource/php/apache/inst_php_apache_linux.html">oracle.com</a>. </p>
-<h4>Should You Use Persistent Connections</h4>
-<p>One question that is frequently asked is should you use persistent connections to Oracle. Persistent connections allow PHP to recycle existing connections, reusing them after the previous web pages have completed. Non-persistent connections close automatically after the web page has completed. Persistent connections are faster because the cost of reconnecting is expensive, but there is additional resource overhead. As an alternative, Oracle allows you to pool and reuse server processes; this is called  <a href="http://www.cise.ufl.edu/help/database/oracle-docs/server.920/a96521/manproc.htm#13132">Shared Server</a> (also known as MTS).</p>
-<p>The author's benchmarks suggest that using non-persistent connections and the  Shared Server configuration offer the best performance. If Shared Server is not an option, only then consider using persistent connections.</p>
-<h4>Connection Examples</h4>
-<p>Just in case you are having problems connecting to Oracle, here are some examples:</p>
-<p>a. PHP and Oracle reside on the same machine, use default SID, with non-persistent connections:</p>
-<pre>	$conn = NewADOConnection('oci8');
-	$conn-&gt;Connect(false, 'scott', 'tiger');</pre>
-<p>b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS', using persistent connections:</p>
-<pre>	$conn = NewADOConnection('oci8');
-	$conn-&gt;PConnect(false, 'scott', 'tiger', 'myTNS');</pre>
-<p>or</p>
-<pre> 	$conn-&gt;PConnect('myTNS', 'scott', 'tiger');</pre>
-<p>c. Host Address and SID</p>
-<pre>
-	$conn->connectSID = true;	
-	$conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'SID');</pre>
-<p>d. Host Address and Service Name</p>
-<pre>	$conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'servicename');</pre>
-<p>e. Oracle connection string:
-<pre>	$cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))
-			(CONNECT_DATA=(SID=$sid)))";
-	$conn-&gt;Connect($cstr, 'scott', 'tiger');
-</pre>
-<p>f. ADOdb data source names (dsn):
-<pre>
-	$dsn = 'oci8://user:pwd@tnsname/?persist';  # persist is optional
-	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect
-	
-	$dsn = 'oci8://user:pwd@host/sid';
-	$conn = ADONewConnection($dsn);
-	
-	$dsn = 'oci8://user:pwd@/';   # oracle on local machine
-	$conn = ADONewConnection($dsn);</pre>
-<p>With ADOdb data source names,
-you don't have to call Connect( ) or PConnect( ).
-</p>
-<p>&nbsp;</p>
-<h3>10. Error Checking</h3>
-<p>The examples in this article are easy to read but a bit simplistic because we ignore error-handling. Execute( ) and Connect( ) will return false on error. So a more realistic way to call Connect( ) and Execute( ) is:
-<pre>function InvokeErrorHandler()
-{<br>global $db; ## assume global
-    MyLogFunction($db-&gt;ErrorNo(), $db-&gt;ErrorMsg());
-}
-if (!$db-&gt;Connect($tns, $usr, $pwd)) InvokeErrorHandler();
-
-$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
-                    array('emp' => 7900));
-if (!$rs) return InvokeErrorHandler();
-while ($arr = $rs->FetchRow()) {
-    print_r($arr);
-	echo "&lt;hr>";
-}
-</pre>
-<p>You can retrieve the  error message and error number of the last SQL statement executed from ErrorMsg( ) and ErrorNo( ). You can also <a href=http://phplens.com/adodb/using.custom.error.handlers.and.pear_error.html>define a custom error handler function</a>.
-ADOdb also supports throwing exceptions in PHP5.
-<p>&nbsp;</p>
-<h3>Handling Large Recordsets (added 27 May 2005)</h3>
-The oci8 driver does not support counting the number of records returned in a SELECT statement, so the function RecordCount() 
-is emulated when the global variable $ADODB_COUNTRECS is set to true, which is the default. 
-We emulate this by buffering all the records. This can take up large amounts of memory for big recordsets.
- Set $ADODB_COUNTRECS to false for the best performance. 
- <p>
-This variable is checked every time a query is executed, so you can selectively choose which recordsets to count.
-<p>&nbsp;</p>
-<h3>11. Other ADOdb Features</h3>
-<p><a href="http://phplens.com/lens/adodb/docs-datadict.htm">Schema generation</a>. This allows you to define a schema using XML and import it into different RDBMS systems portably.</p>
-<p><a href="http://phplens.com/lens/adodb/docs-perf.htm">Performance monitoring and tracing</a>. Highlights of performance monitoring include identification of poor and suspicious SQL, with explain plan support, and identifying which web pages the SQL ran on.</p>
-<p>&nbsp;</p>
-<h3>12. Download</h3>
-<p>You can <a href="http://adodb.sourceforge.net/#download">download ADOdb from sourceforge</a>. ADOdb uses a BSD style license. That means that it is free for commercial use, and redistribution without source code is allowed.</p>
-<p>&nbsp;</p>
-<h3>13. Resources</h3>
-<ul>
-  <li>Oracle's <a href="http://www.oracle.com/technology/pub/articles/php_experts/index.html">Hitchhiker Guide to PHP</a></li>
-  <li>OTN article on <a href=http://www.oracle.com/technology/pub/articles/deployphp/lim_deployphp.html>Optimizing PHP and Oracle</a> by this author.
-  <li>Oracle has an excellent <a href="http://www.oracle.com/technology/tech/opensource/php/php_troubleshooting_faq.html">FAQ on PHP</a></li>
-  <li>PHP <a href="http://php.net/oci8">oci8</a> manual pages</li>
-  <li><a href=http://phplens.com/lens/lensforum/topics.php?id=4>ADOdb forums</a>.
-</ul>
-</body>
-</html>
Index: admin/include/lib/adodb/docs/docs-active-record.htm
===================================================================
--- admin/include/lib/adodb/docs/docs-active-record.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/docs-active-record.htm	(working copy)
@@ -1,541 +0,0 @@
-<html>
-<style>
-pre {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-
-li,p {
-font-family: Arial, Helvetica, sans-serif ;
-}
-</style>
-<title>ADOdb Active Record</title>
-<body>
-<h1>ADOdb Active Record</h1>
-<p> (c) 2000-2007 John Lim (jlim#natsoft.com)</p>
-<p><font size="1">This software is dual licensed using BSD-Style and LGPL. This 
-  means you can use it in compiled proprietary and commercial products.</font></p>
-<p><hr>
-<ol>
-
-<h3><li>Introduction</h3>
-<p>
-ADOdb_Active_Record is an Object Relation Mapping (ORM) implementation using PHP. In an ORM system, the tables and rows of the database are abstracted into native PHP objects. This allows the programmer to focus more on manipulating the data and less on writing SQL queries.
-<p>
-This implementation differs from Zend Framework's implementation in the following ways:
-<ul>
-<li>Works with PHP4 and PHP5 and provides equivalent functionality in both versions of PHP.<p>
-<li>ADOdb_Active_Record works when you are connected to multiple databases. Zend's only works when connected to a default database.<p>
-<li>Support for $ADODB_ASSOC_CASE. The field names are upper-cased, lower-cased or left in natural case depending on this setting.<p>
-<li>No field name conversion to camel-caps style, unlike Zend's implementation which will convert field names such as 'first_name' to 'firstName'.<p>
-<li>NewADOConnection::GetActiveRecords() and ADOConnection::GetActiveRecordsClass() functions in adodb.inc.php.<p>
-<li>Caching of table metadata so it is only queried once per table, no matter how many Active Records are created.<p>
-<li>The additional functionality is described <a href=#additional>below</a>. 
-</ul>
-<P>
-ADOdb_Active_Record is designed upon the principles of the "ActiveRecord" design pattern, which was first described by Martin Fowler. The ActiveRecord pattern has been implemented in many forms across the spectrum of programming languages. ADOdb_Active_Record attempts to represent the database as closely to native PHP objects as possible.
-<p>
-ADOdb_Active_Record maps a database table to a PHP class, and each instance of that class represents a table row. Relations between tables can also be defined, allowing the ADOdb_Active_Record objects to be nested.
-<p>
-
-<h3><li>Setting the Database Connection</h3>
-<p>
-The first step to using  ADOdb_Active_Record is to set the default connection that an ADOdb_Active_Record objects will use to connect to a database. 
-
-<pre>
-require_once('adodb/adodb-active-record.inc.php');
-
-$db = NewADOConnection('mysql://root:pwd@localhost/dbname');
-ADOdb_Active_Record::SetDatabaseAdapter($db);
-</pre>        
-
-<h3><li>Table Rows as Objects</h3>
-<p>
-First, let's create a temporary table in our MySQL database that we can use for demonstrative purposes throughout the rest of this tutorial. We can do this by sending a CREATE query:
-
-<pre>
-$db->Execute("CREATE TEMPORARY TABLE `persons` (
-                `id` int(10) unsigned NOT NULL auto_increment,
-                `name_first` varchar(100) NOT NULL default '',
-                `name_last` varchar(100) NOT NULL default '',
-                `favorite_color` varchar(100) NOT NULL default '',
-                PRIMARY KEY  (`id`)
-            ) ENGINE=MyISAM;
-           ");
- </pre>   
-<p>
-ADOdb_Active_Record's are object representations of table rows. Each table in the database is represented by a class in PHP. To begin working with a table as a ADOdb_Active_Record, a class that extends ADOdb_Active_Records needs to be created for it.
-
-<pre>
-class Person extends ADOdb_Active_Record{}
-$person = new Person();
-</pre>   
-
-<p>
-In the above example, a new ADOdb_Active_Record object $person was created to access the "persons" table. Zend_Db_DataObject takes the name of the class, pluralizes it (according to American English rules), and assumes that this is the name of the table in the database.
-<p>
-This kind of behavior is typical of ADOdb_Active_Record. It will assume as much as possible by convention rather than explicit configuration. In situations where it isn't possible to use the conventions that ADOdb_Active_Record expects, options can be overridden as we'll see later.
-
-<h3><li>Table Columns as Object Properties</h3>
-<p>
-When the $person object was instantiated, ADOdb_Active_Record read the table metadata from the database itself, and then exposed the table's columns (fields) as object properties.
-<p>
-Our "persons" table has three fields: "name_first", "name_last", and "favorite_color". Each of these fields is now a property of the $person object. To see all these properties, use the ADOdb_Active_Record::getAttributeNames() method:
-<pre>
-var_dump($person->getAttributeNames());
-
-/**
- * Outputs the following:
- * array(4) {
- *    [0]=>
- *    string(2) "id"
- *    [1]=>
- *    string(9) "name_first"
- *    [2]=>
- *    string(8) "name_last"
- *    [3]=>
- *    string(13) "favorite_color"
- *  }
- */
-    </pre>   
-<p>
-One big difference between ADOdb and Zend's implementation is we do not automatically convert to camelCaps style.
-<p>
-<h3><li>Inserting and Updating a Record</h3><p>
-
-An ADOdb_Active_Record object is a representation of a single table row. However, when our $person object is instantiated, it does not reference any particular row. It is a blank record that does not yet exist in the database. An ADOdb_Active_Record object is considered blank when its primary key is NULL. The primary key in our persons table is "id".
-<p>
-To insert a new record into the database, change the object's properties and then call the ADOdb_Active_Record::save() method:
-<pre>
-$person = new Person();
-$person->nameFirst = 'Andi';
-$person->nameLast  = 'Gutmans';
-$person->save();
- </pre>   
-<p>
-Oh, no! The above code snippet does not insert a new record into the database. Instead, outputs an error:
-<pre>
-1048: Column 'name_first' cannot be null
- </pre>   
-<p>
-This error occurred because MySQL rejected the INSERT query that was generated by ADOdb_Active_Record. If exceptions are enabled in ADOdb and you are using PHP5, an error will be thrown. In the definition of our table, we specified all of the fields as NOT NULL; i.e., they must contain a value.
-<p>
-ADOdb_Active_Records are bound by the same contraints as the database tables they represent. If the field in the database cannot be NULL, the corresponding property in the ADOdb_Active_Record also cannot be NULL. In the example above, we failed to set the property $person->favoriteColor, which caused the INSERT to be rejected by MySQL.
-<p>
-To insert a new ADOdb_Active_Record in the database, populate all of ADOdb_Active_Record's properties so that they satisfy the constraints of the database table, and then call the save() method:
-<pre>
-/**
- * Calling the save() method will successfully INSERT
- * this $person into the database table.
- */
-$person = new Person();
-$person->name_first     = 'Andi';
-$person->name_last      = 'Gutmans';
-$person->favorite_color = 'blue';
-$person->save();
-</pre>
-<p>
-Once this $person has been INSERTed into the database by calling save(), the primary key can now be read as a property. Since this is the first row inserted into our temporary table, its "id" will be 1:
-<pre>
-var_dump($person->id);
-
-/**
- * Outputs the following:
- * string(1)
- */
- </pre>       
-<p>
-From this point on, updating it is simply a matter of changing the object's properties and calling the save() method again:
-
-<pre>
-$person->favorite_color = 'red';
-$person->save();
-   </pre>
-<p>
-The code snippet above will change the favorite color to red, and then UPDATE the record in the database.
-
-<a name=additional>
-<h2>ADOdb Specific Functionality</h2>
-<h3><li>Setting the Table Name</h3>
-<p>The default behaviour on creating an ADOdb_Active_Record is to "pluralize" the class name and
- use that as the table name. Often, this is not the case. For example, the Person class could be reading 
- from the "People" table. 
-<p>We provide two ways to define your own table:
-<p>1. Use a constructor parameter to override the default table naming behaviour.
-<pre>
-	class Person extends ADOdb_Active_Record{}
-	$person = new Person('People');
-</pre>
-<p>2. Define it in a class declaration:
-<pre>
-	class Person extends ADOdb_Active_Record
-	{
-	var $_table = 'People';
-	}
-	$person = new Person();
-</pre>
-
-<h3><li>$ADODB_ASSOC_CASE</h3>
-<p>This allows you to control the case of field names and properties. For example, all field names in Oracle are upper-case by default. So you 
-can force field names to be lowercase using $ADODB_ASSOC_CASE. Legal values are as follows:
-<pre>
- 0: lower-case
- 1: upper-case
- 2: native-case
-</pre>
-<p>So to force all Oracle field names to lower-case, use
-<pre>
-$ADODB_ASSOC_CASE = 0;
-$person = new Person('People');
-$person->name = 'Lily';
-$ADODB_ASSOC_CASE = 2;
-$person2 = new Person('People');
-$person2->NAME = 'Lily'; 
-</pre>
-
-<p>Also see <a href=http://phplens.com/adodb/reference.constants.adodb_assoc_case.html>$ADODB_ASSOC_CASE</a>.
-
-<h3><li>ADOdb_Active_Record::Save()</h3>
-<p>
-Saves a record by executing an INSERT or UPDATE SQL statement as appropriate. 
-<p>Returns false on  unsuccessful INSERT, true if successsful INSERT.
-<p>Returns 0 on failed UPDATE, and 1 on UPDATE if data has changed, and -1 if no data was changed, so no UPDATE statement was executed.
-
-<h3><li>ADOdb_Active_Record::Replace()</h3>
-<p>
-ADOdb supports replace functionality, whereby the record is inserted if it does not exists, or updated otherwise.
-<pre>
-$rec = new ADOdb_Active_Record("product");
-$rec->name = 'John';
-$rec->tel_no = '34111145';
-$ok = $rec->replace(); // 0=failure, 1=update, 2=insert
-</pre>
-
-
-<h3><li>ADOdb_Active_Record::Load($where)</h3>
-<p>Sometimes, we want to load a single record into an Active Record. We can do so using:
-<pre>
-$person->load("id=3");
-
-// or using bind parameters
-
-$person->load("id=?", array(3));
-</pre>
-<p>Returns false if an error occurs.
-
-<h3><li>ADOdb_Active_Record::Find($whereOrderBy, $bindarr=false, $pkeyArr=false)</h3>
-<p>We want to retrieve an array of active records based on some search criteria. For example:
-<pre>
-class Person extends ADOdb_Active_Record {
-var $_table = 'people';
-}
-
-$person = new Person();
-$peopleArray =& $person->Find("name like ? order by age", array('Sm%'));
-</pre>
-
-<h3><li>Error Handling and Debugging</h3>
-<p>
-In PHP5, if adodb-exceptions.inc.php is included, then errors are thrown. Otherwise errors are handled by returning a value. False by default means an error has occurred. You can get the last error message using the ErrorMsg() function. 
-<p>
-To check for errors in ADOdb_Active_Record, do not poll ErrorMsg() as the last error message will always be returned, even if it occurred several operations ago. Do this instead:
-<pre>
-# right!
-$ok = $rec->Save();
-if (!$ok) $err = $rec->ErrorMsg();
-
-# wrong :(
-$rec->Save();
-if ($rec->ErrorMsg()) echo "Wrong way to detect error";
-</pre>
-<p>The ADOConnection::Debug property is obeyed. So
-if $db->debug is enabled, then ADOdb_Active_Record errors are also outputted to standard output and written to the browser.
-
-<h3><li>ADOdb_Active_Record::Set()</h3>
-<p>You can convert an array to an ADOdb_Active_Record using Set(). The array must be numerically indexed, and have all fields of the table defined in the array. The elements of the array must be in the table's natural order too.
-<pre>
-$row = $db->GetRow("select * from tablex where id=$id");
-
-# PHP4 or PHP5 without enabling exceptions
-$obj =& new ADOdb_Active_Record('Products');
-if ($obj->ErrorMsg()){
-	echo $obj->ErrorMsg();
-} else {
-	$obj->Set($row);
-}
-
-# in PHP5, with exceptions enabled:
-
-include('adodb-exceptions.inc.php');
-try {
-	$obj =& new ADOdb_Active_Record('Products');
-	$obj->Set($row);
-} catch(exceptions $e) {
-	echo $e->getMessage();
-}
-</pre>
-<p>
-<h3><li>Primary Keys</h3>
-<p>
-ADOdb_Active_Record does not require the table to have a primary key. You can insert records for such a table, but you will not be able to update nor delete. 
-<p>Sometimes you are retrieving data from a view or table that has no primary key, but has a unique index. You can dynamically set the primary key of a table through the constructor, or using ADOdb_Active_Record::SetPrimaryKeys():
-<pre>
-	$pkeys = array('category','prodcode');
-	
-	// set primary key using constructor
-	$rec = new ADOdb_Active_Record('Products', $pkeys);
-	
-	 // or use method
-	$rec->SetPrimaryKeys($pkeys);
-</pre>
-
-
-<h3><li>Retrieval of Auto-incrementing ID</h3>
-When creating a new record, the retrieval of the last auto-incrementing ID is not reliable for databases that do not support the Insert_ID() function call (check $connection->hasInsertID). In this case we perform a <b>SELECT MAX($primarykey) FROM $table</b>, which will not work reliably in a multi-user environment. You can override the ADOdb_Active_Record::LastInsertID() function in this case.
-
-<h3><li>Dealing with Multiple Databases</h3>
-<p>
-Sometimes we want to load  data from one database and insert it into another using ActiveRecords. This can be done using the optional parameter of the ADOdb_Active_Record constructor. In the following example, we read data from db.table1 and store it in db2.table2:
-<pre>
-$db = NewADOConnection(...);
-$db2 = NewADOConnection(...);
-
-ADOdb_Active_Record::SetDatabaseAdapter($db2);
-
-$activeRecs = $db->GetActiveRecords('table1');
-
-foreach($activeRecs as $rec) {
-	$rec2 = new ADOdb_Active_Record('table2',$db2);
-	$rec2->id = $rec->id;
-	$rec2->name = $rec->name;
-	
-	$rec2->Save();
-}
-</pre>
-<p>
-If you have to pass in a primary key called "id" and the 2nd db connection in the constructor, you can do so too:
-<pre>
-$rec = new ADOdb_Active_Record("table1",array("id"),$db2);
-</pre>
-
-<h3><li>$ADODB_ACTIVE_CACHESECS</h3>
-<p>You can cache the table metadata (field names, types, and other info such primary keys) in $ADODB_CACHE_DIR (which defaults to /tmp) by setting
-the global variable $ADODB_ACTIVE_CACHESECS to a value greater than 0. This will be the number of seconds to cache.
- You should set this to a value of 30 seconds or greater for optimal performance.
-
-<h3><li>Active Record Considered Bad?</h3>
-<p>Although the Active Record concept is useful, you have to be aware of some pitfalls when using Active Record. The level of granularity of Active Record is individual records. It encourages code like the following, used to increase the price of all furniture products by 10%:
-<pre>
- $recs = $db->GetActiveRecords("Products","category='Furniture'");
- foreach($recs as $rec) {
-    $rec->price *= 1.1; // increase price by 10% for all Furniture products
-    $rec->save();
- }
-</pre>
-Of course a SELECT statement is superior because it's simpler and much more efficient (probably by a factor of x10 or more):
-<pre>
-   $db->Execute("update Products set price = price * 1.1 where category='Furniture'");
-</pre>
-<p>Another issue is performance. For performance sensitive code, using direct SQL will always be faster than using Active Records due to overhead and the fact that all fields in a row are retrieved (rather than only the subset you need) whenever an Active Record is loaded.
-
-<h3><li>Transactions</h3>
-<p>
-The default transaction mode in ADOdb is autocommit. So that is the default with active record too. 
-The general rules for managing transactions still apply. Active Record to the database is a set of insert/update/delete statements, and the db has no knowledge of active records.
-<p>
-Smart transactions, that does an auto-rollback if an error occurs, is still the best method to multiple activities (inserts/updates/deletes) that need to be treated as a single transaction:
-<pre>
-$conn->StartTrans();
-$parent->save();
-$child->save();
-$conn->CompleteTrans();
-</pre>
-
-<h2>ADOConnection Supplement</h2>
-
-<h3><li>ADOConnection::GetActiveRecords()</h3>
-<p>
-This allows you to retrieve an array of ADOdb_Active_Records. Returns false if an error occurs.
-<pre>
-$table = 'products';
-$whereOrderBy = "name LIKE 'A%' ORDER BY Name";
-$activeRecArr = $db->GetActiveRecords($table, $whereOrderBy);
-foreach($activeRecArr as $rec) {
-	$rec->id = rand();
-	$rec->save();
-}
-</pre>
-<p>
-And to retrieve all records ordered by specific fields:
-<pre>
-$whereOrderBy = "1=1 ORDER BY Name";
-$activeRecArr = $db->ADOdb_Active_Records($table);
-</pre>
-<p>
-To use bind variables (assuming ? is the place-holder for your database):
-<pre>
-$activeRecArr = $db->GetActiveRecords($tableName, 'name LIKE ?',
-						array('A%'));
-</pre>
-<p>You can also define the primary keys of the table by passing an array of field names:
-<pre>
-$activeRecArr = $db->GetActiveRecords($tableName, 'name LIKE ?',
-						array('A%'), array('id'));
-</pre>
-
-<h3><li>ADOConnection::GetActiveRecordsClass()</h3>
-<p>
-This allows you to retrieve an array of objects derived from ADOdb_Active_Records. Returns false if an error occurs.
-<pre>
-class Product extends ADOdb_Active_Records{};
-$table = 'products';
-$whereOrderBy = "name LIKE 'A%' ORDER BY Name";
-$activeRecArr = $db->GetActiveRecordsClass('Product',$table, $whereOrderBy);
-
-# the objects in $activeRecArr are of class 'Product'
-foreach($activeRecArr as $rec) {
-	$rec->id = rand();
-	$rec->save();
-}
-</pre>
-<p>
-To use bind variables (assuming ? is the place-holder for your database):
-<pre>
-$activeRecArr = $db->GetActiveRecordsClass($className,$tableName, 'name LIKE ?',
-						array('A%'));
-</pre>
-<p>You can also define the primary keys of the table by passing an array of field names:
-<pre>
-$activeRecArr = $db->GetActiveRecordsClass($className,$tableName, 'name LIKE ?',
-						array('A%'), array('id'));
-</pre>
-
-</ol>
-
-<h3><li>ADOConnection::ErrorMsg()</h3>
-<p>Returns last error message.
-<h3><li>ADOConnection::ErrorNo()</h3>
-<p>Returns last error number.
-<h2>Code Sample</h2>
-<p>The following works with PHP4 and PHP5
-<pre>
-include('../adodb.inc.php');
-include('../adodb-active-record.inc.php');
-
-// uncomment the following if you want to test exceptions
-#if (PHP_VERSION >= 5) include('../adodb-exceptions.inc.php');
-
-$db = NewADOConnection('mysql://root@localhost/northwind');
-$db->debug=1;
-ADOdb_Active_Record::SetDatabaseAdapter($db);
-
-$db->Execute("CREATE TEMPORARY TABLE `persons` (
-                `id` int(10) unsigned NOT NULL auto_increment,
-                `name_first` varchar(100) NOT NULL default '',
-                `name_last` varchar(100) NOT NULL default '',
-                `favorite_color` varchar(100) NOT NULL default '',
-                PRIMARY KEY  (`id`)
-            ) ENGINE=MyISAM;
-           ");
-		   
-class Person extends ADOdb_Active_Record{}
-$person = new Person();
-
-echo "&lt;p>Output of getAttributeNames: ";
-var_dump($person->getAttributeNames());
-
-/**
- * Outputs the following:
- * array(4) {
- *    [0]=>
- *    string(2) "id"
- *    [1]=>
- *    string(9) "name_first"
- *    [2]=>
- *    string(8) "name_last"
- *    [3]=>
- *    string(13) "favorite_color"
- *  }
- */
-
-$person = new Person();
-$person->nameFirst = 'Andi';
-$person->nameLast  = 'Gutmans';
-$person->save(); // this save() will fail on INSERT as favorite_color is a must fill...
-
-
-$person = new Person();
-$person->name_first     = 'Andi';
-$person->name_last      = 'Gutmans';
-$person->favorite_color = 'blue';
-$person->save(); // this save will perform an INSERT successfully
-
-echo "&lt;p>The Insert ID generated:"; print_r($person->id);
-
-$person->favorite_color = 'red';
-$person->save(); // this save() will perform an UPDATE
-
-$person = new Person();
-$person->name_first     = 'John';
-$person->name_last      = 'Lim';
-$person->favorite_color = 'lavender';
-$person->save(); // this save will perform an INSERT successfully
-
-// load record where id=2 into a new ADOdb_Active_Record
-$person2 = new Person();
-$person2->Load('id=2');
-var_dump($person2);
-
-// retrieve an array of records
-$activeArr = $db->GetActiveRecordsClass($class = "Person",$table = "persons","id=".$db->Param(0),array(2));
-$person2 =& $activeArr[0];
-echo "&lt;p>Name first (should be John): ",$person->name_first, "&lt;br>Class = ",get_class($person2);	
-</pre>
-
- <h3>Todo (Code Contributions welcome)</h3>
- <p>Check _original and current field values before update, only update changes. Also if the primary key value is changed, then on update, we should save and use the original primary key values in the WHERE clause!
- <p>Handle 1-to-many relationships.
- <p>PHP5 specific:  Make GetActiveRecords*() return an Iterator.
- <p>PHP5 specific: Change PHP5 implementation of Active Record to use __get() and __set() for better performance.
-
-<h3> Change Log</h3>
-<p>0.07
-<p>$ADODB_ASSOC_CASE=2 did not work properly. Fixed.
-<p>Added === check in ADODB_SetDatabaseAdapter for $db, adodb-active-record.inc.php. Thx Christian Affolter.
-
-<p>0.06
-<p>Added ErrorNo().
-<p>Fixed php 5.2.0 compat issues.
- 
-<p>0.05
-<p>If inserting a record and the value of a primary key field is null, then we do not insert that field in as
-we assume it is an auto-increment field. Needed by mssql.
-
-<p>0.04 5 June 2006 <br>
-<p>Added support for declaring table name in $_table in class declaration. Thx Bill Dueber for idea.
-<p>Added find($where,$bindarr=false) method to retrieve an array of active record objects.
-
-<p>0.03 <br>
-- Now we only update fields that have changed, using $this->_original.<br>
-- We do not include auto_increment fields in replace(). Thx Travis Cline<br>
-- Added ADODB_ACTIVE_CACHESECS.<br>
-
-<p>0.02 <br>
-- Much better error handling. ErrorMsg() implemented. Throw implemented if adodb-exceptions.inc.php detected.<br>
-- You can now define the primary keys of the view or table you are accessing manually.<br>
-- The Active Record allows you to create an object which does not have a primary key. You can INSERT but not UPDATE in this case.
-- Set() documented.<br>
-- Fixed _pluralize bug with y suffix.
-
-<p>
- 0.01 6 Mar 2006<br>
-- Fixed handling of nulls when saving (it didn't save nulls, saved them as '').<br>
-- Better error handling messages.<br>
-- Factored out a new method GetPrimaryKeys().<br>
- <p>
- 0.00 5 Mar 2006<br>
- 1st release
-</body>
-</html>
\ No newline at end of file
Index: admin/include/lib/adodb/docs/readme.htm
===================================================================
--- admin/include/lib/adodb/docs/readme.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/readme.htm	(working copy)
@@ -1,68 +0,0 @@
-<html>
-<head>
-<title>ADODB Manual</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<XSTYLE
-	body,td {font-family:Arial,Helvetica,sans-serif;font-size:11pt}
-	pre {font-size:9pt}
-	.toplink {font-size:8pt}
-	/>
-</head>	
-<body bgcolor="#FFFFFF">
-
-<h3>ADOdb Library for PHP</h3>
-<p>ADOdb is a suite of database libraries that allow you to connect to multiple 
-	databases in a portable manner. Download from <a href=http://adodb.sourceforge.net/>http://adodb.sourceforge.net/</a>.
-<ul><li>The ADOdb documentation has moved to <a href=docs-adodb.htm>docs-adodb.htm</a> 
-	This allows you to query, update and insert records using a portable API.
-<p><li>The ADOdb data dictionary docs are at <a href=docs-datadict.htm>docs-datadict.htm</a>. 
-	This allows you to create database tables and indexes in a portable manner.
-<p><li>The ADOdb database performance monitoring docs are at <a href=docs-perf.htm>docs-perf.htm</a>. 
-	This allows you to perform health checks, tune and monitor your database.
-<p><li>The ADOdb database-backed session docs are at <a href=docs-session.htm>docs-session.htm</a>. 
-</ul>
-<p>
-<h3>Installation</h3>
-Make sure you are running PHP4.0.4 or later. Unpack all the files into a directory accessible by your webserver.
-<p>
-To test, try modifying some of the tutorial examples. Make sure you customize the connection settings correctly. You can debug using:
-<pre>
-&lt;?php
-include('adodb/adodb.inc.php');
-
-$db = <b>ADONewConnection</b>($driver); # eg. 'mysql' or 'oci8' 
-$db->debug = true;
-$db-><b>Connect</b>($server, $user, $password, $database);
-$rs = $db-><b>Execute</b>('select * from some_small_table');
-print "&lt;pre>";
-print_r($rs-><b>GetRows</b>());
-print "&lt;/pre>";
-?>
-</pre>
-<h3>How are people using ADOdb</h3>
-Here are some examples of how people are using ADOdb: 
-<ul>
-	<li> <strong>PhpLens</strong> is a commercial data grid component that allows 
-		both cool Web designers and serious unshaved programmers to develop and 
-		maintain databases on the Web easily. Developed by the author of ADOdb. 
-	</li>
-	<li> <strong>PHAkt</strong>: PHP Extension for DreamWeaver Ultradev allows 
-		you to script PHP in the popular Web page editor. Database handling provided 
-		by ADOdb. </li>
-	<li> <strong>Analysis Console for Intrusion Databases (ACID)</strong>: PHP-based 
-		analysis engine to search and process a database of security incidents 
-		generated by security-related software such as IDSes and firewalls (e.g. 
-		Snort, ipchains). By Roman Danyliw. </li>
-	<li> <strong>PostNuke</strong> is a very popular free content management system 
-		and weblog system. It offers full CSS support, HTML 4.01 transitional 
-		compliance throughout, an advanced blocks system, and is fully multi-lingual 
-		enabled. </li>
-	<li><strong> EasyPublish CMS</strong> is another free content management system 
-		for managing information and integrated modules on your internet, intranet- 
-		and extranet-sites. From Norway. </li>
-	<li> <strong>NOLA</strong> is a full featured accounting, inventory, and job 
-		tracking application. It is licensed under the GPL, and developed by Noguska. 
-	</li>
-</ul>
-</body>
-</html>
Index: admin/include/lib/adodb/docs/docs-adodb.htm
===================================================================
--- admin/include/lib/adodb/docs/docs-adodb.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/docs-adodb.htm	(working copy)
@@ -1,3584 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><title>ADODB Manual</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-	
-<style>
-pre {
-  background-color: #eee;
-  padding: 0.75em 1.5em;
-  font-size: 12px;
-  border: 1px solid #ddd;
-}
-</style></head>
-<body bgcolor="#ffffff" text="black">
-
-<h2>ADOdb Library for PHP</h2>
-<p>V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com)</p>
-<p><font size="1">This software is dual licensed using BSD-Style and LGPL. This 
-  means you can use it in compiled proprietary and commercial products.</font></p>
-  
-
-	<p>Useful ADOdb links:  <a href="http://adodb.sourceforge.net/#download">Download</a> &nbsp; <a href="http://adodb.sourceforge.net/#docs">Other Docs</a>
-
-</p><p><a href="#intro"><b>Introduction</b></a><b><br>
-	<a href="#features">Unique Features</a><br>
-	<a href="#users">How People are using ADOdb</a><br>
-	<a href="#bugs">Feature Requests and Bug Reports</a><br>
-	</b><b><a href="#install">Installation</a><br>
-	<a href="#mininstall">Minimum Install</a><br>
-	<a href="#coding">Initializing Code and Connectioning to Databases</a><br>
-	</b><font size="2"> &nbsp; <a href="#dsnsupport">Data Source Name (DSN) Support</a></font>  &nbsp;  <a href="#connect_ex">Connection Examples</a> <br>
-	<b><a href="#speed">High Speed ADOdb - tuning tips</a></b><br>
-	<b><a href="#hack">Hacking and Modifying ADOdb Safely</a><br>
-	<a href="#php5">PHP5 Features</a></b><br>
-	<font size="2"><a href="#php5iterators">foreach iterators</a> <a href="#php5exceptions">exceptions</a></font><br>
-	<b> <a href="#drivers">Supported Databases</a></b><br>
-	<b> <a href="#quickstart">Tutorials</a></b><br>
-	<a href="#ex1">Example 1: Select</a><br>
-	<a href="#ex2">Example 2: Advanced Select</a><br>
-	<a href="#ex3">Example 3: Insert</a><br>
-	<a href="#ex4">Example 4: Debugging</a> &nbsp;<a href="#exrs2html">rs2html 
-	example</a><br>
-	<a href="#ex5">Example 5: MySQL and Menus</a><br>
-	<a href="#ex6">Example 6: Connecting to Multiple Databases at once</a> <br>
-	<a href="#ex7">Example 7: Generating Update and Insert SQL</a> <br>
-	<a href="#ex8">Example 8: Implementing Scrolling with Next and Previous</a><br>
-	<a href="#ex9">Example 9: Exporting in CSV or Tab-Delimited Format</a> <br>
-	<a href="#ex10">Example 10: Custom filters</a><br>
-	<a href="#ex11">Example 11: Smart Transactions</a><br>
-	<br>
-	<b> <a href="#errorhandling">Using Custom Error Handlers and PEAR_Error</a><br>
-	<a href="#DSN">Data Source Names</a><br>
-	<a href="#caching">Caching</a><br>
-	<a href="#pivot">Pivot Tables</a></b> 
-</p><p><a href="#ref"><b>REFERENCE</b></a>
-</p><p> <font size="2">Variables: <a href="#adodb_countrecs">$ADODB_COUNTRECS</a> 
-<a href="#adodb_ansi_padding_off">$ADODB_ANSI_PADDING_OFF</a>
-  <a href="#adodb_cache_dir">$ADODB_CACHE_DIR</a> <br>
-  &nbsp; &nbsp; &nbsp; &nbsp;  <a href="#force_type">$ADODB_FORCE_TYPE</a> 
-  <a href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a> 
-  <a href="#adodb_lang">$ADODB_LANG</a> <a href=#adodb_auto_quote>ADODB_QUOTE_FIELDNAMES</a> <br>
-  Constants: </font><font size="2"><a href="#adodb_assoc_case">ADODB_ASSOC_CASE</a> 
-  </font><br>
-  <a href="#ADOConnection"><b> ADOConnection</b></a><br>
-  <font size="2">Connections: <a href="#connect">Connect</a> <a href="#pconnect">PConnect</a> 
-  <a href="#nconnect">NConnect</a> <a href="#isconnected">IsConnected</a><br>
-  Executing SQL: <a href="#execute">Execute</a> <a href="#cacheexecute"><i>CacheExecute</i></a> 
-  <a href="#selectlimit">SelectLimit</a> <a href="#cacheSelectLimit"><i>CacheSelectLimit</i></a> 
-  <a href="#param">Param</a> <a href="#prepare">Prepare</a> <a href="#preparesp">PrepareSP</a> 
-  <a href="#inparameter">InParameter</a> <a href="#outparameter">OutParameter</a> <a href="#autoexecute">AutoExecute</a>
-  <br>
-  &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href="#getone">GetOne</a> 
-  <a href="#cachegetone"><i>CacheGetOne</i></a> <a href="#getrow">GetRow</a> <a href="#cachegetrow"><i>CacheGetRow</i></a> 
-  <a href="#getall">GetAll</a> <a href="#cachegetall"><i>CacheGetAll</i></a> <a href="#getcol">GetCol</a> 
-  <a href="#cachegetcol"><i>CacheGetCol</i></a> <a href="#getassoc1">GetAssoc</a> <a href="#cachegetassoc"><i>CacheGetAssoc</i></a> <a href="#replace">Replace</a> 
-  <br>
-  &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href="#executecursor">ExecuteCursor</a> 
-  (oci8 only)<br>
-  Generates SQL strings: <a href="#getupdatesql">GetUpdateSQL</a> <a href="#getinsertsql">GetInsertSQL</a> 
-  <a href="#concat">Concat</a> <a href="#ifnull">IfNull</a> <a href="#length">length</a> <a href="#random">random</a> <a href="#substr">substr</a> 
-  <a href="#qstr">qstr</a> <a href="#param">Param</a>  <a href="#OffsetDate">OffsetDate</a> <a href="#sqldate">SQLDate</a> 
-  <a href="#dbdate">DBDate</a>  <a href="#dbtimestamp">DBTimeStamp</a>
-  <a href="#binddate">BindDate</a>  <a href="#bindtimestamp">BindTimeStamp</a>
-  <br>
-  Blobs: <a href="#updateblob">UpdateBlob</a> <a href="#updateclob">UpdateClob</a> 
-  <a href="#updateblobfile">UpdateBlobFile</a> <a href="#blobencode">BlobEncode</a> 
-  <a href="#blobdecode">BlobDecode</a><br>
-  Paging/Scrolling: <a href="#pageexecute">PageExecute</a> <a href="#cachepageexecute">CachePageExecute</a><br>
-  Cleanup: <a href="#cacheflush">CacheFlush</a> <a href="#Close">Close</a><br>
-  Transactions: <a href="#starttrans">StartTrans</a> <a href="#completetrans">CompleteTrans</a> 
-  <a href="#failtrans">FailTrans</a> <a href="#hasfailedtrans">HasFailedTrans</a> 
-  <a href="#begintrans">BeginTrans</a> <a href="#committrans">CommitTrans</a> 
-  <a href="#rollbacktrans">RollbackTrans</a> <a href=#SetTransactionMode>SetTransactionMode</a><br>
-  Fetching Data: </font> <font size="2"><a href="#setfetchmode">SetFetchMode</a><br>
-  Strings: <a href="#concat">concat</a> <a href="#length">length</a>  <a href="#qstr">qstr</a> <a href="#quote">quote</a> <a href="#substr">substr</a><br>
-  Dates: <a href="#dbdate">DBDate</a> <a href="#dbtimestamp">DBTimeStamp</a> <a href="#unixdate">UnixDate</a> 
-  <a href="#binddate">BindDate</a>  <a href="#bindtimestamp">BindTimeStamp</a>
-  <a href="#unixtimestamp">UnixTimeStamp</a> <a href="#OffsetDate">OffsetDate</a> 
-  <a href="#SQLDate">SQLDate</a> <br>
-  Row Management: <a href="#affected_rows">Affected_Rows</a> <a href="#inserted_id">Insert_ID</a>  <a href="#rowlock">RowLock</a>
-  <a href="#genid">GenID</a> <a href="#createseq">CreateSequence</a> <a href="#dropseq">DropSequence</a> 
-  <br>
-  Error Handling: <a href="#errormsg">ErrorMsg</a> <a href="#errorno">ErrorNo</a> 
-  <a href="#metaerror">MetaError</a> <a href="#metaerrormsg">MetaErrorMsg</a> <a href="#ignoreerrors">IgnoreErrors</a><br>
-  Data Dictionary (metadata): <a href="#metadatabases">MetaDatabases</a> <a href="#metatables">MetaTables</a> 
-  <a href="#metacolumns">MetaColumns</a> <a href="#metacolumnames">MetaColumnNames</a> 
-  <a href="#metaprimarykeys">MetaPrimaryKeys</a> <a href="#metaforeignkeys">MetaForeignKeys</a> 
-  <a href="#serverinfo">ServerInfo</a> <br>
-  Statistics and Query-Rewriting: <a href="#logsql">LogSQL</a> <a href="#fnexecute">fnExecute 
-  and fnCacheExecute</a><br>
-  </font><font size="2">Deprecated: <a href="#bind">Bind</a> <a href="#blankrecordset">BlankRecordSet</a>
-  <a href="#parameter">Parameter</a></font>
-  <a href="#adorecordSet"><b><br>
-  ADORecordSet</b></a><br>
-  <font size="2">
-  Returns one field: <a href="#fields">Fields</a><br>
- Returns one row:<a href="#fetchrow">FetchRow</a> <a href="#fetchinto">FetchInto</a> 
-  <a href="#fetchobject">FetchObject</a> <a href="#fetchnextobject">FetchNextObject</a> 
-  <a href="#fetchobj">FetchObj</a> <a href="#fetchnextobj">FetchNextObj</a>
- <a href="#getrowassoc">GetRowAssoc</a> <br>
-  Returns all rows:<a href="#getarray">GetArray</a> <a href="#getrows">GetRows</a> 
-  <a href="#getassoc">GetAssoc</a><br>
-  Scrolling:<a href="#move">Move</a> <a href="#movenext">MoveNext</a> <a href="#movefirst">MoveFirst</a> 
-  <a href="#movelast">MoveLast</a> <a href="#abspos">AbsolutePosition</a> <a href="#currentrow">CurrentRow</a> 
-  <a href="#atfirstpage">AtFirstPage</a> <a href="#atlastpage">AtLastPage</a> 
-  <a href="#absolutepage">AbsolutePage</a> </font> <font size="2"><br>
-  Menu generation:<a href="#getmenu">GetMenu</a> <a href="#getmenu2">GetMenu2</a><br>
-  Dates:<a href="#userdate">UserDate</a> <a href="#usertimestamp">UserTimeStamp</a> 
-  <a href="#unixdate">UnixDate</a> <a href="#unixtimestamp">UnixTimeStamp<br>
-  </a>Recordset Info:<a href="#recordcount">RecordCount</a> <a href="#po_recordcount">PO_RecordCount</a> 
-  <a href="#nextrecordset">NextRecordSet</a><br>
-  Field Info:<a href="#fieldcount">FieldCount</a> <a href="#fetchfield">FetchField</a> 
-  <a href="#metatype">MetaType</a><br>
-  Cleanup: <a href="#rsclose">Close</a></font>  
-</p>
-<p><font size="2"><a href="#rs2html"><b>rs2html</b></a>&nbsp; <a href="#exrs2html">example</a></font><br>
-  <a href="#adodiff">Differences between ADOdb and ADO</a><br>
-  <a href="#driverguide"><b>Database Driver Guide<br>
-  </b></a><b><a href="#changes">Change Log</a></b><br>
-</p>
-<h2>Introduction<a name="intro"></a></h2>
-<p>PHP's database access functions are not standardised. This creates a need for 
-  a database class library to hide the differences between the different database 
-  API's (encapsulate the differences) so we can easily switch databases. PHP 4.0.5 or later
-  is now required (because we use array-based str_replace).</p>
-<p>We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, Informix, 
-  PostgreSQL, FrontBase,  SQLite, Interbase (Firebird and Borland variants), Foxpro, Access, ADO, DB2, SAP DB and ODBC. 
-  We have had successful reports of connecting to Progress and CacheLite via ODBC. We hope more people 
-  will contribute drivers to support other databases.</p>
-<p>PHP4 supports session variables. You can store your session information using 
-  ADOdb for true portability and scalability. See adodb-session.php for more information.</p>
-<p>Also read <a href="http://phplens.com/lens/adodb/tips_portable_sql.htm">tips_portable_sql.htm</a> 
- for tips on writing 
-  portable SQL.</p>
-<h2>Unique Features of ADOdb<a name="features"></a></h2>
-<ul>
-  <li><b>Easy for Windows programmers</b> to adapt to because many of the conventions 
-	are similar to Microsoft's ADO.</li>
-  <li>Unlike other PHP database classes which focus only on select statements, 
-	<b>we provide support code to handle inserts and updates which can be adapted 
-	to multiple databases quickly.</b> Methods are provided for date handling, 
-	string concatenation and string quoting characters for differing databases.</li>
-  <li>A<b> metatype system </b>is built in so that we can figure out that types 
-	such as CHAR, TEXT and STRING are equivalent in different databases.</li>
-  <li><b>Easy to port</b> because all the database dependant code are stored in 
-	stub functions. You do not need to port the core logic of the classes.</li>
-  <li><b>Portable table and index creation</b> with the <a href="docs-datadict.htm">datadict</a> classes.
-  </li><li><b>Database performance monitoring and SQL tuning</b> with the <a href="docs-perf.htm">performance monitoring</a> classes.
-  </li><li><b>Database-backed sessions</b> with the <a href="docs-session.htm">session management</a> classes. Supports session expiry notification.
-<li><b>Object-Relational Mapping</b> using <a href="docs-active-record.htm">ADOdb_Active_Record</a> classes.
-</li></ul>
-<h2>How People are using ADOdb<a name="users"></a></h2>
-Here are some examples of how people are using ADOdb (for a much longer list, 
-visit <a href="http://phplens.com/phpeverywhere/adodb-cool-apps">adodb-cool-apps</a>): 
-<ul>
-<li><a href="http://phplens.com/">PhpLens</a> is a commercial data grid
-component that allows both cool Web designers and serious unshaved
-programmers to develop and maintain databases on the Web easily.
-Developed by the author of ADOdb.<p>
-
-</p></li><li><a href="http://www.interakt.ro/phakt/">PHAkt: PHP Extension for DreamWeaver Ultradev</a> allows you to script PHP in the popular Web page editor. Database handling provided by ADOdb.<p>
-
-</p></li><li><a href="http://www.andrew.cmu.edu/%7Erdanyliw/snort/snortacid.html">Analysis Console for Intrusion Databases</a>
-(ACID): PHP-based analysis engine to search and process a database of
-security incidents generated by security-related software such as IDSes
-and firewalls (e.g. Snort, ipchains). By Roman Danyliw.<p>
-
-</p></li><li><a href="http://www.postnuke.com/">PostNuke</a> is a very
-popular free content management system and weblog system. It offers
-full CSS support, HTML 4.01 transitional compliance throughout, an
-advanced blocks system, and is fully multi-lingual enabled. <p>
-
-</p></li><li><a href="http://www.auto-net.no/easypublish.php?page=index&amp;lang_id=2">EasyPublish CMS</a>
-is another free content management system for managing information and
-integrated modules on your internet, intranet- and extranet-sites. From
-Norway.<p>
-
-</p></li><li><a href="http://nola.noguska.com/">NOLA</a> is a full featured accounting, inventory, and job tracking application. It is licensed under the GPL, and developed by Noguska.
-</li></ul><p>
-
-</p><h2>Feature Requests and Bug Reports<a name="bugs"></a></h2>
-<p>Feature requests and bug reports can be emailed to <a href="mailto:jlim#natsoft.com.my">jlim#natsoft.com.my</a> 
-  or posted to the ADOdb Help forums at <a href="http://phplens.com/lens/lensforum/topics.php?id=4">http://phplens.com/lens/lensforum/topics.php?id=4</a>.</p>
-<h2>Installation Guide<a name="install"></a></h2>
-<p>Make sure you are running PHP 4.0.5 or later. 
-  Unpack all the files into a directory accessible by your webserver.</p>
-<p>To test, try modifying some of the tutorial examples. Make sure you customize 
-  the connection settings correctly. You can debug using <i>$db-&gt;debug = true</i> as shown below:</p>
-<pre>&lt;?php<br>	include('adodb/adodb.inc.php');<br>	$db = <a href="#adonewconnection">ADONewConnection</a>($dbdriver); # eg 'mysql' or 'postgres'<br>	$db-&gt;debug = true;<br>	$db-&gt;<a href="#connect">Connect</a>($server, $user, $password, $database);<br>	$rs = $db-&gt;<a href="#execute">Execute</a>('select * from some_small_table');<br>	print "&lt;pre&gt;";<br>	print_r($rs-&gt;<a href="#getrows">GetRows</a>());<br>	print "&lt;/pre&gt;";<br>?&gt;</pre>
-
- <h3>Minimum Install<a name="mininstall"></a></h3>
-<p>For developers who want to release a minimal install of ADOdb, you will need:
-</p><ul>
-<li>adodb.inc.php
-</li><li>adodb-lib.inc.php
-</li><li>adodb-time.inc.php
-</li><li>drivers/adodb-$database.inc.php
-</li><li>license.txt (for legal reasons)
-</li><li>adodb-php4.inc.php 
-</li><li>adodb-iterator.inc.php  (php5 functionality)
-</li></ul>
-Optional:
-<ul>
-<li>adodb-error.inc.php and lang/adodb-$lang.inc.php (if you use MetaError())
-</li><li>adodb-csvlib.inc.php (if you use cached recordsets - CacheExecute(), etc)
-</li><li>adodb-exceptions.inc.php and adodb-errorhandler.inc.php (if you use adodb error handler or php5 exceptions).
-<li>adodb-active-record.inc.php if you use <a href=docs-active-record.htm>Active Records</a>.
-</li></ul>
-
-<h3>Code Initialization Examples<a name="coding"></a></h3>
-<p>When running ADOdb, at least two files are loaded. First is adodb/adodb.inc.php, 
- which contains all functions used by all database classes. The code specific 
- to a particular database is in the adodb/driver/adodb-????.inc.php file.</p>
- <a name="adonewconnection"></a>
-<p>For example, to connect to a mysql database:</p>
-<pre>include('/path/to/set/here/adodb.inc.php');<br>$conn = &amp;ADONewConnection('mysql');<br></pre>
-<p>Whenever you need to connect to a database, you create a Connection object 
-  using the <b>ADONewConnection</b>($driver) function. 
-  <b>NewADOConnection</b>($driver) is an alternative name for the same function.</p>
-
-<p>At this point, you are not connected to the database (no longer true if you pass in a <a href="#dsnsupport">dsn</a>). You will first need to decide
-whether to use <i>persistent</i> or <i>non-persistent</i> connections. The advantage of <i>persistent</i>
-connections is that they are faster, as the database connection is never closed (even 
-when you call Close()). <i>Non-persistent </i>connections take up much fewer resources though,
-reducing the risk of your database and your web-server becoming overloaded. 
-</p><p>For persistent connections,
-use $conn-&gt;<a href="#pconnect">PConnect()</a>,
- or $conn-&gt;<a href="#connect">Connect()</a> for non-persistent connections.
-Some database drivers also support <a href="#nconnect">NConnect()</a>, which forces 
-the creation of a new connection. 
-
-<a name="connection_gotcha"></a>
-</p><p><b>Connection Gotcha</b>:  If you create two connections, but both use the same userid and password,
-PHP will share the same connection. This can cause problems if the connections are meant to 
-different databases. The solution is to always use different userid's for different databases,
- or use NConnect().
-
- <a name="dsnsupport"></a>
- </p><h3>Data Source Name (DSN) Support</h3>
- <p> Since ADOdb 4.51, you can connect to a database by passing a dsn to NewADOConnection() (or ADONewConnection, which is
- the same function). The dsn format is:
-</p><pre>	$driver://$username:$password@hostname/$database?options[=value]<br></pre><p>
-NewADOConnection() calls Connect() or PConnect() internally for you. If the connection fails, false is returned.
-</p><pre>	<font color="#008000"># non-persistent connection</font>
-	$dsn = 'mysql://root:pwd@localhost/mydb'; 
-	$db = NewADOConnection($dsn);
-	if (!$db) die("Connection failed");   
-	
-	<font color="#008000"># no need to call connect/pconnect!</font>
-	$arr = $db-&gt;GetArray("select * from table");
-	
-	<font color="#008000"># persistent connection</font>
-	$dsn2 = 'mysql://root:pwd@localhost/mydb?persist'; 
-</pre>
-<p>
-If you have special characters such as /:?_ in your dsn, then you need to rawurlencode them first:
-</p><pre>	$pwd = rawurlencode($pwd);<br>	$dsn = "mysql://root:$pwd@localhost/mydb";
-	$dsn2=rawurlencode("sybase_ase")."://user:pass@host/path?query";<br></pre>
-<p>
-Legal options are:
-</p><p>
-<table align="center" border="1"><tbody><tr><td>For all drivers</td><td>
-	'persist', 'persistent', 'debug', 'fetchmode', 'new'
-	</td></tr><tr><td>Interbase/Firebird
-	</td><td>
-					 'dialect','charset','buffers','role'
-	</td></tr><tr><td>M'soft ADO</td><td>
-					 'charpage'
-					
-		</td></tr><tr><td>MySQL</td><td>
-					'clientflags'
-</td></tr><tr><td>MySQLi</td><td>
-	'port', 'socket', 'clientflags'
-</td></tr><tr><td>Oci8</td><td>
- 'nls_date_format','charset'
-</td></tr></tbody></table>
-</p><p>
-For all drivers, when the options <i>persist</i> or <i>persistent</i> are set,  a persistent connection is forced; similarly, when <i>new</i> is set, then
-a new connection will be created using NConnect if the underlying driver supports it. 
-The <i>debug</i> option enables debugging. The <i>fetchmode</i> calls <a href="#setfetchmode">SetFetchMode()</a>.
-If no value is defined for an option, then the value is set to 1.
-</p><p>
-ADOdb DSN's are compatible with version 1.0 of PEAR DB's DSN format.
-<a name="connect_ex">
-</a></p><h3><a name="connect_ex">Examples of Connecting to Databases</a></h3>
-<h4><a name="connect_ex">MySQL and Most Other Database Drivers</a></h4>
-<p><a name="connect_ex">MySQL connections are very straightforward, and the parameters are identical 
-  to mysql_connect:</a></p>
-<pre><a name="connect_ex">	$conn = &amp;ADONewConnection('mysql'); <br>	$conn-&gt;PConnect('localhost','userid','password','database');<br>	<br>	<font color="#008000"># or dsn </font>
-	$dsn = 'mysql://user:pwd@localhost/mydb'; 
-	$conn = ADONewConnection($dsn);  # no need for Connect()
-	
-	<font color="#008000"># or persistent dsn</font>
-	$dsn = 'mysql://user:pwd@localhost/mydb?persist'; 
-	$conn = ADONewConnection($dsn);  # no need for PConnect()
-	
-	<font color="#008000"># a more complex example:</font>
-	$pwd = urlencode($pwd);
-	$flags =  MYSQL_CLIENT_COMPRESS;
-	$dsn = "mysql://user:$pwd@localhost/mydb?persist&amp;clientflags=$flags";
-	$conn = ADONewConnection($dsn);  # no need for PConnect()
- </a></pre>
-<p><a name="connect_ex"> For most drivers, you can use the standard function: Connect($server, $user, $password, $database), or
-a </a><a href="dsnsupport">DSN</a> since ADOdb 4.51. Exceptions to this are listed below.
-</p>
-<a name=pdo>
-<h4>PDO</h4>
-<p>PDO, which only works with PHP5, accepts a driver specific connection string:
-<pre>
-	$conn =& NewADConnection('pdo');
-	$conn->Connect('mysql:host=localhost',$user,$pwd,$mydb);
-	$conn->Connect('mysql:host=localhost;dbname=mydb',$user,$pwd);
-	$conn->Connect("mysql:host=localhost;dbname=mydb;username=$user;password=$pwd");
-</pre>
-<p>The DSN mechanism is also supported:
-<pre>
-	$conn =& NewADConnection("pdo_mysql://user:pwd@localhost/mydb?persist"); # persist is optional
-</pre>
-<h4>PostgreSQL</h4>
-<p>PostgreSQL 7 and 8 accepts connections using: </p>
-<p>a. the standard connection string:</p>
-<pre>	$conn = &amp;ADONewConnection('postgres');  <br>	$conn-&gt;PConnect('host=localhost port=5432 dbname=mary');</pre>
-<p> b. the classical 4 parameters:</p>
- <pre>	$conn-&gt;PConnect('localhost','userid','password','database');<br> </pre>
-<p>c. dsn:
-</p><pre>	$dsn = 'postgres://user:pwd@localhost/mydb?persist';  # persist is optional
-	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect<br></pre>
-<a name="ldap"></a>
-
- <h4>LDAP</h4>
-  <p>Here is an example of querying a LDAP server. Thanks to Josh Eldridge for the driver and this example:
-</p><pre>
-require('/path/to/adodb.inc.php');
-
-/* Make sure to set this BEFORE calling Connect() */
-$LDAP_CONNECT_OPTIONS = Array(
-	Array ("OPTION_NAME"=>LDAP_OPT_DEREF, "OPTION_VALUE"=>2),
-	Array ("OPTION_NAME"=>LDAP_OPT_SIZELIMIT,"OPTION_VALUE"=>100),
-	Array ("OPTION_NAME"=>LDAP_OPT_TIMELIMIT,"OPTION_VALUE"=>30),
-	Array ("OPTION_NAME"=>LDAP_OPT_PROTOCOL_VERSION,"OPTION_VALUE"=>3),
-	Array ("OPTION_NAME"=>LDAP_OPT_ERROR_NUMBER,"OPTION_VALUE"=>13),
-	Array ("OPTION_NAME"=>LDAP_OPT_REFERRALS,"OPTION_VALUE"=>FALSE),
-	Array ("OPTION_NAME"=>LDAP_OPT_RESTART,"OPTION_VALUE"=>FALSE)
-);
-$host = 'ldap.baylor.edu';
-$ldapbase = 'ou=People,o=Baylor University,c=US';
-
-$ldap = NewADOConnection( 'ldap' );
-$ldap->Connect( $host, $user_name='', $password='', $ldapbase );
-
-echo "&lt;pre>";
-
-print_r( $ldap->ServerInfo() );
-$ldap->SetFetchMode(ADODB_FETCH_ASSOC);
-$userName = 'eldridge';
-$filter="(|(CN=$userName*)(sn=$userName*)(givenname=$userName*)(uid=$userName*))";
-
-$rs = $ldap->Execute( $filter );
-if ($rs)
-	while ($arr = $rs->FetchRow()) {
-	     print_r($arr);	
-	}
-
-$rs = $ldap->Execute( $filter );
-if ($rs) 
-	while (!$rs->EOF) {
- 		print_r($rs->fields);	
-		$rs->MoveNext();
-	} 
-	
-print_r( $ldap->GetArray( $filter ) );
-print_r( $ldap->GetRow( $filter ) );
-
-$ldap->Close();
-echo "&lt;/pre>";
-</pre>
-<p>Using DSN:
-<pre>
-$dsn = "ldap://ldap.baylor.edu/ou=People,o=Baylor University,c=US";
-$db = NewADOConnection($dsn);
-</pre>
-<h4>Interbase/Firebird</h4>
-You define the database in the $host parameter:
-<pre>	$conn = &amp;ADONewConnection('ibase'); <br>	$conn-&gt;PConnect('localhost:c:\ibase\employee.gdb','sysdba','masterkey');<br></pre>
-<p>Or dsn:
-</p><pre>	$dsn = 'firebird://user:pwd@localhost/mydb?persist&amp;dialect=3';  # persist is optional<br>	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect<br></pre>
-<h4>SQLite</h4>
-Sqlite will create the database file if it does not exist.
-<pre>	$conn = &amp;ADONewConnection('sqlite');
-	$conn-&gt;PConnect('c:\path\to\sqlite.db'); # sqlite will create if does not exist<br></pre>
-<p>Or dsn:
-</p><pre>	$path = urlencode('c:\path\to\sqlite.db');
-	$dsn = "sqlite://$path/?persist";  # persist is optional
-	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect<br></pre>
-<h4>Oracle (oci8)</h4>
-<p>With oci8, you can connect in multiple ways. Note that oci8 works fine with 
-newer versions of the Oracle, eg. 9i and 10g.</p>
-<p>a. PHP and Oracle reside on the same machine, use default SID.</p>
-<pre>	$conn-&gt;Connect(false, 'scott', 'tiger');</pre>
-<p>b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS'</p>
-<pre>	$conn-&gt;PConnect(false, 'scott', 'tiger', 'myTNS');</pre>
-<p>or</p>
-<pre> 	$conn-&gt;PConnect('myTNS', 'scott', 'tiger');</pre>
-<p>c. Host Address and SID</p>
-<pre>
-	$conn->connectSID = true;
-	$conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'SID');</pre>
-<p>d. Host Address and Service Name</p>
-<pre>	$conn-&gt;Connect('192.168.0.1', 'scott', 'tiger', 'servicename');</pre>
-<p>e. Oracle connection string:
-</p><pre>	$cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))<br>			(CONNECT_DATA=(SID=$sid)))";<br>	$conn-&gt;Connect($cstr, 'scott', 'tiger');<br></pre>
-<p>f. ADOdb dsn:
-</p><pre>	$dsn = 'oci8://user:pwd@tnsname/?persist';  # persist is optional<br>	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect<br>	<br>	$dsn = 'oci8://user:pwd@host/sid';<br>	$conn = ADONewConnection($dsn);<br>	<br>	$dsn = 'oci8://user:pwd@/';   # oracle on local machine<br>	$conn = ADONewConnection($dsn);<br></pre>
-<p>You can also set the charSet for Oracle 9.2 and later, supported since PHP 4.3.2, ADOdb 4.54:
-</p><pre>	$conn-&gt;charSet = 'we8iso8859p1';<br>	$conn-&gt;Connect(...);<br>	<br>	# or<br>	$dsn = 'oci8://user:pwd@tnsname/?charset=WE8MSWIN1252';<br>	$db = ADONewConnection($dsn);<br></pre>
-<a name="dsnless"></a>
-<h4>DSN-less ODBC ( Access, MSSQL and DB2 examples)</h4>
-<p>ODBC DSN's can be created in the ODBC control panel, or you can use a DSN-less 
-  connection.To use DSN-less connections with ODBC you need PHP 4.3 or later. 
-</p>
-<p>For Microsoft Access:</p>
-<pre>	$db =&amp; ADONewConnection('access');<br>	$dsn = <strong>"Driver={Microsoft Access Driver (*.mdb)};Dbq=d:\\northwind.mdb;Uid=Admin;Pwd=;";</strong>
-	$db-&gt;Connect($dsn);
-</pre>
-For Microsoft SQL Server: 
-<pre>	$db =&amp; ADONewConnection('odbc_mssql');<br>	$dsn = <strong>"Driver={SQL Server};Server=localhost;Database=northwind;"</strong>;<br>	$db-&gt;Connect($dsn,'userid','password');<br></pre>
-or if you prefer to use the mssql extension (which is limited to mssql 6.5 functionality):
-<pre>	$db =&amp; ADONewConnection('mssql');<br>	$db-&gt;Execute('localhost', 'userid', 'password', 'northwind');<br></pre>
-For DB2:
-<pre>
-	$dbms = 'db2'; # or 'odbc_db2' if db2 extension not available
-	$db =&amp; ADONewConnection($dbms);
-	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP;".
-				"uid=root; pwd=secret";<br>	$db-&gt;Connect($dsn);
-</pre>
-<b>DSN-less Connections with ADO</b><br>
-If you are using versions of PHP earlier than PHP 4.3.0, DSN-less connections 
-only work with Microsoft's ADO, which is Microsoft's COM based API. An example 
-using the ADOdb library and Microsoft's ADO: 
-<pre>&lt;?php<br>	include('adodb.inc.php'); <br>	$db = &amp;ADONewConnection("ado_mssql");<br>	print "&lt;h1&gt;Connecting DSN-less $db-&gt;databaseType...&lt;/h1&gt;";<br>		<br>	<b>$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"<br>		. "SERVER=flipper;DATABASE=ai;UID=sa;PWD=;"  ;</b>
-	$db-&gt;Connect($myDSN);
-	
-	$rs = $db-&gt;Execute("select * from table");
-	$arr = $rs-&gt;GetArray();
-	print_r($arr);
-?&gt;
-</pre><a name="speed"></a>
-<h2>High Speed ADOdb - tuning tips</h2>
-<p>ADOdb is a big class library, yet it <a href="http://phplens.com/lens/adodb/">consistently beats</a> all other PHP class 
-  libraries in performance. This is because it is designed in a layered fashion, 
-  like an onion, with the fastest functions in the innermost layer. Stick to the 
-  following functions for best performance:</p>
-<table align="center" border="1" width="40%">
-  <tbody><tr>
-    <td><div align="center"><b>Innermost Layer</b></div></td>
-  </tr>
-  <tr> 
-    <td><p align="center">Connect, PConnect, NConnect<br>
-        Execute, CacheExecute<br>
-        SelectLimit, CacheSelectLimit<br>
-        MoveNext, Close <br>
-		qstr, Affected_Rows, Insert_ID</p></td>
-  </tr>
-</tbody></table>
-<p>The fastest way to access the field data is by accessing the array $recordset-&gt;fields 
-  directly. Also set the global variables <a href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a> 
-  = ADODB_FETCH_NUM, and (for oci8, ibase/firebird and odbc) <a href="#adodb_countrecs">$ADODB_COUNTRECS</a> = false 
-  before you connect to your database.</p>
-<p>Consider using bind parameters if your database supports it, as it improves 
-  query plan reuse. Use ADOdb's performance tuning system to identify bottlenecks 
-  quickly. At the time of writing (Dec 2003), this means oci8 and odbc drivers.</p>
- <p>Lastly make sure you have a PHP accelerator cache installed such as APC, Turck 
-  MMCache, Zend Accelerator or ionCube.</p>
- <p>Some examples:</p>
- <table align="center" border="1"><tbody><tr><td><b>Fastest data retrieval using PHP</b></td><td><b>Fastest data retrieval using ADOdb extension</b></td></tr>
-<tr><td>
-<pre>$rs =&amp; $rs-&gt;Execute($sql);<br>while (!$rs-&gt;EOF) {<br>	var_dump($rs-&gt;fields);<br>	$rs-&gt;MoveNext();<br>}</pre></td><td>
-<pre>$rs =&amp; $rs-&gt;Execute($sql);<br>$array = adodb_getall($rs);<br>var_dump($array);<br><br><br></pre></td></tr></tbody></table>
- <p><b>Advanced Tips</b>
- </p><p>If you have the <a href="http://adodb.sourceforge.net/#extension">ADOdb C extension</a> installed, 
- you can replace your calls to $rs-&gt;MoveNext() with adodb_movenext($rs). 
- This doubles the speed of this operation. For retrieving entire recordsets at once,
-use GetArray(), which uses the high speed extension function adodb_getall($rs) internally.
- </p><p>Execute() is the default way to run queries. You can use the low-level functions _Execute() and _query()
-to reduce query overhead.  Both these functions share the same parameters as Execute().
-</p><p>If you do not have any bind parameters or your database supports
-binding (without emulation),
-then you can call _Execute() directly. Calling this function bypasses
-bind emulation. Debugging is still supported in _Execute().
-</p><p>If you do not require debugging facilities nor emulated
-binding, and do not require a recordset to be returned, then you can
-call _query. This is great for inserts, updates and deletes. Calling
-this function
-bypasses emulated binding, debugging, and recordset handling. Either
-the resultid, true or false are returned by _query(). </p><p>For Informix, you can disable scrollable cursors with $db-&gt;cursorType = 0.
-</p><p><a name="hack"></a> </p>
-<h2>Hacking ADOdb Safely</h2>
-<p>You might want to modify ADOdb for your own purposes. Luckily you can
-still maintain backward compatibility by sub-classing ADOdb and using the $ADODB_NEWCONNECTION
-variable. $ADODB_NEWCONNECTION allows you to override the behaviour of ADONewConnection().
-ADOConnection() checks for this variable and will call
-the function-name stored in this variable if it is defined.
-</p><p>In the following example, new functionality for the connection object 
-is placed in the <i>hack_mysql</i> and <i>hack_postgres7</i> classes. The recordset class naming convention
-can be controlled using $rsPrefix. Here we set it to 'hack_rs_', which will make ADOdb use
-<i>hack_rs_mysql</i> and <i>hack_rs_postgres7</i> as the recordset classes.
-
-
-</p><pre>class hack_mysql extends adodb_mysql {<br>var $rsPrefix = 'hack_rs_';<br>  /* Your mods here */<br>}<br><br>class hack_rs_mysql extends ADORecordSet_mysql {<br>	 /* Your mods here */<br>}<br><br>class hack_postgres7 extends adodb_postgres7 {<br>var $rsPrefix = 'hack_rs_';<br>  /* Your mods here */<br>}<br><br>class hack_rs_postgres7 extends ADORecordSet_postgres7 {<br> /* Your mods here */<br>}<br><br>$ADODB_NEWCONNECTION = 'hack_factory';<br><br>function&amp; hack_factory($driver)<br>{<br>	if ($driver !== 'mysql' &amp;&amp; $driver !== 'postgres7') return false;<br>	<br>	$driver = 'hack_'.$driver;<br>	$obj = new $driver();<br>	return $obj;<br>}<br><br>include_once('adodb.inc.php');<br></pre>
-<p></p><p>Don't forget to call the constructor of the parent class in
-your constructor. If you want to use the default ADOdb drivers return
-false in the above hack_factory() function.
-<a name="php5"></a>
-</p><h2>PHP5 Features</h2>
- ADOdb 4.02 or later will transparently determine which version of PHP you are using.
-If PHP5 is detected, the following features become available:
-<ul>
-
-<li><b>PDO</b>: PDO drivers are available. See the <a href=#pdo>connection examples</a>. Currently PDO drivers are
- not as powerful as native drivers, and should be treated as experimental.<br><br>
-<a name="php5iterators"></a>
-<li><b>Foreach iterators</b>: This is a very natural way of going through a recordset:
-<pre>	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;<br>	$rs = $db-&gt;Execute($sql);<br>	foreach($rs as $k =&gt; $row) {<br>		echo "r1=".$row[0]." r2=".$row[1]."&lt;br&gt;";<br>	}<br></pre>
-<p>
-<a name="php5exceptions"></a>
-</p></li><li><b>Exceptions</b>: Just include <i>adodb-exceptions.inc.php</i> and you can now 
-catch exceptions on errors as they occur.
-<pre>	<b>include("../adodb-exceptions.inc.php");</b> <br>	include("../adodb.inc.php");	 <br>	try { <br>		$db = NewADOConnection("oci8"); <br>		$db-&gt;Connect('','scott','bad-password'); <br>	} catch (exception $e) { <br>		var_dump($e); <br>		adodb_backtrace($e-&gt;gettrace());<br>	} <br></pre>
-<p>Note that reaching EOF is <b>not</b> considered an error nor an exception.
-</p></li></ul> 
-<h3><a name="drivers"></a>Databases Supported</h3>
-The <i>name</i> below is the value you pass to NewADOConnection($name) to create a  connection object for that database.
-<p>
-</p><p> 
-</p><table border="1" width="100%">
-  <tbody><tr valign="top"> 
-    <td><b>Name</b></td>
-    <td><b>Tested</b></td>
-    <td><b>Database</b></td>
-    <td><b><font size="2">RecordCount() usable</font></b></td>
-    <td><b>Prerequisites</b></td>
-    <td><b>Operating Systems</b></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">access</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><font size="2">Microsoft Access/Jet. You need to create an ODBC DSN.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ODBC </font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ado</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><p><font size="2">Generic ADO, not tuned for specific databases. Allows 
-        DSN-less connections. For best performance, use an OLEDB provider. This 
-        is the base class for all ado drivers.</font></p>
-      <p><font size="2">You can set $db-&gt;codePage before connecting.</font></p></td>
-    <td><font size="2">? depends on database</font></td>
-    <td><font size="2">ADO or OLEDB provider</font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ado_access</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><font size="2">Microsoft Access/Jet using ADO. Allows DSN-less connections. 
-      For best performance, use an OLEDB provider.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ADO or OLEDB provider</font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ado_mssql</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><font size="2">Microsoft SQL Server using ADO. Allows DSN-less connections. 
-      For best performance, use an OLEDB provider.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ADO or OLEDB provider</font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-    <tr valign="top"> 
-    <td height="54"><b><font size="2">db2</font></b></td>
-    <td height="54"><font size="2">C</font></td>
-    <td height="54"><font size="2">Uses PHP's db2-specific extension for better performance.</font></td>
-    <td height="54"><font size="2">Y/N</font></td>
-    <td height="54"><font size="2">DB2 CLI/ODBC interface</font></td>
-    <td height="54"> <p><font size="2">Unix and Windows. Requires IBM DB2 Universal Database client.</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="54"><b><font size="2">odbc_db2</font></b></td>
-    <td height="54"><font size="2">C</font></td>
-    <td height="54"><font size="2">Connects to DB2 using generic ODBC extension.</font></td>
-    <td height="54"><font size="2">Y/N</font></td>
-    <td height="54"><font size="2">DB2 CLI/ODBC interface</font></td>
-    <td height="54"> <p><font size="2">Unix and Windows. <a href="http://www.faqts.com/knowledge_base/view.phtml/aid/6283/fid/14">Unix 
-        install hints</a>. I have had reports that the $host and $database params have to be reversed in Connect() when using the CLI interface.</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">vfp</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Microsoft Visual FoxPro. You need to create an ODBC DSN.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ODBC</font></td>
-    <td><font size="2">Windows only</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">fbsql</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">FrontBase. </font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">?</font></td>
-    <td> <p><font size="2">Unix and Windows</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ibase</font></b></td>
-    <td><font size="2">B</font></td>
-    <td><font size="2">Interbase 6 or earlier. Some users report you might need 
-      to use this<br>
-      $db-&gt;PConnect('localhost:c:/ibase/employee.gdb', "sysdba", "masterkey") 
-      to connect. Lacks Affected_Rows currently.<br>
-      <br>
-      You can set $db-&gt;role, $db-&gt;dialect, $db-&gt;buffers and $db-&gt;charSet before connecting.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Interbase client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><i><font size="2">firebird</font></i></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Firebird version of interbase.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Interbase client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><i><font size="2">borland_ibase</font></i></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Borland version of Interbase 6.5 or later. Very sad that 
-      the forks differ.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Interbase client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-
-  <tr valign="top"> 
-    <td><b><font size="2">informix</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Generic informix driver. Use this if you are using Informix 7.3 or later.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Informix client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">informix72</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2"> Informix databases before Informix 7.3 that do no support 
-      SELECT FIRST.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Informix client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">ldap</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">LDAP driver. See this example for usage information.</font></td>
-    <td>&nbsp;</td>
-    <td><font size="2">LDAP extension</font></td>
-    <td><font size="2">?</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="73"><b><font size="2">mssql</font></b></td>
-    <td height="73"><font size="2">A</font></td>
-    <td height="73"> <p><font size="2">Microsoft SQL Server 7 and later. Works 
-        with Microsoft SQL Server 2000 also. Note that date formating is problematic 
-        with this driver. For example, the PHP mssql extension does not return 
-        the seconds for datetime!</font></p></td>
-    <td height="73"><font size="2">Y/N</font></td>
-    <td height="73"><font size="2">Mssql client</font></td>
-    <td height="73"> <p><font size="2">Unix and Windows. <br>
-        <a href="http://phpbuilder.com/columns/alberto20000919.php3">Unix install 
-        howto</a> and <a href="http://linuxjournal.com/article.php?sid=6636&amp;mode=thread&amp;order=0">another 
-        one</a>. </font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="73"><b><font size="2">mssqlpo</font></b></td>
-    <td height="73"><font size="2">A</font></td>
-    <td height="73"> <p><font size="2">Portable mssql driver. Identical to above 
-        mssql driver, except that '||', the concatenation operator, is converted 
-        to '+'. Useful for porting scripts from most other sql variants that use 
-        ||.</font></p></td>
-    <td height="73"><font size="2">Y/N</font></td>
-    <td height="73"><font size="2">Mssql client</font></td>
-    <td height="73"> <p><font size="2">Unix and Windows. <a href="http://phpbuilder.com/columns/alberto20000919.php3"><br>
-        Unix install howto</a>.</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">mysql</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">MySQL without transaction support. You can also set $db-&gt;clientFlags 
-      before connecting.</font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">MySQL client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><font size="2"><b>mysqlt</b> or <b>maxsql</b></font></td>
-    <td><font size="2">A</font></td>
-    <td> <p><font size="2">MySQL with transaction support. We recommend using 
-        || as the concat operator for best portability. This can be done by running 
-        MySQL using: <br>
-        <i>mysqld --ansi</i> or <i>mysqld --sql-mode=PIPES_AS_CONCAT</i></font></p></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">MySQL client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">oci8</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Oracle 8/9. Has more functionality than <i>oracle</i> driver 
-      (eg. Affected_Rows). You might have to putenv('ORACLE_HOME=...') before 
-      Connect/PConnect. </font> <p><font size="2"> There are 2 ways of connecting 
-        - with server IP and service name: <br>
-        <i>PConnect('serverip:1521','scott','tiger','service'</i>)<br>
-        or using an entry in TNSNAMES.ORA or ONAMES or HOSTNAMES: <br>
-        <i>PConnect(false, 'scott', 'tiger', $oraname)</i>. </font> 
-      </p><p><font size="2">Since 2.31, we support Oracle REF cursor variables directly 
-        (see <a href="#executecursor">ExecuteCursor</a>).</font> </p></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Oracle client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">oci805</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Supports reduced Oracle functionality for Oracle 8.0.5. 
-      SelectLimit is not as efficient as in the oci8 or oci8po drivers.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Oracle client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">oci8po</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Oracle 8/9 portable driver. This is nearly identical with 
-      the oci8 driver except (a) bind variables in Prepare() use the ? convention, 
-      instead of :bindvar, (b) field names use the more common PHP convention 
-      of lowercase names. </font> <p><font size="2">Use this driver if porting 
-        from other databases is important. Otherwise the oci8 driver offers better 
-        performance. </font> </p></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Oracle client</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">odbc</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Generic ODBC, not tuned for specific databases. To connect, 
-      use <br>
-      PConnect('DSN','user','pwd'). This is the base class for all odbc derived 
-      drivers.</font></td>
-    <td><font size="2">? depends on database</font></td>
-    <td><font size="2">ODBC</font></td>
-    <td><font size="2">Unix and Windows. <a href="http://phpbuilder.com/columns/alberto20000919.php3?page=4">Unix 
-      hints.</a></font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">odbc_mssql</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Uses ODBC to connect to MSSQL</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ODBC</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">odbc_oracle</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Uses ODBC to connect to Oracle</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">ODBC</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-    
-  <tr valign="top"> 
-    <td><b><font size="2">odbtp</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Generic odbtp driver. <a href="http://odbtp.sourceforge.net/">Odbtp</a> is a software for
-	accessing Windows ODBC data sources from other operating systems.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">odbtp</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">odbtp_unicode</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Odtbp with unicode support</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">odbtp</font></td>
-    <td><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="34"><b><font size="2">oracle</font></b></td>
-    <td height="34"><font size="2">C</font></td>
-    <td height="34"><font size="2">Implements old Oracle 7 client API. Use oci8 
-      driver if possible for better performance.</font></td>
-    <td height="34"><font size="2">Y/N</font></td>
-    <td height="34"><font size="2">Oracle client</font></td>
-    <td height="34"><font size="2">Unix and Windows</font></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="34"><b><font size="2">netezza</font></b></td>
-    <td height="34"><font size="2">C</font></td>
-    <td height="34"><font size="2">Netezza driver. Netezza is based on postgres code-base.</font></td>
-    <td height="34"><font size="2">Y</font></td>
-    <td height="34"><font size="2">?</font></td>
-    <td height="34"><font size="2">?</font></td>
-  </tr>
-     <tr valign="top"> 
-    <td><b><font size="2">pdo</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Generic PDO driver for PHP5. </font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">PDO extension and database specific drivers</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">postgres</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">Generic PostgreSQL driver. Currently identical to postgres7 
-      driver.</font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">PostgreSQL client</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">postgres64</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">For PostgreSQL 6.4 and earlier which does not support LIMIT 
-      internally.</font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">PostgreSQL client</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">postgres7</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">PostgreSQL which supports LIMIT and other version 7 functionality.</font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">PostgreSQL client</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-    <tr valign="top"> 
-    <td><b><font size="2">postgres8</font></b></td>
-    <td><font size="2">A</font></td>
-    <td><font size="2">PostgreSQL which supports version 8 functionality.</font></td>
-    <td><font size="2">Y</font></td>
-    <td><font size="2">PostgreSQL client</font></td>
-    <td><font size="2">Unix and Windows. </font></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">sapdb</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">SAP DB. Should work reliably as based on ODBC driver.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">SAP ODBC client</font></td>
-    <td> <p><font size="2">?</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td><b><font size="2">sqlanywhere</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Sybase SQL Anywhere. Should work reliably as based on ODBC 
-      driver.</font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">SQL Anywhere ODBC client</font></td>
-    <td> <p><font size="2">?</font></p></td>
-  </tr>
-  <tr valign="top"> 
-    <td height="54"><b><font size="2">sqlite</font></b></td>
-    <td height="54"><font size="2">B</font></td>
-    <td height="54"><font size="2">SQLite.</font></td>
-    <td height="54"><font size="2">Y</font></td>
-    <td height="54"><font size="2">-</font></td>
-    <td height="54"> <p><font size="2">Unix and Windows.</font></p></td>
-  </tr>
-    <tr valign="top"> 
-    <td height="54"><b><font size="2">sqlitepo</font></b></td>
-    <td height="54"><font size="2">B</font></td>
-    <td height="54"><font size="2">Portable SQLite driver.  This is because assoc mode does not work like other drivers in sqlite.
-   Namely, when selecting (joining) multiple tables, the table
-   	  names are included in the assoc keys in the "sqlite" driver.</font><p>
-<font size="2">	  In "sqlitepo" driver, the table names are stripped from the returned column names. 
-	  When this results in a conflict,  the first field get preference.
-	  </font></p></td>
-    <td height="54"><font size="2">Y</font></td>
-    <td height="54"><font size="2">-</font></td>
-    <td height="54"> <p><font size="2">Unix and Windows.</font></p></td>
-  </tr>
- 
-	  
-  <tr valign="top"> 
-    <td><b><font size="2">sybase</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Sybase. </font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Sybase client</font></td>
-    <td> <p><font size="2">Unix and Windows.</font></p></td>
-  </tr>
-  
-    <tr valign="top"> 
-    <td><b><font size="2">sybase_ase</font></b></td>
-    <td><font size="2">C</font></td>
-    <td><font size="2">Sybase ASE. </font></td>
-    <td><font size="2">Y/N</font></td>
-    <td><font size="2">Sybase client</font></td>
-    <td> <p><font size="2">Unix and Windows.</font></p></td>
-  </tr>
-  </tbody></table>
-
-<p></p><p>The "Tested" column indicates how extensively the code has been tested 
-  and used. <br>
-  A = well tested and used by many people<br>
-  B = tested and usable, but some features might not be implemented<br>
-  C = user contributed or experimental driver. Might not fully support all of 
-  the latest features of ADOdb. </p>
-<p>The column "RecordCount() usable" indicates whether RecordCount() 
-  return the number of rows, or returns -1 when a SELECT statement is executed. 
-  If this column displays Y/N then the RecordCount() is emulated when the global 
-  variable $ADODB_COUNTRECS=true (this is the default). Note that for large recordsets, 
-  it might be better to disable RecordCount() emulation because substantial amounts 
-  of memory are required to cache the recordset for counting. Also there is a 
-  speed penalty of 40-50% if emulation is required. This is emulated in most databases 
-  except for PostgreSQL and MySQL. This variable is checked every time a query 
-  is executed, so you can selectively choose which recordsets to count.</p>
-<p> 
-</p><hr />
-<h1>Tutorials<a name="quickstart"></a></h1>
-<h3>Example 1: Select Statement<a name="ex1"></a></h3>
-<p>Task: Connect to the Access Northwind DSN, display the first 2 columns of each 
-  row.</p>
-<p>In this example, we create a ADOConnection object, which represents the connection 
-  to the database. The connection is initiated with <a href="#pconnect"><font face="Courier New, Courier, mono">PConnect</font></a>, 
-  which is a persistent connection. Whenever we want to query the database, we 
-  call the <font face="Courier New, Courier, mono">ADOConnection.<a href="#execute">Execute</a>()</font> 
-  function. This returns an ADORecordSet object which is actually a cursor that 
-  holds the current row in the array <font face="Courier New, Courier, mono">fields[]</font>. 
-  We use <font face="Courier New, Courier, mono"><a href="#movenext">MoveNext</a>()</font> 
-  to move from row to row.</p>
-<p>NB: A useful function that is not used in this example is <font face="Courier New, Courier, mono"><a href="#selectlimit">SelectLimit</a></font>, 
-  which allows us to limit the number of rows shown. 
-</p><pre>&lt;?<br><font face="Courier New, Courier, mono"><b>include</b>('adodb.inc.php');	   # load code common to ADOdb<br>$<font color="#660000">conn</font> = &amp;ADONewConnection('access');	# create a connection<br>$<font color="#660000">conn</font>-&gt;PConnect('northwind');   # connect to MS-Access, northwind DSN<br>$<font color="#660000">recordSet</font> = &amp;$<font color="#660000">conn</font>-&gt;Execute('select * from products');<br>if (!$<font color="#660000">recordSet</font>) <br>	print $<font color="#660000">conn</font>-&gt;ErrorMsg();<br>else<br><b>while</b> (!$<font color="#660000">recordSet</font>-&gt;EOF) {<br>	<b>print</b> $<font color="#660000">recordSet</font>-&gt;fields[0].' '.$<font color="#660000">recordSet</font>-&gt;fields[1].'&lt;BR&gt;';<br>	$<font color="#660000">recordSet</font>-&gt;MoveNext();<br>}</font><font face="Courier New, Courier, mono">
-
-$<font color="#660000">recordSet</font>-&gt;Close(); # optional<br>$<font color="#660000">conn</font>-&gt;Close(); # optional<br></font>
-?&gt;
-</pre>
-<p>The $<font face="Courier New, Courier, mono">recordSet</font> returned stores 
-  the current row in the <font face="Courier New, Courier, mono">$recordSet-&gt;fields</font> 
-  array, indexed by column number (starting from zero). We use the <font face="Courier New, Courier, mono"><a href="#movenext">MoveNext</a>()</font> 
-  function to move to the next row. The <font face="Courier New, Courier, mono">EOF</font> 
-  property is set to true when end-of-file is reached. If an error occurs in Execute(), 
-  we return false instead of a recordset.</p>
-<p>The <code>$recordSet-&gt;fields[]</code> array is generated by the PHP database 
-  extension. Some database extensions only index by number and do not index the 
-  array by field name. To force indexing by name - that is associative arrays 
-  - use the SetFetchMode function. Each recordset saves and uses whatever fetch 
-  mode was set when the recordset was created in Execute() or SelectLimit(). 
-</p><pre>	$db-&gt;SetFetchMode(ADODB_FETCH_NUM);<br>	$rs1 = $db-&gt;Execute('select * from table');<br>	$db-&gt;SetFetchMode(ADODB_FETCH_ASSOC);<br>	$rs2 = $db-&gt;Execute('select * from table');<br>	print_r($rs1-&gt;fields); # shows <i>array([0]=&gt;'v0',[1] =&gt;'v1')</i>
-	print_r($rs2-&gt;fields); # shows <i>array(['col1']=&gt;'v0',['col2'] =&gt;'v1')</i>
-</pre>
-<p> </p>
-<p>To get the number of rows in the select statement, you can use <font face="Courier New, Courier, mono">$recordSet-&gt;<a href="#recordcount">RecordCount</a>()</font>. 
-  Note that it can return -1 if the number of rows returned cannot be determined.</p>
-<h3>Example 2: Advanced Select with Field Objects<a name="ex2"></a></h3>
-<p>Select a table, display the first two columns. If the second column is a date 
-  or timestamp, reformat the date to US format.</p>
-<pre>&lt;?<br><font face="Courier New, Courier, mono"><b>include</b>('adodb.inc.php');	   # load code common to ADOdb<br>$<font color="#660000">conn</font> = &amp;ADONewConnection('access');	# create a connection<br>$<font color="#660000">conn</font>-&gt;PConnect('northwind');   # connect to MS-Access, northwind dsn<br>$<font color="#660000">recordSet</font> = &amp;$<font color="#660000">conn</font>-&gt;Execute('select CustomerID,OrderDate from Orders');<br>if (!$<font color="#660000">recordSet</font>) <br>	print $<font color="#660000">conn</font>-&gt;ErrorMsg();<br>else<br><b>while</b> (!$<font color="#660000">recordSet</font>-&gt;EOF) {<br>	$<font color="#660000">fld</font> = <font color="#336600"><b>$</b><font color="#660000">recordSet</font><b>-&gt;FetchField</b></font><font color="#006600">(</font>1<font color="#006600">);</font>
-	$<font color="#660000">type</font> = <font color="#336600"><b>$</b><font color="#660000">recordSet</font><b>-&gt;MetaType</b></font>($fld-&gt;type);<br><br>	<b>if</b> ( $<font color="#660000">type</font> == 'D' || $<font color="#660000">type</font> == 'T') <br>		<b>print</b> $<font color="#660000">recordSet</font>-&gt;fields[0].' '.<br>			<b><font color="#336600">$</font></b><font color="#660000">recordSet</font><b><font color="#336600">-&gt;UserDate</font></b>($<font color="#660000">recordSet</font>-&gt;fields[1],'<b>m/d/Y</b>').'&lt;BR&gt;';<br>	<b>else </b>
-		<b>print</b> $<font color="#660000">recordSet</font>-&gt;fields[0].' '.$<font color="#660000">recordSet</font>-&gt;fields[1].'&lt;BR&gt;';<br><br>	$<font color="#660000">recordSet</font>-&gt;MoveNext();<br>}</font><font face="Courier New, Courier, mono">
-$<font color="#660000">recordSet</font>-&gt;Close(); # optional<br>$<font color="#660000">conn</font>-&gt;Close(); # optional<br></font>
-?&gt;
-</pre>
-<p>In this example, we check the field type of the second column using <font face="Courier New, Courier, mono"><a href="#fetchfield">FetchField</a>().</font> 
-  This returns an object with at least 3 fields.</p>
-<ul>
-  <li><b>name</b>: name of column</li>
-  <li> <b>type</b>: native field type of column</li>
-  <li> <b>max_length</b>: maximum length of field. Some databases such as MySQL 
-    do not return the maximum length of the field correctly. In these cases max_length 
-    will be set to -1.</li>
-</ul>
-<p>We then use <font face="Courier New, Courier, mono"><a href="#metatype">MetaType</a>()</font> 
-  to translate the native type to a <i>generic</i> type. Currently the following 
-  <i>generic</i> types are defined:</p>
-<ul>
-  <li><b>C</b>: character fields that should be shown in a &lt;input type="text"&gt; 
-    tag.</li>
-  <li><b>X</b>: TeXt, large text fields that should be shown in a &lt;textarea&gt;</li>
-  <li><b>B</b>: Blobs, or Binary Large Objects. Typically images. 
-  </li><li><b>D</b>: Date field</li>
-  <li><b>T</b>: Timestamp field</li>
-  <li><b>L</b>: Logical field (boolean or bit-field)</li>
-  <li><b>I</b>:&nbsp; Integer field</li>
-  <li><b>N</b>: Numeric field. Includes autoincrement, numeric, floating point, 
-    real and integer. </li>
-  <li><b>R</b>: Serial field. Includes serial, autoincrement integers. This works 
-    for selected databases. </li>
-</ul>
-<p>If the metatype is of type date or timestamp, then we print it using the user 
-  defined date format with <font face="Courier New, Courier, mono"><a href="#userdate">UserDate</a>(),</font> 
-  which converts the PHP SQL date string format to a user defined one. Another 
-  use for <font face="Courier New, Courier, mono"><a href="#metatype">MetaType</a>()</font> 
-  is data validation before doing an SQL insert or update.</p>
-<h3>Example 3: Inserting<a name="ex3"></a></h3>
-<p>Insert a row to the Orders table containing dates and strings that need to 
-  be quoted before they can be accepted by the database, eg: the single-quote 
-  in the word <i>John's</i>.</p>
-<pre>&lt;?<br><b>include</b>('adodb.inc.php');	   # load code common to ADOdb<br>$<font color="#660000">conn</font> = &amp;ADONewConnection('access');	# create a connection<br><br>$<font color="#660000">conn</font>-&gt;PConnect('northwind');   # connect to MS-Access, northwind dsn<br>$<font color="#660000">shipto</font> = <font color="#006600"><b>$conn-&gt;qstr</b></font>("<i>John's Old Shoppe</i>");<br><br>$<font color="#660000">sql</font> = "insert into orders (customerID,EmployeeID,OrderDate,ShipName) ";<br>$<font color="#660000">sql</font> .= "values ('ANATR',2,".<b><font color="#006600">$conn-&gt;DBDate(</font>time()<font color="#006600">)</font></b><font color="#006600">.</font>",$<font color="#660000">shipto</font>)";<br><br><b>if</b> ($<font color="#660000">conn</font>-&gt;Execute($<font color="#660000">sql</font>) <font color="#336600"><b>=== false</b></font>) {<br>	<b>print</b> 'error inserting: '.<font color="#336600"><b>$conn-&gt;ErrorMsg()</b></font>.'&lt;BR&gt;';<br>}<br>?&gt;<br></pre>
-<p>In this example, we see the advanced date and quote handling facilities of 
-  ADOdb. The unix timestamp (which is a long integer) is appropriately formated 
-  for Access with <font face="Courier New, Courier, mono"><a href="#dbdate">DBDate</a>()</font>, 
-  and the right escape character is used for quoting the <i>John's Old Shoppe</i>, 
-  which is<b> </b><i>John'<b>'</b>s Old Shoppe</i> and not PHP's default <i>John<b>'</b>s 
-  Old Shoppe</i> with <font face="Courier New, Courier, mono"><a href="#qstr">qstr</a>()</font>. 
-</p>
-<p>Observe the error-handling of the Execute statement. False is returned by<font face="Courier New, Courier, mono"> 
-  <a href="#execute">Execute</a>() </font>if an error occured. The error message 
-  for the last error that occurred is displayed in <font face="Courier New, Courier, mono"><a href="#errormsg">ErrorMsg</a>()</font>. 
-  Note: <i>php_track_errors</i> might have to be enabled for error messages to 
-  be saved.</p>
-<h3> Example 4: Debugging<a name="ex4"></a></h3>
-<pre>&lt;?<br><b>include</b>('adodb.inc.php');	   # load code common to ADOdb<br>$<font color="#663300">conn</font> = &amp;ADONewConnection('access');	# create a connection<br>$<font color="#663300">conn</font>-&gt;PConnect('northwind');   # connect to MS-Access, northwind dsn<br><font>$<font color="#663300">shipto</font> = <b>$conn-&gt;qstr</b>("John's Old Shoppe");<br>$<font color="#663300">sql</font> = "insert into orders (customerID,EmployeeID,OrderDate,ShipName) ";<br>$<font color="#663300">sql</font> .= "values ('ANATR',2,".$<font color="#663300">conn</font>-&gt;FormatDate(time()).",$shipto)";<br><b><font color="#336600">$<font color="#663300">conn</font>-&gt;debug = true;</font></b>
-<b>if</b> ($<font color="#663300">conn</font>-&gt;Execute($sql) <b>=== false</b>) <b>print</b> 'error inserting';</font>
-?&gt;
-</pre>
-<p>In the above example, we have turned on debugging by setting <b>debug = true</b>. 
-  This will display the SQL statement before execution, and also show any error 
-  messages. There is no need to call <font face="Courier New, Courier, mono"><a href="#errormsg">ErrorMsg</a>()</font> 
-  in this case. For displaying the recordset, see the <font face="Courier New, Courier, mono"><a href="#exrs2html">rs2html</a>() 
-  </font>example.</p>
-<p>Also see the section on <a href="#errorhandling">Custom Error Handlers</a>.</p>
-<h3>Example 5: MySQL and Menus<a name="ex5"></a></h3>
-<p>Connect to MySQL database <i>agora</i>, and generate a &lt;select&gt; menu 
-  from an SQL statement where the &lt;option&gt; captions are in the 1st column, 
-  and the value to send back to the server is in the 2nd column.</p>
-<pre>&lt;?<br><b>include</b>('adodb.inc.php'); # load code common to ADOdb<br>$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');  # create a connection<br>$<font color="#663300">conn</font>-&gt;PConnect('localhost','userid','','agora');# connect to MySQL, agora db<br><font>$<font color="#663300">sql</font> = 'select CustomerName, CustomerID from customers';<br>$<font color="#663300">rs</font> = $<font color="#663300">conn</font>-&gt;Execute($sql);<br><b>print</b> <b><font color="#336600">$<font color="#663300">rs</font>-&gt;GetMenu('GetCust','Mary Rosli');<br>?&gt;</font></b></font></pre>
-<p>Here we define a menu named GetCust, with the menu option 'Mary Rosli' selected. 
-  See <a href="#getmenu"><font face="Courier New, Courier, mono">GetMenu</font></a><font face="Courier New, Courier, mono">()</font>. 
-  We also have functions that return the recordset as an array: <font face="Courier New, Courier, mono"><a href="#getarray">GetArray</a>()</font>, 
-  and as an associative array with the key being the first column: <a href="#getassoc1">GetAssoc</a>().</p>
-<h3>Example 6: Connecting to 2 Databases At Once<a name="ex6"></a></h3>
-<pre>&lt;?<br><b>include</b>('adodb.inc.php');	 # load code common to ADOdb<br>$<font color="#663300">conn1</font> = &amp;ADONewConnection('mysql');  # create a mysql connection<br>$<font color="#663300">conn2</font> = &amp;ADONewConnection('oracle');  # create a oracle connection<br><br>$conn1-&gt;PConnect($server, $userid, $password, $database);<br>$conn2-&gt;PConnect(false, $ora_userid, $ora_pwd, $oraname);<br><br>$conn1-&gt;Execute('insert ...');<br>$conn2-&gt;Execute('update ...');<br>?&gt;</pre>
-<p> 
-</p><h3>Example 7: Generating Update and Insert SQL<a name="ex7"></a></h3>
-<p>Since ADOdb 4.56, we support <a href="reference.functions.getupdatesql.html#autoexecute">AutoExecute()</a>, 
-which simplifies things by providing an advanced wrapper for GetInsertSQL() and GetUpdateSQL(). For example,
-an INSERT can be carried out with:
-
-<pre>
-    $record["firstname"] = "Bob"; 
-    $record["lastname"] = "Smith"; 
-    $record["created"] = time(); 
-    $insertSQL = $conn->AutoExecute($rs, $record, 'INSERT'); 
-</pre>
-
-and an UPDATE with:
-<pre>
-    $record["firstname"] = "Caroline"; 
-    $record["lastname"] = "Smith"; # Update Caroline's lastname from Miranda to Smith 
-    $insertSQL = $conn->AutoExecute($rs, $record, 'UPDATE', 'id = 1'); 
-</pre>
-<p>
-The rest of this section is out-of-date:
-<p>ADOdb 1.31 and later supports two new recordset functions: GetUpdateSQL( ) and 
-GetInsertSQL( ). This allow you to perform a "SELECT * FROM table query WHERE...", 
-make a copy of the $rs-&gt;fields, modify the fields, and then generate the SQL to 
-update or insert into the table automatically. 
-<p> We show how the functions can be used when accessing a table with the following 
-  fields: (ID, FirstName, LastName, Created). 
-</p><p> Before these functions can be called, you need to initialize the recordset 
-  by performing a select on the table. Idea and code by Jonathan Younger jyounger#unilab.com. 
- Since ADOdb 2.42, you can pass a  table name instead of a recordset into 
-GetInsertSQL (in $rs), and it will generate an insert statement for that table.
-</p><p> 
-</p><pre>&lt;?<br>#==============================================<br># SAMPLE GetUpdateSQL() and GetInsertSQL() code<br>#==============================================<br>include('adodb.inc.php');<br>include('tohtml.inc.php');<br><br>#==========================<br># This code tests an insert<br><br>$sql = "SELECT * FROM ADOXYZ WHERE id = -1"; <br># Select an empty record from the database<br><br>$conn = &amp;ADONewConnection("mysql");  # create a connection<br>$conn-&gt;debug=1;<br>$conn-&gt;PConnect("localhost", "admin", "", "test"); # connect to MySQL, testdb<br>$rs = $conn-&gt;Execute($sql); # Execute the query and get the empty recordset<br><br>$record = array(); # Initialize an array to hold the record data to insert<br><br># Set the values for the fields in the record<br># Note that field names are case-insensitive<br>$record["firstname"] = "Bob";<br>$record["lastNamE"] = "Smith";<br>$record["creaTed"] = time();<br><br># Pass the empty recordset and the array containing the data to insert<br># into the GetInsertSQL function. The function will process the data and return<br># a fully formatted insert sql statement.<br>$insertSQL = $conn-&gt;GetInsertSQL($rs, $record);<br><br>$conn-&gt;Execute($insertSQL); # Insert the record into the database<br><br>#==========================<br># This code tests an update<br><br>$sql = "SELECT * FROM ADOXYZ WHERE id = 1"; <br># Select a record to update<br><br>$rs = $conn-&gt;Execute($sql); # Execute the query and get the existing record to update<br><br>$record = array(); # Initialize an array to hold the record data to update<br><br># Set the values for the fields in the record<br># Note that field names are case-insensitive<br>$record["firstname"] = "Caroline";<br>$record["LasTnAme"] = "Smith"; # Update Caroline's lastname from Miranda to Smith<br><br># Pass the single record recordset and the array containing the data to update<br># into the GetUpdateSQL function. The function will process the data and return<br># a fully formatted update sql statement with the correct WHERE clause.<br># If the data has not changed, no recordset is returned<br>$updateSQL = $conn-&gt;GetUpdateSQL($rs, $record);<br><br>$conn-&gt;Execute($updateSQL); # Update the record in the database<br>$conn-&gt;Close();<br>?&gt;<br></pre>
-<a name="ADODB_FORCE_TYPE"></a>
-<b>$ADODB_FORCE_TYPE</b><p>
-The behaviour of AutoExecute(), GetUpdateSQL() and GetInsertSQL()  
-when converting empty or null PHP variables to SQL is controlled by the
- global $ADODB_FORCE_TYPE variable. Set it to one of the values below. Default
-  is ADODB_FORCE_VALUE (3):
-</p><pre>0 = ignore empty fields. All empty fields in array are ignored.<br>1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.<br>2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.<br>3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and <br>    empty fields '' are set to empty '' sql values.<br><br>define('ADODB_FORCE_IGNORE',0);<br>define('ADODB_FORCE_NULL',1);<br>define('ADODB_FORCE_EMPTY',2);<br>define('ADODB_FORCE_VALUE',3);<br></pre>
-<p>
-Thanks to Niko (nuko#mbnet.fi) for the $ADODB_FORCE_TYPE code.
-</p><p>
-Note: the constant ADODB_FORCE_NULLS is obsolete since 4.52 and is ignored. Set $ADODB_FORCE_TYPE = ADODB_FORCE_NULL
-for equivalent behaviour.
-<p>Since 4.62, the table name to be used can be overridden by setting $rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
-</p><h3>Example 8: Implementing Scrolling with Next and Previous<a name="ex8"></a></h3>
-<p> The following code creates a very simple recordset pager, where you can scroll 
-  from page to page of a recordset.</p>
-<pre>include_once('../adodb.inc.php');<br>include_once('../adodb-pager.inc.php');<br>session_start();<br><br>$db = NewADOConnection('mysql');<br><br>$db-&gt;Connect('localhost','root','','xphplens');<br><br>$sql = "select * from adoxyz ";<br><br>$pager = new ADODB_Pager($db,$sql);<br>$pager-&gt;Render($rows_per_page=5);</pre>
-<p>This will create a basic record pager that looks like this: <a name="scr"></a> 
-</p><p> 
-<table bgcolor="beige" border="1">
-  <tbody><tr> 
-    <td> <a href="#scr"><code>|&lt;</code></a> &nbsp; <a href="#scr"><code>&lt;&lt;</code></a> 
-      &nbsp; <a href="#scr"><code>&gt;&gt;</code></a> &nbsp; <a href="#scr"><code>&gt;|</code></a> 
-      &nbsp; </td>
-  </tr>
-  <tr>
-    <td><table bgcolor="white" border="1" cols="4" width="100%">
-        <tbody><tr><th>ID</th>
-        <th>First Name</th>
-        <th>Last Name</th>
-        <th>Date Created</th>
-        </tr><tr> 
-          <td align="right">36&nbsp;</td>
-          <td>Alan&nbsp;</td>
-          <td>Turing&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-        <tr> 
-          <td align="right">37&nbsp;</td>
-          <td>Serena&nbsp;</td>
-          <td>Williams&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-        <tr> 
-          <td align="right">38&nbsp;</td>
-          <td>Yat Sun&nbsp;</td>
-          <td>Sun&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-        <tr> 
-          <td align="right">39&nbsp;</td>
-          <td>Wai Hun&nbsp;</td>
-          <td>See&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-        <tr> 
-          <td align="right">40&nbsp;</td>
-          <td>Steven&nbsp;</td>
-          <td>Oey&nbsp;</td>
-          <td>Sat 06, Oct 2001&nbsp;</td>
-        </tr>
-      </tbody></table></td>
-  </tr>
-  <tr>
-    <td><font size="-1">Page 8/10</font></td>
-  </tr>
-</tbody></table>
-</p><p>The number of rows to display at one time is controled by the Render($rows) 
-  method. If you do not pass any value to Render(), ADODB_Pager will default to 
-  10 records per page. 
-</p><p>You can control the column titles by modifying your SQL (supported by most 
-  databases): 
-</p><pre>$sql = 'select id as "ID", firstname as "First Name", <br>		  lastname as "Last Name", created as "Date Created" <br>		from adoxyz';</pre>
-<p>The above code can be found in the <i>adodb/tests/testpaging.php</i> example 
-  included with this release, and the class ADODB_Pager in <i>adodb/adodb-pager.inc.php</i>. 
-  The ADODB_Pager code can be adapted by a programmer so that the text links can 
-  be replaced by images, and the dull white background be replaced with more interesting 
-  colors. 
-</p><p>You can also allow display of html by setting $pager-&gt;htmlSpecialChars = false. 
-</p><p>Some of the code used here was contributed by Iv&aacute;n Oliva and Cornel 
-  G. </p>
-<h3><a name="ex9"></a>Example 9: Exporting in CSV or Tab-Delimited Format</h3>
-<p>We provide some helper functions to export in comma-separated-value (CSV) and 
-  tab-delimited formats:</p>
-<pre><b>include_once('/path/to/adodb/toexport.inc.php');</b><br>include_once('/path/to/adodb/adodb.inc.php');<br>
-$db = &amp;NewADOConnection('mysql');<br>$db-&gt;Connect($server, $userid, $password, $database);<br><br>$rs = $db-&gt;Execute('select fname as "First Name", surname as "Surname" from table');<br><br>print "&lt;pre&gt;";<br>print <b>rs2csv</b>($rs); # return a string, CSV format<p>print '&lt;hr&gt;';<br><br>$rs-&gt;MoveFirst(); # note, some databases do not support MoveFirst<br>print <b>rs2tab</b>($rs,<i>false</i>); # return a string, tab-delimited<br>						 # false == suppress field names in first line</p>print '&lt;hr&gt;';<br>$rs-&gt;MoveFirst();<br><b>rs2tabout</b>($rs); # send to stdout directly (there is also an rs2csvout function)<br>print "&lt;/pre&gt;";<br><br>$rs-&gt;MoveFirst();<br>$fp = fopen($path, "w");<br>if ($fp) {<br>  <b>rs2csvfile</b>($rs, $fp); # write to file (there is also an rs2tabfile function)<br>  fclose($fp);<br>}<br></pre>
-<p> Carriage-returns or newlines are converted to spaces. Field names are returned 
-  in the first line of text. Strings containing the delimiter character are quoted 
-  with double-quotes. Double-quotes are double-quoted again. This conforms to 
-  Excel import and export guide-lines. 
-</p><p>All the above functions take as an optional last parameter, $addtitles which 
-  defaults to <i>true</i>. When set to <i>false</i> field names in the first line 
-  are suppressed. <br>
-</p><h3>Example 10: Recordset Filters<a name="ex10"></a></h3>
-<p>Sometimes we want to pre-process all rows in a recordset before we use it. 
-  For example, we want to ucwords all text in recordset. 
-</p><pre>include_once('adodb/rsfilter.inc.php');<br>include_once('adodb/adodb.inc.php');<br><br>// ucwords() every element in the recordset<br>function do_ucwords(&amp;$arr,$rs)<br>{<br>	foreach($arr as $k =&gt; $v) {<br>		$arr[$k] = ucwords($v);<br>	}<br>}<br><br>$db = NewADOConnection('mysql');<br>$db-&gt;PConnect('server','user','pwd','db');<br><br>$rs = $db-&gt;Execute('select ... from table');<br>$rs = <b>RSFilter</b>($rs,'do_ucwords');<br></pre>
-<p>The <i>RSFilter</i> function takes 2 parameters, the recordset, and the name 
-  of the <i>filter</i> function. It returns the processed recordset scrolled to 
-  the first record. The <i>filter</i> function takes two parameters, the current 
-  row as an array, and the recordset object. For future compatibility, you should 
-  not use the original recordset object. </p>
-<h3>Example 11:<a name="ex11"></a> Smart Transactions</h3>
-The old way of doing transactions required you to use 
-<pre>$conn-&gt;<b>BeginTrans</b>();<br>$ok = $conn-&gt;Execute($sql);<br>if ($ok) $ok = $conn-&gt;Execute($sql2);<br>if (!$ok) $conn-&gt;<b>RollbackTrans</b>();<br>else $conn-&gt;<b>CommitTrans</b>();<br></pre>
-This is very complicated for large projects because you have to track the error 
-status. Smart Transactions is much simpler. You start a smart transaction by calling 
-StartTrans(): 
-<pre>$conn-&gt;<b>StartTrans</b>();<br>$conn-&gt;Execute($sql);<br>$conn-&gt;Execute($Sql2);<br>$conn-&gt;<b>CompleteTrans</b>();<br></pre>
-CompleteTrans() detects when an SQL error occurs, and will Rollback/Commit as 
-appropriate. To specificly force a rollback even if no error occured, use FailTrans(). 
-Note that the rollback is done in CompleteTrans(), and not in FailTrans(). 
-<pre>$conn-&gt;<b>StartTrans</b>();<br>$conn-&gt;Execute($sql);<br>if (!CheckRecords()) $conn-&gt;<strong>FailTrans</strong>();<br>$conn-&gt;Execute($Sql2);<br>$conn-&gt;<b>CompleteTrans</b>();<br></pre>
-<p>You can also check if a transaction has failed, using HasFailedTrans(), which 
-  returns true if FailTrans() was called, or there was an error in the SQL execution. 
-  Make sure you call HasFailedTrans() before you call CompleteTrans(), as it is 
-  only works between StartTrans/CompleteTrans.
-</p><p>Lastly, StartTrans/CompleteTrans is nestable, and only the outermost block 
-  is executed. In contrast, BeginTrans/CommitTrans/RollbackTrans is NOT nestable. 
-</p><pre>$conn-&gt;<strong>StartTrans</strong>();<br>$conn-&gt;Execute($sql);<br>  $conn-&gt;<strong>StartTrans</strong>();    <font color="#006600"># ignored</font>
-  if (!CheckRecords()) $conn-&gt;FailTrans();
-  $conn-&gt;<strong>CompleteTrans</strong>(); <font color="#006600"># ignored</font>
-$conn-&gt;Execute($Sql2);
-$conn-&gt;<strong>CompleteTrans</strong>();<br></pre>
-<p>Note: Savepoints are currently not supported. 
-</p><h2><a name="errorhandling"></a>Using Custom Error Handlers and PEAR_Error</h2>
-<p>ADOdb supports PHP5 exceptions.  Just include <i>adodb-exceptions.inc.php</i> and you can now 
-catch exceptions on errors as they occur.
-</p><pre>	<b>include("../adodb-exceptions.inc.php");</b> <br>	include("../adodb.inc.php");	 <br>	try { <br>		$db = NewADOConnection("oci8://scott:bad-password@mytns/"); <br>	} catch (exception $e) { <br>		var_dump($e); <br>		adodb_backtrace($e-&gt;gettrace());<br>	} <br></pre>
-<p> ADOdb also provides two custom handlers which you can modify for your needs. The 
-  first one is in the <b>adodb-errorhandler.inc.php</b> file. This makes use of 
-  the standard PHP functions <a href="http://php.net/error_reporting">error_reporting</a> 
-  to control what error messages types to display, and <a href="http://php.net/trigger_error">trigger_error</a> 
-  which invokes the default PHP error handler. 
-</p><p> Including the above file will cause <i>trigger_error($errorstring,E_USER_ERROR)</i> 
-  to be called when<br>
-  (a) Connect() or PConnect() fails, or <br>
-  (b) a function that executes SQL statements such as Execute() or SelectLimit() 
-  has an error.<br>
-  (c) GenID() appears to go into an infinite loop. 
-</p><p> The $errorstring is generated by ADOdb and will contain useful debugging information 
-  similar to the error.log data generated below. This file adodb-errorhandler.inc.php 
-  should be included before you create any ADOConnection objects. 
-</p><p> If you define error_reporting(0), no errors will be passed to the error handler. 
-  If you set error_reporting(E_ALL), all errors will be passed to the error handler. 
-  You still need to use <b>ini_set("display_errors", "0" or "1")</b> to control 
-  the display of errors. 
-</p><pre>&lt;?php<br><b>error_reporting(E_ALL); # pass any error messages triggered to error handler<br>include('adodb-errorhandler.inc.php');</b>
-include('adodb.inc.php');
-include('tohtml.inc.php');
-$c = NewADOConnection('mysql');
-$c-&gt;PConnect('localhost','root','','northwind');
-$rs=$c-&gt;Execute('select * from productsz'); #invalid table productsz');
-if ($rs) rs2html($rs);
-?&gt;
-</pre>
-<p> If you want to log the error message, you can do so by defining the following 
-  optional constants ADODB_ERROR_LOG_TYPE and ADODB_ERROR_LOG_DEST. ADODB_ERROR_LOG_TYPE 
-  is the error log message type (see <a href="http://php.net/error_log">error_log</a> 
-  in the PHP manual). In this case we set it to 3, which means log to the file 
-  defined by the constant ADODB_ERROR_LOG_DEST. 
-</p><pre>&lt;?php<br><b>error_reporting(E_ALL); # report all errors<br>ini_set("display_errors", "0"); # but do not echo the errors<br>define('ADODB_ERROR_LOG_TYPE',3);<br>define('ADODB_ERROR_LOG_DEST','C:/errors.log');<br>include('adodb-errorhandler.inc.php');</b>
-include('adodb.inc.php');
-include('tohtml.inc.php');
-
-$c = NewADOConnection('mysql');
-$c-&gt;PConnect('localhost','root','','northwind');
-$rs=$c-&gt;Execute('select * from productsz'); ## invalid table productsz
-if ($rs) rs2html($rs);
-?&gt;
-</pre>
-The following message will be logged in the error.log file: 
-<pre>(2001-10-28 14:20:38) mysql error: [1146: Table 'northwind.productsz' doesn't exist] in<br> EXECUTE("select * from productsz")<br></pre>
-<h3>PEAR_ERROR</h3>
-The second error handler is <b>adodb-errorpear.inc.php</b>. This will create a 
-PEAR_Error derived object whenever an error occurs. The last PEAR_Error object 
-created can be retrieved using ADODB_Pear_Error(). 
-<pre>&lt;?php<br><b>include('adodb-errorpear.inc.php');</b>
-include('adodb.inc.php');
-include('tohtml.inc.php');
-$c = NewADOConnection('mysql');
-$c-&gt;PConnect('localhost','root','','northwind');
-$rs=$c-&gt;Execute('select * from productsz'); #invalid table productsz');
-if ($rs) rs2html($rs);
-else {
-	<b>$e = ADODB_Pear_Error();<br>	echo '&lt;p&gt;',$e-&gt;message,'&lt;/p&gt;';</b>
-}
-?&gt;
-</pre>
-<p> You can use a PEAR_Error derived class by defining the constant ADODB_PEAR_ERROR_CLASS 
-  before the adodb-errorpear.inc.php file is included. For easy debugging, you 
-  can set the default error handler in the beginning of the PHP script to PEAR_ERROR_DIE, 
-  which will cause an error message to be printed, then halt script execution: 
-</p><pre>include('PEAR.php');<br>PEAR::setErrorHandling('PEAR_ERROR_DIE');<br></pre>
-<p> Note that we do not explicitly return a PEAR_Error object to you when an error 
-  occurs. We return false instead. You have to call ADODB_Pear_Error() to get 
-  the last error or use the PEAR_ERROR_DIE technique. 
-</p>
-<h3>MetaError and MetaErrMsg</h3>
- <p>If you need error messages that work across multiple databases, then use <a href="#metaerror">MetaError()</a>, which returns a virtualized error number, based on PEAR DB's error number system, and <a href=<a href="#metaerrmsg">MetaErrMsg()</a>.
-
-<h4>Error Messages</h4>
-<p>Error messages are outputted using the static method ADOConnnection::outp($msg,$newline=true). 
-  By default, it sends the messages to the client. You can override this to perform 
-  error-logging. 
-</p><h2><a name="dsn"></a> Data Source Names</h2>
-<p>We now support connecting using PEAR style DSN's. A DSN is a connection string 
-  of the form:</p>
-<p>$dsn = <i>"$driver://$username:$password@$hostname/$databasename"</i>;</p>
-<p>An example:</p>
-<pre>   $username = 'root';<br>   $password = '';<br>   $hostname = 'localhost';<br>   $databasename = 'xphplens';<br>   $driver = 'mysql';<br>   $dsn = "$driver://$username:$password@$hostname/$databasename"<br>   $db = NewADOConnection(); <br>   # DB::Connect($dsn) also works if you include 'adodb/adodb-pear.inc.php' at the top<br>   $rs = $db-&gt;query('select firstname,lastname from adoxyz');<br>   $cnt = 0;<br>   while ($arr = $rs-&gt;fetchRow()) {<br>		print_r($arr); print "&lt;br&gt;";<br>   }</pre>
-   <p></p>
-<p>   <a href="#dsnsupport">More info and connection examples</a> on the DSN format.
-
-</p><h2><a name="pear"></a>PEAR Compatibility</h2>
-  We support DSN's (see above), and the following functions:
- <pre><b> DB_Common</b>
- 	query - returns PEAR_Error on error
-	limitQuery - return PEAR_Error on error
-	prepare - does not return PEAR_Error on error
-	execute - does not return PEAR_Error on error
-	setFetchMode - supports ASSOC and ORDERED
-	errorNative
-	quote
-	nextID
-	disconnect
-	
-	getOne
-	getAssoc
-	getRow
-	getCol
-	
-<b> DB_Result</b>
- 	numRows - returns -1 if not supported
-	numCols
-	fetchInto - does not support passing of fetchmode
-	fetchRows - does not support passing of fetchmode
-	free
-</pre>
-<h2><a name="caching"></a>Caching of Recordsets</h2>
-<p>ADOdb now supports caching of recordsets using the CacheExecute( ), CachePageExecute( 
-  ) and CacheSelectLimit( ) functions. There are similar to the non-cache functions, 
-  except that they take a new first parameter, $secs2cache. 
-</p><p> An example: 
-</p><pre><b>include</b>('adodb.inc.php'); # load code common to ADOdb<br>$ADODB_CACHE_DIR = '/usr/ADODB_cache';<br>$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');  # create a connection<br>$<font color="#663300">conn</font>-&gt;PConnect('localhost','userid','','agora');# connect to MySQL, agora db<br><font>$<font color="#663300">sql</font> = 'select CustomerName, CustomerID from customers';<br>$<font color="#663300">rs</font> = $<font color="#663300">conn</font>-&gt;CacheExecute(15,$sql);</font></pre>
-<p><font> The first parameter is the number of seconds to cache 
-  the query. Subsequent calls to that query will used the cached version stored 
-  in $ADODB_CACHE_DIR. To force a query to execute and flush the cache, call CacheExecute() 
-  with the first parameter set to zero. Alternatively, use the CacheFlush($sql) 
-  call. </font></p>
-<p><font>For the sake of security, we recommend you set <i>register_globals=off</i> 
-  in php.ini if you are using $ADODB_CACHE_DIR.</font></p>
-<p>In ADOdb 1.80 onwards, the secs2cache parameter is optional in CacheSelectLimit() 
-  and CacheExecute(). If you leave it out, it will use the $connection-&gt;cacheSecs 
-  parameter, which defaults to 60 minutes. 
-</p><pre>	$conn-&gt;Connect(...);<br>	$conn-&gt;cacheSecs = 3600*24; # cache 24 hours<br>	$rs = $conn-&gt;CacheExecute('select * from table');<br></pre>
-<p>Please note that magic_quotes_runtime should be turned off. <a href="http://phplens.com/lens/lensforum/msgs.php?LeNs#LensBM_forummsg">More 
-  info</a>, and do not change $ADODB_FETCH_MODE (or SetFetchMode) 
-  as the cached recordset will use the $ADODB_FETCH_MODE set when the query was executed. <font> 
-<h2><a name="pivot"></a>Pivot Tables</h2>
-</font> </p><p><font>Since ADOdb 2.30, we support the generation of 
-SQL to create pivot tables, also known as cross-tabulations. For further explanation 
-read this DevShed <a href="http://www.devshed.com/Server_Side/MySQL/MySQLWiz/">Cross-Tabulation 
-tutorial</a>. We assume that your database supports the SQL case-when expression. </font></p> 
-<font> 
-<p>In this example, we will use the Northwind database from Microsoft. In the 
-  database, we have a products table, and we want to analyze this table by <i>suppliers 
-  versus product categories</i>. We will place the suppliers on each row, and 
-  pivot on categories. So from the table on the left, we generate the pivot-table 
-  on the right:</p>
-</font> 
-<table align="center" border="0" cellpadding="2" cellspacing="2">
-  <tbody><tr>
-	<td>
-	  <table align="center" border="1" cellpadding="2" cellspacing="2" width="142">
-		<tbody><tr> 
-		  <td><i>Supplier</i></td>
-		  <td><i>Category</i></td>
-		</tr>
-		<tr> 
-		  <td>supplier1</td>
-		  <td>category1</td>
-		</tr>
-		<tr> 
-		  <td>supplier2</td>
-		  			<td>category1</td>
-		</tr>
-		<tr> 
-		  			<td>supplier2</td>
-		  <td>category2</td>
-		</tr>
-	  </tbody></table>
-	</td>
-	<td> <font face="Courier New, Courier, mono">--&gt;</font></td>
-	<td>
-	  <table align="center" border="1" cellpadding="2" cellspacing="2">
-		<tbody><tr> 
-		  <td>&nbsp;</td>
-		  <td><i>category1</i></td>
-		  <td><i>category2</i></td>
-		  <td><i>total</i></td>
-		</tr>
-		<tr> 
-		  <td><i>supplier1</i></td>
-		  <td align="right">1</td>
-		  <td align="right">0</td>
-		  <td align="right">1</td>
-		</tr>
-		<tr> 
-		  <td><i>supplier2</i></td>
-		  <td align="right">1</td>
-		  <td align="right">1</td>
-		  <td align="right">2</td>
-		</tr>
-	  </tbody></table>
-	</td>
-  </tr>
-</tbody></table>
-<font> 
-</font><p><font>The following code will generate the SQL for a cross-tabulation: 
-</font></p><pre><font># Query the main "product" table<br># Set the rows to SupplierName<br># and the columns to the values of Categories<br># and define the joins to link to lookup tables <br># "categories" and "suppliers"<br>#<br> include "adodb/pivottable.inc.php";<br> $sql = PivotTableSQL(<br> 	$gDB,                                      # adodb connection<br> 	'products p ,categories c ,suppliers s',   # tables<br>	'SupplierName',                             # rows (multiple fields allowed)<br>	'CategoryName',                            # column to pivot on <br>	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where<br>);<br></font></pre>
- 
-<p><font> This will generate the following SQL:</font></p>
-<p><code><font size="2">SELECT SupplierName, <br>
-  SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
-  <br>
-  SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
-  <br>
-  SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
-  <br>
-  SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy 
-  Products", <br>
-  SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
-  <br>
-  SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
-  <br>
-  SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
-  <br>
-  SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
-  <br>
-  SUM(1) as Total <br>
-  FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID 
-  and s.SupplierID= p.SupplierID <br>
-  GROUP BY SupplierName</font></code></p>
-<p> You can also pivot on <i>numerical columns</i> and <i>generate totals</i> 
-	by using ranges. <font>This code was revised in ADODB 2.41 
-	and is not backward compatible.</font> The second example shows this:</p>
-<pre> $sql = PivotTableSQL(<br> 	$gDB,                                       # adodb connection<br> 	'products p ,categories c ,suppliers s',    # tables<br>	'SupplierName',                              #<font> rows (multiple fields allowed)</font>
-   array(                                       # column ranges
-	' 0 '      =&gt; 'UnitsInStock &lt;= 0',
-	"1 to 5"   =&gt; '0 &lt; UnitsInStock and UnitsInStock &lt;= 5',
-	"6 to 10"  =&gt; '5 &lt; UnitsInStock and UnitsInStock &lt;= 10',
-	"11 to 15" =&gt; '10 &lt; UnitsInStock and UnitsInStock &lt;= 15',
-	"16+"      =&gt; '15 &lt; UnitsInStock'
-	),
-	' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # joins/where
-	'UnitsInStock',                             # sum this field
-	'Sum '                                      # sum label prefix
-);
-</pre> 
-<p>Which generates: </p>
-<p> <code> <font size="2">SELECT SupplierName, <br>
-	SUM(CASE WHEN UnitsInStock &lt;= 0 THEN UnitsInStock ELSE 0 END) AS "Sum 
-	0 ", <br>
-	SUM(CASE WHEN 0 &lt; UnitsInStock and UnitsInStock &lt;= 5 THEN UnitsInStock 
-	ELSE 0 END) AS "Sum 1 to 5",<br>
-	SUM(CASE WHEN 5 &lt; UnitsInStock and UnitsInStock &lt;= 10 THEN UnitsInStock 
-	ELSE 0 END) AS "Sum 6 to 10",<br>
-	SUM(CASE WHEN 10 &lt; UnitsInStock and UnitsInStock &lt;= 15 THEN UnitsInStock 
-	ELSE 0 END) AS "Sum 11 to 15", <br>
-	SUM(CASE WHEN 15 &lt; UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 
-	16+", <br>
-	SUM(UnitsInStock) AS "Sum UnitsInStock", <br>
-	SUM(1) as Total,<br>
-	FROM products p ,categories c ,suppliers s WHERE p.CategoryID = c.CategoryID 
-	and s.SupplierID= p.SupplierID <br>
-	GROUP BY SupplierName</font></code><font size="2"><br>
-	</font> </p>
-<font><hr />
-<h1>Class Reference<a name="ref"></a></h1>
-<p>Function parameters with [ ] around them are optional.</p>
-</font> 
-<h2>Global Variables</h2>
-<h3><font><a name="adodb_countrecs"></a></font>$ADODB_COUNTRECS</h3>
-<p>If the database driver API does not support counting the number of records 
-	returned in a SELECT statement, the function RecordCount() is emulated when 
-	the global variable $ADODB_COUNTRECS is set to true, which is the default. 
-	We emulate this by buffering the records, which can take up large amounts 
-	of memory for big recordsets. Set this variable to false for the best performance. 
-	This variable is checked every time a query is executed, so you can selectively 
-	choose which recordsets to count.</p>
-<h3><font><a name="adodb_cache_dir"></a>$ADODB_CACHE_DIR</font></h3>
-<font> 
-<p>If you are using recordset caching, this is the directory to save your recordsets 
-  in. Define this before you call any caching functions such as CacheExecute( 
-  ). We recommend setting <i>register_globals=off</i> in php.ini if you use this 
-  feature for security reasons.</p>
-<p>If you are using Unix and apache, you might need to set your cache directory 
-  permissions to something similar to the following:</p>
-</font> 
-<p>chown -R apache /path/to/adodb/cache<br>
-  chgrp -R apache /path/to/adodb/cache </p>
-<h3><font><a name="adodb_ansi_padding_off"></a>$ADODB_ANSI_PADDING_OFF</font></h3>
-<p><font>Determines whether to right trim CHAR fields (and also VARCHAR for ibase/firebird).
-Set to true to trim. Default is false. Currently works for oci8po, ibase and firebird 
-drivers. Added in ADOdb 4.01.
-</font></p><h3><font><a name="adodb_lang"></a>$ADODB_LANG</font></h3>
-<p><font>Determines the language used in MetaErrorMsg(). The default is 'en', for English. 
-To find out what languages are supported, see the files 
-in adodb/lang/adodb-$lang.inc.php, where $lang is the supported langauge.
-</font></p><h3><font><a name="adodb_fetch_mode"></a>$ADODB_FETCH_MODE</font></h3>
-<p><font>This is a global variable that determines how arrays are retrieved by recordsets. 
-  The recordset saves this value on creation (eg. in Execute( ) or SelectLimit( 
-  )), and any subsequent changes to $ADODB_FETCH_MODE have no affect on existing 
-  recordsets, only on recordsets created in the future.</font></p>
- <p><font>The following constants are defined:</font></p>
- <p><font>define('ADODB_FETCH_DEFAULT',0);<br>
-  define('ADODB_FETCH_NUM',1);<br>
-  define('ADODB_FETCH_ASSOC',2);<br>
-  define('ADODB_FETCH_BOTH',3); </font></p>
-<font> 
-</font><p><font> An example: 
-</font></p><pre><font>	$ADODB_<b>FETCH_MODE</b> = ADODB_FETCH_NUM;<br>	$rs1 = $db-&gt;Execute('select * from table');<br>	$ADODB_<b>FETCH_MODE</b> = ADODB_FETCH_ASSOC;<br>	$rs2 = $db-&gt;Execute('select * from table');<br>	print_r($rs1-&gt;fields); # shows <i>array([0]=&gt;'v0',[1] =&gt;'v1')</i>
-	print_r($rs2-&gt;fields); # shows <i>array(['col1']=&gt;'v0',['col2'] =&gt;'v1')</i>
-</font></pre>
-<p><font> As you can see in the above example, both recordsets store and use different 
-	fetch modes based on the $ADODB_FETCH_MODE setting when the recordset was 
-	created by Execute().</font></p>
-<p><font>If no fetch mode is predefined, the fetch mode defaults to ADODB_FETCH_DEFAULT. 
-	The behaviour of this default mode varies from driver to driver, so do not 
-	rely on ADODB_FETCH_DEFAULT. For portability, we recommend sticking to ADODB_FETCH_NUM 
-	or ADODB_FETCH_ASSOC. Many drivers do not support ADODB_FETCH_BOTH.</font></p>
-<p><font><strong>SetFetchMode Function</strong></font></p>
-<p><font>If you have multiple connection objects, and want to have different fetch modes for each 
-connection, then use <a href="#setfetchmode">SetFetchMode</a>. 
-	Once this function is called for a connection object, that connection object 
-	will ignore the global variable $ADODB_FETCH_MODE and will use the internal 
-	fetchMode property exclusively.</font></p>
-<pre><font>	$db-&gt;SetFetchMode(ADODB_FETCH_NUM);<br>	$rs1 = $db-&gt;Execute('select * from table');<br>	$db-&gt;SetFetchMode(ADODB_FETCH_ASSOC);<br>	$rs2 = $db-&gt;Execute('select * from table');<br>	print_r($rs1-&gt;fields); # shows <i>array([0]=&gt;'v0',[1] =&gt;'v1')</i>
-	print_r($rs2-&gt;fields); # shows <i>array(['col1']=&gt;'v0',['col2'] =&gt;'v1')</i></font></pre>
-<p><font>To retrieve the previous fetch mode, you can use check the $db-&gt;fetchMode 
-	property, or use the return value of SetFetchMode( ). 
-</font></p><p><font><strong><a name="adodb_assoc_case"></a>ADODB_ASSOC_CASE</strong></font></p>
-<p><font>You can control the associative fetch case for certain drivers which behave 
-	differently. For the sybase, oci8po, mssql, odbc and ibase drivers and all 
-	drivers derived from them, ADODB_ASSOC_CASE will by default generate recordsets 
-	where the field name keys are lower-cased. Use the constant ADODB_ASSOC_CASE 
-	to change the case of the keys. There are 3 possible values:</font></p>
-<p><font>0 = assoc lowercase field names. $rs-&gt;fields['orderid']<br>
-	1 = assoc uppercase field names. $rs-&gt;fields['ORDERID']<br>
-	2 = use native-case field names. $rs-&gt;fields['OrderID'] -- this is the 
-	default since ADOdb 2.90</font></p>
-<p><font>To use it, declare it before you incldue adodb.inc.php.</font></p>
-<p><font>define('ADODB_ASSOC_CASE', 2); # use native-case for ADODB_FETCH_ASSOC<br>
-	include('adodb.inc.php'); </font></p>
-<h3><font><a name="force_type"></a>$ADODB_FORCE_TYPE</font></h3>
-<p><font>See the <a href="#ADODB_FORCE_TYPE">GetUpdateSQL tutorial</a>.
-</font></p>
-<h3><font><a name="adodb_auto_quote"></a>$ADODB_QUOTE_FIELDNAMES</font></h3>
-<p><font>Auto-quotes field names when using AutoExecute() when set to true. </font>
-<p>&nbsp;</p>
-<hr />
-<h2><font>ADOConnection<a name="adoconnection"></a></font></h2>
-<p><font>Object that performs the connection to the database, executes SQL statements 
-	and has a set of utility functions for standardising the format of SQL statements 
-	for issues such as concatenation and date formats.</font></p>
-<h3><font>ADOConnection Fields</font></h3>
-<p><font><b>databaseType</b>: Name of the database system we are connecting to. Eg. 
-	<b>odbc</b> or <b>mssql</b> or <b>mysql</b>.</font></p>
-<p><font><b>dataProvider</b>: The underlying mechanism used to connect to the database. 
-	Normally set to <b>native</b>, unless using <b>odbc</b> or <b>ado</b>.</font></p>
-<p><font><b>host: </b>Name of server or data source name (DSN) to connect to.</font></p>
-<p><font><b>database</b>: Name of the database or to connect to. If ado is used, it 
-	will hold the ado data provider.</font></p>
-<p><font><b>user</b>: Login id to connect to database. Password is not saved for security 
-	reasons.</font></p>
-<p><font><b>raiseErrorFn</b>: Allows you to define an error handling function. See adodb-errorhandler.inc.php 
-	for an example.</font></p>
-<p><font><b>debug</b>: Set to <i>true</i> to make debug statements to appear.</font></p>
-<p><font><b>concat_operator</b>: Set to '+' or '||' normally. The operator used to concatenate 
-	strings in SQL. Used by the <b><a href="#concat">Concat</a></b> function.</font></p>
-<p><font><b>fmtDate</b>: The format used by the <b><a href="#dbdate">DBDate</a></b> 
-	function to send dates to the database. is '#Y-m-d#' for Microsoft Access, 
-	and ''Y-m-d'' for MySQL.</font></p>
-<p><font><b>fmtTimeStamp: </b>The format used by the <b><a href="#dbtimestamp">DBTimeStamp</a></b> 
-	function to send timestamps to the database. </font></p>
-<p><font><b>true</b>: The value used to represent true.Eg. '.T.'. for Foxpro, '1' for 
-	Microsoft SQL.</font></p>
-<p><font><b>false: </b> The value used to represent false. Eg. '.F.'. for Foxpro, '0' 
-	for Microsoft SQL.</font></p>
-<p><font><b>replaceQuote</b>: The string used to escape quotes. Eg. double single-quotes 
-	for Microsoft SQL, and backslash-quote for MySQL. Used by <a href="#qstr">qstr</a>.</font></p>
-<p><font><b>autoCommit</b>: indicates whether automatic commit is enabled. Default is 
-	true.</font></p>
-<p><font><b>charSet</b>: set the default charset to use. Currently only interbase/firebird supports 
-	this.</font></p>
-<p><font><b>dialect</b>: set the default sql dialect to use. Currently only interbase/firebird 
-	supports this.</font></p>
-	<p><font><b>role</b>: set the role. Currently only interbase/firebird 
-	supports this.</font></p>
-<p><font><b>metaTablesSQL</b>: SQL statement to return a list of available tables. Eg. 
-	<i>SHOW TABLES</i> in MySQL.</font></p>
-<p><font><b>genID</b>: The latest id generated by GenID() if supported by the database.</font></p>
-<p><font><b>cacheSecs</b>: The number of seconds to cache recordsets if CacheExecute() 
-	or CacheSelectLimit() omit the $secs2cache parameter. Defaults to 60 minutes.</font></p>
-<p><font><b>sysDate</b>: String that holds the name of the database function to call 
-	to get the current date. Useful for inserts and updates.</font></p>
-<p><font><b>sysTimeStamp</b>: String that holds the name of the database function to 
-	call to get the current timestamp/datetime value.</font></p>
-<p><font><b>leftOuter</b>: String that holds operator for left outer join, if known. 
-	Otherwise set to false.</font></p>
-<p><font><b>rightOuter</b>: String that holds operator for left outer join, if known. 
-	Otherwise set to false.</font></p>
-<p><font><b>ansiOuter</b>: Boolean that if true indicates that ANSI style outer joins 
-	are permitted. Eg. <i>select * from table1 left join table2 on p1=p2.</i></font></p>
-<p><font><b>connectSID</b>: Boolean that indicates whether to treat the $database parameter 
-	in connects as the SID for the oci8 driver. Defaults to false. Useful for 
-	Oracle 8.0.5 and earlier.</font></p>
-<p><font><b>autoRollback</b>: Persistent connections are auto-rollbacked in PConnect( 
-	) if this is set to true. Default is false.</font></p>
-<hr />
-<h3><font>ADOConnection Main Functions</font></h3>
-<p><font><b>ADOConnection( )</b></font></p>
-<p><font>Constructor function. Do not call this directly. Use ADONewConnection( ) instead.</font></p>
-<p><font><b>Connect<a name="connect"></a>($host,[$user],[$password],[$database])</b></font></p>
-<p><font>Non-persistent connect to data source or server $<b>host</b>, using userid 
-	$<b>user </b>and password $<b>password</b>. If the server supports multiple 
-	databases, connect to database $<b>database</b>. </font></p>
-<p><font>Returns true/false depending on connection success. Since 4.23, null is returned if the extension is not loaded.</font></p>
-<p><font>ADO Note: If you are using a Microsoft ADO and not OLEDB, you can set the $database 
-	parameter to the OLEDB data provider you are using.</font></p>
-<p><font>PostgreSQL: An alternative way of connecting to the database is to pass the 
-	standard PostgreSQL connection string in the first parameter $host, and the 
-	other parameters will be ignored.</font></p>
-<p><font>For Oracle and Oci8, there are two ways to connect. First is to use the TNS 
-	name defined in your local tnsnames.ora (or ONAMES or HOSTNAMES). Place the 
-	name in the $database field, and set the $host field to false. Alternatively, 
-	set $host to the server, and $database to the database SID, this bypassed 
-	tnsnames.ora. 
-</font></p><p><font>Examples: 
-</font></p><pre><font> # $oraname in tnsnames.ora/ONAMES/HOSTNAMES<br> $conn-&gt;Connect(false, 'scott', 'tiger', $oraname); <br> $conn-&gt;Connect('server:1521', 'scott', 'tiger', 'ServiceName'); # bypass tnsnames.ora</font></pre>
-<p><font>There are many examples of connecting to a database.
-See  <a href="#connect_ex">Connection Examples</a> for many examples.
-
-</font></p><p><font><b>PConnect<a name="pconnect"></a>($host,[$user],[$password],[$database])</b></font></p>
-<p><font>Persistent connect to data source or server $<b>host</b>, using userid $<b>user</b> 
-	and password $<b>password</b>. If the server supports multiple databases, 
-	connect to database $<b>database</b>.</font></p>
-<p><font>We now perform a rollback on persistent connection for selected databases since 
-	2.21, as advised in the PHP manual. See change log or source code for which 
-	databases are affected. 
-</font></p><p><font>Returns true/false depending on connection. Since 4.23, 0 is returned if the extension is not loaded.
-See Connect( ) above for more info.</font></p>
-<p><font>Since ADOdb 2.21, we also support autoRollback. If you set:</font></p>
- 
-<pre> $conn = &amp;NewADOConnection('mysql');<br> $conn-&gt;autoRollback = true; # default is false<br> $conn-&gt;PConnect(...); # rollback here</pre>
-<p> Then when doing a persistent connection with PConnect( ), ADOdb will 
-  perform a rollback first. This is because it is documented that PHP is 
-  not guaranteed to rollback existing failed transactions when 
-  persistent connections are used. This is implemented in Oracle, 
-  MySQL, PgSQL, MSSQL, ODBC currently. 
-</p><p>Since ADOdb 3.11, you can force non-persistent 
-connections even if PConnect is called by defining the constant 
-ADODB_NEVER_PERSIST  before you call PConnect.
-</p><p>
-Since 4.23, null is returned if the extension is not loaded.
-</p><p><b>NConnect<a name="nconnect"></a>($host,[$user],[$password],[$database])</b></p>
-<p>Always force a new connection. In contrast, PHP sometimes reuses connections 
-	when you use Connect() or PConnect(). Currently works only on mysql (PHP 4.3.0 
-	or later), postgresql and oci8-derived drivers. For other drivers, NConnect() works like 
-	Connect().</p>
-<p><font><b>IsConnected( )<a name="isconnected"></a></b></font></p>
-<p>
-<font>Returns true if connected to database. Added in 4.53.
-
-</font></p><p><font><b>Execute<a name="execute"></a>($sql,$inputarr=false)</b></font></p>
-<p><font>Execute SQL statement $<b>sql</b> and return derived class of ADORecordSet 
-	if successful. Note that a record set is always returned on success, even 
-	if we are executing an insert or update statement. You can also pass in $sql a statement prepared 
-	in <a href="#prepare">Prepare()</a>.</font></p>
-<p><font>Returns derived class of ADORecordSet. Eg. if connecting via mysql, then ADORecordSet_mysql 
-	would be returned. False is returned if there was an error in executing the 
-	sql.</font></p>
-<p><font>The $inputarr parameter can be used for binding variables to parameters. Below 
-	is an Oracle example:</font></p>
-<pre><font> $conn-&gt;Execute("SELECT * FROM TABLE WHERE COND=:val", array('val'=&gt; $val));<br> </font></pre>
-<p><font>Another example, using ODBC,which uses the ? convention:</font></p>
-<pre><font>  $conn-&gt;Execute("SELECT * FROM TABLE WHERE COND=?", array($val));<br></font></pre>
-<font><a name="binding"></a>
-<i>Binding variables</i></font><p>
-<font>Variable binding speeds the compilation and caching of SQL statements, leading 
-to higher performance. Currently Oracle, Interbase and ODBC supports variable binding. 
-Interbase/ODBC style ? binding is emulated in databases that do not support binding. 
-Note that you do not have to quote strings if you use binding.
-</font></p><p><font> Variable binding in the odbc, interbase and oci8po drivers. 
-</font></p><pre><font>$rs = $db-&gt;Execute('select * from table where val=?', array('10'));<br></font></pre>
-<font>Variable binding in the oci8 driver: 
-</font><pre><font>$rs = $db-&gt;Execute('select name from table where val=:key', <br>  array('key' =&gt; 10));<br></font></pre>
-<font><a name="bulkbind"></a>
-<i>Bulk binding</i>
-</font><p><font>Since ADOdb 3.80, we support bulk binding in Execute(), in which you pass in a 2-dimensional array to
-be bound to an INSERT/UPDATE or DELETE statement.
-</font></p><pre><font>$arr = array(<br>	array('Ahmad',32),<br>	array('Zulkifli', 24),<br>	array('Rosnah', 21)<br>	);<br>$ok = $db-&gt;Execute('insert into table (name,age) values (?,?)',$arr);<br></font></pre>
-<p><font>This provides very high performance as the SQL statement is prepared first. 
-The prepared statement is executed repeatedly for each array row until all rows are completed, 
-or until the first error. Very useful for importing data.
-
-</font></p><p><font><b>CacheExecute<a name="cacheexecute"></a>([$secs2cache,]$sql,$inputarr=false)</b></font></p>
-<p><font>Similar to Execute, except that the recordset is cached for $secs2cache seconds 
-	in the $ADODB_CACHE_DIR directory, and $inputarr only accepts 1-dimensional arrays. 
-	If CacheExecute() is called again with the same $sql, $inputarr, 
-	and also the same database, same userid, and the cached recordset 
-	has not expired, the cached recordset is returned. 
-</font></p><pre><font>  include('adodb.inc.php'); <br>  include('tohtml.inc.php');<br>  $ADODB_<b>CACHE_DIR</b> = '/usr/local/ADOdbcache';<br>  $conn = &amp;ADONewConnection('mysql'); <br>  $conn-&gt;PConnect('localhost','userid','password','database');<br>  $rs = $conn-&gt;<b>CacheExecute</b>(15, 'select * from table'); # cache 15 secs<br>  rs2html($rs); /* recordset to html table */  <br></font></pre>
-<p><font> Alternatively, since ADOdb 1.80, the $secs2cache parameter is optional:</font></p>
-<pre><font>	$conn-&gt;Connect(...);<br>   	$conn-&gt;cacheSecs = 3600*24; // cache 24 hours<br>	$rs = $conn-&gt;CacheExecute('select * from table');<br></font></pre>
-<font>If $secs2cache is omitted, we use the value 
-in $connection-&gt;cacheSecs (default is 3600 seconds, or 1 hour). Use CacheExecute() 
-only with SELECT statements. 
-</font><p><font>Performance note: I have done some benchmarks and found that they vary so greatly 
-	that it's better to talk about when caching is of benefit. When your database 
-	server is <i>much slower </i>than your Web server or the database is <i>very 
-	overloaded </i>then ADOdb's caching is good because it reduces the load on 
-	your database server. If your database server is lightly loaded or much faster 
-	than your Web server, then caching could actually reduce performance. </font></p>
-<p><font><b>ExecuteCursor<a name="executecursor"></a>($sql,$cursorName='rs',$parameters=false)</b></font></p>
-<p><font>Execute an Oracle stored procedure, and returns an Oracle REF cursor variable as 
-	a regular ADOdb recordset. Does not work with any other database except oci8. 
-	Thanks to Robert Tuttle for the design.
-</font></p><pre><font>    $db = ADONewConnection("oci8"); <br>    $db-&gt;Connect("foo.com:1521", "uid", "pwd", "FOO"); <br>    $rs = $db-&gt;ExecuteCursor("begin :cursorvar := getdata(:param1); end;", <br>					'cursorvar',<br>					array('param1'=&gt;10)); <br>    # $rs is now just like any other ADOdb recordset object<br>    rs2html($rs);</font></pre>
-<p><font>ExecuteCursor() is a helper function that does the following internally: 
-</font></p><pre><font>	$stmt = $db-&gt;Prepare("begin :cursorvar := getdata(:param1); end;", true); <br>	$db-&gt;Parameter($stmt, $cur, 'cursorvar', false, -1, OCI_B_CURSOR);<br>	$rs = $db-&gt;Execute($stmt,$bindarr);<br></font></pre>
-<p><font>ExecuteCursor only accepts 1 out parameter. So if you have 2 out parameters, use:
-</font></p><pre><font>	$vv = 'A%';<br>	$stmt = $db-&gt;PrepareSP("BEGIN list_tabs(:crsr,:tt); END;");<br>	$db-&gt;OutParameter($stmt, $cur, 'crsr', -1, OCI_B_CURSOR);<br>	$db-&gt;OutParameter($stmt, $vv, 'tt', 32); # return varchar(32)<br>	$arr = $db-&gt;GetArray($stmt);<br>	print_r($arr);<br>	echo " val = $vv"; ## outputs 'TEST'<br></font></pre>
-<font>for the following PL/SQL:
-</font><pre><font>	TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;<br><br>	PROCEDURE list_tabs(tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) IS<br>	BEGIN<br>		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;<br>		tablenames := 'TEST';<br>	END list_tabs;<br></font></pre>
-<p><font><b>SelectLimit<a name="selectlimit"></a>($sql,$numrows=-1,$offset=-1,$inputarr=false)</b></font></p>
-<p><font>Returns a recordset if successful. Returns false otherwise. Performs a select 
-	statement, simulating PostgreSQL's SELECT statement, LIMIT $numrows OFFSET 
-	$offset clause.</font></p>
-<p><font>In PostgreSQL, SELECT * FROM TABLE LIMIT 3 will return the first 3 records 
-	only. The equivalent is <code>$connection-&gt;SelectLimit('SELECT * FROM TABLE',3)</code>. 
-	This functionality is simulated for databases that do not possess this feature.</font></p>
-<p><font>And SELECT * FROM TABLE LIMIT 3 OFFSET 2 will return records 3, 4 and 5 (eg. 
-	after record 2, return 3 rows). The equivalent in ADOdb is <code>$connection-&gt;SelectLimit('SELECT 
-	* FROM TABLE',3,2)</code>.</font></p>
-<p><font>Note that this is the <i>opposite</i> of MySQL's LIMIT clause. You can also 
-	set <code>$connection-&gt;SelectLimit('SELECT * FROM TABLE',-1,10)</code> to 
-	get rows 11 to the last row.</font></p>
-<p><font>The last parameter $inputarr is for databases that support variable binding 
-	such as Oracle oci8. This substantially reduces SQL compilation overhead. 
-	Below is an Oracle example:</font></p>
-<pre><font> $conn-&gt;SelectLimit("SELECT * FROM TABLE WHERE COND=:val", 100,-1,array('val'=&gt; $val));<br> </font></pre>
-<p><font>The oci8po driver (oracle portable driver) uses the more standard bind variable 
-	of ?: 
-</font></p><pre><font> $conn-&gt;SelectLimit("SELECT * FROM TABLE WHERE COND=?", 100,-1,array('val'=&gt; $val));<br></font></pre>
-<p><font> 
-</font></p><p><font>Ron Wilson reports that SelectLimit does not work with UNIONs. 
-</font></p><p><font><b>CacheSelectLimit<a name="cacheselectlimit"></a>([$secs2cache,] $sql, $numrows=-1,$offset=-1,$inputarr=false)</b></font></p>
-<p><font>Similar to SelectLimit, except that the recordset returned is cached for $secs2cache 
-	seconds in the $ADODB_CACHE_DIR directory. </font></p>
-<p><font>Since 1.80, $secs2cache has been optional, and you can define the caching time 
-	in $connection-&gt;cacheSecs.</font></p>
- 
-<pre><font>	$conn-&gt;Connect(...);<br>   $conn-&gt;cacheSecs = 3600*24; // cache 24 hours<br>	$rs = $conn-&gt;CacheSelectLimit('select * from table',10);</font></pre>
-<font> 
-</font><p><font><b>CacheFlush<a name="cacheflush"></a>($sql=false,$inputarr=false)</b></font></p>
-<p><font>Flush (delete) any cached recordsets for the SQL statement $sql in $ADODB_CACHE_DIR. 
-</font></p><p><font>If no parameter is passed in, then all adodb_*.cache files are deleted. 
-</font></p>
-  <p>CacheSelectLimit() rewrites the SQL query, so you won't be able to pass the SQL to CacheFlush. In this case,
-   to flush the cached SQL recordset returned by CacheSelectLimit(), set $secs2cache to -1:
-<pre>
-	$db->CacheSelectLimit(-1, $sql, $nrows);
-</pre>
-<p><font> If you want to flush all cached recordsets manually, execute the following 
-	PHP code (works only under Unix): <br>
-	<code> &nbsp; system("rm -f `find ".$ADODB_CACHE_DIR." -name 
-	adodb_*.cache`");</code></font></p>
-<p><font>For general cleanup of all expired files, you should use <a href="http://www.superscripts.com/tutorial/crontab.html">crontab</a> 
-	on Unix, or at.exe on Windows, and a shell script similar to the following:<font face="Courier New, Courier, mono"><br>
-	#------------------------------------------------------ <br>
-	# This particular example deletes files in the TMPPATH <br>
-	# directory with the string ".cache" in their name that <br>
-	# are more than 7 days old. <br>
-	#------------------------------------------------------ <br>
-	AGED=7 <br>
-	find ${TMPPATH} -mtime +$AGED | grep "\.cache" | xargs rm -f <br>
-	</font> </font></p>
-<p><font><b>MetaError<a name="metaerror"></a>($errno=false)</b></font></p>
-<p><font>Returns a virtualized error number, based on PEAR DB's error number system. You might
-need to include adodb-error.inc.php before you call this function. The parameter $errno
-is the native error number you want to convert. If you do not pass any parameter, MetaError
-will call ErrorNo() for you and convert it. If the error number cannot be virtualized, MetaError 
-will return -1 (DB_ERROR).</font></p>
-
-<p><font><b>MetaErrorMsg<a name="metaerrormsg"></a>($errno)</b></font></p>
-<p><font>Pass the error number returned by MetaError() for the equivalent textual error message.</font></p>
-<p><font><b>ErrorMsg<a name="errormsg"></a>()</b></font></p>
-<p><font>Returns the last status or error message. The error message is reset after every 
-call to Execute(). 
-</font></p><p>
-<font>This can return a string even if 
-	no error occurs. In general you do not need to call this function unless an 
-	ADOdb function returns false on an error. </font></p>
-<p><font>Note: If <b>debug</b> is enabled, the SQL error message is always displayed 
-	when the <b>Execute</b> function is called.</font></p>
-<p><font><b>ErrorNo<a name="errorno"></a>()</b></font></p>
-<p><font>Returns the last error number. The error number is reset after every call to Execute(). 
-If 0 is returned, no error occurred.
-</font></p><p>
-<font>Note that old versions of PHP (pre 4.0.6) do 
-	not support error number for ODBC. In general you do not need to call this 
-	function unless an ADOdb function returns false on an error.</font></p>
-<p><font><b>IgnoreErrors<a name="ignoreerrors"></a>($saveErrHandlers)</b></font></p>
-<p>Allows you to ignore errors so that StartTrans()/CompleteTrans() is not affected, nor is the default error handler called if an error occurs.
-Useful when you want to check if a field or table exists in a database without invoking an error if it does not exist.
-<p>Usage:
-<pre>
-$saveErrHandlers = $conn->IgnoreErrors();
-$rs = $conn->Execute("select field from some_table_that_might_not_exist");
-$conn->IgnoreErrors($saveErrHandlers);
-</pre>
-<p>Warning: do not call StartTrans()/CompleteTrans() inside a code block that is using IgnoreErrors().
-<p><font><b>SetFetchMode<a name="setfetchmode"></a>($mode)</b></font></p>
-<p><font>Sets the current fetch mode for the connection and stores 
-	it in $db-&gt;fetchMode. Legal modes are ADODB_FETCH_ASSOC and ADODB_FETCH_NUM. 
-	For more info, see <a href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a>.</font></p>
-<p><font>Returns the previous fetch mode, which could be false 
-	if SetFetchMode( ) has not been called before.</font></p>
-<font> 
-</font><p><font><b>CreateSequence<a name="createseq"></a>($seqName = 'adodbseq',$startID=1)</b></font></p>
-<p><font>Create a sequence. The next time GenID( ) is called, the value returned will 
-	be $startID. Added in 2.60. 
-</font></p><p><font><b>DropSequence<a name="dropseq"></a>($seqName = 'adodbseq')</b></font></p>
-<p><font>Delete a sequence. Added in 2.60. 
-</font></p><p><font><b>GenID<a name="genid"></a>($seqName = 'adodbseq',$startID=1)</b></font></p>
-<p><font>Generate a sequence number . Works for interbase, 
-	mysql, postgresql, oci8, oci8po, mssql, ODBC based (access,vfp,db2,etc) drivers 
-	currently. Uses $seqName as the name of the sequence. GenID() will automatically 
-	create the sequence for you if it does not exist (provided the userid has 
-	permission to do so). Otherwise you will have to create the sequence yourself. 
-</font></p><p><font> If your database driver emulates sequences, the name of the table is the sequence 
-	name. The table has one column, "id" which should be of type integer, or if 
-	you need something larger - numeric(16). 
-</font></p><p><font> For ODBC and databases that do not support sequences natively (eg mssql, mysql), 
-	we create a table for each sequence. If the sequence has not been defined 
-	earlier, it is created with the starting value set in $startID.</font></p>
-<p><font>Note that the mssql driver's GenID() before 1.90 used to generate 16 byte GUID's.</font></p>
-<p><font><b>UpdateBlob<a name="updateblob"></a>($table,$column,$val,$where)</b></font></p>
-<font>Allows you to store a blob (in $val) into $table into $column in a row at $where. 
-</font><p><font> Usage: 
-</font></p><p><font> 
-</font></p><pre><font>	# for oracle<br>	$conn-&gt;Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, empty_blob())');<br>	$conn-&gt;UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');<br>	<br>	# non oracle databases<br>	$conn-&gt;Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');<br>	$conn-&gt;UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');<br></font></pre>
-<p><font> Returns true if succesful, false otherwise. Supported by MySQL, PostgreSQL, 
-	Oci8, Oci8po and Interbase drivers. Other drivers might work, depending on 
-	the state of development.</font></p>
-<p><font>Note that when an Interbase blob is retrieved using SELECT, it still needs 
-	to be decoded using $connection-&gt;DecodeBlob($blob); to derive the original 
-	value in versions of PHP before 4.1.0. 
-</font></p><p><font>For PostgreSQL, you can store your blob using blob oid's or as a bytea field. 
-	You can use bytea fields but not blob oid's currently with UpdateBlob( ). 
-	Conversely UpdateBlobFile( ) supports oid's, but not bytea data.<br>
-	<br>
-	If you do not pass in an oid, then UpdateBlob() assumes that you are storing 
-	in bytea fields.
-	<p>If you do not have any blob fields, you can improve you can improve general SQL query performance by disabling blob handling with $connection->disableBlobs = true.
-</p></font><p><font><b>UpdateClob<a name="updateclob"></a>($table,$column,$val,$where)</b></font></p>
-<font>Allows you to store a clob (in $val) into $table into $column in a row at $where. 
-Similar to UpdateBlob (see above), but for Character Large OBjects. 
-</font><p><font> Usage:
-</font></p><pre><font>	# for oracle<br>	$conn-&gt;Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, empty_clob())');<br>	$conn-&gt;UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');<br>	<br>	# non oracle databases<br>	$conn-&gt;Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');<br>	$conn-&gt;UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');<br></font></pre>
-<p><font><b>UpdateBlobFile<a name="updateblobfile"></a>($table,$column,$path,$where,$blobtype='BLOB')</b></font></p>
-<p><font>Similar to UpdateBlob, except that we pass in a file path to where the blob 
-	resides.
-</font></p><p><font>For PostgreSQL, if you are using blob oid's, use this interface. This interface 
-	does not support bytea fields.
-</font></p><p><font>Returns true if successful, false otherwise. 
-</font></p><p><font><b>BlobEncode<a name="blobencode" id="blobencode"></a>($blob)</b> 
-</font></p><p><font>Some databases require blob's to be encoded manually before upload. Note if 
-	you use UpdateBlob( ) or UpdateBlobFile( ) the conversion is done automatically 
-	for you and you do not have to call this function. For PostgreSQL, currently, 
-	BlobEncode() can only be used for bytea fields.
-</font></p><p><font>Returns the encoded blob value.
-</font></p><p><font>Note that there is a connection property called <em>blobEncodeType</em> which 
-	has 3 legal values: 
-</font></p><p><font>false - no need to perform encoding or decoding.<br>
-	'I' - blob encoding required, and returned encoded blob is a numeric value 
-	(no need to quote).<br>
-	'C' - blob encoding required, and returned encoded blob is a character value 
-	(requires quoting).
-</font></p><p><font>This is purely for documentation purposes, so that programs that accept multiple 
-	database drivers know what is the right thing to do when processing blobs.
-</font></p><p><font><strong>BlobDecode<a name="blobdecode"></a>($blob, $maxblobsize = false)</strong> 
-</font></p><p><font>Some databases require blob's to be decoded manually after doing a select statement. 
-	If the database does not require decoding, then this function will return 
-	the blob unchanged. Currently BlobDecode is only required for one database, 
-	PostgreSQL, and only if you are using blob oid's (if you are using bytea fields, 
-	we auto-decode for you).</font> The default maxblobsize is set in $connection-&gt;maxblobsize, which 
-	is set to 256K in adodb 4.54. </p><p>
-	In ADOdb 4.54 and later, the blob is the return value. In earlier versions, the blob data is sent to stdout.</p><font>
-</font><p></p><pre><font>$rs = $db-&gt;Execute("select bloboid from postgres_table where id=$key");<br>$blob = $db-&gt;BlobDecode( reset($rs-&gt;fields) );</font></pre>
-<p><font><b>Replace<a name="replace"></a>($table, $arrFields, $keyCols,$autoQuote=false)</b></font></p>
-<p><font>Try to update a record, and if the record is not found, an insert statement 
-	is generated and executed. Returns 0 on failure, 1 if update statement worked, 
-	2 if no record was found and the insert was executed successfully. This differs 
-	from MySQL's replace which deletes the record and inserts a new record. This 
-	also means you cannot update the primary key. The only exception to this is 
-	Interbase and its derivitives, which uses delete and insert because of some 
-	Interbase API limitations. 
-</font></p><p><font>The parameters are $table which is the table name, the $arrFields which is an 
-	associative array where the keys are the field names, and $keyCols is the name 
-	of the primary key, or an array of field names if it is a compound key. If 
-	$autoQuote is set to true, then Replace() will quote all values that are non-numeric; 
-	auto-quoting will not quote nulls. Note that auto-quoting will not work if 
-	you use SQL functions or operators. 
-</font></p><p><font>Examples: 
-</font></p><pre><font># single field primary key<br>$ret = $db-&gt;Replace('atable', <br>	array('id'=&gt;1000,'firstname'=&gt;'Harun','lastname'=&gt;'Al-Rashid'),<br>	'id',$autoquote = true);	<br># generates UPDATE atable SET firstname='Harun',lastname='Al-Rashid' WHERE id=1000<br># or INSERT INTO atable (id,firstname,lastname) VALUES (1000,'Harun','Al-Rashid')<br><br># compound key<br>$ret = $db-&gt;Replace('atable2', <br>	array('firstname'=&gt;'Harun','lastname'=&gt;'Al-Rashid', 'age' =&gt; 33, 'birthday' =&gt; 'null'),<br>	array('lastname','firstname'),<br>	$autoquote = true);<br><br># no auto-quoting<br>$ret = $db-&gt;Replace('atable2', <br>	array('firstname'=&gt;"'Harun'",'lastname'=&gt;"'Al-Rashid'", 'age' =&gt; 'null'),<br>	array('lastname','firstname'));	<br></font></pre>
-<p><font><b>AutoExecute<a name="autoexecute"></a>($table, $arrFields, $mode, $where=false, $forceUpdate=true,$magicq=false)</b></font></p>
-<p>Since ADOdb 4.56, you can automatically generate and execute INSERTs and UPDATEs on a given table with this
-function, which is a wrapper for GetInsertSQL() and GetUpdateSQL().
-<p>AutoExecute() inserts or updates $table given an array of $arrFields, where the keys are the field names and the array values are the 
-field values to store. Note that there is some overhead because the table is first queried to extract key information 
-before the SQL is generated. We generate an INSERT or UPDATE based on $mode (see below).
-<p>
-Legal values for $mode are 
-<ul>
-<li>'INSERT' or 1 or DB_AUTOQUERY_INSERT
-<li>'UPDATE' or 2 or DB_AUTOQUERY_UPDATE
-</ul>
-<p>You have to define the constants DB_AUTOQUERY_UPDATE and DB_AUTOQUERY_INSERT yourself or include adodb-pear.inc.php.
-<p>The $where clause is required if $mode == 'UPDATE'. If $forceUpdate=false then we will query the 
-database first and check if the field value returned by the query matches the current field value; only if they differ do we update that field.
-<p>Returns true on success, false on error.
-<p>An example of its use is:
-<pre>
-$record["firstName"] = "Carol";
-$record["lasTname"] = "Smith"; 
-$conn->AutoExecute($table,$record,'INSERT');
-# executes <i>"INSERT INTO $table (firstName,lasTname) values ('Carol',Smith')"</i>;
-
-$record["firstName"] = "Carol";
-$record["lasTname"] = "Jones"; 
-$conn->AutoExecute($table,$record,'UPDATE', "lastname like 'Sm%'");
-# executes <i>"UPDATE $table SET firstName='Carol',lasTname='Jones' WHERE lastname like 'Sm%'"</i>;
-</pre>
-<p>Note: One of the strengths of ADOdb's AutoExecute() is that only valid field names for $table are updated. If $arrFields
-contains keys that are invalid field names for $table, they are ignored. There is some overhead in doing this as we have to 
-query the database to get the field names, but given that you are not directly coding the SQL yourself, you probably aren't interested in
-speed at all, but convenience.
-<p>Since 4.62, the table name to be used can be overridden by setting $rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
-<p>Since 4.94, setting the global variable $ADODB_QUOTE_FIELDNAMES to true will force field names to be auto-quoted in AutoExecute(), GetInsertSQL() and GetUpdateSQL(). </p>
-<p><font><b>GetUpdateSQL<a name="getupdatesql"></a>(&amp;$rs, $arrFields, $forceUpdate=false,$magicq=false, $force=null)</b></font></p>
-<p><font>Generate SQL to update a table given a recordset $rs, and the modified fields 
-	of the array $arrFields (which must be an associative array holding the column 
-	names and the new values) are compared with the current recordset. If $forceUpdate 
-	is true, then we also generate the SQL even if $arrFields is identical to 
-	$rs-&gt;fields. Requires the recordset to be associative. $magicq is used 
-	to indicate whether magic quotes are enabled (see qstr()). The field names in the array 
-	are case-insensitive.</font></p>
-<font>	</font><p><font>Since 4.52, we allow you to pass the $force type parameter, and this overrides the <a href="#ADODB_FORCE_TYPE">$ADODB_FORCE_TYPE</a>
-	global variable.
-<p>Since 4.62, the table name to be used can be overridden by setting $rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
-</p></font><p><font><b>GetInsertSQL<a name="getinsertsql"></a>(&amp;$rs, $arrFields,$magicq=false,$force_type=false)</b></font></p>
-<p><font>Generate SQL to insert into a table given a recordset $rs. Requires the query 
-	to be associative. $magicq is used to indicate whether magic quotes are enabled 
-	(for qstr()). The field names in the array are case-insensitive.</font></p>
-<p>
-<font>  Since 2.42, you can pass a  table name instead of a recordset into 
-GetInsertSQL (in $rs), and it will generate an insert statement for that table.
-</font></p><p><font>Since 4.52, we allow you to pass the $force_type parameter, and this overrides the <a href="#ADODB_FORCE_TYPE">$ADODB_FORCE_TYPE</a>
-	global variable.
-<p>Since 4.62, the table name to be used can be overridden by setting $rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is called.
-</p></font><p><font><b>PageExecute<a name="pageexecute"></a>($sql, $nrows, $page, $inputarr=false)</b> 
-</font></p><p><font>Used for pagination of recordset. $page is 1-based. See <a href="#ex8">Example 
-  8</a>.</font></p>
- 
-<p><font><b>CachePageExecute<a name="cachepageexecute"></a>($secs2cache, 
-  $sql, $nrows, $page, $inputarr=false)</b> </font></p>
-<p><font>Used for pagination of recordset. $page is 1-based. See 
-  <a href="#ex8">Example 8</a>. Caching version of PageExecute.</font></p>
-<font> 
-</font><p></p>
-<p><font><b>Close<a name="close"></a>( )</b></font></p>
-<p><font>Close the database connection. PHP4 proudly states that we no longer have to 
-  clean up at the end of the connection because the reference counting mechanism 
-  of PHP4 will automatically clean up for us.</font></p>
-<font>  </font><p><font><b>StartTrans<a name="starttrans"></a>( )</b></font></p>
-<font>  </font><p><font>Start a monitored transaction. As SQL statements are executed, ADOdb will monitor
-  for SQL errors, and if any are detected, when CompleteTrans() is called, we auto-rollback.
-  </font></p><p>
-<font>  </font></p><p><font> To understand why StartTrans() is superior to BeginTrans(), 
-  let us examine a few ways of using BeginTrans().
-  The following is the wrong way to use transactions: 
-</font></p><pre><font>$DB-&gt;BeginTrans();<br>$DB-&gt;Execute("update table1 set val=$val1 where id=$id");<br>$DB-&gt;Execute("update table2 set val=$val2 where id=$id");<br>$DB-&gt;CommitTrans();<br></font></pre>
-<p><font>because you perform no error checking. It is possible to update table1 and 
-  for the update on table2 to fail. Here is a better way: 
-</font></p><pre><font>$DB-&gt;BeginTrans();<br>$ok = $DB-&gt;Execute("update table1 set val=$val1 where id=$id");<br>if ($ok) $ok = $DB-&gt;Execute("update table2 set val=$val2 where id=$id");<br>if ($ok) $DB-&gt;CommitTrans();<br>else $DB-&gt;RollbackTrans();<br></font></pre>
-<p><font>Another way is (since ADOdb 2.0): 
-</font></p><pre><font>$DB-&gt;BeginTrans();<br>$ok = $DB-&gt;Execute("update table1 set val=$val1 where id=$id");<br>if ($ok) $ok = $DB-&gt;Execute("update table2 set val=$val2 where id=$id");<br>$DB-&gt;CommitTrans($ok);<br></font></pre>
-<p><font> Now it is a headache monitoring $ok all over the place. StartTrans() is an
-improvement because it monitors all SQL errors for you. This is particularly
-useful if you are calling black-box functions in which SQL queries might be executed.
- Also all BeginTrans, CommitTrans and RollbackTrans calls inside a StartTrans block 
-  will be disabled, so even if the black box function does a commit, it will be ignored.
-</font></p><pre><font>$DB-&gt;StartTrans();<br>CallBlackBox();<br>$DB-&gt;Execute("update table1 set val=$val1 where id=$id");<br>$DB-&gt;Execute("update table2 set val=$val2 where id=$id");<br>$DB-&gt;CompleteTrans();<br></font></pre>
-<p><font>Note that a StartTrans blocks are nestable, the inner blocks are ignored.
- </font></p><p><font><b>CompleteTrans<a name="completetrans"></a>($autoComplete=true)</b></font></p>
-<font>  </font><p><font>Complete a transaction called with StartTrans(). This function monitors
-  for SQL errors, and will commit if no errors have occured, otherwise it will rollback. 
-  Returns true on commit, false on rollback. If the parameter $autoComplete is true
-  monitor sql errors and commit and rollback as appropriate. Set $autoComplete to false 
-  to force rollback even if no SQL error detected.
-  </font></p><p><font><b>FailTrans<a name="failtrans"></a>( )</b></font></p>
-<font>  </font><p><font>Fail a transaction started with StartTrans(). The rollback will only occur when
-  CompleteTrans() is called.
-    </font></p><p><font><b>HasFailedTrans<a name="hasfailedtrans"></a>( )</b></font></p>
-<font>	</font><p><font>Check whether smart transaction has failed, 
-	eg. returns true if there was an error in SQL execution or FailTrans() was called.
-	If not within smart transaction, returns false.
-</font></p><p><font><b>BeginTrans<a name="begintrans"></a>( )</b></font></p>
-<p><font>Begin a transaction. Turns off autoCommit. Returns true if successful. Some 
-  databases will always return false if transaction support is not available. 
-   Any open transactions will be rolled back when the connection is closed. Among the
-   databases that support transactions are Oracle, PostgreSQL, Interbase, MSSQL, certain
-    versions of MySQL, DB2, Informix, Sybase, etc.</font></p>
-<font> </font><p><font>Note that <a href="#starttrans">StartTrans()</a> and CompleteTrans() is a superior method of 
- handling transactions, available since ADOdb 3.40. For a explanation, see the <a href="#starttrans">StartTrans()</a> documentation.
-
-</font></p><p><font>You can also use the ADOdb <a href="#errorhandling">error handler</a> to die 
-  and rollback your transactions for you transparently. Some buggy database extensions 
-  are known to commit all outstanding tranasactions, so you might want to explicitly 
-  do a $DB-&gt;RollbackTrans() in your error handler for safety. 
- </font></p><h4><font>Detecting Transactions</font></h4>
-<font> </font><p><font>Since ADOdb 2.50, you are able to detect when you are inside a transaction. Check
- that $connection-&gt;transCnt &gt; 0. This variable is incremented whenever BeginTrans() is called,
- and decremented whenever RollbackTrans() or CommitTrans() is called.
-</font></p><p><font><b>CommitTrans<a name="committrans"></a>($ok=true)</b></font></p>
-<p><font>End a transaction successfully. Returns true if successful. If the database 
-  does not support transactions, will return true also as data is always committed. 
-</font></p>
-<p><font>If you pass the parameter $ok=false, the data is rolled back. See example in 
-  BeginTrans().</font></p>
-<p><font><b>RollbackTrans<a name="rollbacktrans"></a>( )</b></font></p>
-<p><font>End a transaction, rollback all changes. Returns true if successful. If the 
-  database does not support transactions, will return false as data is never rollbacked. 
-</font></p>
- 
-<p><font><b>SetTransactionMode<a name="SetTransactionMode"></a>($mode )</b></font></p>
-<p>SetTransactionMode allows you to pass in the transaction mode to use for all subsequent transactions. 
-Note: if you have persistent connections and using mssql or mysql, you might have to explicitly reset your transaction mode at the beginning of each page request. 
-This is only supported in postgresql, mssql, mysql with InnoDB and oci8 currently. For example:
-<pre>
-$db->SetTransactionMode("SERIALIZABLE");
-$db->BeginTrans();
-$db->Execute(...); $db->Execute(...);
-$db->CommiTrans();
-
-$db->SetTransactionMode(""); // restore to default
-$db->StartTrans();
-$db->Execute(...); $db->Execute(...);
-$db->CompleteTrans();
-</pre>
-
-<p>Supported values to pass in:
-<ul>
-<li>READ UNCOMMITTED (allows dirty reads, but fastest)
-<li>READ COMMITTED (default postgres, mssql and oci8)
-<li>REPEATABLE READ (default mysql)
-<li>SERIALIZABLE (slowest and most restrictive)
-</ul>
-<p>You can also pass in database specific values such as 'SNAPSHOT' for mssql or 'READ ONLY' for oci8/postgres.
-<p>See transaction levels for <a href=http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html>PostgreSQL</a>,
-<a href=http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm>Oracle</a>,
-<a href=http://dev.mysql.com/doc/refman/5.0/en/set-transaction.html>MySQL</a>, and
-<a href=http://msdn2.microsoft.com/en-US/ms173763.aspx>MS SQL Server</a>.
-<p><font><b>GetAssoc<a name="getassoc1"></a>($sql,$inputarr=false,$force_array=false,$first2cols=false)</b></font></p>
-<p><font>Returns an associative array for the given query $sql with optional bind parameters 
-  in $inputarr. If the number of columns returned is greater to two, a 2-dimensional 
-  array is returned, with the first column of the recordset becomes the keys 
-  to the rest of the rows. If the columns is equal to two, a 1-dimensional array 
-  is created, where the the keys directly map to the values (unless $force_array 
-  is set to true, when an array is created for each value).
-</font></p><p><font> Examples:<a name="getassocex"></a></font></p>
-
-<p><font>We have the following data in a recordset:</font></p>
-<p><font>row1: Apple, Fruit, Edible<br>
-  row2: Cactus, Plant, Inedible<br>
-  row3: Rose, Flower, Edible</font></p>
-<p><font>GetAssoc will generate the following 2-dimensional associative 
-  array:</font></p>
-<p><font>Apple =&gt; array[Fruit, Edible]<br>
-  Cactus =&gt; array[Plant, Inedible]<br>
-  Rose =&gt; array[Flower,Edible]</font></p>
-<p><font>If the dataset is:</font></p>
-<p><font>row1: Apple, Fruit<br>
-row2: Cactus, Plant<br>
-row3: Rose, Flower </font></p>
-<p><font>GetAssoc will generate the following 1-dimensional associative
-  array (with $force_array==false):</font></p>
-<p><font>Apple =&gt; Fruit</font><br>
-  Cactus=&gt;Plant<br>
-  Rose=&gt;Flower </p>
-<p><font>The function returns:</font></p>
-<p><font>The associative array, or false if an error occurs.</font></p>
-<font>
-<p><b>CacheGetAssoc<a name="cachegetassoc"></a>([$secs2cache,] $sql,$inputarr=false,$force_array=false,$first2cols=false)</b></p>
-</font>
-<p><font>Caching version of <a href="#getassoc1">GetAssoc</a> function above.
-</font></p><p><font><b>GetOne<a name="getone"></a>($sql,$inputarr=false)</b></font></p>
-<p><font>Executes the SQL and returns the first field of the first row. The recordset 
-  and remaining rows are discarded for you automatically. If an error occur, false 
-  is returned.</font></p>
-<p><font><b>GetRow<a name="getrow"></a>($sql,$inputarr=false)</b></font></p>
-<p><font>Executes the SQL and returns the first row as an array. The recordset and remaining 
-  rows are discarded for you automatically. If an error occurs, false is returned.</font></p>
-<p><font><b>GetAll<a name="getall"></a>($sql,$inputarr=false)</b></font></p>
-
-<p>Executes the SQL and returns the all the rows as a 2-dimensional 
-  array. The recordset is discarded for you automatically. If an error occurs, 
-  false is returned. <i>GetArray</i> is a synonym for <i>GetAll</i>.</p>
- <p><b>GetCol<a name="getcol"></a>($sql,$inputarr=false,$trim=false)</b></p>
-
-<p><font>Executes the SQL and returns all elements of the first column as a 
-1-dimensional array. The recordset is discarded for you automatically. If an error occurs, 
-  false is returned.</font></p>
-<p><font><b>CacheGetOne<a name="cachegetone"></a>([$secs2cache,] 
-  $sql,$inputarr=false), CacheGetRow<a name="cachegetrow"></a>([$secs2cache,] $sql,$inputarr=false), CacheGetAll<a name="cachegetall"></a>([$secs2cache,] 
-  $sql,$inputarr=false), CacheGetCol<a name="cachegetcol"></a>([$secs2cache,] 
-  $sql,$inputarr=false,$trim=false)</b></font></p>
-<font> 
-</font><p><font>Similar to above Get* functions, except that the recordset is serialized and 
-  cached in the $ADODB_CACHE_DIR directory for $secs2cache seconds. Good for speeding 
-  up queries on rarely changing data. Note that the $secs2cache parameter is optional. 
-  If omitted, we use the value in $connection-&gt;cacheSecs (default is 3600 seconds, 
-  or 1 hour).</font></p>
-<p><font><b>Prepare<a name="prepare"></a>($sql )</b></font></p>
- 
-<p><font>Prepares (compiles) an SQL query for repeated execution. Bind parameters
-are denoted by ?, except for the oci8 driver, which uses the traditional Oracle :varname
-convention. 
-  </font></p>
-<p><font>Returns an array containing the original sql statement 
-  in the first array element; the remaining elements of the array are driver dependent. 
-  If there is an error, or we are emulating Prepare( ), we return the original 
-  $sql string. This is because all error-handling has been centralized in Execute( 
-  ).</font></p>
-<p><font>Prepare( ) cannot be used with functions that use SQL 
-  query rewriting techniques, e.g. PageExecute( ) and SelectLimit( ).</font></p>
-<p>Example:</p>
-<pre><font>$stmt = $DB-&gt;Prepare('insert into table (col1,col2) values (?,?)');<br>for ($i=0; $i &lt; $max; $i++)<br></font>	$DB-&gt;<font>Execute($stmt,array((string) rand(), $i));<br></font></pre>
-<font> 
-</font><p><font>Also see InParameter(), OutParameter() and PrepareSP() below. Only supported internally by interbase, 
-  oci8 and selected ODBC-based drivers, otherwise it is emulated. There is no 
-  performance advantage to using Prepare() with emulation. 
-</font></p><p><font> Important: Due to limitations or bugs in PHP, if you are getting errors when 
-  you using prepared queries, try setting $ADODB_COUNTRECS = false before preparing. 
-  This behaviour has been observed with ODBC. 
-</font></p><p><font><b>IfNull<a name="ifnull"></a>($field, $nullReplacementValue)</b></font></p>
-<p><font>Portable IFNULL function (NVL in Oracle). Returns a string that represents 
-  the function that checks whether a $field is null for the given database, and 
-  if null, change the value returned to $nullReplacementValue. Eg.</font></p>
-<pre><font>$sql = <font color="#993300">'SELECT '</font>.$db-&gt;IfNull('name', <font color="#993300">"'- unknown -'"</font>).<font color="#993300"> ' FROM table'</font>;</font></pre>
-
-<p><font><b>length<a name="length"></a></b></font></p>
-<p><font>This is not a function, but a property. Some databases have "length" and others "len"
-as the function to measure the length of a string. To use this property:
-</font></p><pre><font>  $sql = <font color="#993300">"SELECT "</font>.$db-&gt;length.<font color="#993300">"(field) from table"</font>;<br>  $rs = $db-&gt;Execute($sql);<br></font></pre>
-
-<p><font><b>random<a name="random"></a></b></font></p>
-<p><font>This is not a function, but a property. This is a string that holds the sql to
-generate a random number between 0.0 and 1.0 inclusive.
-
-</font></p><p><font><b>substr<a name="substr"></a></b></font></p>
-<p><font>This is not a function, but a property. Some databases have "substr" and others "substring"
-as the function to retrieve a sub-string. To use this property:
-</font></p><pre><font>  $sql = <font color="#993300">"SELECT "</font>.$db-&gt;substr.<font color="#993300">"(field, $offset, $length) from table"</font>;<br>  $rs = $db-&gt;Execute($sql);<br></font></pre>
-<p><font>For all databases, the 1st parameter of <i>substr</i> is the field, the 2nd is the
-offset (1-based) to the beginning of the sub-string, and the 3rd is the length of the sub-string.
-
-
-</font></p><p><font><b>Param<a name="param"></a>($name)</b></font></p>
-<p><font>Generates a bind placeholder portably. For most databases, the bind placeholder 
-  is "?". However some databases use named bind parameters such as Oracle, eg 
-  ":somevar". This allows us to portably define an SQL statement with bind parameters: 
-</font></p><pre><font>$sql = <font color="#993300">'insert into table (col1,col2) values ('</font>.$DB-&gt;Param('a').<font color="#993300">','</font>.$DB-&gt;Param('b').<font color="#993300">')'</font>;<br><font color="#006600"># generates 'insert into table (col1,col2) values (?,?)'<br># or        'insert into table (col1,col2) values (:a,:b)</font>'<br>$stmt = $DB-&gt;Prepare($sql);<br>$stmt = $DB-&gt;Execute($stmt,array('one','two'));<br></font></pre>
-<font> </font>
-<p></p>
-<p><font><b>PrepareSP</b><b><a name="preparesp"></a></b><b>($sql,
-$cursor=false )</b></font></p>
-<p><font>When calling stored procedures in mssql and oci8 (oracle),
-    and you might want to directly bind to parameters that return values, or
-for special LOB handling. PrepareSP() allows you to do so. </font></p>
-<p><font>Returns the same array or $sql string as Prepare( )
-    above. If you do not need to bind to return values, you should use Prepare(
-  ) instead.</font></p>
-<p><font>The 2nd parameter, $cursor is not used except with oci8.
-    Setting it to true will force OCINewCursor to be called; this is to support
-output REF CURSORs. </font></p>
-<p><font>For examples of usage of PrepareSP( ), see InParameter(
-) below. </font></p>
-<p><font>Note: in the mssql driver, preparing stored procedures
-    requires a special function call, mssql_init( ), which is called by this
-    function. PrepareSP( ) is available in all other drivers, and is emulated
-  by calling Prepare( ). </font></p>
-<p><font><b> InParameter<a name="inparameter"></a>($stmt, $var,
-  $name, $maxLen = 4000, $type = false )</b></font></p>
-<font>Binds a PHP variable as input to a stored procedure variable.
-The parameter <i>$stmt</i> is the value returned by PrepareSP(), <i>$var</i> is
-the PHP variable you want to bind, $name is the name of the stored procedure
-variable. Optional is <i>$maxLen</i>, the maximum length of the data to bind,
-and $type which is database dependant. Consult <a href="http://php.net/mssql_bind">mssql_bind</a> and <a href="http://php.net/ocibindbyname">ocibindbyname</a> docs
-at php.net for more info on legal values for $type. </font>
-<p>
-<font>InParameter() is a wrapper function that calls Parameter()
-with $isOutput=false. The advantage of this function is that it is self-documenting,
-because the $isOutput parameter is no longer needed. Only for mssql and oci8
-currently. </font></p>
-<p><font>Here is an example using oci8: </font></p>
-<pre><font><font color="green"># For oracle, Prepare and PrepareSP are identical</font>
-$stmt = $db-&gt;PrepareSP(
-	<font color="#993300">"declare RETVAL integer; <br>	begin<br>	:RETVAL := </font><font color="#993300">SP_RUNSOMETHING</font><font color="#993300">(:myid,:group);<br>	end;"</font>);<br>$db-&gt;InParameter($stmt,$id,'myid');<br>$db-&gt;InParameter($stmt,$group,'group',64);<br>$db-&gt;OutParameter($stmt,$ret,'RETVAL');<br>$db-&gt;Execute($stmt);<br></font></pre>
-<p><font> The same example using mssql:</font></p>
-<font> 
-</font><pre><font><font color="green"># @RETVAL = SP_RUNSOMETHING @myid,@group</font>
-$stmt = $db-&gt;PrepareSP(<font color="#993333">'<font color="#993300">SP_RUNSOMETHING</font>'</font>); <br><font color="green"># note that the parameter name does not have @ in front!</font>
-$db-&gt;InParameter($stmt,$id,'myid');
-$db-&gt;InParameter($stmt,$group,'group',64);
-<font color="green"># return value in mssql - RETVAL is hard-coded name</font> <br>$db-&gt;OutParameter($stmt,$ret,'RETVAL');<br>$db-&gt;Execute($stmt); </font></pre>
-
-<p><font>Note that the only difference between the oci8 and mssql implementations is $sql.</font></p>
-<p>
-<font> If $type parameter is set to false, in mssql, $type will be dynamicly determined 
-based on the type of the PHP variable passed <font face="Courier New, Courier, mono">(string 
-=&gt; SQLCHAR, boolean =&gt;SQLINT1, integer =&gt;SQLINT4 or float/double=&gt;SQLFLT8)</font>.
-</font></p><p><font> 
-In oci8, $type can be set to OCI_B_FILE (Binary-File), OCI_B_CFILE (Character-File), 
-OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). To 
-pass in a null, use<font face="Courier New, Courier, mono"> $db-&gt;Parameter($stmt, 
-$null=null, 'param')</font>. 
-  </font></p><p><font><b> OutParameter<a name="outparameter"></a>($stmt, $var, $name, 
-  $maxLen = 4000, $type = false )</b></font></p>
-<font>  Binds a PHP variable as output from a stored procedure variable. The parameter <i>$stmt</i>
- is the value returned by PrepareSP(), <i>$var</i> is the PHP variable you want to bind, <i>$name</i>
- is the name of the stored procedure variable. Optional is <i>$maxLen</i>, the maximum length of the
- data to bind, and <i>$type</i> which is database dependant. 
-</font><p>
-<font>  OutParameter() is a wrapper function that calls Parameter() with $isOutput=true. 
-  The advantage of this function is that it is self-documenting, because
-the $isOutput parameter is no longer needed.  Only for mssql 
-  and oci8 currently.
-</font></p><p>
-<font>For an example, see <a href="#inparameter">InParameter</a>.
-
-</font></p><p><font><b> Parameter<a name="parameter"></a>($stmt, $var, $name, $isOutput=false, 
-  $maxLen = 4000, $type = false )</b></font></p>
-<p><font>Note: This function is deprecated, because of the new InParameter() and OutParameter() functions.
-These are superior because they are self-documenting, unlike Parameter().
-</font></p><p><font>Adds a bind parameter suitable for return values or special data handling (eg. 
-  LOBs) after a statement has been prepared using PrepareSP(). Only for mssql 
-  and oci8 currently. The parameters are:<br>
-  <br>
-  $<i><b>stmt</b></i> Statement returned by Prepare() or PrepareSP().<br>
-  $<i><b>var</b></i> PHP variable to bind to. Make sure you pre-initialize it!<br>
-  $<i><b>name</b></i> Name of stored procedure variable name to bind to.<br>
-  [$<i><b>isOutput</b></i>] Indicates direction of parameter 0/false=IN 1=OUT 
-  2= IN/OUT. This is ignored in oci8 as this driver auto-detects the direction.<br>
-  [$<b>maxLen</b>] Maximum length of the parameter variable.<br>
-  [$<b>type</b>] Consult <a href="http://php.net/mssql_bind">mssql_bind</a> and 
-  <a href="http://php.net/ocibindbyname">ocibindbyname</a> docs at php.net for 
-  more info on legal values for type.</font></p>
-<p><font>Lastly, in oci8, bind parameters can be reused without calling PrepareSP( ) 
-  or Parameters again. This is not possible with mssql. An oci8 example:</font></p>
-<pre><font>$id = 0; $i = 0;<br>$stmt = $db-&gt;PrepareSP( <font color="#993300">"update table set val=:i where id=:id"</font>);<br>$db-&gt;Parameter($stmt,$id,'id');<br>$db-&gt;Parameter($stmt,$i, 'i');<br>for ($cnt=0; $cnt &lt; 1000; $cnt++) {<br>	$id = $cnt; <br>	$i = $cnt * $cnt; <font color="green"># works with oci8!</font>
-	$db-&gt;Execute($stmt); <br>}</font></pre>
-<p><font><b>Bind<a name="bind"></a>($stmt, $var, $size=4001, $type=false, $name=false)</b></font></p>
- 
-<p><font>This is a low-level function supported only by the oci8 
-  driver. <b>Avoid using</b> unless you only want to support Oracle. The Parameter( 
-  ) function is the recommended way to go with bind variables.</font></p>
-<p><font>Bind( ) allows you to use bind variables in your sql 
-  statement. This binds a PHP variable to a name defined in an Oracle sql statement 
-  that was previously prepared using Prepare(). Oracle named variables begin with 
-  a colon, and ADOdb requires the named variables be called :0, :1, :2, :3, etc. 
-  The first invocation of Bind() will match :0, the second invocation will match 
-  :1, etc. Binding can provide 100% speedups for insert, select and update statements. 
-  </font></p>
-<p>The other variables, $size sets the buffer size for data storage, $type is 
-  the optional descriptor type OCI_B_FILE (Binary-File), OCI_B_CFILE (Character-File), 
-  OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and OCI_B_ROWID (ROWID). 
-  Lastly, instead of using the default :0, :1, etc names, you can define your 
-  own bind-name using $name. 
-</p><p><font>The following example shows 3 bind variables being used: 
-  p1, p2 and p3. These variables are bound to :0, :1 and :2.</font></p>
-<pre>$stmt = $DB-&gt;Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");<br>$DB-&gt;Bind($stmt, $p1);<br>$DB-&gt;Bind($stmt, $p2);<br>$DB-&gt;Bind($stmt, $p3);<br>for ($i = 0; $i &lt; $max; $i++) { <br>   $p1 = ?; $p2 = ?; $p3 = ?;<br>   $DB-&gt;Execute($stmt);<br>}</pre>
-<p>You can also use named variables:</p>
-<pre>$stmt = $DB-&gt;Prepare("insert into table (col0, col1, col2) values (:name0, :name1, :name2)");<br>$DB-&gt;Bind($stmt, $p1, "name0");<br>$DB-&gt;Bind($stmt, $p2, "name1");<br>$DB-&gt;Bind($stmt, $p3, "name2");<br>for ($i = 0; $i &lt; $max; $i++) { <br>   $p1 = ?; $p2 = ?; $p3 = ?;<br>   $DB-&gt;Execute($stmt);<br>}</pre>
-<p><b>LogSQL($enable=true)<a name="logsql"></a></b></p>
-Call this method to install a SQL logging and timing function (using fnExecute). 
-Then all SQL statements are logged into an adodb_logsql table in a database. If 
-the adodb_logsql table does not exist, ADOdb will create the table if you have 
-the appropriate permissions. Returns the previous logging value (true for enabled, 
-false for disabled). Here are samples of the DDL for selected databases: 
-<p> 
-</p><pre>		<b>mysql:</b>
-		CREATE TABLE adodb_logsql (
-		  created datetime NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 text NOT NULL,
-		  params text NOT NULL,
-		  tracer text NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)
-		
-		<b>postgres:</b>
-		CREATE TABLE adodb_logsql (
-		  created timestamp NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 text NOT NULL,
-		  params text NOT NULL,
-		  tracer text NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)
-		
-		<b>mssql:</b>
-		CREATE TABLE adodb_logsql (
-		  created datetime NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 varchar(4000) NOT NULL,
-		  params varchar(3000) NOT NULL,
-		  tracer varchar(500) NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)
-		
-		<b>oci8:</b>
-		CREATE TABLE adodb_logsql (
-		  created date NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 varchar(4000) NOT NULL,
-		  params varchar(4000),
-		  tracer varchar(4000),
-		  timer decimal(16,6) NOT NULL
-		)
-</pre>
-Usage: 
-<pre>	$conn-&gt;LogSQL(); // turn on logging<br>	  :<br>	$conn-&gt;Execute(...);<br>	  :<br>	$conn-&gt;LogSQL(false); // turn off logging<br>	<br>	# output summary of SQL logging results<br>	$perf = NewPerfMonitor($conn);<br>	echo $perf-&gt;SuspiciousSQL();<br>	echo $perf-&gt;ExpensiveSQL();<br></pre>
-<p>One limitation of logging is that rollback also prevents SQL from being logged.
-</p><p>
-If you prefer to use another name for the table used to store the SQL, you can override it by calling 
-adodb_perf::table($tablename), where $tablename is the new table name (you will still need to manually
-create the table yourself). An example:
-</p><pre>	include('adodb.inc.php');<br>	include('adodb-perf.inc.php');<br>	adodb_perf::table('my_logsql_table');<br></pre>
-Also see <a href="docs-perf.htm">Performance Monitor</a>. 
-<p><font><b>fnExecute and fnCacheExecute properties<a name="fnexecute" id="fnexecute"></a></b></font></p>
-<p>These two properties allow you to define bottleneck functions for all sql statements 
-  processed by ADOdb. This allows you to perform statistical analysis and query-rewriting 
-  of your sql. 
-</p><p><b>Examples of fnExecute</b></p>
-<p>Here is an example of using fnExecute, to count all cached queries and non-cached 
-  queries, you can do this:</p>
-<pre><font color="#006600"># $db is the connection object</font>
-function &CountExecs($db, $sql, $inputarray)
-{
-global $EXECS;
-
-	if (!is_array(inputarray)) $EXECS++;
-	<font color="#006600"># handle 2-dimensional input arrays</font>
-	else if (is_array(reset($inputarray))) $EXECS += sizeof($inputarray);
-	else $EXECS++;
-	
-	<font color="#006600"># in PHP4.4 and PHP5, we need to return a value by reference</font>
-	$null = null;
-	return $null;
-}
-
-<font color="#006600"># $db is the connection object</font>
-function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
-{<br>global $CACHED; $CACHED++;<br>}<br><br>$db = NewADOConnection('mysql');<br>$db-&gt;Connect(...);<br>$db-&gt;<strong>fnExecute</strong> = 'CountExecs';<br>$db-&gt;<strong>fnCacheExecute</strong> = 'CountCachedExecs';<br> :<br> :<br><font color="#006600"># After many sql statements:</font>`<br>printf("&lt;p&gt;Total queries=%d; total cached=%d&lt;/p&gt;",$EXECS+$CACHED, $CACHED);<br></pre>
-<p>The fnExecute function is called before the sql is parsed and executed, so 
-  you can perform a query rewrite. If you are passing in a prepared statement, 
-  then $sql is an array (see <a href="#prepare">Prepare</a>). The fnCacheExecute 
-  function is only called if the recordset returned was cached.<font> 
-  The function parameters match the Execute and CacheExecute functions respectively, 
-  except that $this (the connection object) is passed as the first parameter.</font></p>
-<p>Since ADOdb 3.91, the behaviour of fnExecute varies depending on whether the 
-  defined function returns a value. If it does not return a value, then the $sql 
-  is executed as before. This is useful for query rewriting or counting sql queries. 
-</p><p> On the other hand, you might want to replace the Execute function with one 
-  of your own design. If this is the case, then have your function return a value. 
-  If a value is returned, that value is returned immediately, without any further 
-  processing. This is used internally by ADOdb to implement LogSQL() functionality. 
-</p>
-<p>
-</p><hr />
-<h3><font>ADOConnection Utility Functions</font></h3>
-<p><font><b>BlankRecordSet<a name="blankrecordset"></a>([$queryid])</b></font></p>
-<p><font>No longer available - removed since 1.99.</font></p>
-<p><font><b>Concat<a name="concat"></a>($s1,$s2,....)</b></font></p>
-<p><font>Generates the sql string used to concatenate $s1, $s2, etc together. Uses the 
-  string in the concat_operator field to generate the concatenation. Override 
-  this function if a concatenation operator is not used, eg. MySQL.</font></p>
-<p><font>Returns the concatenated string.</font></p>
-<p><font><b>DBDate<a name="dbdate"></a>($date)</b></font></p>
-<p><font>Format the $<b>date</b> in the format the database accepts - the return string is also quoted. This is used
-when you are sending dates to the database (eg INSERT, UPDATE or where clause of SELECT statement). 
-  The $<b>date</b> parameter can be a Unix integer timestamp or an ISO format 
-  Y-m-d. Uses the fmtDate field, which holds the format to use. If null or false 
-  or '' is passed in, it will be converted to an SQL null.</font></p>
-<p><font>Returns the date as a quoted string.</font></p>
-<pre>
-	$sql = "select * from atable where created > ".$db->DBDate("$year-$month-$day");
-	$db->Execute($sql);
-</pre>
-<p>Note to retrieve a date column in a specific format,  use <a href="#sqldate">SQLDate</a>. </p>
-<p><font><b>BindDate<a name="binddate"></a>($date)</b></font></p>
-<p><font>Format the $<b>date</b> in the bind format the database accepts. Normally
- this means that the date string is not quoted, unlike DBDate, which quotes the string.
-<pre>
-	$sql = "select * from atable where created > ".$db->Param('0');
-	// or
-	$sql = "select * from atable where created > ?";
-	$db->Execute($sql,array($db->BindDate("$year-$month-$day"));
-</pre>
-<p><font><b>DBTimeStamp<a name="dbtimestamp"></a>($ts)</b></font></p>
-<p><font>Format the timestamp $<b>ts</b> in the format the database accepts; this can 
-  be a Unix integer timestamp or an ISO format Y-m-d H:i:s. Uses the fmtTimeStamp 
-  field, which holds the format to use. If null or false or '' is passed in, it 
-  will be converted to an SQL null.</font></p>
-<p><font>Returns the timestamp as a quoted string.</font></p>
-<pre>
-	$sql = "select * from atable where created > ".$db->DBTimeStamp("$year-$month-$day $hr:$min:$secs");
-	$db->Execute($sql);
-</pre>
-<p><font><b>BindTimeStamp<a name="bindtimestamp"></a>($ts)</b></font></p>
-<p><font>Format the timestamp $<b>ts</b> in the bind format the database accepts. Normally
- this means that the timestamp string is not quoted, unlike DBTimeStamp, which quotes the string.
-<pre>
-	$sql = "select * from atable where created > ".$db->Param('0');
-	// or
-	$sql = "select * from atable where created > ?";
-	$db->Execute($sql,array($db->BindTimeStamp("$year-$month-$day $hr:$min:$secs"));
-</pre>
-<p><font><b>qstr<a name="qstr"></a>($s,[$magic_quotes_enabled</b>=false]<b>)</b></font></p>
-<p><font>Quotes a string to be sent to the database. The $<b>magic_quotes_enabled</b> 
-  parameter may look funny, but the idea is if you are quoting a string extracted 
-  from a POST/GET variable, then pass get_magic_quotes_gpc() as the second parameter. 
-  This will ensure that the variable is not quoted twice, once by <i>qstr</i> 
-  and once by the <i>magic_quotes_gpc</i>.</font></p>
-<p><font>Eg.<font face="Courier New, Courier, mono"> $s = $db-&gt;qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());</font></font></p>
-<p><font>Returns the quoted string.</font></p>
-<p><font><b>Quote<a name="quote"></a>($s)</b></font></p>
-<p><font>Quotes the string $s, escaping the database specific quote character as appropriate. 
-  Formerly checked magic quotes setting, but this was disabled since 3.31 for 
-  compatibility with PEAR DB. 
-</font></p><p><font><b>Affected_Rows<a name="affected_rows"></a>( )</b></font></p>
-<p><font>Returns the number of rows affected by a update or delete statement. Returns 
-  false if function not supported.</font></p>
-<p><font>Not supported by interbase/firebird currently. </font></p>
-<p><font><b>Insert_ID<a name="inserted_id"></a>( )</b></font></p>
-<p><font>Returns the last autonumbering ID inserted. Returns false if function not supported. 
-</font></p>
-<p><font>Only supported by databases that support auto-increment or object id's, such 
-  as PostgreSQL, MySQL and MS SQL Server currently. PostgreSQL returns the OID, which 
-  can change on a database reload.</font></p>
-<p><font><b>RowLock<a name="rowlock"></a>($table,$where)</b></font></p>
-<p><font>Lock a table row for the duration of a transaction. For example to lock record $id in table1:
-</font></p><pre><font>	$DB-&gt;StartTrans();<br>	$DB-&gt;RowLock("table1","rowid=$id");<br>	$DB-&gt;Execute($sql1);<br>	$DB-&gt;Execute($sql2);<br>	$DB-&gt;CompleteTrans();<br></font></pre>
-<p><font>Supported in db2, interbase, informix, mssql, oci8, postgres, sybase.
-</font></p><p><font><b>MetaDatabases<a name="metadatabases"></a>()</b></font></p>
-<p><font>Returns a list of databases available on the server as an array. You have to 
-  connect to the server first. Only available for ODBC, MySQL and ADO.</font></p>
-<p><font><b>MetaTables<a name="metatables"></a>($ttype = false, $showSchema = false, 
-  $mask=false)</b></font></p>
-<p><font>Returns an array of tables and views for the current database as an array. 
-  The array should exclude system catalog tables if possible. To only show tables, 
-  use $db-&gt;MetaTables('TABLES'). To show only views, use $db-&gt;MetaTables('VIEWS'). 
-  The $showSchema parameter currently works only for DB2, and when set to true, 
-  will add the schema name to the table, eg. "SCHEMA.TABLE". </font></p>
-<p><font>You can define a mask for matching. For example, setting $mask = 'TMP%' will 
-  match all tables that begin with 'TMP'. Currently only mssql, oci8, odbc_mssql 
-  and postgres* support $mask. 
-</font></p><p><font><b>MetaColumns<a name="metacolumns"></a>($table,$notcasesensitive=true)</b></font></p>
-<p><font>Returns an array of ADOFieldObject's, one field object for every column of 
-  $table. A field object is a class instance with (name, type, max_length) defined.
-  Currently Sybase does not recognise date types, and ADO cannot identify 
-  the correct data type (so we default to varchar).   
- </font></p><p><font> The $notcasesensitive parameter determines whether we uppercase or lowercase the table name to normalize it
- (required for some databases). Does not work with MySQL ISAM tables.
- </font></p><p><font>For schema support, pass in the $table parameter, "$schema.$tablename". This is only
- supported for selected databases.
-</font></p><p><font><b>MetaColumnNames<a name="metacolumnames"></a>($table,$numericIndex=false)</b></font></p>
-<p><font>Returns an array of column names for $table. Since ADOdb 4.22, this is an associative array, with the
-keys in uppercase. Set $numericIndex=true if you want the old behaviour of numeric indexes (since 4.23).
-</font></p><p>
-<font>e.g. array('FIELD1' =&gt; 'Field1', 'FIELD2'=&gt;'Field2')
-</font></p><p>
-</p><p><font><b>MetaPrimaryKeys<a name="metaprimarykeys"></a>($table,
-      $owner=false)</b></font> 
-</p>
-<p><font>Returns an array containing column names that are the 
-  primary keys of $table. Supported by mysql, odbc (including db2, odbc_mssql, 
-etc), mssql, postgres, interbase/firebird, oci8 currently. </font></p>
-<p><font>Views (and some tables) have primary keys, but sometimes this information is not available from the
-database. You can define a function  ADODB_View_PrimaryKeys($databaseType, $database, $view, $owner) that
-should return an array containing the fields that make up the primary key. If that function exists,
-it will be called when MetaPrimaryKeys() cannot find a primary key for a table or view.
-</font></p><pre><font>// In this example: dbtype = 'oci8', $db = 'mydb', $view = 'dataView', $owner = false <br>function ADODB_View_PrimaryKeys($dbtype,$db,$view,$owner)<br>{<br>	switch(strtoupper($view)) {<br>	case 'DATAVIEW': return array('DATAID');<br>	default: return false;<br>	}<br>}<br><br>$db = NewADOConnection('oci8');<br>$db-&gt;Connect('localhost','root','','mydb'); <br>$db-&gt;MetaPrimaryKeys('dataView');<br></font></pre>
-<p><font><b>ServerInfo<a name="serverinfo" id="serverinfo"></a>()</b></font> 
-</p>
-<p><font>Returns an array of containing two elements 'description' 
-  and 'version'. The 'description' element contains the string description of 
-  the database. The 'version' naturally holds the version number (which is also 
-a string).</font></p>
-<p><font><b>MetaForeignKeys<a name="metaforeignkeys"></a>($table, $owner=false, $upper=false)</b> 
-</font></p><p><font>Returns an associate array of foreign keys, or false if not supported. For 
-  example, if table employee has a foreign key where employee.deptkey points to 
-  dept_table.deptid, and employee.posn=posn_table.postionid and employee.poscategory=posn_table.category, 
-  then $conn-&gt;MetaForeignKeys('employee') will return 
-</font></p><pre><font>	array(<br>		'dept_table' =&gt; array('deptkey=deptid'),<br>		'posn_table' =&gt; array('posn=positionid','poscategory=category')<br>	)<br></font></pre>
-<p><font>The optional schema or owner can be defined in $owner. If $upper is true, then 
-  the table names (array keys) are upper-cased. 
-</font></p><hr />
-<h2><font>ADORecordSet<a name="adorecordset"></a></font></h2>
-<p><font>When an SQL statement successfully is executed by <font face="Courier New, Courier, mono">ADOConnection-&gt;Execute($sql),</font>an 
-  ADORecordSet object is returned. This object contains a virtual cursor so we 
-  can move from row to row, functions to obtain information about the columns 
-  and column types, and helper functions to deal with formating the results to 
-  show to the user.</font></p>
-<h3><font>ADORecordSet Fields</font></h3>
-<p><font><b>fields: </b>Array containing the current row. This is not associative, but 
-  is an indexed array from 0 to columns-1. See also the function <b><a href="#fields">Fields</a></b>, 
-  which behaves like an associative array.</font></p>
-<p><font><b>dataProvider</b>: The underlying mechanism used to connect to the database. 
-  Normally set to <b>native</b>, unless using <b>odbc</b> or <b>ado</b>.</font></p>
-<p><font><b>blobSize</b>: Maximum size of a char, string or varchar object before it 
-  is treated as a Blob (Blob's should be shown with textarea's). See the <a href="#metatype">MetaType</a> 
-  function.</font></p>
-<p><font><b>sql</b>: Holds the sql statement used to generate this record set.</font></p>
-<p><font><b>canSeek</b>: Set to true if Move( ) function works.</font></p>
-<p><font><b>EOF</b>: True if we have scrolled the cursor past the last record.</font></p>
-<h3><font>ADORecordSet Functions</font></h3>
-<p><font><b>ADORecordSet( )</b></font></p>
-<p><font>Constructer. Normally you never call this function yourself.</font></p>
-<p><font><b>GetAssoc<a name="getassoc"></a>([$force_array])</b></font></p>
-<p><font>Generates an associative array from the recordset. Note that is this function 
-  is also <a href="#getassoc1">available</a> in the connection object. More details 
-  can be found there.</font></p>
-<font> </font>
-<p><font><b>GetArray<a name="getarray"></a>([$number_of_rows])</b></font></p>
-<p><font>Generate a 2-dimensional array of records from the current
-    cursor position, indexed from 0 to $number_of_rows - 1. If $number_of_rows
-  is undefined, till EOF.</font></p>
-<p><font><b>GetRows<a name="getrows"></a>([$number_of_rows])</b></font></p>
-<font>Generate a 2-dimensional array of records from the current
-cursor position. Synonym for GetArray() for compatibility with Microsoft ADO. </font>
-<p><font> <b>GetMenu<a name="getmenu"></a>($name, [$default_str=''],
-  [$blank1stItem=true], [$multiple_select=false], [$size=0], [$moreAttr=''])</b></font></p>
-<p><font>Generate a HTML menu (&lt;select&gt;&lt;option&gt;&lt;option&gt;&lt;/select&gt;).
-    The first column of the recordset (fields[0]) will hold the string to display
-    in the option tags. If the recordset has more than 1 column, the second column
-    (fields[1]) is the value to send back to the web server.. The menu will be
-given the name $<i>name</i>. </font></p>
-<p><font> If $<i>default_str</i> is defined, then if $<i>default_str</i> ==
-    fields[0], that field is selected. If $<i>blank1stItem</i> is true, the first
-    option is empty. You can also set the first option strings by setting $blank1stItem
-  = "$value:$text".</font></p>
-<p><font>$<i>Default_str</i> can be array for a multiple select
-listbox.</font></p>
-<p><font>To get a listbox, set the $<i>size</i> to a non-zero
-    value (or pass $default_str as an array). If $<i>multiple_select</i> is true
-    then a listbox will be generated with $<i>size</i> items (or if $size==0,
-    then 5 items) visible, and we will return an array to a server. Lastly use
-  $<i>moreAttr </i> to add additional attributes such as javascript or styles. </font></p>
-<p><font>Menu Example 1: <code>GetMenu('menu1','A',true)</code> will
-    generate a menu:
-    <select name="menu1"><option> </option><option value="1" selected="selected">A </option><option value="2">B </option><option value="3">C </option></select>
-for the data (A,1), (B,2), (C,3). Also see <a href="#ex5">example 5</a>.</font></p>
-<p><font>Menu Example 2: For the same data, <code>GetMenu('menu1',array('A','B'),false)</code> will
-    generate a menu with both A and B selected: <br>
-    <select name="menu1" multiple="multiple" size="3"><option value="1" selected="selected">A </option><option value="2" selected="selected">B </option><option value="3">C </option></select>
-</font></p>
-<p><font> <b>GetMenu2<a name="getmenu2"></a>($name, [$default_str=''],
-  [$blank1stItem=true], [$multiple_select=false], [$size=0], [$moreAttr=''])</b></font></p>
-<p><font>This is nearly identical to GetMenu, except that the
-  $<i>default_str</i> is matched to fields[1] (the option values).</font></p>
-<p><font>Menu Example 3: Given the data in menu example 2, <code>GetMenu2('menu1',array('1','2'),false)</code> will
-    generate a menu with both A and B selected in menu example 2, but this time
-    the selection is based on the 2nd column, which holds the values to return
-to the Web server. </font></p>
-<p><font><b>UserDate<a name="userdate"></a>($str, [$fmt])</b></font></p>
-<p><font>Converts the date string $<i>str</i> to another format.
-    The date format is Y-m-d, or Unix timestamp format. The default $<i>fmt</i> is
-Y-m-d.</font></p>
-<p><font><b>UserTimeStamp<a name="usertimestamp"></a>($str, [$fmt])</b></font></p>
-<p><font>Converts the timestamp string $<b>str</b> to another
-    format. The timestamp format is Y-m-d H:i:s, as in '2002-02-28 23:00:12',
-    or Unix timestamp format. UserTimeStamp calls UnixTimeStamp to parse $<i>str</i>,
-and $<i>fmt</i> defaults to Y-m-d H:i:s if not defined. </font></p>
-<p><font><b>UnixDate<a name="unixdate"></a>($str)</b></font></p>
-<p><font>Parses the date string $<b>str</b> and returns it in
-    unix mktime format (eg. a number indicating the seconds after January 1st,
-    1970). Expects the date to be in Y-m-d H:i:s format, except for Sybase and
-    Microsoft SQL Server, where M d Y is also accepted (the 3 letter month strings
-  are controlled by a global array, which might need localisation).</font></p>
-<p><font>This function is available in both ADORecordSet and
-ADOConnection since 1.91.</font></p>
-<p><font><b>UnixTimeStamp<a name="unixtimestamp"></a>($str)</b></font></p>
-<p><font>Parses the timestamp string $<b>str</b> and returns
-    it in unix mktime format (eg. a number indicating the seconds after January
-    1st, 1970). Expects the date to be in "Y-m-d, H:i:s" (1970-12-24, 00:00:00)
-    or "Y-m-d H:i:s" (1970-12-24 00:00:00) or "YmdHis" (19701225000000) format,
-    except for Sybase and Microsoft SQL Server, where "M d Y h:i:sA" (Dec 25
-    1970 00:00:00AM) is also accepted (the 3 letter month strings are controlled
-by a global array, which might need localisation).</font></p>
-<font> 
-</font><p><font>This function is available in both ADORecordSet
-    and ADOConnection since 1.91. </font></p>
-<p><font><b>OffsetDate<a name="OffsetDate"></a>($dayFraction,
-  $basedate=false)</b></font></p>
-<p><font>Returns a string with the native SQL functions to calculate
-    future and past dates based on $basedate in a portable fashion. If $basedate
-    is not defined, then the current date (at 12 midnight) is used. Returns the
-  SQL string that performs the calculation when passed to Execute(). </font></p>
-<p><font>For example, in Oracle, to find the date and time that
-  is 2.5 days from today, you can use:</font></p>
-<pre><font># get date one week from now<br>$fld = $conn-&gt;OffsetDate(7); // returns "(trunc(sysdate)+7")</font></pre>
-<pre><font># get date and time that is 60 hours from current date and time<br>$fld = $conn-&gt;OffsetDate(2.5, $conn-&gt;sysTimeStamp);	// returns "(sysdate+2.5)"<br><br>$conn-&gt;Execute("UPDATE TABLE SET dodate=$fld WHERE ID=$id");</font></pre>
-<p><font> This function is available for mysql, mssql, oracle, oci8 and postgresql drivers 
-  since 2.13. It might work with other drivers provided they allow performing
-  numeric day arithmetic on dates.</font></p>
-<font> </font>
-<p><font><b>SQLDate<a name="sqldate"></a>($dateFormat, $basedate=false)</b></font></p>
-<font>Returns a string which contains the native SQL functions
-to format a date or date column $basedate. This is used when retrieving date columns in SELECT statements.
-For sending dates to the database (eg. in UPDATE, INSERT or the where clause of SELECT statements) 
-use <a href="#dbdate">DBDate</a>. It uses a case-sensitive
-$dateFormat, which supports: </font>
-<pre><font> 
-  Y: 4-digit Year
-  Q: Quarter (1-4)
-  M: Month (Jan-Dec)
-  m: Month (01-12)
-  d: Day (01-31)
-  H: Hour (00-23)
-  h: Hour (1-12)
-  i: Minute (00-59)
-  s: Second (00-60)
-  A: AM/PM indicator
-  w: day of week (0-6 or 1-7 depending on DB)
-  l: day of week (as string - lowercase L)
-  W: week in year (0..53 for MySQL, 1..53 for PostgreSQL and Oracle)
-  </font></pre>
-<p><font>All other characters are treated as strings. You can
-    also use \ to escape characters. Available on selected databases, including
-mysql, postgresql, mssql, oci8 and DB2. </font></p>
-<p><font>This is useful in writing portable sql statements that
-    GROUP BY on dates. For example to display total cost of goods sold broken
-by quarter (dates are stored in a field called postdate): </font></p>
-<pre><font> $sqlfn = $db-&gt;SQLDate('Y-\QQ','postdate'); # get sql that formats postdate to output 2002-Q1<br> $sql = "SELECT $sqlfn,SUM(cogs) FROM table GROUP BY $sqlfn ORDER BY 1 desc";<br> </font></pre>
-<p><font><b>MoveNext<a name="movenext"></a>( )</b></font></p>
-<p><font>Move the internal cursor to the next row. The <i>$this-&gt;fields</i> array
-    is automatically updated. Returns false if unable to do so (normally because
-EOF has been reached), otherwise true. </font></p>
-<p><font> If EOF is reached, then the $this-&gt;fields array
-    is set to false (this was only implemented consistently in ADOdb 3.30). For
-    the pre-3.30 behaviour of $this-&gt;fields (at EOF), set the global variable
-  $ADODB_COMPAT_FETCH = true.</font></p>
-<p><font>Example:</font></p>
-<pre><font>$rs = $db-&gt;Execute($sql);<br>if ($rs) <br>	while (!$rs-&gt;EOF) {<br> 		ProcessArray($rs-&gt;fields);	<br>		$rs-&gt;MoveNext();<br>	} </font></pre>
-<p><font><b>Move<a name="move"></a>($to)</b></font></p>
-<p><font>Moves the internal cursor to a specific row $<b>to</b>.
-    Rows are zero-based eg. 0 is the first row. The <b>fields</b> array is automatically
-    updated. For databases that do not support scrolling internally, ADOdb will
-    simulate forward scrolling. Some databases do not support backward scrolling.
-    If the $<b>to</b> position is after the EOF, $<b>to</b> will move to the
-    end of the RecordSet for most databases. Some obscure databases using odbc
-  might not behave this way.</font></p>
-<p><font>Note: This function uses <i>absolute positioning</i>,
-unlike Microsoft's ADO.</font></p>
-<p><font>Returns true or false. If false, the internal cursor
-    is not moved in most implementations, so AbsolutePosition( ) will return
-  the last cursor position before the Move( ). </font></p>
-<p><font><b>MoveFirst<a name="movefirst"></a>()</b></font></p>
-<p><font>Internally calls Move(0). Note that some databases do
-not support this function.</font></p>
-<p><font><b>MoveLast<a name="movelast"></a>()</b></font></p>
-<p><font>Internally calls Move(RecordCount()-1). Note that some
-  databases do not support this function.</font></p>
-<p><font><b>GetRowAssoc</b><a name="getrowassoc"></a>($toUpper=true)</font></p>
-<p><font>Returns an associative array containing the current
-    row. The keys to the array are the column names. The column names are upper-cased
-  for easy access. To get the next row, you will still need to call MoveNext(). </font></p>
-<p><font>For example:<br>
-Array ( [ID] =&gt; 1 [FIRSTNAME] =&gt; Caroline [LASTNAME] =&gt; Miranda [CREATED]
-=&gt; 2001-07-05 ) </font></p>
-<p><font>Note: do not use GetRowAssoc() with $ADODB_FETCH_MODE
-    = ADODB_FETCH_ASSOC. Because they have the same functionality, they will
-  interfere with each other.</font></p>
-<font> 
-</font><p><font><b>AbsolutePage<a name="absolutepage"></a>($page=-1) </b></font></p>
-<p><font>Returns the current page. Requires PageExecute()/CachePageExecute() to be called. 
-  See <a href="#ex8">Example 8</a>.</font></p>
-<font>
-<p><b>AtFirstPage<a name="atfirstpage">($status='')</a></b></p>
-<p>Returns true if at first page (1-based). Requires PageExecute()/CachePageExecute()
-  to be called. See <a href="#ex8">Example 8</a>.</p>
-<p><b>AtLastPage<a name="atlastpage">($status='')</a></b></p>
-<p>Returns true if at last page (1-based). Requires PageExecute()/CachePageExecute()
-  to be called. See <a href="#ex8">Example 8</a>.</p>
-<p><b>Fields</b><a name="fields"></a>(<b>$colname</b>)</p>
-<p>Returns the value of the associated column $<b>colname</b> for the current
-  row. The column name is case-insensitive.</p>
-<p>This is a convenience function. For higher performance, use <a href="#adodb_fetch_mode">$ADODB_FETCH_MODE</a>. </p>
-<p><b>FetchRow</b><a name="fetchrow"></a>()</p> 
-</font><p><font>Returns array containing current row, or false
-    if EOF. FetchRow( ) internally moves to the next record after returning the
-    current row. </font></p>
-<p><font>Warning: Do not mix using FetchRow() with MoveNext().</font></p>
-<p><font>Usage:</font></p>
-<pre><font>$rs = $db-&gt;Execute($sql);<br>if ($rs)<br>	while ($arr = $rs-&gt;FetchRow()) {<br>	   &nbsp;&nbsp;# process $arr	<br>	}</font></pre>
-<p><font><b>FetchInto</b><a name="fetchinto"></a>(<b>&amp;$array</b>)</font></p>
-<p><font> Sets $array to the current row. Returns PEAR_Error
-    object if EOF, 1 if ok (DB_OK constant). If PEAR is undefined, false is returned
-    when EOF. FetchInto( ) internally moves to the next record after returning
-  the current row. </font></p>
-<p><font> FetchRow() is easier to use. See above.</font></p>
-<font> </font>
-<p><font><b>FetchField<a name="fetchfield"></a>($column_number)</b></font></p>
-<p><font>Returns an object containing the <b>name</b>, <b>type</b> and <b>max_length</b> of
-    the associated field. If the max_length cannot be determined reliably, it
-    will be set to -1. The column numbers are zero-based. See <a href="#ex2">example
-  2.</a></font></p>
-<p><font><b>FieldCount<a name="fieldcount"></a>( )</b></font></p>
-<p><font>Returns the number of fields (columns) in the record
-set.</font></p>
-<p><font><b>RecordCount<a name="recordcount"></a>( )</b></font></p>
-<p><font>Returns the number of rows in the record set. If the
-    number of records returned cannot be determined from the database driver
-    API, we will buffer all rows and return a count of the rows after all the
-    records have been retrieved. This buffering can be disabled (for performance
-    reasons) by setting the global variable $ADODB_COUNTRECS = false. When disabled,
-    RecordCount( ) will return -1 for certain databases. See the supported databases
-  list above for more details. </font></p>
-<p><font> RowCount is a synonym for RecordCount.</font></p>
-<p><font><b>PO_RecordCount<a name="po_recordcount"></a>($table,
-$where)</b></font></p>
-<p><font>Returns the number of rows in the record set. If the
-    database does not support this, it will perform a SELECT COUNT(*) on the
-    table $table, with the given $where condition to return an estimate of the
-  recordset size.</font></p>
-<p><font>$numrows = $rs-&gt;PO_RecordCount("articles_table", "group=$group");</font></p>
-<font><b> NextRecordSet<a name="nextrecordset" id="nextrecordset"></a>()</b> </font>
-<p><font>For databases that allow multiple recordsets to be returned
-    in one query, this function allows you to switch to the next recordset. Currently
-  only supported by mssql driver.</font></p>
-<pre><font>$rs = $db-&gt;Execute('execute return_multiple_rs');<br>$arr1 = $rs-&gt;GetArray();<br>$rs-&gt;NextRecordSet();<br>$arr2 = $rs-&gt;GetArray();</font></pre>
-<p><font><b>FetchObject<a name="fetchobject"></a>($toupper=true)</b></font></p>
-<p><font>Returns the current row as an object. If you set $toupper
-    to true, then the object fields are set to upper-case. Note: The newer FetchNextObject()
-  is the recommended way of accessing rows as objects. See below.</font></p>
-<p><font><b>FetchNextObject<a name="fetchnextobject"></a>($toupper=true)</b></font></p>
-<p><font>Gets the current row as an object and moves to the next
-    row automatically. Returns false if at end-of-file. If you set $toupper to
-  true, then the object fields are set to upper-case. Note that for some drivers such as mssql, you need to SetFetchMode(ADODB_FETCH_ASSOC) or SetFetchMode(ADODB_FETCH_BOTH).</font></p>
-<pre><font>$rs = $db-&gt;Execute('select firstname,lastname from table');<br>if ($rs) {<br>	while ($o = $rs-&gt;FetchNextObject()) {<br>		print "$o-&gt;FIRSTNAME, $o-&gt;LASTNAME&lt;BR&gt;";<br>	}<br>}<br></font></pre>
-<p><font>There is some trade-off in speed in using FetchNextObject().
-If performance is important, you should access rows with the <code>fields[]</code> array. <b>FetchObj<a name="fetchobj" id="fetchobj"></a>()</b> </font></p>
-<p><font>Returns the current record as an object. Fields are
-    not upper-cased, unlike FetchObject.  
-</font></p>
-<p><font><b>FetchNextObj<a name="fetchnextobj" id="fetchnextobj"></a>()</b> </font></p>
-<p><font>Returns the current record as an object and moves to
-    the next record. If EOF, false is returned. Fields are not upper-cased, unlike
-  FetctNextObject. </font></p>
-<font>
-<p><b>CurrentRow<a name="currentrow"></a>( )</b></p>
-<p>Returns the current row of the record set. 0 is the first row.</p>
-<p><b>AbsolutePosition<a name="abspos"></a>( )</b></p>
-<p>Synonym for <b>CurrentRow</b> for compatibility with ADO. Returns the current
-  row of the record set. 0 is the first row.</p>
-<p><b>MetaType<a name="metatype"></a>($nativeDBType[,$field_max_length],[$fieldobj])</b></p>
-<p>Determine what <i>generic</i> meta type a database field type is given its
-  native type $<b>nativeDBType</b> as a string and the length of the field $<b>field_max_length</b>.
-  Note that field_max_length can be -1 if it is not known. The field object returned
-  by FetchField() can be passed in $<b>fieldobj</b> or as the 1st parameter <b>$nativeDBType</b>.
-  This is useful for databases such as <i>mysql</i> which has additional properties
-  in the field object such as <i>primary_key</i>. </p>
-<p>Uses the field <b>blobSize</b> and compares it with $<b>field_max_length</b> to
-  determine whether the character field is actually a blob.</p>
-For example, $db-&gt;MetaType('char') will return 'C'.
-<p>Returns:</p>
-<ul>
-  <li><b>C</b>: Character fields that should be shown in a &lt;input type="text"&gt; tag. </li>
-  <li><b>X</b>: Clob (character large objects), or large text fields that should
-    be shown in a &lt;textarea&gt;</li>
-  <li><b>D</b>: Date field</li>
-  <li><b>T</b>: Timestamp field</li>
-  <li><b>L</b>: Logical field (boolean or bit-field)</li>
-  <li><b>N</b>: Numeric field. Includes decimal, numeric, floating point, and
-    real. </li>
-  <li><b>I</b>:&nbsp; Integer field. </li>
-  <li><b>R</b>: Counter or Autoincrement field. Must be numeric.</li>
-  <li><b>B</b>: Blob, or binary large objects. </li>
-</ul> 
-</font><p><font> Since ADOdb 3.0, MetaType accepts $fieldobj
-    as the first parameter, instead of $nativeDBType. </font></p>
-<font> </font>
-<p><font><b>Close( )<a name="rsclose"></a></b></font></p>
-<p><font>Closes the recordset, cleaning all memory and resources
-associated with the recordset. </font></p>
-<p>
-<font>If memory management is not an issue, you do not need to
-call this function as recordsets are closed for you by PHP at the end of the
-script. SQL statements such as INSERT/UPDATE/DELETE do not really return a recordset,
-so you do not have to call Close() for such SQL statements.</font></p>
-<hr />
-<h3><font>function rs2html<a name="rs2html"></a>($adorecordset,[$tableheader_attributes],
-  [$col_titles])</font></h3>
-<p><font>This is a standalone function (rs2html = recordset to
-    html) that is similar to PHP's <i>odbc_result_all</i> function, it prints
-    a ADORecordSet, $<b>adorecordset</b> as a HTML table. $<b>tableheader_attributes</b> allow
-    you to control the table <i>cellpadding</i>, <i>cellspacing</i> and <i>border</i> attributes.
-    Lastly you can replace the database column names with your own column titles
-    with the array $<b>col_titles</b>. This is designed more as a quick debugging
-  mechanism, not a production table recordset viewer.</font></p>
-<p><font>You will need to include the file <i>tohtml.inc.php</i>.</font></p>
-<p><font>Example of rs2html:<b><font color="#336600"><a name="exrs2html"></a></font></b></font></p>
-<pre><font><b><font color="#336600">&lt;?<br>include('tohtml.inc.php')</font></b>; # load code common to ADOdb <br><b>include</b>('adodb.inc.php'); # load code common to ADOdb <br>$<font color="#663300">conn</font> = &amp;ADONewConnection('mysql');   # create a connection <br>$<font color="#663300">conn</font>-&gt;PConnect('localhost','userid','','agora');# connect to MySQL, agora db<br>$<font color="#663300">sql</font> = 'select CustomerName, CustomerID from customers'; <br>$<font color="#663300">rs</font>   = $<font color="#663300">conn</font>-&gt;Execute($sql); <br><font color="#336600"><b>rs2html</b></font><b>($<font color="#663300">rs</font>,'<i>border=2 cellpadding=3</i>',array('<i>Customer Name','Customer ID</i>'));<br>?&gt;</b></font></pre>
-<hr />
-<h3><font>Differences between this ADOdb library and Microsoft
-ADO<a name="adodiff"></a></font></h3>
-<ol>
-<font>
-<li>ADOdb only supports recordsets created by a connection object. Recordsets
-  cannot be created independently.</li>
-<li>ADO properties are implemented as functions in ADOdb. This makes it easier
-  to implement any enhanced ADO functionality in the future.</li>
-<li>ADOdb's <font face="Courier New, Courier, mono">ADORecordSet-&gt;Move()</font> uses
-  absolute positioning, not relative. Bookmarks are not supported.</li>
-<li><font face="Courier New, Courier, mono">ADORecordSet-&gt;AbsolutePosition() </font>cannot
-  be used to move the record cursor.</li>
-<li>ADO Parameter objects are not supported. Instead we have the ADOConnection::<a href="#parameter">Parameter</a>(
-  ) function, which provides a simpler interface for calling preparing parameters
-  and calling stored procedures.</li>
-<li>Recordset properties for paging records are available, but implemented as
-  in <a href="#ex8">Example 8</a>.</li>
-</font></ol>
-<hr />
-<h1><font>Database Driver Guide<a name="driverguide"></a></font></h1>
-<p><font>This describes how to create a class to connect to a
-    new database. To ensure there is no duplication of work, kindly email me
-  at jlim#natsoft.com.my if you decide to create such a class.</font></p>
-<p><font>First decide on a name in lower case to call the database
-  type. Let's say we call it xbase. </font></p>
-<p><font>Then we need to create two classes ADODB_xbase and ADORecordSet_xbase
-  in the file adodb-xbase.inc.php.</font></p>
-<p><font>The simplest form of database driver is an adaptation
-    of an existing ODBC driver. Then we just need to create the class <i>ADODB_xbase
-    extends ADODB_odbc</i> to support the new <b>date</b> and <b>timestamp</b> formats,
-    the <b>concatenation</b> operator used, <b>true</b> and <b>false</b>. For
-    the<i> ADORecordSet_xbase extends ADORecordSet_odbc </i>we need to change
-  the <b>MetaType</b> function. See<b> adodb-vfp.inc.php</b> as an example.</font></p>
-<p><font>More complicated is a totally new database driver that
-    connects to a new PHP extension. Then you will need to implement several
-    functions. Fortunately, you do not have to modify most of the complex code.
-    You only need to override a few stub functions. See <b>adodb-mysql.inc.php</b> for
-  example.</font></p>
-<p><font>The default date format of ADOdb internally is YYYY-MM-DD
-    (Ansi-92). All dates should be converted to that format when passing to an
-    ADOdb date function. See Oracle for an example how we use ALTER SESSION to
-  change the default date format in _pconnect _connect.</font></p>
-<p><font><b>ADOConnection Functions to Override</b></font></p>
-<p><font>Defining a constructor for your ADOConnection derived
-  function is optional. There is no need to call the base class constructor.</font></p>
-<p><font>_<b>connect</b>: Low level implementation of Connect.
-  Returns true or false. Should set the _<b>connectionID</b>.</font></p>
-<p><font>_<b>pconnect:</b> Low level implemention of PConnect.
-  Returns true or false. Should set the _<b>connectionID</b>.</font></p>
-<p><font>_<b>query</b>: Execute a query. Returns the queryID,
-or false.</font></p>
-<p><font>_<b>close: </b>Close the connection -- PHP should clean
-up all recordsets. </font></p>
-<p><font><b>ErrorMsg</b>: Stores the error message in the private
-variable _errorMsg. </font></p>
-<p><font><b>ADOConnection Fields to Set</b></font></p>
-<p><font>_<b>bindInputArray</b>: Set to true if binding of parameters
-  for SQL inserts and updates is allowed using ?, eg. as with ODBC.</font></p>
-<p><font><b>fmtDate</b></font></p>
-<p><font><b>fmtTimeStamp</b></font></p>
-<p><font><b>true</b></font></p>
-<p><font><b>false</b></font></p>
-<p><font><b>concat_operator</b></font></p>
-<p><font><b>replaceQuote</b></font></p>
-<p><font><b>hasLimit</b> support SELECT * FROM TABLE LIMIT 10
-of MySQL.</font></p>
-<p><font><b>hasTop</b> support Microsoft style SELECT TOP 10
-* FROM TABLE.</font></p>
-<p><font><b>ADORecordSet Functions to Override</b></font></p>
-<p><font>You will need to define a constructor for your ADORecordSet
-  derived class that calls the parent class constructor.</font></p>
-<p><font><b>FetchField: </b> as documented above in ADORecordSet</font></p>
-<p><font>_<b>initrs</b>: low level initialization of the recordset:
-    setup the _<b>numOfRows</b> and _<b>numOfFields</b> fields -- called by the
-  constructor.</font></p>
-<p><font>_<b>seek</b>: seek to a particular row. Do not load
-    the data into the fields array. This is done by _fetch. Returns true or false.
-    Note that some implementations such as Interbase do not support seek. Set
-  canSeek to false.</font></p>
-<p><font>_<b>fetch</b>: fetch a row using the database extension
-    function and then move to the next row. Sets the <b>fields</b> array. If
-    the parameter $ignore_fields is true then there is no need to populate the <b>fields</b> array,
-  just move to the next row. then Returns true or false.</font></p>
-<p><font>_<b>close</b>: close the recordset</font></p>
-<p><font><b>Fields</b>: If the array row returned by the PHP
-    extension is not an associative one, you will have to override this. See
-    adodb-odbc.inc.php for an example. For databases such as MySQL and MSSQL
-    where an associative array is returned, there is no need to override this
-  function.</font></p>
-<p><font><b>ADOConnection Fields to Set</b></font></p>
-<p><font>canSeek: Set to true if the _seek function works.</font></p>
-<h2><font>Optimizing PHP</font></h2>
-    For info on tuning PHP, read this article on <a href="http://phplens.com/lens/php-book/optimizing-debugging-php.php">Optimizing
-  PHP</a>. </font></p>
-
-<h2><font>Change Log<a name="Changes"></a><a name="changes"></a><a name="changelog"></a></font></h2>
-
-<p><a name="4.95"></a><b>4.95/5.01 17 May 2007</b>
-<p>CacheFlush debug outp() passed in invalid parameters. Fixed.
-<p>Added Thai language file for adodb. Thx Trirat Petchsingh rosskouk#gmail.com and Marcos Pont</p>
-<p>Added zerofill checking support to MetaColumns for mysql and mysqli.
-<p>CacheFlush no longer deletes all files/directories. Only *.cache files deleted.</p>
-<p>DB2 timestamp format changed to var $fmtTimeStamp = "'Y-m-d-H:i:s'";</p>
-<p>Added some code sanitization to AutoExecute in adodb-lib.inc.php.</p>
-<p>Due to typo, all connections in adodb-oracle.inc.php would become persistent, even non-persistent ones. Fixed.</p>
-<P>Oci8 DBTimeStamp uses 24 hour time for input now, so you can perform string comparisons between 2 DBTimeStamp values.</P>
-<p>Some PHP4.4 compat issues fixed in adodb-session2.inc.php</p>
-<p>For ADOdb 5.01, fixed some adodb-datadict.inc.php MetaType compat issues with PHP5.
-<p>The $argHostname was wiped out in adodb-ado5.inc.php. Fixed.
-<p>Adodb5 version, added iterator support for adodb_recordset_empty.
-
-<p><a name="4.94"></a><b>4.94 23 Jan 2007</b>
-<p>Active Record: $ADODB_ASSOC_CASE=2 did not work properly. Fixed. Thx gmane#auxbuss.com.
-<p>mysqli had bugs in BeginTrans() and EndTrans(). Fixed.</p>
-<p>Improved error handling when no database is connected for oci8. Thx Andy Hassall.</p>
-<p>Names longer than 30 chars in oci8 datadict will be changed to random name. Thx Eugenio. http://phplens.com/lens/lensforum/msgs.php?id=16182
-<p>Added var $upperCase = 'ucase' to access and ado_access drivers. Thx Renato De Giovanni renato#cria.org.br</p>
-<p>Postgres64 driver, if preparing plan failed in _query, did not handle error properly. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=16131.
-<p>Fixed  GetActiveRecordsClass() reference bug. See http://phplens.com/lens/lensforum/msgs.php?id=16120
-<p>
-
-Added handling of nulls in adodb-ado_mssql.inc.php for qstr(). Thx to Felix Rabinovich.
-<p>
-
-Adodb-dict contributions by Gaetano:
-<br>
-+ Support for INDEX in data-dict. Example:
-idx_ev1. The ability to define indexes using the INDEX keyword was added in ADOdb 4.94. The following example features mutiple indexes, including a compound index idx_ev1. 
-<pre>
-  event_id I(11) NOTNULL AUTOINCREMENT PRIMARY,
-  event_type I(4) NOTNULL  <b>INDEX idx_evt</b>,
-  event_start_date T DEFAULT NULL <b>INDEX id_esd</b>,
-  event_end_date T DEFAULT '0000-00-00 00:00:00' <b>INDEX id_eted</b>,
-  event_parent I(11) UNSIGNED NOTNULL DEFAULT 0 <b>INDEX id_evp</b>,
-  event_owner I(11) DEFAULT 0 <b>INDEX idx_ev1</b>,
-  event_project I(11) DEFAULT 0 <b>INDEX idx_ev1</b>,
-  event_times_recuring I(11) UNSIGNED NOTNULL DEFAULT 0,
-  event_icon C(20) DEFAULT 'obj/event',
-  event_description X
-</pre>
-<br>
-+ Prevents the generated SQL from including double drop-sequence statements for REPLACE case of tables with autoincrement columns (on those dbs that emulate it via sequences)
-<br>
-+ makes any date defined as DEFAULT value for D and T columns work cross-database, not just the "sysdate" value (as long as it is specified using adodb standard format). See above example.
-<p>Fixed pdo's GetInsertID() support. Thx Ricky Su.
-<p>oci8 Prepare() now sets error messages if an error occurs.
-<p>Added 'PT_BR' to SetDateLocale() -- brazilian portugese.
-<p>charset in oci8 was not set correctly on *Connect()
-<p>ADOConnection::Transpose() now appends as first column the field names.
-<p>Added $ADODB_QUOTE_FIELDNAMES. If set to true, will autoquote field names in AutoExecute(),GetInsertSQL(), GetUpdateSQL().
-<p>Transpose now adds the field names as the first column after transposition.
-<p>Added === check in ADODB_SetDatabaseAdapter for $db, adodb-active-record.inc.php. Thx Christian Affolter.
-<p>Added ErrorNo() to adodb-active-record.inc.php. Thx ante#novisplet.com.
-
-
-
-<p><a name="4.93"></a><b>4.93 10 Oct 2006</b>
-<p>Added support for multiple database connections in performance monitoring code (adodb-perf.inc.php). Now all sql in multiple database connections can be saved into one database ($ADODB_LOG_CONN).
-<p>Added MetaIndexes() to odbc_mssql.
-<p>Added connection property $db->null2null = 'null'. In autoexecute/getinsertsql/getupdatesql, this value will be converted to a null. Set this to a funny invalid value if you do not want null conversion. See http://phplens.com/lens/lensforum/msgs.php?id=15902.
-<p>Path disclosure problem in mysqli fixed. Thx Andy.
-<p>Fixed typo in session_schema2.xml.
-<p>Changed INT in oci8 to return correct precision in $fld->max_length, MetaColumns(). Thx Eloy Lafuente Plaza.
-<p>Patched postgres64 _connect to handle serverinfo(). see http://phplens.com/lens/lensforum/msgs.php?id=15887.
-<p>Added pdo fix for null columns. See http://phplens.com/lens/lensforum/msgs.php?id=15889
-<p>For stored procedures, missing connection id now passed into mssql_query(). Thx Ecsy (ecsy#freemail.hu).
-
-<p><a name="4.92a"></a><b>4.92a 30 Aug 2006</b>
-<p>Syntax error in postgres7 driver. Thx Eloy Lafuente Plaza. 
-<p>Minor bug fixes - adodb informix 10 types added to adodb.inc.php. Thx Fernando Ortiz.
-
-<p><a name="4.92"></a><b>4.92 29 Aug 2006</b>
-
-<p>Better odbtp date support.
-<P>Added IgnoreErrors() to bypass default error handling.
-<p>The _adodb_getcount() function in adodb-lib.inc.php, some ORDER BY bug fixes.
-<p>For ibase and firebird, set  $sysTimeStamp = "CURRENT_TIMESTAMP".
-<p>Fixed postgres connection bug: http://phplens.com/lens/lensforum/msgs.php?id=11057.
-<p>Changed CacheSelectLimit() to flush cache when $secs2cache==-1 due to complaints from other users. 
-<p>Added support for using memcached with CacheExecute/CacheSelectLimit. Requires memcache module PECL extension. Usage:
-<pre>
-$db = NewADOConnection($driver);
-$db->memCache = true; /// should we use memCache instead of caching in files
-$db->memCacheHost = 126.0.1.1; /// memCache host
-$db->memCachePort = 11211; /// this is default memCache port
-$db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib)
-
-$db->Connect(...);
-$db->CacheExecute($sql);
-</pre>
-<p>Implemented Transpose() for recordsets. Recordset must be retrieved using ADODB_FETCH_NUM. First column becomes the 
-column name.
-<pre>
-$DB = NewADOConnection('mysql');
-$DB->Connect(...);
-$DB->SetFetchMode(ADODB_FETCH_NUM);
-$rs = $DB->Execute('select productname,productid,unitprice from products limit 10');
-$rs2 = $DB->Transpose($rs);
-rs2html($rs2);
-</pre>
-<p><a name="4.91"></a><b>4.91 2 Aug 2006</b>
-<p>Major session code rewrite .... See session docs.
-<p>PDO bindinputarray was not set properly for MySQL (changed from true to false).
-<p>Changed CacheSelectLimit() to re-cache when $secs2cache==0. This is one way to flush the cache when SelectLimit is called.
-<p>Added to quotes to mysql  and mysqli: "SHOW COLUMNS FROM `%s`";
-<p>Removed accidental optgroup handling in GetMenu().
-<a>Fixed ibase _BlobDecode for php5 compat, and also mem alloc issues for small blobs, thx salvatori#interia.pl
-<p>Mysql driver OffsetDate() speedup, useful for adodb-sessions.
-<p>Fix for GetAssoc() PHP5 compat. See http://phplens.com/lens/lensforum/msgs.php?id=15425
-<p>Active Record - If inserting a record and the value of a primary key field is null, then we do not insert that field in as we assume it is an auto-increment field. Needed by mssql.
-<p>Changed postgres7 MetaForeignKeys() see http://phplens.com/lens/lensforum/msgs.php?id=15531
-<p>DB2 will now return db2_conn_errormsg() when it is a connection error. 
-<p><a name="4.90"></a><b>4.90 8 June 2006</b>
-<p>Changed adodb_countrec() in adodb-lib.inc.php to allow LIMIT to be used as a speedup to reduce no of records counted.
-<p>Added support for transaction modes for postgres and oci8 with SetTransactionMode(). 
-These transaction modes affect all subsequent transactions of that connection.
-<p>Thanks to Halmai Csongor for suggestion.
-<p>Removed $off = $fieldOffset - 1 line in db2 driver, FetchField(). Tx Larry Menard.
-<p>Added support for PHP5 objects as Execute() bind parameters using __toString (eg. Simple-XML). Thx Carl-Christian Salvesen.
-<p>Rounding in tohtml.inc.php did not work properly. Fixed.
-<p>MetaIndexes in postgres fails when fields are deleted then added in again because the attnum has gaps in it. 
-See http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976. Fixed.
-<p>MetaForeignkeys in mysql and mysqli did not work when fetchMode==ADODB_FETCH_ASSOC used. Fixed.
-<p>Reference error in AutoExecute() fixed.
-<p>Added macaddr postgres type to MetaType. Maps to 'C'.
-<p>Added to _connect() in adodb-ado5.inc.php support for $database and $dataProvider parameters.  Thx Larry Menard.
-<p>Added support for sequences in adodb-ado_mssql.inc.php. Thx Larry Menard.
-<p>Added ADODB_SESSION_READONLY.
-<p>Added session expiryref support to crc32 mode, and in LOB code.
-<p>Clear _errorMsg in postgres7 driver, so that ErrorMsg() displays properly when no error occurs.
-<p>Added BindDate and BindTimeStamp
-<p><a name="4.81"></a><b>4.81 3 May 2006</b>
-<p>Fixed variable ref errors in adodb-ado5.inc.php in _query().
-<p>Mysqli setcharset fix using method_exists().
-<p>The adodb-perf.inc.php CreateLogTable() code now works for user-defined table names.
-<p>Error in ibase_blob_open() fixed. See http://phplens.com/lens/lensforum/msgs.php?id=14997
-<p><a name="4.80"></a><b>4.80 8 Mar 2006</b>
-<p>Added activerecord support.
-<p>Added mysql $conn->compat323 = true if you want MySQL 3.23 compat enabled. Fixes GetOne() Select-Limit problems.
-<p>Added adodb-xmlschema03.inc.php to support XML Schema version 3 and updated adodb-datadict.htm docs.
-<p>Better memory management in Execute. Thx Mike Fedyk.
-<p><a name="4.72"></a><b>4.72 21 Feb 2006</b>
-<p>Added 'new' DSN parameter for NConnect().
-<p>Pager now sanitizes $PHP_SELF to protect against XSS. Thx to James Bercegay and others.
-<p>ADOConnection::MetaType changed to setup $rs->connection correctly. 
-<p>New native DB2 driver contributed by Larry Menard, Dan Scott, Andy Staudacher, Bharat Mediratta.
-<p>The mssql CreateSequence() did not BEGIN TRANSACTION correctly. Fixed. Thx Sean Lee.
-<p>The _adodb_countrecs() function in adodb-lib.inc.php has been revised to handle more ORDER BY variations.
-<p><a name="4.71"></a><b>4.71 24 Jan 2006</b>
-<p>Fixes postgresql security issue related to binary strings. Thx to Andy Staudacher.
-<p>Several DSN bugs found:
-<p>1. Fix bugs in DSN connections introduced in 4.70 when underscores are found in the DSN. 
-<p>2. DSN with _ did not work properly in PHP5 (fine in PHP4). Fixed.
-<p>3. Added support for PDO DSN connections in NewADOConnection(), and database parameter in PDO::Connect().
-<p>The oci8 datetime flag not correctly implemented in ADORecordSet_array. Fixed.
-<p>Added BlobDelete() to postgres, as a counterpoint to UpdateBlobFile().
-<p>Fixed GetInsertSQL() to support oci8po.
-<p>Fixed qstr() issue with postgresql with \0 in strings.
-<p>Fixed some datadict driver loading issues in _adodb_getdriver(). 
-<p>Added register shutdown function session_write_close in adodb-session.inc.php for PHP 5 compat. See http://phplens.com/lens/lensforum/msgs.php?id=14200.
-<p><a name="4.70"></a><b>4.70 6 Jan 2006</b>
-<p>Many fixes from Danila Ulyanov  to ibase, oci8, postgres, mssql, odbc_oracle, odbtp, etc drivers.
-<p>Changed usage of binary hint in adodb-session.inc.php for mysql. See 
-http://phplens.com/lens/lensforum/msgs.php?id=14160
-<p>Fixed invalid variable reference problem in undomq(), adodb-perf.inc.php.
-<p>Fixed http://phplens.com/lens/lensforum/msgs.php?id=14254 in adodb-perf.inc.php, _DBParameter() settings of fetchmode was wrong.
-<p>Fixed security issues in server.php and tmssql.php discussed by Andreas Sandblad in a Secunia security advisory. Added $ACCEPTIP = 127.0.0.1
-and changed suggested root password to something more secure.
-<p>Changed pager to close recordset after RenderLayout().
-<p><a name="4.68"></a><b>4.68 25 Nov  2005</b>
-<p>PHP 5 compat for mysqli. MetaForeignKeys repeated twice and MYSQLI_BINARY_FLAG missing.
-<p>PHP 5.1 support for postgresql bind parameters using ? did not work if >= 10 parameters. Fixed. Thx to Stanislav Shramko.
-<p>Lots of PDO improvements.
-<p>Spelling error fixed in mysql MetaForeignKeys, $associative parameter.
-<p><a name="4.67"></a><b>4.67 16 Nov  2005</b>
-<p>Postgresql not_null flag not set to false correctly. Thx Cristian MARIN.
-<p>We now check in Replace() if key is in fieldArray. Thx S�bastien Vanvelthem.
-<p>_file_get_contents() function was missing in xmlschema. fixed.
-<p>Added week in year support to SQLDate(), using 'W' flag. Thx Spider.
-<p>In sqlite metacolumns was repeated twice, causing PHP 5 problems. Fixed.
-<p>Made debug output XHTML compliant. 
-<p><a name="4.66"></a><b>4.66 28 Sept  2005</b>
-<p>ExecuteCursor() in oci8 did not clean up properly on failure. Fixed.
-<p>Updated xmlschema.dtd, by "Alec Smecher" asmecher#smecher.bc.ca
-<p>Hardened SelectLimit, typecasting nrows and offset to integer.
-<p>Fixed misc bugs in AutoExecute() and GetInsertSQL().
-<p>Added $conn->database as the property holding the database name. The older $conn->databaseName is retained for backward
-compat.
-<p>Changed _adodb_backtrace() compat check to use function_exists().
-<p>Bug in postgresql MetaIndexes fixed. Thx Kevin Jamieson. 
-<p>Improved OffsetDate for MySQL, reducing rounding error.
-<p>Metacolumns added to sqlite. Thx Mark Newnham.
-<p>PHP 4.4 compat fixes for GetAssoc().
-<p>Added postgresql bind support for php 5.1. Thx Cristiano da Cunha Duarte
-<p>OffsetDate() fixes for postgresql, typecasting strings to date or timestamp.
-<p>DBTimeStamp formats for mssql, odbc_mssql and postgresql made to conform with other db's.
-<p>Changed PDO constants from PDO_ to PDO:: to support latest spec.
-<p><a name="4.65"></a><b>4.65 22 July  2005</b>
-<p>Reverted 'X' in mssql datadict to 'TEXT' to be compat with mssql driver. However now you can 
-set $datadict->typeX = 'varchar(4000)' or 'TEXT' or 'CLOB' for mssql and oci8 drivers. 
-<p>Added charset support when using DSN for Oracle.
-<p>_adodb_getmenu did not use fieldcount() to get number of fields. Fixed.
-<p>MetaForeignKeys() for mysql/mysqli contributed by Juan Carlos Gonzalez.
-<p>MetaDatabases() now correctly returns an array for mysqli driver. Thx Cristian MARIN.
-<p>CompleteTrans(false) did not return false. Fixed. Thx to JMF.
-<p>AutoExecute() did not work with Oracle. Fixed. Thx Jos� Moreira.
-<p>MetaType() added to connection object.
-<p>More PHP 4.4 reference return fixes. Thx Ryan C Bonham and others.
-
-<p><a name="4.64"></a><b>4.64 20 June 2005</b>
-<p>In datadict, if the default field value is set to '', then it is not applied when the field is created. Fixed by Eugenio.
-<p>MetaPrimaryKeys for postgres did not work because of true/false change in 4.63. Fixed.
-<p>Tested ocifetchstatement in oci8. Rejected at the end.
-<p>Added port to dsn handling. Supported in postgres, mysql, mysqli,ldap.
-<p>Added  'w' and 'l' to mysqli SQLDate().
-<p>Fixed error handling in ldap _connect() to be more consistent. Also added ErrorMsg() handling to ldap.
-<p>Added support for union in _adodb_getcount, adodb-lib.inc.php for postgres and oci8.
-<p>rs2html() did not work with null dates properly.
-<p>PHP 4.4 reference return fixes.
-
-<p><a name="4.63"></a><b>4.63  18 May 2005</b>
-<p>Added $nrows<0 check to mysqli's SelectLimit().
-<p>Added OptimizeTable() and OptimizeTables() in adodb-perf.inc.php. By Markus Staab.
-<p>PostgreSQL inconsistencies fixed. true and false set to TRUE and FALSE, and boolean type in datadict-postgres.inc.php set
-to 'L' => 'BOOLEAN'. Thx Kevin Jamieson.
-<p>New adodb_session_create_table() function in adodb-session.inc.php. By Markus Staab.
-<p>Added null check to UserTimeStamp().
-<p>Fixed typo in mysqlt driver in adorecordset. Thx to Andy Staudacher.
-<p>GenID() had a bug in the raiseErrorFn handling. Fixed. Thx Marcos Pont.
-<p>Datadict name quoting now handles ( ) in index fields correctly - they aren't part of the index field.
-<p>Performance monitoring: (1) oci8 Ixora checks moved down; (2) expensive sql changed so that only those sql with 
-count(*)>1 are shown; (3) changed sql1 field to a length+crc32 checksum - this breaks backward compat.
-<p>We remap firebird15 to firebird in data dictionary.
-
-<p><a name="4.62"></a><b>4.62  2 Apr 2005</b>
-<p>Added 'w' (dow as 0-6 or 1-7) and 'l' (dow as string) for SQLDate for oci8, postgres and mysql.
-<p>Rolled back MetaType() changes for mysqli done in prev version.
-<p>Datadict change by chris, cblin#tennaxia.com data mappings from:
-<pre>
-oci8:  X->varchar(4000) XL->CLOB
-mssql: X->XL->TEXT
-mysql: X->XL->LONGTEXT
-fbird: X->XL->varchar(4000)
-</pre>
-<p>to:
-<pre>
-oci8:  X->varchar(4000) XL->CLOB
-mssql: X->VARCHAR(4000) XL->TEXT
-mysql: X->TEXT          XL->LONGTEXT
-fbird: X->VARCHAR(4000) XL->VARCHAR(32000)
-</pre>
-<p>Added $connection->disableBlobs to postgresql to improve performance when no bytea is used (2-5% improvement).
-<p>Removed all HTTP_* vars.
-<p>Added $rs->tableName to be set before calling AutoExecute().
-<p>Alex Rootoff rootoff#pisem.net contributed ukrainian language file.
-<p>Added new mysql_option() support using $conn->optionFlags array.
-<p>Added support for ldap_set_option() using the $LDAP_CONNECT_OPTIONS global variable. Contributed by Josh Eldridge.
-<p>Added LDAP_* constant definitions to ldap.
-<p>Added support for boolean bind variables. We use $conn->false and $conn->true to hold values to set false/true to.
-<p>We now do not close the session connection in adodb-session.inc.php as other objects could be using this connection.
-<p>We now strip off \0 at end of Ixora SQL strings in $perf->tohtml() for oci8.
-<p><a name="4.61"></a><b>4.61 23 Feb 2005</b>
-<p>MySQLi added support for mysqli_connect_errno() and mysqli_connect_error().
-<p>Massive improvements to alpha PDO driver.
-<p>Quote string bind parameters logged by performance monitor for easy type checking. Thx Jason Judge.
-<p>Added support for $role when connecting with Interbase/firebird.
-<p>Added support for enum recognition in MetaColumns() mysql and mysqli. Thx Amedeo Petrella.
-<p>The sybase_ase driver contributed by Interakt Online. Thx Cristian Marin cristic#interaktonline.com.
-<p>Removed not_null, has_default, and default_value from ADOFieldObject.
-<p>Sessions code, fixed quoting of keys when handling LOBs in session write() function.
-<p>Sessions code, added adodb_session_regenerate_id(), to reduce risk of session hijacking by changing session cookie dynamically. Thx Joe Li.
-<p>Perf monitor, polling for CPU did not work for PHP 4.3.10 and 5.0.0-5.0.3 due to PHP bugs, so we special case these versions.
-<p>Postgresql, UpdateBlob() added code to handle type==CLOB.
-<p><a name="4.60"></a><b>4.60 24 Jan 2005</b>
-<p>Implemented PEAR DB's autoExecute(). Simplified design because I don't like using constants when
-strings work fine.
-<p>_rs2serialize will now update $rs->sql and $rs->oldProvider.
-<p>Added autoExecute().
-<p>Added support for postgres8 driver. Currently just remapped to postgres7 driver.
-<p>Changed oci8 _query(), so that OCIBindByName() sets the length to -1 if element size is > 4000. This provides better support
-for LONGs.
-<p>Added SetDateLocale() support for netherlands (Nl).
-<p>Spelling error in pivot code ($iff should be $iif).
-</p><p>mysql insert_id() did not work with mysql 3.x. Fixed.
-</p><p>"\r\n" not converted to spaces correctly in exporting data. Fixed.
-</p><p>_nconnect() in mysqli did not return value correctly. Fixed.
-</p><p>Arne Eckmann contributed danish language file.
-</p><p>Added clone() support to FetchObject() for PHP5.<br>
-</p>
-<p>Removed SQL_CUR_USE_ODBC from odbc_mssql.<br>
-</p>
-<p><a name="4.55"></a><b>4.55 5 Jan 2005</b>
-</p><p>Found bug in Execute() with bind params for db's that do not support binding natively.
-</p><p>DropSequence() now correctly uses default parameter.
-</p><p>Now Execute() ignores locale for floats, so 1.23 is NEVER converted to 1,23.
-</p><p>SetFetchMode() not properly saved in adodb-perf, suspicious sql and expensive sql. Fixed.
-</p><p>Added INET to postgresql metatypes. Thx motzel.
-</p><p>Allow oracle hints to work when counting with _adodb_getcount in adodb-lib.inc.php. Thx Chris Wrye.
-</p><p>Changed mysql insert_id() to use SELECT LAST_INSERT_ID().
-</p><p>If alter col in datadict does not modify col type/size of actual
-col, then it is removed from alter col code. By Mark Newham. Not
-perfect as MetaType() !== ActualType().
-</p><p>Added handling of view fields in metacolumns() for postgresql. Thx Renato De Giovanni.
-</p><p>Added to informix MetaPrimaryKeys and MetaColumns fixes for null bit. Thx to Cecilio Albero.
-</p><p>Removed obsolete connection_timeout() from perf code.
-</p><p>Added support for arrayClass in adodb-csv.inc.php.
-</p><p>RSFilter now accepts methods of the form $array($obj, 'methodname'). Thx to blake#near-time.com.
-</p><p>Changed CacheFlush to $cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/'; 
-</p><p>For better cursor concurrency, added code to free ref cursors in
-oci8 when $rs-&gt;Close() is called. Note that CLose() is called
-internally by the Get* functions too.
-</p><p>Added IIF support for access when pivoting.  Thx Volodia Krupach.
-</p><p>Added mssql datadict support for timestamp. Thx Alexios.
-</p><p>Informix pager fix. By Mario Ramirez.
-</p><p>ADODB_TABLE_REGEX now includes ':'. By Mario Ramirez.
-</p><p>Mark Newnham contributed MetaIndexes for oci8 and db2.
-</p><p><a name="4.54"></a><b>4.54 5 Nov 2004</b>
-</p><p>
-Now you can set $db-&gt;charSet = ?? before doing a Connect() in oci8.
-</p><p>
-Added adodbFetchMode to sqlite.
-</p><p>
-Perf code, added a string typecast to substr in adodb_log_sql().
-</p><p>
-Postgres: Changed BlobDecode() to use po_loread, added new $maxblobsize parameter, and now it returns the blob instead
-of sending it to stdout - make sure to mention that as a compat warning.
-Also added $db-&gt;IsOID($oid) function; uses a heuristic, not guaranteed to work 100%.
-</p><p>
-Contributed arabic language file by "El-Shamaa, Khaled" k.el-shamaa#cgiar.org
-</p><p>
-PHP5 exceptions did not handle @ protocol properly. Fixed.
-</p><p>
-Added ifnull handling for postgresql (using coalesce).
-</p><p>
-Added  metatables() support for Postgresql 8.0 (no longer uses pg_% dictionary tables).
-</p><p>
-Improved Sybase ErrorMsg() function. By Gaetano Giunta.
-</p><p>
-Improved oci8 SelectLimit() to use Prepare(). By Cristiano Duarte.
-</p><p>
-Type-cast $row parameter in ifx_fetch_row() to int. Thx stefan bodgan.
-</p><p>Ralf becker contributed improvements in postgresql, sapdb, mysql data dictionary handling:<br>
-- MySql and Postgres MetaType was reporting every int column which was 
-part of a primary key and unique as serial<br>
-- Postgres was not reporting the scale of decimal types<br>
-- MaxDB was padding the defaults of none-string types with spaces<br>
-- MySql now correctly converts enum columns to varchar
-</p><p>
-Ralf also changed Postgresql datadict:<br>
-- you cant add NOT NULL columns in postgres in one go, they need to be 
-added as NULL and then altered to NOT NULL<br>
-- AlterColumnSQL could not change a varchar column with numbers into an 
-integer column, postgres need an explicit conversation<br>
-- a re-created sequence was not set to the correct value, if the name 
-was the old name (no implicit sequence), now always the new name of the 
-implicit sequence is used<br>
-</p><p>Sergio Strampelli added extra $intoken check to Lens_ParseArgs() in datadict code.
-</p><p><a name="4.53"></a><b>4.53 28 Sept 2004</b>
-</p><p>FetchMode cached in recordset is sometimes mapped to native db fetchMode. Normally this does not matter,
-but when using cached recordsets, we need to switch back to using adodb fetchmode.  So we cache this
-in $rs-&gt;adodbFetchMode if it differs from the db's fetchMode.
-</p><p>For informix we now set canSeek = false driver because stefan bodgan tells me that seeking doesn't work. 
-</p><p>SetDateLocale() never worked till now ;-) Thx david#tomato.it
-</p><p>Set $_bindInputArray = true in sapdb driver. Required for clob support.
-</p><p>Fixed some PEAR::DB emulation issues with isError() and isWarning. Thx to Gert-Rainer Bitterlich.
-</p><p>Empty() used in getupdatesql without strlen() check. Fixed.</p>
-<p>Added unsigned detection to mysql and mysqli drivers. Thx to dan cech.
-</p><p>Added hungarian language file. Thx to Hal&aacute;szv&aacute;ri G&aacute;bor.
-</p><p>Improved fieldname-type formatting of datadict SQL generated (adding $widespacing parameter to _GenField).
-</p><p>Datadict oci8 DROP CONSTRAINTS misspelt. Fixed. Thx Mark Newnham.
-</p><p>Changed odbtp to dynamically change databaseType based on connection, eg. from 'odbtp' to 'odbtp_mssql' when connecting
-to mssql database.
-</p><p>In datadict, MySQL I4 was wrongly mapped to MEDIUMINT, which is actually I3. Fixed.
-</p><p>Fixed mysqli MetaType() recognition. Mysqli returns numeric types unlike mysql extension. Thx Francesco Riosa.
-</p><p>VFP odbc driver curmode set wrongly, causing problems with memo fields. Fixed.
-</p><p>Odbc driver did not recognize odbc version 2 driver date types properly. Fixed. Thx Bostjan.
-</p><p>ChangeTableSQL() fixes to datadict-db2.inc.php by Mark Newnham.
-</p><p>Perf monitoring with odbc improved. Now we try in perf code to manually set the sysTimeStamp using date() if sysTimeStamp
-is empty.
-</p><p>All ADO errors are thrown as exceptions in PHP5. 
-So we added exception handling to ado in PHP5 by creating new adodb-ado5.inc.php driver.
-</p><p>Added IsConnected(). Returns true if connection object connected. By Luca.Gioppo.
-</p><p>"Ralf Becker"
-RalfBecker#digitalROCK.de contributed new sapdb data-dictionary driver
-and a large patch that implements field and table renaming for oracle,
-mssql, postgresql, mysql and sapdb. See the new RenameTableSQL() and
-RenameColumnSQL() functions.
-</p><p>We now check ExecuteCursor to see if PrepareSP was initially called.
-</p><p>Changed oci8 datadict to use MODIFY for $dd-&gt;alterCol. Thx Mark Newnham.
-</p><p><a name="4.52"></a><b>4.52  10 Aug 2004</b>
-</p><p>Bug found in Replace() when performance logging enabled, introduced in ADOdb 4.50. Fixed.
-</p><p>Replace() checks update stmt. If update stmt fails, we now return immediately. Thx to alex.
-</p><p>Added support for $ADODB_FORCE_TYPE in GetUpdateSQL/GetInsertSQL. Thx to niko.
-</p><p>Added ADODB_ASSOC_CASE support to postgres/postgres7 driver.
-</p><p>Support for DECLARE stmt in oci8. Thx Lochbrunner.
-</p><p><a name="4.51"></a><b>4.51  29 July  2004</b>
-</p><p>Added adodb-xmlschema 1.0.2. Thx dan and richard.
-</p><p>Added new adorecordset_ext_* classes. If ADOdb extension installed for mysql, mysqlt and oci8 
-(but not oci8po),  we use the superfast ADOdb extension code for movenext.
-</p><p>Added schema support to mssql and odbc_mssql MetaPrimaryKeys().
-</p><p>Patched MSSQL driver to support PHP NULL and Boolean values 
-while binding the input array parameters in the _query() function. By Stephen Farmer.
-</p><p>Added support for clob's for mssql,  UpdateBlob(). Thx to gfran#directa.com.br
-</p><p>Added normalize support for postgresql (true=lowercase table name, or false=case-sensitive table names) 
-to MetaColumns($table, $normalize=true).
-</p><p>PHP5 variant dates in ADO not working. Fixed in adodb-ado.inc.php.
-</p><p>Constant ADODB_FORCE_NULLS was not working properly for many releases (for GetUpdateSQL). Fixed. 
-Also GetUpdateSQL strips off ORDER BY now - thx Elieser Le&atilde;o.
-</p><p>Perf Monitor for oci8 now dynamically highlights optimizer_* params if too high/low.
-</p><p>Added dsn support to NewADOConnection/ADONewConnection.
-</p><p>Fixed out of page bounds bug in _adodb_pageexecute_all_rows() Thx to "Sergio Strampelli" sergio#rir.it
-</p><p>Speedup of movenext for mysql and oci8 drivers.
-</p><p>Moved debugging code _adodb_debug_execute() to adodb-lib.inc.php.
-</p><p>Fixed postgresql bytea detection bug. See http://phplens.com/lens/lensforum/msgs.php?id=9849.
-</p><p>Fixed ibase datetimestamp typo in PHP5. Thx stefan.
-</p><p>Removed whitespace at end of odbtp drivers.
-</p><p>Added db2 metaprimarykeys fix.
-</p><p>Optimizations to MoveNext() for mysql and oci8. Misc speedups to Get* functions.
-</p><p><a name="4.50"></a><b>4.50  6 July  2004</b>
-</p><p>Bumped it to 4.50 to avoid confusion with PHP 4.3.x series.
-</p><p>Added db2 metatables and metacolumns extensions.
-</p><p>Added alpha PDO driver. Very buggy, only works with odbc.
-</p><p>Tested mysqli. Set poorAffectedRows = true. Cleaned up movenext() and _fetch().
-</p><p>PageExecute does not work properly with php5 (return val not a variable). Reported Dmytro Sychevsky sych#php.com.ua.  Fixed.
-</p><p>MetaTables() for mysql, $showschema parameter was not backward compatible with older versions of adodb. Fixed.
-</p><p>Changed mysql GetOne() to work with mysql 3.23 when using with non-select stmts (e.g. SHOW TABLES).
-</p><p>Changed TRIG_ prefix to a variable in datadict-oci8.inc.php. Thx to Luca.Gioppo#csi.it.
-</p><p>New to adodb-time code. We allow you to define your own daylights savings function, 
-adodb_daylight_sv for pre-1970 dates. If the function is defined 
-(somewhere in an include), then you can correct 
-for daylights savings. See http://phplens.com/phpeverywhere/node/view/16#daylightsavings
-for more info.
-</p><p>New sqlitepo driver. This is because assoc mode does not work like other drivers in sqlite.
-   Namely, when selecting (joining) multiple tables, in assoc mode the table
-   	  names are included in the assoc keys in the "sqlite" driver.
-	  In "sqlitepo" driver, the table names are stripped from the returned column names. 
-	  When this results in a conflict,  the first field get preference.
-	Contributed by Herman Kuiper  herman#ozuzo.net  
-</p><p>Added $forcenull parameter to GetInsertSQL/GetUpdateSQL. Idea by Marco Aurelio Silva.
-</p><p>More XHTML changes for GetMenu. By Jeremy Evans.
-</p><p>Fixes some ibase date issues. Thx to stefan bogdan.
-</p><p>Improvements to mysqli driver to support $ADODB_COUNTRECS.
-</p><p>Fixed adodb-csvlib.inc.php problem when reading stream from socket. We need to poll stream continiously.
-</p><p><a name="4.23"></a><b>4.23  16 June   2004</b>
-</p><p>
-New interbase/firebird fixes thx to Lester Caine.
-Driver fixes a problem with getting field names in the result array, and 
-corrects a couple of data conversions. Also we default to dialect3 for firebird.
-Also ibase sysDate property was wrong. Changed to cast as timestamp.
-</p><p>
-The datadict driver is set up to give quoted tables and fields as this 
-was the only way round reserved words being used as field names in 
-TikiWiki. TikiPro is tidying that up, and I hope to be able to produce a 
-build of THAT which uses what I consider proper UPPERCASE field and 
-table names. The conversion of TikiWiki to ADOdb helped in that, but 
-until the database is completely tidied up in TikiPro ...
-</p><p>Modified _gencachename() to include fetchmode in name hash.
-This means you should clear your cache directory after installing this release as the 
-cache name algorithm has changed.
-</p><p>Now Cache* functions work in safe
-mode, because we do not create sub-directories in the $ADODB_CACHE_DIR
-in safe mode. In non-safe mode we still create sub-directories. Done by
-modifying _gencachename().
-</p><p>Added $gmt parameter (true/false)
-to UserDate and UserTimeStamp in connection class, to force conversion
-of input (in local time) to be converted to UTC/GMT.
-</p><p>Mssql datadict did not support INT types properly (no size param allowed). 
-Added _GetSize() to datadict-mssql.inc.php.
-</p><p>For borland_ibase, BeginTrans(), changed:<br>
-</p><pre>   $this-&gt;_transactionID = $this-&gt;_connectionID;</pre>
-to<br>
-<pre>   $this-&gt;_transactionID = ibase_trans($this-&gt;ibasetrans, $this-&gt;_connectionID);</pre>
-		
-<p>Fixed typo in mysqi_field_seek(). Thx to Sh4dow (sh4dow#php.pl).
-</p><p>LogSQL did not work with Firebird/Interbase. Fixed.
-</p><p>Postgres: made errorno() handling more consistent. Thx to Michael Jahn, Michael.Jahn#mailbox.tu-dresden.de.
-</p><p>Added informix patch to better support metatables, metacolumns by "Cecilio Albero" c-albero#eos-i.com
-</p><p>Cyril Malevanov contributed patch to oci8 to support passing of LOB parameters:
-</p><pre>	$text = 'test test test';<br>	$sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";<br>	$stmt = $conn -&gt; PrepareSP($sql);<br>	$conn -&gt; InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB);<br>	$rs = '';<br>	$conn -&gt; OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);<br>	$conn -&gt; Execute($stmt);<br>	echo "return = ".$rs."&lt;br&gt;";<br></pre>
-As he says, the LOBs limitations are:
-<pre> - use OCINewDescriptor before binding<br> - if Param is IN, uses save() before each execute. This is done automatically for you.<br> - if Param is OUT, uses load() after each execute. This is done automatically for you.<br> - when we bind $var as LOB, we create new descriptor and return it as a<br>   Bind Result, so if we want to use OUT parameters, we have to store<br>   somewhere &amp;$var to load() data from LOB to it.<br> - IN OUT params are not working now (should not be a big problem to fix it)<br> - now mass binding not working too (I've wrote about it before)<br></pre>
-<p>Simplified Connect() and PConnect() error handling.
-</p><p>When extension not loaded, Connect() and PConnect() will return null. On connect error, the fns will return false.
-</p><p>CacheGetArray() added to code.
-</p><p>Added Init() to adorecordset_empty().
-</p><p>Changed postgres64 driver, MetaColumns() to not strip off quotes in default value if :: detected (type-casting of default).
-</p><p>Added test: if (!defined('ADODB_DIR')) die(). Useful to prevent hackers from detecting file paths.
-</p><p>Changed metaTablesSQL to ignore Postgres 7.4 information schemas (sql_*).
-</p><p>New polish language file by  Grzegorz Pacan
-</p><p>Added support for UNION in _adodb_getcount().
-</p><p>Added security check for ADODB_DIR to limit path disclosure issues. Requested by postnuke team.
-</p><p>Added better error message support to oracle driver. Thx to Gaetano Giunta.
-</p><p>Added showSchema support to mysql.
-</p><p>Bind in oci8 did not handle $name=false properly. Fixed.
-</p><p>If extension not loaded, Connect(), PConnect(), NConnect() will return null.
-</p><p><b>4.22  15 Apr   2004</b>
-</p><p>Moved docs to own adodb/docs folder.
-</p><p>Fixed session bug when quoting compressed/encrypted data in Replace().
-</p><p>Netezza Driver and LDAP drivers contributed by Josh Eldridge.
-</p><p>GetMenu now uses rtrim() on values instead of trim().
-</p><p>Changed MetaColumnNames to return an associative array, keys being the field names in uppercase.
-</p><p>Suggested fix to adodb-ado.inc.php affected_rows to support PHP5 variants. Thx to Alexios Fakos.
-</p><p>Contributed bulgarian language file by Valentin Sheiretsky valio#valio.eu.org.
-</p><p>Contributed romanian language file by stefan bogdan.
-</p><p>GetInsertSQL now checks for table name (string) in $rs, and will create a recordset for that
-table automatically. Contributed by Walt Boring. Also added OCI_B_BLOB in bind on Walt's request - hope
-it doesn't break anything :-)
-</p><p>Some minor postgres speedups in _initrs().
-</p><p> ChangeTableSQL checks now if MetaColumns returns empty. Thx Jason Judge.
-</p><p>Added ADOConnection::Time(), returns current database time in unix timestamp format, or false.
-</p><p><b>4.21 20 Mar 2004</b>
-</p><p>We no longer in SelectLimit for VFP driver add SELECT TOP X unless an ORDER BY exists.
-</p><p>Pim Koeman contributed dutch language file adodb-nl.inc.php.
-</p><p>Rick Hickerson added CLOB support to db2 datadict.
-</p><p>Added odbtp driver. Thx to "stefan bogdan" sbogdan#rsb.ro.
-</p><p>Changed PrepareSP() 2nd parameter, $cursor, to default to true (formerly false). Fixes oci8 backward
-compat problems with OUT params.
-</p><p>Fixed month calculation error in adodb-time.inc.php. 2102-June-01 appeared as 2102-May-32.
-</p><p>Updated PHP5 RC1 iterator support. API changed, hasMore() renamed to valid().
-</p><p>Changed internal format of serialized cache recordsets. As we store a version number, this should be
-backward compatible.
-</p><p>Error handling when driver file not found was flawed in ADOLoadCode(). Fixed.
-</p><p><b>4.20 27 Feb 2004</b>
-</p><p>Updated to AXMLS 1.01.
-</p><p>MetaForeignKeys for postgres7 modified by Edward Jaramilla, works on pg 7.4.
-</p><p>Now numbers accepts function calls or sequences for GetInsertSQL/GetUpdateSQL numeric fields.
-</p><p>Changed quotes of 'delete from $perf_table' to "". Thx Kehui (webmaster#kehui.net)
-</p><p>Added ServerInfo() for ifx, and putenv trim fix. Thx Fernando Ortiz.
-</p><p>Added addq(), which is analogous to addslashes().
-</p><p>Tested with php5b4. Fix some php5 compat problems with exceptions and sybase.
-</p><p>Carl-Christian Salvesen added patch to mssql _query to support binds greater than 4000 chars.
-</p><p>Mike suggested patch to PHP5 exception handler. $errno must be numeric.
-</p><p>Added double quotes (") to ADODB_TABLE_REGEX.
-</p><p>For oci8, Prepare(...,$cursor),
-$cursor's meaning was accidentally inverted in 4.11. This causes
-problems with ExecuteCursor() too, which calls Prepare() internally.
-Thx to William Lovaton.
-</p><p>Now dateHasTime property in connection object renamed to datetime for consistency. This could break bc.
-</p><p>Csongor Halmai reports that db2 SelectLimit with input array is not working. Fixed..
-</p><p><b>4.11 27 Jan 2004</b>
-</p><p>Csongor Halmai reports db2 binding not working. Reverted back to emulated binding.
-</p><p>Dan Cech modifies datadict code. Adds support for DropIndex. Minor cleanups.
-</p><p>Table misspelt in perf-oci8.inc.php. Changed v$conn_cache_advice to v$db_cache_advice. Reported by Steve W.
-</p><p>UserTimeStamp and DBTimeStamp did not handle YYYYMMDDHHMMSS format properly. Reported by Mike Muir. Fixed.
-</p><p>Changed oci8 Prepare(). Does not auto-allocate OCINewCursor automatically, unless 2nd param is set to true.
-This will break backward compat, if Prepare/Execute is used instead of ExecuteCursor. Reported by Chris Jones.
-</p><p>Added InParameter() and OutParameter(). Wrapper functions to Parameter(), but nicer because they
-are self-documenting.
-</p><p>Added 'R' handling in ActualType() to datadict-mysql.inc.php
-</p><p>Added ADOConnection::SerializableRS($rs). Returns a recordset that can be serialized in a session.
-</p><p>Added "Run SQL" to performance UI().
-</p><p>Misc spelling corrections in adodb-mysqli.inc.php, adodb-oci8.inc.php and datadict-oci8.inc.php, from Heinz Hombergs.
-</p><p>MetaIndexes() for ibase contributed by Heinz Hombergs.
-</p><p><b>4.10 12 Jan 2004</b>
-</p><p>Dan Cech contributed extensive changes to data dictionary to support name quoting (with `), and drop table/index.
-</p><p>Informix added cursorType property. Default remains IFX_SCROLL, but you can change to 0 (non-scrollable cursor) for performance.
-</p><p>Added ADODB_View_PrimaryKeys() for returning view primary keys to MetaPrimaryKeys().
-</p><p>Simplified chinese file, adodb-cn.inc.php from cysoft.
-</p><p>Added check for ctype_alnum in adodb-datadict.inc.php. Thx to Jason Judge.
-</p><p>Added connection parameter to ibase Prepare(). Fix by Daniel Hassan.
-</p><p>Added nameQuote for quoting identifiers and names to connection obj. Requested by Jason Judge. Also the
-data dictionary parser now detects `field name` and generates column names with spaces correctly.
-</p><p>BOOL type not recognised correctly as L. Fixed.
-</p><p>Fixed paths in ADODB_DIR for session files, and back-ported it to 4.05 (15 Dec 2003)
-</p><p>Added Schema to postgresql MetaTables. Thx to col#gear.hu
-</p><p>Empty postgresql recordsets that had blob fields did not set EOF properly. Fixed.
-</p><p>CacheSelectLimit internal parameters to SelectLimit were wrong. Thx to Nio.
-</p><p>Modified adodb_pr() and adodb_backtrace() to support command-line usage (eg. no html).
-</p><p>Fixed some fr and it lang errors. Thx to Gaetano G.
-</p><p>Added contrib directory, with adodb rs to xmlrpc convertor by Gaetano G.
-</p><p>Fixed array recordset bugs when _skiprow1 is true. Thx to Gaetano G.
-</p><p>Fixed pivot table code when count is false.
-</p><p>
-
-</p><p><b>4.05 13 Dec 2003 </b>
-</p><p>Added MetaIndexes to data-dict code - thx to Dan Cech.
-</p><p>Rewritten session code by Ross Smith. Moved code to adodb/session directory.
-</p><p>Added function exists check on connecting to most drivers, so we don't crash with the unknown function error.
-</p><p>Smart Transactions failed with GenID() when it no seq table has been created because the sql
-	statement fails. Fix by Mark Newnham.
-</p><p>Added $db-&gt;length, which holds name of function that returns strlen.
-</p><p>Fixed error handling for bad driver in ADONewConnection - passed too few params to error-handler.
-</p><p>Datadict did not handle types like 16.0 properly in _GetSize. Fixed.
-</p><p>Oci8 driver SelectLimit() bug &amp;= instead of =&amp; used. Thx to Swen Th&uuml;mmler.
-</p><p>Jesse Mullan suggested not flushing outp when output buffering enabled. Due to Apache 2.0 bug. Added.
-</p><p>MetaTables/MetaColumns return ref bug with PHP5 fixed in adodb-datadict.inc.php.
-</p><p>New mysqli driver contributed by Arjen de Rijke. Based on adodb 3.40 driver.
-Then jlim added BeginTrans, CommitTrans, RollbackTrans, IfNull, SQLDate. Also fixed return ref bug.
-</p><p>$ADODB_FLUSH added, if true then force flush in debugging outp. Default is false.  In earlier
-versions, outp defaulted to flush, which is not compat with apache 2.0.
-</p><p>Mysql driver's GenID() function did not work when when sql logging is on. Fixed.
-</p><p>$ADODB_SESSION_TBL not declared as global var. Not available if adodb-session.inc.php included in function. Fixed.
-</p><p>The input array not passed to Execute() in _adodb_getcount(). Fixed.
-</p><p><b>4.04 13 Nov 2003 </b>
-</p><p>Switched back to foreach - faster than list-each.
-</p><p>Fixed bug in ado driver - wiping out $this-&gt;fields with date fields.
-</p><p>Performance Monitor, View SQL, Explain Plan did not work if strlen($SQL)&gt;max($_GET length). Fixed.
-</p><p>Performance monitor, oci8 driver added memory sort ratio.
-</p><p>Added random property, returns SQL to generate a floating point number between 0 and 1;
-</p><p><b>4.03 6 Nov 2003 </b>
-</p><p>The path to adodb-php4.inc.php and adodb-iterators.inc.php was not setup properly.
-</p><p>Patched SQLDate in interbase to support hours/mins/secs. Thx to ari kuorikoski.
-</p><p>Force autorollback for pgsql persistent connections - 
-apparently pgsql did not autorollback properly before 4.3.4. See http://bugs.php.net/bug.php?id=25404
-</p><p><b>4.02 5 Nov 2003 </b>
-</p><p>Some errors in adodb_error_pg() fixed. Thx to Styve.
-</p><p>Spurious Insert_ID() error was generated by LogSQL(). Fixed.
-</p><p>Insert_ID was interfering with Affected_Rows() and Replace()  when LogSQL() enabled. Fixed.
-</p><p>More foreach loops optimized with list/each.
-</p><p>Null dates not handled properly in ADO driver (it becomes 31 Dec 1969!).
-</p><p>Heinz Hombergs contributed patches for mysql MetaColumns - adding scale, made
-interbase MetaColumns work with firebird/interbase, and added lang/adodb-de.inc.php.
-</p><p>Added INFORMIXSERVER environment variable.
-</p><p>Added $ADODB_ANSI_PADDING_OFF for interbase/firebird.
-</p><p>PHP 5 beta 2 compat check. Foreach (Iterator) support. Exceptions support.
-</p><p><b>4.01 23 Oct 2003 </b>
-</p><p>Fixed bug in rs2html(), tohtml.inc.php, that generated blank table cells.
-</p><p>Fixed insert_id() incorrectly generated when logsql() enabled.
-</p><p>Modified PostgreSQL _fixblobs to use list/each instead of foreach.
-</p><p>Informix ErrorNo() implemented correctly.
-</p><p>Modified several places to use list/each, including GetRowAssoc().
-</p><p>Added UserTimeStamp() to connection class.
-</p><p>Added $ADODB_ANSI_PADDING_OFF for oci8po.
-</p><p><b>4.00 20 Oct 2003 </b>
-</p><p>Upgraded adodb-xmlschema to 1 Oct 2003 snapshot.
-</p><p>Fix to rs2html warning message. Thx to Filo.
-</p><p>Fix for odbc_mssql/mssql SQLDate(), hours was wrong.
-</p><p>Added MetaColumns and MetaPrimaryKeys for sybase. Thx to Chris Phillipson.
-</p><p>Added autoquoting to datadict for MySQL and PostgreSQL. Suggestion by Karsten Dambekalns  
-</p><p><b>3.94 11 Oct 2003 </b>
-</p><p>Create trigger in datadict-oci8.inc.php did not work, because all cr/lf's must be removed. 
-</p><p>ErrorMsg()/ErrorNo() did not work for many databases when logging enabled. Fixed.
-</p><p>Removed global variable $ADODB_LOGSQL as it does not work properly with multiple connections.
-</p><p>Added SQLDate support for sybase. Thx to Chris Phillipson
-</p><p>Postgresql checking of pgsql resultset resource was incorrect. Fix by Bharat Mediratta bharat#menalto.com.
-Same patch applied to  _insertid and _affectedrows for adodb-postgres64.inc.php.
-</p><p>Added support for NConnect for postgresql.
-</p><p>Added Sybase data dict support. Thx to Chris Phillipson  
-</p><p>Extensive improvements in $perf-&gt;UI(), eg. Explain now opens in new window, we show scripts
-which call sql, etc.
-</p><p>Perf Monitor UI works with magic quotes enabled.
-</p><p>rsPrefix was declared twice. Removed.
-</p><p>Oci8 stored procedure support, eg. "begin func(); end;" was incorrect in _query. Fixed.
-</p><p>Tiraboschi Massimiliano contributed italian language file.
-</p><p>Fernando Ortiz, fortiz#lacorona.com.mx, contributed informix performance monitor.
-</p><p>Added _varchar (varchar arrays) support for postgresql. Reported by PREVOT St&eacute;phane.<hr />
-<p><strong>0.10 Sept 9 2000</strong> First release 
-</p><h3><strong>Old change log history moved to <a href="old-changelog.htm">old-changelog.htm</a>. 
-  </strong></h3>
-<p>&nbsp;</p>
-<p>  
-</p></body></html>
\ No newline at end of file
Index: admin/include/lib/adodb/docs/tute.htm
===================================================================
--- admin/include/lib/adodb/docs/tute.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/tute.htm	(working copy)
@@ -1,290 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>Tutorial: Moving from MySQL to ADODB</title>
-</head>
-
-<body bgcolor=white>
-<h1>Tutorial: Moving from MySQL to ADODB</h1>
-
-<pre>		You say eether and I say eyether, 
-		You say neether and I say nyther; 
-		Eether, eyether, neether, nyther - 
-		Let's call the whole thing off ! 
-<br>
-		You like potato and I like po-tah-to, 
-		You like tomato and I like to-mah-to; 
-		Potato, po-tah-to, tomato, to-mah-to - 
-		Let's call the whole thing off ! 
-</pre>
-<p>I love this song, especially the version with Louis Armstrong and Ella singing 
-  duet. It is all about how hard it is for two people in love to be compatible 
-  with each other. It's about compromise and finding a common ground, and that's 
-  what this article is all about. 
-<p>PHP is all about creating dynamic web-sites with the least fuss and the most 
-  fun. To create these websites we need to use databases to retrieve login information, 
-  to splash dynamic news onto the web page and store forum postings. So let's 
-  say we were using the popular MySQL database for this. Your company has done 
-  such a fantastic job that the Web site is more popular than your wildest dreams. 
-  You find that MySQL cannot scale to handle the workload; time to switch databases. 
-<p> Unfortunately in PHP every database is accessed slightly differently. To connect 
-  to MySQL, you would use <i>mysql_connect()</i>; when you decide to upgrade to 
-  Oracle or Microsoft SQL Server, you would use <i>ocilogon() </i>or <i>mssql_connect()</i> 
-  respectively. What is worse is that the parameters you use for the different 
-  connect functions are different also.. One database says po-tato, the other 
-  database says pota-to. Oh-oh. 
-<h3>Let's NOT call the whole thing off</h3>
-<p>A database wrapper library such as ADODB comes in handy when you need to ensure portability. It provides 
-  you with a common API to communicate with any supported database so you don't have to call things off. <p>
-
-<p>ADODB stands for Active Data Objects DataBase (sorry computer guys are sometimes 
-  not very original). ADODB currently supports MySQL, PostgreSQL, Oracle, Interbase, 
-  Microsoft SQL Server, Access, FoxPro, Sybase, ODBC and ADO. You can download 
-  ADODB from <a href=http://php.weblogs.com/adodb></a><a href="http://php.weblogs.com/adodb">http://php.weblogs.com/adodb</a>.
-<h3>MySQL Example</h3>
-<p>The most common database used with PHP is MySQL, so I guess you should be familiar 
-  with the following code. It connects to a MySQL server at <i>localhost</i>, 
-  database <i>mydb</i>, and executes an SQL select statement. The results are 
-  printed, one line per row. 
-<pre><font color="#666600">$db = <b>mysql_connect</b>(&quot;localhost&quot;, &quot;root&quot;, &quot;password&quot;);
-<b>mysql_select_db</b>(&quot;mydb&quot;,$db);</font>
-<font color="#660000">$result = <b>mysql_query</b>(&quot;SELECT * FROM employees&quot;,$db)</font><code><font color="#663300">;
-if ($result === false) die(&quot;failed&quot;);</font></code> 
-<font color="#006666"><b>while</b> ($fields =<b> mysql_fetch_row</b>($result)) &#123;
- <b>for</b> ($i=0, $max=sizeof($fields); $i &lt; $max; $i++) &#123;
-		<b>print</b> $fields[$i].' ';
- &#125;
- <b>print</b> &quot;&lt;br&gt;\n&quot;;
-&#125;</font> 
-</pre>
-<p>The above code has been color-coded by section. The first section is the connection 
-  phase. The second is the execution of the SQL, and the last section is displaying 
-  the fields. The <i>while</i> loop scans the rows of the result, while the <i>for</i> 
-  loop scans the fields in one row.</p>
-<p>Here is the equivalent code in ADODB</p>
-<pre><b><font color="#666600"> include(&quot;adodb.inc.php&quot;);</font></b><font color="#666600">
- $db = <b>NewADOConnection</b>('mysql');
- $db-&gt;<b>Connect</b>(&quot;localhost&quot;, &quot;root&quot;, &quot;password&quot;, &quot;mydb&quot;);</font>
- <font color="#663300">$result = $db-&gt;<b>Execute</b>(&quot;SELECT * FROM employees&quot;);
- </font><font color="#663300"></font><code><font color="#663300">if ($result === false) die(&quot;failed&quot;)</font></code><code><font color="#663300">;</font></code>  
- <font color="#006666"><b>while</b> (!$result-&gt;EOF) &#123;
-	<b>for</b> ($i=0, $max=$result-&gt;<b>FieldCount</b>(); $i &lt; $max; $i++)
-		   <b>print</b> $result-&gt;fields[$i].' ';
-	$result-&gt;<b>MoveNext</b>();
-	<b>print</b> &quot;&lt;br&gt;\n&quot;;
- &#125;</font> </pre>
-<p></p>
-<p>Now porting to Oracle is as simple as changing the second line to <code>NewADOConnection('oracle')</code>. 
-  Let's walk through the code...</p>
-<h3>Connecting to the Database</h3>
-<p></p>
-<pre><b><font color="#666600">include(&quot;adodb.inc.php&quot;);</font></b><font color="#666600">
-$db = <b>NewADOConnection</b>('mysql');
-$db-&gt;<b>Connect</b>(&quot;localhost&quot;, &quot;root&quot;, &quot;password&quot;, &quot;mydb&quot;);</font></pre>
-<p>The connection code is a bit more sophisticated than MySQL's because our needs 
-  are more sophisticated. In ADODB, we use an object-oriented approach to managing 
-  the complexity of handling multiple databases. We have different classes to 
-  handle different databases. If you aren't familiar with object-oriented programing, 
-  don't worry -- the complexity is all hidden away in the<code> NewADOConnection()</code> 
-  function.</p>
-<p>To conserve memory, we only load the PHP code specific to the database you 
-  are connecting to. We do this by calling <code>NewADOConnection(databasedriver)</code>. 
-  Legal database drivers include <i>mysql, mssql, oracle, oci8, postgres, sybase, 
-  vfp, access, ibase </i>and many others.</p>
-<p>Then we create a new instance of the connection class by calling <code>NewADOConnection()</code>. 
-  Finally we connect to the database using <code>$db-&gt;Connect(). </code></p>
-<h3>Executing the SQL</h3>
-<p><code><font color="#663300">$result = $db-&gt;<b>Execute</b>(&quot;SELECT * 
-  FROM employees&quot;);<br>
-  if ($result === false) die(&quot;failed&quot;)</font></code><code><font color="#663300">;</font></code> 
-  <br>
-</p>
-<p>Sending the SQL statement to the server is straight forward. Execute() will 
-  return a recordset object on successful execution. You should check $result 
-  as we do above.
-<p>An issue that confuses beginners is the fact that we have two types of objects 
-  in ADODB, the connection object and the recordset object. When do we use each?
-<p>The connection object ($db) is responsible for connecting to the database, 
-  formatting your SQL and querying the database server. The recordset object ($result) 
-  is responsible for retrieving the results and formatting the reply as text or 
-  as an array.
-<p>The only thing I need to add is that ADODB provides several helper functions 
-  for making INSERT and UPDATE statements easier, which we will cover in the Advanced 
-  section. 
-<h3>Retrieving the Data<br>
-</h3>
-<pre><font color="#006666"><b>while</b> (!$result-&gt;EOF) &#123;
-   <b>for</b> ($i=0, $max=$result-&gt;<b>FieldCount</b>(); $i &lt; $max; $i++)
-	   <b>print</b> $result-&gt;fields[$i].' ';
-   $result-&gt;<b>MoveNext</b>();
-   <b>print</b> &quot;&lt;br&gt;\n&quot;;
-&#125;</font></pre>
-<p>The paradigm for getting the data is that it's like reading a file. For every 
-  line, we check first whether we have reached the end-of-file (EOF). While not 
-  end-of-file, loop through each field in the row. Then move to the next line 
-  (MoveNext) and repeat. 
-<p>The <code>$result-&gt;fields[]</code> array is generated by the PHP database 
-  extension. Some database extensions do not index the array by field name. 
-  To force indexing by name - that is associative arrays - 
-  use the $ADODB_FETCH_MODE global variable. 
-<pre>
-	$<b>ADODB_FETCH_MODE</b> = ADODB_FETCH_NUM;
-	$rs1 = $db->Execute('select * from table');
-	$<b>ADODB_FETCH_MODE</b> = ADODB_FETCH_ASSOC;
-	$rs2 = $db->Execute('select * from table');
-	print_r($rs1->fields); // shows <i>array([0]=>'v0',[1] =>'v1')</i>
-	print_r($rs2->fields); // shows <i>array(['col1']=>'v0',['col2'] =>'v1')</i>
-</pre>
-<p>
-As you can see in the above example, both recordsets store and use different fetch modes
-based on the $ADODB_FETCH_MODE setting when the recordset was created by Execute().</p>
-<h2>ADOConnection<a name="ADOConnection"></a></h2>
-<p>Object that performs the connection to the database, executes SQL statements 
-  and has a set of utility functions for standardising the format of SQL statements 
-  for issues such as concatenation and date formats.</p>
-  
-<h3>Other Useful Functions</h3>
-<p><code>$recordset-&gt;Move($pos)</code> scrolls to that particular row. ADODB supports forward 
-  scrolling for all databases. Some databases will not support backwards scrolling. 
-  This is normally not a problem as you can always cache records to simulate backwards 
-  scrolling. 
-<p><code>$recordset-&gt;RecordCount()</code> returns the number of records accessed by the 
-  SQL statement. Some databases will return -1 because it is not supported. 
-<p><code>$recordset-&gt;GetArray()</code> returns the result as an array. 
-<p><code>rs2html($recordset)</code> is a function that is generates a HTML table based on the 
-  $recordset passed to it. An example with the relevant lines in bold:
-<pre>   include('adodb.inc.php'); 
-   <b>include('tohtml.inc.php');</b> /* includes the rs2html function */
-   $conn = &amp;ADONewConnection('mysql'); 
-   $conn-&gt;PConnect('localhost','userid','password','database');
-   $rs = $conn-&gt;Execute('select * from table');
-  <b> rs2html($rs)</b>; /* recordset to html table */ </pre>
-<p>There are many other helper functions that are listed in the documentation available at <a href="http://php.weblogs.com/adodb_manual"></a><a href="http://php.weblogs.com/adodb_manual">http://php.weblogs.com/adodb_manual</a>. 
-<h2>Advanced Material</h2>
-<h3>Inserts and Updates </h3>
-<p>Let's say you want to insert the following data into a database. 
-<p><b>ID</b> = 3<br>
-  <b>TheDate</b>=mktime(0,0,0,8,31,2001) /* 31st August 2001 */<br>
-  <b>Note</b>= sugar why don't we call it off 
-<p>When you move to another database, your insert might no longer work.</p>
-<p>The first problem is that each database has a different default date format. 
-  MySQL expects YYYY-MM-DD format, while other databases have different defaults. 
-  ADODB has a function called DBDate() that addresses this issue by converting 
-  converting the date to the correct format.</p>
-<p>The next problem is that the <b>don't</b> in the Note needs to be quoted. In 
-  MySQL, we use <b>don\'t</b> but in some other databases (Sybase, Access, Microsoft 
-  SQL Server) we use <b>don''t. </b>The qstr() function addresses this issue.</p>
-<p>So how do we use the functions? Like this:</p>
-<pre>$sql = &quot;INSERT INTO table (id, thedate,note) values (&quot; 
-   . $<b>ID</b> . ','
-   . $db-&gt;DBDate($<b>TheDate</b>) .','
-   . $db-&gt;qstr($<b>Note</b>).&quot;)&quot;;
-$db-&gt;Execute($sql);</pre>
-<p>ADODB also supports <code>$connection-&gt;Affected_Rows()</code> (returns the 
-  number of rows affected by last update or delete) and <code>$recordset-&gt;Insert_ID()</code> 
-  (returns last autoincrement number generated by an insert statement). Be forewarned 
-  that not all databases support the two functions.<br>
-</p>
-<h3>MetaTypes</h3>
-<p>You can find out more information about each of the fields (I use the words 
-  fields and columns interchangebly) you are selecting by calling the recordset 
-  method <code>FetchField($fieldoffset)</code>. This will return an object with 
-  3 properties: name, type and max_length. 
-<pre>For example:</pre>
-<pre>$recordset = $conn-&gt;Execute(&quot;select adate from table&quot;);<br>$f0 = $recordset-&gt;FetchField(0);
-</pre>
-<p>Then <code>$f0-&gt;name</code> will hold <i>'adata'</i>, <code>$f0-&gt;type</code> 
-  will be set to '<i>date'</i>. If the max_length is unknown, it will be set to 
-  -1. 
-<p>One problem with handling different databases is that each database often calls 
-  the same type by a different name. For example a <i>timestamp</i> type is called 
-  <i>datetime</i> in one database and <i>time</i> in another. So ADODB has a special 
-  <code>MetaType($type, $max_length)</code> function that standardises the types 
-  to the following: 
-<p>C: character and varchar types<br>
-  X: text or long character (eg. more than 255 bytes wide).<br>
-  B: blob or binary image<br>
-  D: date<br>
-  T: timestamp<br>
-  L: logical (boolean)<br>
-  I: integer<br>
-  N: numeric (float, double, money) 
-<p>In the above date example, 
-<p><code>$recordset = $conn-&gt;Execute(&quot;select adate from table&quot;);<br>
-  $f0 = $recordset-&gt;FetchField(0);<br>
-  $type = $recordset-&gt;MetaType($f0-&gt;type, $f0-&gt;max_length);<br>
-  print $type; /* should print 'D'</code> */
-<p> 
-<p><b>Select Limit and Top Support</b> 
-<p>ADODB has a function called $connection->SelectLimit($sql,$nrows,$offset) that allows
-you to retrieve a subset of the recordset. This will take advantage of native
-SELECT TOP on Microsoft products and SELECT ... LIMIT with PostgreSQL and MySQL, and
-emulated if the database does not support it.
-<p><b>Caching Support</b> 
-<p>ADODB allows you to cache recordsets in your file system, and only requery the database
-server after a certain timeout period with $connection->CacheExecute($secs2cache,$sql) and 
-$connection->CacheSelectLimit($secs2cache,$sql,$nrows,$offset).
-<p><b>PHP4 Session Handler Support</b> 
-<p>ADODB also supports PHP4 session handlers. You can store your session variables 
-  in a database for true scalability using ADODB. For further information, visit 
-  <a href="http://php.weblogs.com/adodb-sessions"></a><a href="http://php.weblogs.com/adodb-sessions">http://php.weblogs.com/adodb-sessions</a>
-<h3>Commercial Use Encouraged</h3>
-<p>If you plan to write commercial PHP applications that you want to resell, you should consider ADODB. It has been released using the lesser GPL, which means you can legally include it in commercial applications, while keeping your code proprietary. Commercial use of ADODB is strongly encouraged! We are using it internally for this reason.<p>
-
-<h2>Conclusion</h2>
-<p>As a thank you for finishing this article, here are the complete lyrics for 
-  <i>let's call the whole thing off</i>.<br>
-  <br>
-<pre>
-   Refrain 
-<br>
-		You say eether and I say eyether, 
-		You say neether and I say nyther; 
-		Eether, eyether, neether, nyther - 
-		Let's call the whole thing off ! 
-<br>
-		You like potato and I like po-tah-to, 
-		You like tomato and I like to-mah-to; 
-		Potato, po-tah-to, tomato, to-mah-to - 
-		Let's call the whole thing off ! 
-<br>
-But oh, if we call the whole thing off, then we must part. 
-And oh, if we ever part, then that might break my heart. 
-<br>
-		So, if you like pajamas and I like pa-jah-mas, 
-		I'll wear pajamas and give up pa-jah-mas. 
-		For we know we 
-		Need each other, so we 
-		Better call the calling off off. 
-		Let's call the whole thing off ! 
-<br>
-   Second Refrain 
-<br>
-		You say laughter and I say lawfter, 
-		You say after and I say awfter; 
-		Laughter, lawfter, after, awfter - 
-		Let's call the whole thing off ! 
-<br>
-		You like vanilla and I like vanella, 
-		You, sa's'parilla and I sa's'parella; 
-		Vanilla, vanella, choc'late, strawb'ry - 
-		Let's call the whole thing off ! 
-<br>
-But oh, if we call the whole thing off, then we must part. 
-And oh, if we ever part, then that might break my heart. 
-<br>
-		So, if you go for oysters and I go for ersters, 
-		I'll order oysters and cancel the ersters. 
-		For we know we 
-		Need each other, so we 
-		Better call the calling off off. 
-		Let's call the whole thing off ! 
-  </pre>
-<p><font size=2>Song and lyrics by George and Ira Gershwin, introduced by Fred Astaire and Ginger Rogers
-in the film "Shall We Dance?"  </font><p>
-<p>
-(c)2001-2002 John Lim.
-
-</body>
-</html>
Index: admin/include/lib/adodb/docs/docs-perf.htm
===================================================================
--- admin/include/lib/adodb/docs/docs-perf.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/docs-perf.htm	(working copy)
@@ -1,962 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>ADOdb Performance Monitoring Library</title>
-  <style type="text/css">
-body, td {
-/*font-family: Arial, Helvetica, sans-serif;*/
-font-size: 11pt;
-}
-pre {
-font-size: 9pt;
-background-color: #EEEEEE; padding: .5em; margin: 0px;
-}
-.toplink {
-font-size: 8pt;
-}
-  </style>
-</head>
-<body>
-<h3>The ADOdb Performance Monitoring Library</h3>
-<p>V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my)</p>
-<p><font size="1">This software is dual licensed using BSD-Style and
-LGPL. This means you can use it in compiled proprietary and commercial
-products.</font></p>
-<p>Useful ADOdb links: <a href="http://adodb.sourceforge.net/#download">Download</a>
-&nbsp; <a href="http://adodb.sourceforge.net/#docs">Other Docs</a>
-</p>
-<h3>Introduction</h3>
-<p>This module, part of the ADOdb package, provides both CLI and HTML
-interfaces for viewing key performance indicators of your database.
-This is very useful because web apps such as the popular phpMyAdmin
-currently do not provide effective database health monitoring tools.
-The module provides the following: </p>
-<ul>
-  <li>A quick health check of your database server using <code>$perf-&gt;HealthCheck()</code>
-or <code>$perf-&gt;HealthCheckCLI()</code>. </li>
-  <li>User interface for performance monitoring, <code>$perf-&gt;UI()</code>.
-This UI displays:
-    <ul>
-      <li>the health check, </li>
-      <li>all SQL logged and their query plans, </li>
-      <li>a list of all tables in the current database</li>
-      <li>an interface to continiously poll the server for key
-performance indicators such as CPU, Hit Ratio, Disk I/O</li>
-      <li>a form where you can enter and run SQL interactively.</li>
-    </ul>
-  </li>
-  <li>Gives you an API to build database monitoring tools for a server
-farm, for example calling <code>$perf-&gt;DBParameter('data cache hit
-ratio')</code> returns this very important statistic in a database
-independant manner. </li>
-</ul>
-<p>ADOdb also has the ability to log all SQL executed, using <a
- href="docs-adodb.htm#logsql">LogSQL</a>. All SQL logged can be
-analyzed through the performance monitor <a href="#ui">UI</a>. In the <i>View
-SQL</i> mode, we categorize the SQL into 3 types:
-</p>
-<ul>
-  <li><b>Suspicious SQL</b>: queries with high average execution times,
-and are potential candidates for rewriting</li>
-  <li><b>Expensive SQL</b>: queries with high total execution times
-(#executions * avg execution time). Optimizing these queries will
-reduce your database server load.</li>
-  <li><b>Invalid SQL</b>: queries that generate errors.</li>
-</ul>
-<p>Each query is hyperlinked to a description of the query plan, and
-every PHP script that executed that query is also shown.</p>
-<p>Please note that the information presented is a very basic database
-health check, and does not provide a complete overview of database
-performance. Although some attempt has been made to make it work across
-multiple databases in the same way, it is impossible to do so. For the
-health check, we do try to display the following key database
-parameters for all drivers:</p>
-<ul>
-  <li><b>data cache size</b> - The amount of memory allocated to the
-cache.</li>
-  <li><b>data cache hit ratio</b> - A measure of how effective the
-cache is, as a percentage. The higher, the better.</li>
-  <li><b>current connections</b> - The number of sessions currently
-connected to the database. </li>
-</ul>
-<p>You will need to connect to the database as an administrator to view
-most of the parameters. </p>
-<p>Code improvements as very welcome, particularly adding new database
-parameters and automated tuning hints.</p>
-<a name="usage"></a>
-<h3>Usage</h3>
-<p>Currently, the following drivers: <em>mysql</em>, <em>postgres</em>,
-<em>oci8</em>, <em>mssql</em>, <i>informix</i> and <em>db2</em> are
-supported. To create a new performance monitor, call NewPerfMonitor( )
-as demonstrated below: </p>
-<pre>&lt;?php<br>include_once('adodb.inc.php');<br>session_start(); <font
- color="#006600"># session variables required for monitoring</font><br>$conn = ADONewConnection($driver);<br>$conn-&gt;Connect($server,$user,$pwd,$db);<br>$perf =&amp; NewPerfMonitor($conn);<br>$perf-&gt;UI($pollsecs=5);<br>?&gt;<br></pre>
-<p>It is also possible to retrieve a single database parameter:</p>
-<pre>$size = $perf-&gt;DBParameter('data cache size');<br></pre>
-<p>
-Thx to Fernando Ortiz for the informix module. </p>
-<h3>Methods</h3>
-<a name="ui"></a>
-<p><font face="Courier New, Courier, mono">function <b>UI($pollsecs=5)</b></font></p>
-<p>Creates a web-based user interface for performance monitoring. When
-you click on Poll, server statistics will be displayed every $pollsecs
-seconds. See <a href="#usage">Usage</a> above. </p>
-<p>Since 4.11, we allow users to enter and run SQL interactively via
-the "Run SQL" link. To disable this for security reasons, set this
-constant before calling $perf-&gt;UI(). </p>
-<p> </p>
-<pre>define('ADODB_PERF_NO_RUN_SQL',1);</pre>
-<p>Sample output follows below:</p>
-<table bgcolor="lightyellow" border="1" width="100%">
-  <tbody>
-    <tr>
-      <td> <b><a href="http://php.weblogs.com/adodb?perf=1">ADOdb</a>
-Performance Monitor</b> for localhost, db=test<br>
-      <font size="-1">PostgreSQL 7.3.2 on i686-pc-cygwin, compiled by
-GCC gcc (GCC) 3.2 20020927 (prerelease)</font></td>
-    </tr>
-    <tr>
-      <td> <a href="#">Performance Stats</a> &nbsp; <a href="#">View
-SQL</a> &nbsp; <a href="#">View Tables</a> &nbsp; <a href="#">Poll
-Stats</a></td>
-    </tr>
-  </tbody>
-</table>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>postgres7</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>statistics collector</td>
-      <td>TRUE</td>
-      <td>Value must be TRUE to enable hit ratio statistics (<i>stats_start_collector</i>,<i>stats_row_level</i>
-and <i>stats_block_level</i> must be set to true in postgresql.conf)</td>
-    </tr>
-    <tr>
-      <td>data cache hit ratio</td>
-      <td>99.7967555299239</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>125</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>21.78125000000000000</td>
-      <td>Count of inserts/updates/deletes * coef</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache buffers</td>
-      <td>640</td>
-      <td>Number of cache buffers. <a
- href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#basic">Tuning</a></td>
-    </tr>
-    <tr>
-      <td>cache blocksize</td>
-      <td>8192</td>
-      <td>(estimate)</td>
-    </tr>
-    <tr>
-      <td>data cache size</td>
-      <td>5M</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>operating system cache size</td>
-      <td>80M</td>
-      <td>(effective cache size)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Memory Usage</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>sort buffer size</td>
-      <td>1M</td>
-      <td>Size of sort buffer (per query)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>0</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>32</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Parameters</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>rollback buffers</td>
-      <td>8</td>
-      <td>WAL buffers</td>
-    </tr>
-    <tr>
-      <td>random page cost</td>
-      <td>4</td>
-      <td>Cost of doing a seek (default=4). See <a
- href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#less">random_page_cost</a></td>
-    </tr>
-  </tbody>
-</table>
-<p><font face="Courier New, Courier, mono">function <b>HealthCheck</b>()</font></p>
-<p>Returns database health check parameters as a HTML table. You will
-need to echo or print the output of this function,</p>
-<p><font face="Courier New, Courier, mono">function <b>HealthCheckCLI</b>()</font></p>
-<p>Returns database health check parameters formatted for a command
-line interface. You will need to echo or print the output of this
-function. Sample output for mysql:</p>
-<pre>-- Ratios -- <br>          MyISAM cache hit ratio =&gt; 56.5635738832 <br>          InnoDB cache hit ratio =&gt; 0 <br>             sql cache hit ratio =&gt; 0 <br> -- IO -- <br>                      data reads =&gt; 2622 <br>                     data writes =&gt; 2415.5 <br> -- Data Cache -- <br>          MyISAM data cache size =&gt; 512K <br>             BDB data cache size =&gt; 8388600<br>          InnoDB data cache size =&gt; 8M<br> -- Memory Pools -- <br>                read buffer size =&gt; 131072 <br>                sort buffer size =&gt; 65528 <br>                     table cache =&gt; 4 <br> -- Connections -- <br>             current connections =&gt; 3<br>                 max connections =&gt; 100</pre>
-<p><font face="Courier New, Courier, mono">function <b>Poll</b>($pollSecs=5)
-</font> </p>
-<p> Run in infinite loop, displaying the following information every
-$pollSecs. This will not work properly if output buffering is enabled.
-In the example below, $pollSecs=3:
-</p>
-<pre>Accumulating statistics...<br> Time   WS-CPU%   Hit%   Sess        Reads/s          Writes/s<br>11:08:30    0.7  56.56      1         0.0000            0.0000<br>11:08:33    1.8  56.56      2         0.0000            0.0000<br>11:08:36   11.1  56.55      3         2.5000            0.0000<br>11:08:39    9.8  56.55      2         3.1121            0.0000<br>11:08:42    2.8  56.55      1         0.0000            0.0000<br>11:08:45    7.4  56.55      2         0.0000            1.5000<br></pre>
-<p><b>WS-CPU%</b> is the Web Server CPU load of the server that PHP is
-running from (eg. the database client), and not the database. The <b>Hit%</b>
-is the data cache hit ratio. <b>Sess</b> is the current number of
-sessions connected to the database. If you are using persistent
-connections, this should not change much. The <b>Reads/s</b> and <b>Writes/s</b>
-are synthetic values to give the viewer a rough guide to I/O, and are
-not to be taken literally. </p>
-<p><font face="Courier New, Courier, mono">function <b>SuspiciousSQL</b>($numsql=10)</font></p>
-<p>Returns SQL which have high average execution times as a HTML table.
-Each sql statement
-is hyperlinked to a new window which details the execution plan and the
-scripts that execute this SQL.
-</p>
-<p> The number of statements returned is determined by $numsql. Data is
-taken from the adodb_logsql table, where the sql statements are logged
-when
-$connection-&gt;LogSQL(true) is enabled. The adodb_logsql table is
-populated using <a href="docs-adodb.htm#logsql">$conn-&gt;LogSQL</a>.
-</p>
-<p>For Oracle, Ixora Suspicious SQL returns a list of SQL statements
-that are most cache intensive as a HTML table. These are data intensive
-SQL statements that could benefit most from tuning. </p>
-<p><font face="Courier New, Courier, mono">function <b>ExpensiveSQL</b>($numsql=10)</font></p>
-<p>Returns SQL whose total execution time (avg time * #executions) is
-high as a HTML table. Each sql statement
-is hyperlinked to a new window which details the execution plan and the
-scripts that execute this SQL.
-</p>
-<p> The number of statements returned is determined by $numsql. Data is
-taken from the adodb_logsql table, where the sql statements are logged
-when
-$connection-&gt;LogSQL(true) is enabled. The adodb_logsql table is
-populated using <a href="docs-adodb.htm#logsql">$conn-&gt;LogSQL</a>.
-</p>
-<p>For Oracle, Ixora Expensive SQL returns a list of SQL statements
-that are taking the most CPU load when run.
-</p>
-<p><font face="Courier New, Courier, mono">function <b>InvalidSQL</b>($numsql=10)</font></p>
-<p>Returns a list of invalid SQL as an HTML table.
-</p>
-<p>Data is taken from the adodb_logsql table, where the sql statements
-are logged when
-$connection-&gt;LogSQL(true) is enabled.
-</p>
-<p><font face="Courier New, Courier, mono">function <b>Tables</b>($orderby=1)</font></p>
-<p>Returns information on all tables in a database, with the first two
-fields containing the table name and table size, the remaining fields
-depend on the database driver. If $orderby is set to 1, it will sort by
-name. If $orderby is set to 2, then it will sort by table size. Some
-database drivers (mssql and mysql) will ignore the $orderby clause. For
-postgresql, the information is up-to-date since the last <i>vacuum</i>.
-Not supported currently for db2.</p>
-<h3>Raw Functions</h3>
-<p>Raw functions return values without any formatting.</p>
-<p><font face="Courier New, Courier, mono">function <b>DBParameter</b>($paramname)</font></p>
-<p>Returns the value of a database parameter, such as
-$this-&gt;DBParameter("data cache size").</p>
-<p><font face="Courier New, Courier, mono">function <b>CPULoad</b>()</font></p>
-<p>Returns the CPU load of the database client (NOT THE SERVER) as a
-percentage. Only works for Linux and Windows. For Windows, WMI must be
-available.</p>
-<h3>Format of $settings Property</h3>
-<p> To create new database parameters, you need to understand
-$settings. The $settings data structure is an associative array. Each
-element of the array defines a database parameter. The key is the name
-of the database parameter. If no key is defined, then it is assumed to
-be a section break, and the value is the name of the section break. If
-this is too confusing, looking at the source code will help a lot!</p>
-<p> Each database parameter is itself an array consisting of the
-following elements:</p>
-<ol start="0">
-  <li> Category code, used to group related db parameters. If the
-category code is 'HIDE', then
-the database parameter is not shown when HTML() is called. <br>
-  </li>
-  <li> either
-    <ol type="a">
-      <li>sql string to retrieve value, eg. "select value from
-v\$parameter where name='db_block_size'", </li>
-      <li>array holding sql string and field to look for, e.g.
-array('show variables','table_cache'); optional 3rd parameter is the
-$rs-&gt;fields[$index] to use (otherwise $index=1), and optional 4th
-parameter is a constant to multiply the result with (typically 100 for
-percentage calculations),</li>
-      <li>a string prefixed by =, then a PHP method of the class is
-invoked, e.g. to invoke $this-&gt;GetIndexValue(), set this array
-element to '=GetIndexValue', <br>
-      </li>
-    </ol>
-  </li>
-  <li> Description of database parameter. If description begins with an
-=, then it is interpreted as a method call, just as in (1c) above,
-taking one parameter, the current value. E.g. '=GetIndexDescription'
-will invoke $this-&gt;GetIndexDescription($val). This is useful for
-generating tuning suggestions. For an example, see WarnCacheRatio().</li>
-</ol>
-<p>Example from MySQL, table_cache database parameter:</p>
-<pre>'table cache' =&gt; array('CACHE',            # category code<br>   array("show variables", 'table_cache'), # array (type 1b)<br>   'Number of tables to keep open'),       # description</pre>
-<h3>Example Health Check Output</h3>
-<p><a href="#db2">db2</a> <a href="#informix">informix</a> <a
- href="#mysql">mysql</a> <a href="#mssql">mssql</a> <a href="#oci8">oci8</a>
-<a href="#postgres">postgres</a></p>
-<p><a name="db2"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>db2</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>data cache hit ratio</td>
-      <td>0 &nbsp; </td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i></td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>data cache buffers</td>
-      <td>250 &nbsp; </td>
-      <td>See <a
- href="http://www7b.boulder.ibm.com/dmdd/library/techarticle/anshum/0107anshum.html#bufferpoolsize">tuning
-reference</a>.</td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>cache blocksize</td>
-      <td>4096 &nbsp; </td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>data cache size</td>
-      <td>1000K &nbsp; </td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i></td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td>current connections</td>
-      <td>2 &nbsp; </td>
-      <td>&nbsp;</td>
-    </tr>
-  </tbody>
-</table>
-<p>&nbsp;</p>
-<p><a name="informix"></a>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>informix</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Val
-ue</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache hit
-ratio</td>
-      <td>95.89</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data
-reads</td>
-      <td>1883884</td>
-      <td>Page reads</td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>1716724</td>
-      <td>Page writes</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i>
-&nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>263.0</td>
-      <td>Number of
-sessions</td>
-    </tr>
-  </tbody>
-</table>
-</p>
-<p>&nbsp;</p>
-<p><a name="mysql" id="mysql"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>mysql</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>MyISAM cache hit ratio</td>
-      <td>56.5658301822</td>
-      <td><font color="red"><b>Cache ratio should be at least 90%</b></font></td>
-    </tr>
-    <tr>
-      <td>InnoDB cache hit ratio</td>
-      <td>0</td>
-      <td><font color="red"><b>Cache ratio should be at least 90%</b></font></td>
-    </tr>
-    <tr>
-      <td>sql cache hit ratio</td>
-      <td>0</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>2622</td>
-      <td>Number of selects (Key_reads is not accurate)</td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>2415.5</td>
-      <td>Number of inserts/updates/deletes * coef (Key_writes is not
-accurate)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>MyISAM data cache size</td>
-      <td>512K</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>BDB data cache size</td>
-      <td>8388600</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>InnoDB data cache size</td>
-      <td>8M</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Memory Pools</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>read buffer size</td>
-      <td>131072</td>
-      <td>(per session)</td>
-    </tr>
-    <tr>
-      <td>sort buffer size</td>
-      <td>65528</td>
-      <td>Size of sort buffer (per session)</td>
-    </tr>
-    <tr>
-      <td>table cache</td>
-      <td>4</td>
-      <td>Number of tables to keep open</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>3</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>100</td>
-      <td>&nbsp;</td>
-    </tr>
-  </tbody>
-</table>
-<p>&nbsp;</p>
-<p><a name="mssql" id="mssql"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>mssql</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache hit ratio</td>
-      <td>99.9999694824</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>prepared sql hit ratio</td>
-      <td>99.7738579828</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>adhoc sql hit ratio</td>
-      <td>98.4540169133</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>2858</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>1438</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache size</td>
-      <td>4362</td>
-      <td>in K</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>14</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>32767</td>
-      <td>&nbsp;</td>
-    </tr>
-  </tbody>
-</table>
-<p>&nbsp;</p>
-<p><a name="oci8" id="oci8"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>oci8</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache hit ratio</td>
-      <td>96.98</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>sql cache hit ratio</td>
-      <td>99.96</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>842938</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>16852</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache buffers</td>
-      <td>3072</td>
-      <td>Number of cache buffers</td>
-    </tr>
-    <tr>
-      <td>data cache blocksize</td>
-      <td>8192</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache size</td>
-      <td>48M</td>
-      <td>shared_pool_size</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Memory Pools</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>java pool size</td>
-      <td>0</td>
-      <td>java_pool_size</td>
-    </tr>
-    <tr>
-      <td>sort buffer size</td>
-      <td>512K</td>
-      <td>sort_area_size (per query)</td>
-    </tr>
-    <tr>
-      <td>user session buffer size</td>
-      <td>8M</td>
-      <td>large_pool_size</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>1</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>170</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache utilization ratio</td>
-      <td>88.46</td>
-      <td>Percentage of data cache actually in use</td>
-    </tr>
-    <tr>
-      <td>user cache utilization ratio</td>
-      <td>91.76</td>
-      <td>Percentage of user cache (large_pool) actually in use</td>
-    </tr>
-    <tr>
-      <td>rollback segments</td>
-      <td>11</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Transactions</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>peak transactions</td>
-      <td>24</td>
-      <td>Taken from high-water-mark</td>
-    </tr>
-    <tr>
-      <td>max transactions</td>
-      <td>187</td>
-      <td>max transactions / rollback segments &lt; 3.5 (or
-transactions_per_rollback_segment)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Parameters</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>cursor sharing</td>
-      <td>EXACT</td>
-      <td>Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR
-(9i+). See <a
- href="http://www.praetoriate.com/oracle_tips_cursor_sharing.htm">cursor_sharing</a>.</td>
-    </tr>
-    <tr>
-      <td>index cache cost</td>
-      <td>0</td>
-      <td>% of indexed data blocks expected in the cache. Recommended
-is 20-80. Default is 0. See <a
- href="http://www.dba-oracle.com/oracle_tips_cbo_part1.htm">optimizer_index_caching</a>.</td>
-    </tr>
-    <tr>
-      <td>random page cost</td>
-      <td>100</td>
-      <td>Recommended is 10-50 for TP, and 50 for data warehouses.
-Default is 100. See <a
- href="http://www.dba-oracle.com/oracle_tips_cost_adj.htm">optimizer_index_cost_adj</a>.
-      </td>
-    </tr>
-  </tbody>
-</table>
-<h3>Suspicious SQL</h3>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td><b>LOAD</b></td>
-      <td><b>EXECUTES</b></td>
-      <td><b>SQL_TEXT</b></td>
-    </tr>
-    <tr>
-      <td align="right"> .73%</td>
-      <td align="right">89</td>
-      <td>select u.name, o.name, t.spare1, t.pctfree$ from sys.obj$ o,
-sys.user$ u, sys.tab$ t where (bitand(t.trigflag, 1048576) = 1048576)
-and o.obj#=t.obj# and o.owner# = u.user# select i.obj#, i.flags,
-u.name, o.name from sys.obj$ o, sys.user$ u, sys.ind$ i where
-(bitand(i.flags, 256) = 256 or bitand(i.flags, 512) = 512) and
-(not((i.type# = 9) and bitand(i.flags,8) = 8)) and o.obj#=i.obj# and
-o.owner# = u.user# </td>
-    </tr>
-    <tr>
-      <td align="right"> .84%</td>
-      <td align="right">3</td>
-      <td>select /*+ RULE */ distinct tabs.table_name, tabs.owner ,
-partitioned, iot_type , TEMPORARY, table_type, table_type_owner from
-DBA_ALL_TABLES tabs where tabs.owner = :own </td>
-    </tr>
-    <tr>
-      <td align="right"> 3.95%</td>
-      <td align="right">6</td>
-      <td>SELECT round(count(1)*avg(buf.block_size)/1048576) FROM
-DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE
-obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
-seg.owner and obj.object_name = seg.segment_name and obj.object_type =
-seg.segment_type and seg.buffer_pool = buf.name and buf.name =
-'DEFAULT' </td>
-    </tr>
-    <tr>
-      <td align="right"> 4.50%</td>
-      <td align="right">6</td>
-      <td>SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM
-DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE
-obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
-seg.owner and obj.object_name = seg.segment_name and obj.object_type =
-seg.segment_type and seg.tablespace_name = tsp.tablespace_name </td>
-    </tr>
-    <tr>
-      <td align="right">57.34%</td>
-      <td align="right">9267</td>
-      <td>select t.schema, t.name, t.flags, q.name from
-system.aq$_queue_tables t, sys.aq$_queue_table_affinities aft,
-system.aq$_queues q where aft.table_objno = t.objno and
-aft.owner_instance = :1 and q.table_objno = t.objno and q.usage = 0 and
-bitand(t.flags, 4+16+32+64+128+256) = 0 for update of t.name,
-aft.table_objno skip locked </td>
-    </tr>
-  </tbody>
-</table>
-<h3>Expensive SQL</h3>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td><b>LOAD</b></td>
-      <td><b>EXECUTES</b></td>
-      <td><b>SQL_TEXT</b></td>
-    </tr>
-    <tr>
-      <td align="right"> 5.24%</td>
-      <td align="right">1</td>
-      <td>select round(sum(bytes)/1048576) from dba_segments </td>
-    </tr>
-    <tr>
-      <td align="right"> 6.89%</td>
-      <td align="right">6</td>
-      <td>SELECT round(count(1)*avg(buf.block_size)/1048576) FROM
-DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE
-obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
-seg.owner and obj.object_name = seg.segment_name and obj.object_type =
-seg.segment_type and seg.buffer_pool = buf.name and buf.name =
-'DEFAULT' </td>
-    </tr>
-    <tr>
-      <td align="right"> 7.85%</td>
-      <td align="right">6</td>
-      <td>SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM
-DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE
-obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
-seg.owner and obj.object_name = seg.segment_name and obj.object_type =
-seg.segment_type and seg.tablespace_name = tsp.tablespace_name </td>
-    </tr>
-    <tr>
-      <td align="right">33.69%</td>
-      <td align="right">89</td>
-      <td>select u.name, o.name, t.spare1, t.pctfree$ from sys.obj$ o,
-sys.user$ u, sys.tab$ t where (bitand(t.trigflag, 1048576) = 1048576)
-and o.obj#=t.obj# and o.owner# = u.user# </td>
-    </tr>
-    <tr>
-      <td align="right">36.44%</td>
-      <td align="right">89</td>
-      <td>select i.obj#, i.flags, u.name, o.name from sys.obj$ o,
-sys.user$ u, sys.ind$ i where (bitand(i.flags, 256) = 256 or
-bitand(i.flags, 512) = 512) and (not((i.type# = 9) and
-bitand(i.flags,8) = 8)) and o.obj#=i.obj# and o.owner# = u.user# </td>
-    </tr>
-  </tbody>
-</table>
-<p><a name="postgres" id="postgres"></a></p>
-<table bgcolor="white" border="1">
-  <tbody>
-    <tr>
-      <td colspan="3">
-      <h3>postgres7</h3>
-      </td>
-    </tr>
-    <tr>
-      <td><b>Parameter</b></td>
-      <td><b>Value</b></td>
-      <td><b>Description</b></td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Ratios</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>statistics collector</td>
-      <td>FALSE</td>
-      <td>Must be set to TRUE to enable hit ratio statistics (<i>stats_start_collector</i>,<i>stats_row_level</i>
-and <i>stats_block_level</i> must be set to true in postgresql.conf)</td>
-    </tr>
-    <tr>
-      <td>data cache hit ratio</td>
-      <td>99.9666031916603</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>IO</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data reads</td>
-      <td>15</td>
-      <td>&nbsp; </td>
-    </tr>
-    <tr>
-      <td>data writes</td>
-      <td>0.000000000000000000</td>
-      <td>Count of inserts/updates/deletes * coef</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Data Cache</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>data cache buffers</td>
-      <td>1280</td>
-      <td>Number of cache buffers. <a
- href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#basic">Tuning</a></td>
-    </tr>
-    <tr>
-      <td>cache blocksize</td>
-      <td>8192</td>
-      <td>(estimate)</td>
-    </tr>
-    <tr>
-      <td>data cache size</td>
-      <td>10M</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>operating system cache size</td>
-      <td>80000K</td>
-      <td>(effective cache size)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Memory Pools</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>sort buffer size</td>
-      <td>1M</td>
-      <td>Size of sort buffer (per query)</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Connections</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>current connections</td>
-      <td>13</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td>max connections</td>
-      <td>32</td>
-      <td>&nbsp;</td>
-    </tr>
-    <tr bgcolor="#f0f0f0">
-      <td colspan="3"><i>Parameters</i> &nbsp;</td>
-    </tr>
-    <tr>
-      <td>rollback buffers</td>
-      <td>8</td>
-      <td>WAL buffers</td>
-    </tr>
-    <tr>
-      <td>random page cost</td>
-      <td>4</td>
-      <td>Cost of doing a seek (default=4). See <a
- href="http://www.varlena.com/GeneralBits/Tidbits/perf.html#less">random_page_cost</a></td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
Index: admin/include/lib/adodb/docs/docs-datadict.htm
===================================================================
--- admin/include/lib/adodb/docs/docs-datadict.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/docs-datadict.htm	(working copy)
@@ -1,328 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>ADOdb Data Dictionary Manual</title>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-  <style type="text/css">
-      body, td {
-        /*font-family: Arial, Helvetica, sans-serif;*/
-        font-size: 11pt;
-      }
-      pre {
-        font-size: 9pt;
-         background-color: #EEEEEE; padding: .5em; margin: 0px; 
-      }
-      .toplink {
-        font-size: 8pt;
-      }
-    </style>
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<h2>ADOdb Data Dictionary Library for PHP</h2>
-<p>V4.94 23 Jan 2007 (c) 2000-2007 John Lim (<a
- href="mailto:jlim#natsoft.com.my">jlim#natsoft.com.my</a>).<br>
-AXMLS (c) 2004 ars Cognita, Inc</p>
-<p><font size="1">This software is dual licensed using BSD-Style and
-LGPL. This means you can use it in compiled proprietary and commercial
-products.</font></p>
-
-<p>Useful ADOdb links: <a href="http://adodb.sourceforge.net/#download">Download</a>
-&nbsp; <a href="http://adodb.sourceforge.net/#docs">Other Docs</a>
-</p>
-<p>This documentation describes a PHP class library to automate the
-creation of tables, indexes and foreign key constraints portably for
-multiple databases. Richard Tango-Lowy and Dan Cech have been kind
-enough to contribute <a href="#xmlschema">AXMLS</a>, an XML schema
-system for defining databases. You can contact them at
-dcech#phpwerx.net and richtl#arscognita.com.</p>
-<p>Currently the following databases are supported:</p>
-<p> <b>Well-tested:</b> PostgreSQL, MySQL, Oracle, MSSQL.<br>
-<b>Beta-quality:</b> DB2, Informix, Sybase, Interbase, Firebird.<br>
-<b>Alpha-quality:</b> MS Access (does not support DEFAULT values) and
-generic ODBC.
-</p>
-<h3>Example Usage</h3>
-<pre>  include_once('adodb.inc.php');<br>  <font color="#006600"># First create a normal connection</font><br>  $db = NewADOConnection('mysql');<br>  $db-&gt;Connect(...);<br><br>  <font
- color="#006600"># Then create a data dictionary object, using this connection</font><br>  $dict = <strong>NewDataDictionary</strong>($db);<br><br>  <font
- color="#006600"># We have a portable declarative data dictionary format in ADOdb, similar to SQL.<br>  # Field types use 1 character codes, and fields are separated by commas.<br>  # The following example creates three fields: "col1", "col2" and "col3":</font><br>  $flds = " <br>  <font
- color="#663300"><strong> col1 C(32) NOTNULL DEFAULT 'abc',<br>   col2 I  DEFAULT 0,<br>   col3 N(12.2)</strong></font><br>  ";<br><br>  <font
- color="#006600"># We demonstrate creating tables and indexes</font><br>  $sqlarray = $dict-&gt;<strong>CreateTableSQL</strong>($tabname, $flds, $taboptarray);<br>  $dict-&gt;<strong>ExecuteSQLArray</strong>($sqlarray);<br><br>  $idxflds = 'co11, col2';<br>  $sqlarray = $dict-&gt;<strong>CreateIndexSQL</strong>($idxname, $tabname, $idxflds);<br>  $dict-&gt;<strong>ExecuteSQLArray</strong>($sqlarray);<br></pre>
-<h3>More Complex Table Sample</h3>
-<p>
-The following string will create a table with a primary key event_id and multiple indexes, including one compound index idx_ev1. The ability to define indexes using the INDEX keyword was added in ADOdb 4.94 by Gaetano Giunta.
-<pre>
-$flds = "
-  event_id I(11) NOTNULL AUTOINCREMENT PRIMARY,
-  event_type I(4) NOTNULL  <b>INDEX idx_evt</b>,
-  event_start_date T DEFAULT NULL <b>INDEX id_esd</b>,
-  event_end_date T DEFAULT '0000-00-00 00:00:00' <b>INDEX id_eted</b>,
-  event_parent I(11) UNSIGNED NOTNULL DEFAULT 0 <b>INDEX id_evp</b>,
-  event_owner I(11) DEFAULT 0 <b>INDEX idx_ev1</b>,
-  event_project I(11) DEFAULT 0 <b>INDEX idx_ev1</b>,
-  event_times_recuring I(11) UNSIGNED NOTNULL DEFAULT 0,
-  event_icon C(20) DEFAULT 'obj/event',
-  event_description X
-";
-$sqlarray = $db-><b>CreateTableSQL</b>($tablename, $flds);
-$dict-><b>ExecuteSQLArray</b>($sqlarray);
-</pre>
-<h3>Class Factory</h3>
-<h4>NewDataDictionary($connection, $drivername=false)</h4>
-<p>Creates a new data dictionary object. You pass a database connection object in $connection. The $connection does not have to be actually connected to the database. Some database connection objects are generic (eg. odbtp and odbc). Since 4.53, you can tell ADOdb  the actual database with $drivername. E.g.</p>
-<pre>
-$db =& NewADOConnection('odbtp');
-$datadict = NewDataDictionary($db, 'mssql'); # force mssql
-</pre>
-<h3>Class Functions</h3>
-<h4>function CreateDatabase($dbname, $optionsarray=false)</h4>
-<p>Create a database with the name $dbname;</p>
-<h4>function CreateTableSQL($tabname, $fldarray, $taboptarray=false)</h4>
-<pre>  RETURNS:      an array of strings, the sql to be executed, or false<br>  $tabname:     name of table<br>  $fldarray:    string (or array) containing field info<br>  $taboptarray: array containing table options<br></pre>
-<p>The new format of $fldarray uses a free text format, where each
-field is comma-delimited.
-The first token for each field is the field name, followed by the type
-and optional
-field size. Then optional keywords in $otheroptions:</p>
-<pre>  "$fieldname $type $colsize $otheroptions"</pre>
-<p>The older (and still supported) format of $fldarray is a
-2-dimensional array, where each row in the 1st dimension represents one
-field. Each row has this format:</p>
-<pre>  array($fieldname, $type, [,$colsize] [,$otheroptions]*)</pre>
-<p>The first 2 fields must be the field name and the field type. The
-field type can be a portable type codes or the actual type for that
-database.</p>
-<p>Legal portable type codes include:</p>
-<pre>  C:  Varchar, capped to 255 characters.<br>  X:  Larger varchar, capped to 4000 characters (to be compatible with Oracle). <br>  XL: For Oracle, returns CLOB, otherwise the largest varchar size.<br><br>  C2: Multibyte varchar<br>  X2: Multibyte varchar (largest size)<br><br>  B:  BLOB (binary large object)<br><br>  D:  Date (some databases do not support this, and we return a datetime type)<br>  T:  Datetime or Timestamp<br>  L:  Integer field suitable for storing booleans (0 or 1)<br>  I:  Integer (mapped to I4)<br>  I1: 1-byte integer<br>  I2: 2-byte integer<br>  I4: 4-byte integer<br>  I8: 8-byte integer<br>  F:  Floating point number<br>  N:  Numeric or decimal number<br></pre>
-<p>The $colsize field represents the size of the field. If a decimal
-number is used, then it is assumed that the number following the dot is
-the precision, so 6.2 means a number of size 6 digits and 2 decimal
-places. It is recommended that the default for number types be
-represented as a string to avoid any rounding errors.</p>
-<p>The $otheroptions include the following keywords (case-insensitive):</p>
-<pre>  AUTO            For autoincrement number. Emulated with triggers if not available.<br>                  Sets NOTNULL also.<br>  AUTOINCREMENT   Same as auto.<br>  KEY             Primary key field. Sets NOTNULL also. Compound keys are supported.<br>  PRIMARY         Same as KEY.<br>  DEF             Synonym for DEFAULT for lazy typists.<br>  DEFAULT         The default value. Character strings are auto-quoted unless<br>                  the string begins and ends with spaces, eg ' SYSDATE '.<br>  NOTNULL         If field is not null.<br>  DEFDATE         Set default value to call function to get today's date.<br>  DEFTIMESTAMP    Set default to call function to get today's datetime.<br>  NOQUOTE         Prevents autoquoting of default string values.<br>  CONSTRAINTS     Additional constraints defined at the end of the field<br>                  definition.<br></pre>
-<p>The Data Dictonary accepts two formats, the older array
-specification:</p>
-<pre>  $flds = array(<br>    array('COLNAME',   'DECIMAL', '8.4', 'DEFAULT' =&gt; 0, 'NOTNULL'),<br>    array('id',        'I'      , 'AUTO'),<br>    array('`MY DATE`', 'D'      , 'DEFDATE'),<br>    array('NAME',      'C'      , '32', 'CONSTRAINTS' =&gt; 'FOREIGN KEY REFERENCES reftable')<br>  );<br></pre>
-<p>Or the simpler declarative format:</p>
-<pre>  $flds = "<font color="#660000"><strong><br>    COLNAME DECIMAL(8.4) DEFAULT 0 NOTNULL,<br>    id I AUTO,<br>    `MY DATE` D DEFDATE,<br>    NAME C(32) CONSTRAINTS 'FOREIGN KEY REFERENCES reftable'</strong></font><br>  ";<br></pre>
-<p>Note that if you have special characters in the field name (e.g. My
-Date), you should enclose it in back-quotes. Normally field names are
-not case-sensitive, but if you enclose it in back-quotes, some
-databases will treat the names as case-sensitive (eg. Oracle) , and
-others won't. So be careful.</p>
-<p>The $taboptarray is the 3rd parameter of the CreateTableSQL
-function. This contains table specific settings. Legal keywords include:</p>
-<ul>
-  <li><b>REPLACE</b><br>
-Indicates that the previous table definition should be removed
-(dropped)together with ALL data. See first example below. </li>
-  <li><b>DROP</b><br>
-Drop table. Useful for removing unused tables. </li>
-  <li><b>CONSTRAINTS</b><br>
-Define this as the key, with the constraint as the value. See the
-postgresql <a href="#foreignkey">example</a> below. Additional constraints defined for the whole
-table. You will probably need to prefix this with a comma. </li>
-</ul>
-<p>Database specific table options can be defined also using the name
-of the database type as the array key. In the following example, <em>create
-the table as ISAM with MySQL, and store the table in the "users"
-tablespace if using Oracle</em>. And because we specified REPLACE, drop
-the table first.</p>
-<pre>  $taboptarray = array('mysql' =&gt; 'TYPE=ISAM', 'oci8' =&gt; 'tablespace users', 'REPLACE');</pre>
-<p><a name=foreignkey></a>You can also define foreign key constraints. The following is syntax
-for postgresql:
-</p>
-<pre>  $taboptarray = array('constraints' =&gt; ', FOREIGN KEY (col1) REFERENCES reftable (refcol)');</pre>
-<h4>function DropTableSQL($tabname)</h4>
-<p>Returns the SQL to drop the specified table.</p>
-<h4>function ChangeTableSQL($tabname, $flds)</h4>
-<p>Checks to see if table exists, if table does not exist, behaves like
-CreateTableSQL. If table exists, generates appropriate ALTER TABLE
-MODIFY COLUMN commands if field already exists, or ALTER TABLE ADD
-$column if field does not exist.</p>
-<p>The class must be connected to the database for ChangeTableSQL to
-detect the existence of the table. Idea and code contributed by Florian
-Buzin.</p>
-<h4>function RenameTableSQL($tabname,$newname)</h4>
-<p>Rename a table.  Returns the an array of strings, which is the SQL required to rename a table. Since ADOdb 4.53. Contributed by Ralf Becker.</p>
-<h4> function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')</h4>
-<p>Rename a table field. Returns the an array of strings, which is the SQL required to rename a column. The optional $flds is a complete column-defintion-string like for AddColumnSQL, only used by mysql at the moment. Since ADOdb 4.53. Contributed by Ralf Becker.</p>
-<h4>function CreateIndexSQL($idxname, $tabname, $flds,
-$idxoptarray=false)</h4>
-<pre>  RETURNS:      an array of strings, the sql to be executed, or false<br>  $idxname:     name of index<br>  $tabname:     name of table<br>  $flds:        list of fields as a comma delimited string or an array of strings<br>  $idxoptarray: array of index creation options<br></pre>
-<p>$idxoptarray is similar to $taboptarray in that index specific
-information can be embedded in the array. Other options include:</p>
-<pre>  CLUSTERED     Create clustered index (only mssql)<br>  BITMAP        Create bitmap index (only oci8)<br>  UNIQUE        Make unique index<br>  FULLTEXT      Make fulltext index (only mysql)<br>  HASH          Create hash index (only postgres)<br>  DROP          Drop legacy index<br></pre>
-<h4>function DropIndexSQL ($idxname, $tabname = NULL)</h4>
-<p>Returns the SQL to drop the specified index.</p>
-<h4>function AddColumnSQL($tabname, $flds)</h4>
-<p>Add one or more columns. Not guaranteed to work under all situations.</p>
-<h4>function AlterColumnSQL($tabname, $flds)</h4>
-<p>Warning, not all databases support this feature.</p>
-<h4>function DropColumnSQL($tabname, $flds)</h4>
-<p>Drop 1 or more columns.</p>
-<h4>function SetSchema($schema)</h4>
-<p>Set the schema.</p>
-<h4>function &amp;MetaTables()</h4>
-<h4>function &amp;MetaColumns($tab, $upper=true, $schema=false)</h4>
-<h4>function &amp;MetaPrimaryKeys($tab,$owner=false,$intkey=false)</h4>
-<h4>function &amp;MetaIndexes($table, $primary = false, $owner = false)</h4>
-<p>These functions are wrappers for the corresponding functions in the
-connection object. However, the table names will be autoquoted by the
-TableName function (see below) before being passed to the connection
-object.</p>
-<h4>function NameQuote($name = NULL)</h4>
-<p>If the provided name is quoted with backquotes (`) or contains
-special characters, returns the name quoted with the appropriate quote
-character, otherwise the name is returned unchanged.</p>
-<h4>function TableName($name)</h4>
-<p>The same as NameQuote, but will prepend the current schema if
-specified</p>
-<h4>function MetaType($t,$len=-1,$fieldobj=false)</h4>
-<h4>function ActualType($meta)</h4>
-<p>Convert between database-independent 'Meta' and database-specific
-'Actual' type codes.</p>
-<h4>function ExecuteSQLArray($sqlarray, $contOnError = true)</h4>
-<pre>  RETURNS:      0 if failed, 1 if executed all but with errors, 2 if executed successfully<br>  $sqlarray:    an array of strings with sql code (no semicolon at the end of string)<br>  $contOnError: if true, then continue executing even if error occurs<br></pre>
-<p>Executes an array of SQL strings returned by CreateTableSQL or
-CreateIndexSQL.</p>
-<hr />
-<a name="xmlschema"></a>
-<h2>ADOdb XML Schema (AXMLS)</h2>
-<p>This is a class contributed by Richard Tango-Lowy and Dan Cech that
-allows the user to quickly
-and easily build a database using the excellent ADODB database library
-and a simple XML formatted file.
-You can <a href="http://sourceforge.net/projects/adodb-xmlschema/">download
-the latest version of AXMLS here</a>.</p>
-<h3>Quick Start</h3>
-<p>Adodb-xmlschema, or AXMLS, is a set of classes that allow the user
-to quickly and easily build or upgrade a database on almost any RDBMS
-using the excellent ADOdb database library and a simple XML formatted
-schema file. Our goal is to give developers a tool that's simple to
-use, but that will allow them to create a single file that can build,
-upgrade, and manipulate databases on most RDBMS platforms.</p>
-<span style="font-weight: bold;"> Installing axmls</span>
-<p>The easiest way to install AXMLS to download and install any recent
-version of the ADOdb database abstraction library. To install AXMLS
-manually, simply copy the adodb-xmlschema.inc.php file and the xsl
-directory into your adodb directory.</p>
-<span style="font-weight: bold;"> Using AXMLS in Your Application</span>
-<p>There are two steps involved in using AXMLS in your application:
-first, you must create a schema, or XML representation of your
-database, and second, you must create the PHP code that will parse and
-execute the schema.</p>
-<p>Let's begin with a schema that describes a typical, if simplistic
-user management table for an application.</p>
-<pre class="listing"><pre>&lt;?xml version="1.0"?&gt;<br>&lt;schema version="0.2"&gt;<br><br>  &lt;table name="users"&gt;<br>    &lt;desc&gt;A typical users table for our application.&lt;/desc&gt;<br>    &lt;field name="userId" type="I"&gt;<br>      &lt;descr&gt;A unique ID assigned to each user.&lt;/descr&gt;<br><br>      &lt;KEY/&gt;<br>      &lt;AUTOINCREMENT/&gt;<br>    &lt;/field&gt;<br>    <br>    &lt;field name="userName" type="C" size="16"&gt;&lt;NOTNULL/&gt;&lt;/field&gt;<br><br>    <br>    &lt;index name="userName"&gt;<br>      &lt;descr&gt;Put a unique index on the user name&lt;/descr&gt;<br>      &lt;col&gt;userName&lt;/col&gt;<br>      &lt;UNIQUE/&gt;<br><br>    &lt;/index&gt;<br>  &lt;/table&gt;<br>  <br>  &lt;sql&gt;<br>    &lt;descr&gt;Insert some data into the users table.&lt;/descr&gt;<br>    &lt;query&gt;insert into users (userName) values ( 'admin' )&lt;/query&gt;<br><br>    &lt;query&gt;insert into users (userName) values ( 'Joe' )&lt;/query&gt;<br>  &lt;/sql&gt;<br>&lt;/schema&gt;			<br></pre></pre>
-<p>Let's take a detailed look at this schema.</p>
-<p>The opening &lt;?xml version="1.0"?&gt; tag is required by XML. The
-&lt;schema&gt; tag tells the parser that the enclosed markup defines an
-XML schema. The version="0.2" attribute sets <em>the version of the
-AXMLS DTD used by the XML schema.</em> </p>
-<p>All versions of AXMLS prior to version 1.0 have a schema version of
-"0.1". The current schema version is "0.2".</p>
-<pre class="listing"><pre>&lt;?xml version="1.0"?&gt;<br>&lt;schema version="0.2"&gt;<br>  ...<br>&lt;/schema&gt;<br></pre></pre>
-<p>Next we define one or more tables. A table consists of a fields (and
-other objects) enclosed by &lt;table&gt; tags. The name="" attribute
-specifies the name of the table that will be created in the database.</p>
-<pre class="listing"><pre>&lt;table name="users"&gt;<br><br>    &lt;desc&gt;A typical users table for our application.&lt;/desc&gt;<br>    &lt;field name="userId" type="I"&gt;<br><br>      &lt;descr&gt;A unique ID assigned to each user.&lt;/descr&gt;<br>      &lt;KEY/&gt;<br>      &lt;AUTOINCREMENT/&gt;<br>    &lt;/field&gt;<br>    <br>    &lt;field name="userName" type="C" size="16"&gt;&lt;NOTNULL/&gt;&lt;/field&gt;<br><br>    <br>&lt;/table&gt;<br></pre></pre>
-<p>This table is called "users" and has a description and two fields.
-The description is optional, and is currently only for your own
-information; it is not applied to the database.</p>
-<p>The first &lt;field&gt; tag will create a field named "userId" of
-type "I", or integer. (See the ADOdb Data Dictionary documentation for
-a list of valid types.) This &lt;field&gt; tag encloses two special
-field options: &lt;KEY/&gt;, which specifies this field as a primary
-key, and &lt;AUTOINCREMENT/&gt;, which specifies that the database
-engine should automatically fill this field with the next available
-value when a new row is inserted.</p>
-<p>The second &lt;field&gt; tag will create a field named "userName" of
-type "C", or character, and of length 16 characters. The
-&lt;NOTNULL/&gt; option specifies that this field does not allow NULLs.</p>
-<p>There are two ways to add indexes to a table. The simplest is to
-mark a field with the &lt;KEY/&gt; option as described above; a primary
-key is a unique index. The second and more powerful method uses the
-&lt;index&gt; tags.</p>
-<pre class="listing"><pre>&lt;table name="users"&gt;<br>  ...<br>    <br>  &lt;index name="userName"&gt;<br>    &lt;descr&gt;Put a unique index on the user name&lt;/descr&gt;<br>    &lt;col&gt;userName&lt;/col&gt;<br><br>    &lt;UNIQUE/&gt;<br>  &lt;/index&gt;<br>    <br>&lt;/table&gt;<br></pre></pre>
-<p>The &lt;index&gt; tag specifies that an index should be created on
-the enclosing table. The name="" attribute provides the name of the
-index that will be created in the database. The description, as above,
-is for your information only. The &lt;col&gt; tags list each column
-that will be included in the index. Finally, the &lt;UNIQUE/&gt; tag
-specifies that this will be created as a unique index.</p>
-<p>Finally, AXMLS allows you to include arbitrary SQL that will be
-applied to the database when the schema is executed.</p>
-<pre class="listing"><pre>&lt;sql&gt;<br>  &lt;descr&gt;Insert some data into the users table.&lt;/descr&gt;<br>  &lt;query&gt;insert into users (userName) values ( 'admin' )&lt;/query&gt;<br><br>  &lt;query&gt;insert into users (userName) values ( 'Joe' )&lt;/query&gt;<br>&lt;/sql&gt;<br></pre></pre>
-<p>The &lt;sql&gt; tag encloses any number of SQL queries that you
-define for your own use.</p>
-<p>Now that we've defined an XML schema, you need to know how to apply
-it to your database. Here's a simple PHP script that shows how to load
-the schema.</p>
-<pre class="listing"><pre>&lt;?PHP<br>/* You must tell the script where to find the ADOdb and<br> * the AXMLS libraries.<br> */
-require( "path_to_adodb/adodb.inc.php");
-require( "path_to_adodb/adodb-xmlschema.inc.php" ); # or adodb-xmlschema03.inc.php
-
-/* Configuration information. Define the schema filename,<br> * RDBMS platform (see the ADODB documentation for valid<br> * platform names), and database connection information here.<br> */<br>$schemaFile = 'example.xml';<br>$platform = 'mysql';<br>$dbHost = 'localhost';<br>$dbName = 'database';<br>$dbUser = 'username';<br>$dbPassword = 'password';<br><br>/* Start by creating a normal ADODB connection.<br> */<br>$db = ADONewConnection( $platform );<br>$db-&gt;Connect( $dbHost, $dbUser, $dbPassword, $dbName );<br><br>/* Use the database connection to create a new adoSchema object.<br> */<br>$schema = new adoSchema( $db );<br><br>/* Call ParseSchema() to build SQL from the XML schema file.<br> * Then call ExecuteSchema() to apply the resulting SQL to <br> * the database.<br> */<br>$sql = $schema-&gt;ParseSchema( $schemaFile );<br>$result = $schema-&gt;ExecuteSchema();<br>?&gt;<br></pre></pre>
-<p>Let's look at each part of the example in turn. After you manually
-create the database, there are three steps required to load (or
-upgrade) your schema.</p>
-<p>First, create a normal ADOdb connection. The variables and values
-here should be those required to connect to your database.</p>
-<pre class="listing"><pre>$db = ADONewConnection( 'mysql' );<br>$db-&gt;Connect( 'host', 'user', 'password', 'database' );<br></pre></pre>
-<p>Second, create the adoSchema object that load and manipulate your
-schema. You must pass an ADOdb database connection object in order to
-create the adoSchema object.</p>
-<pre class="listing">$schema = new adoSchema( $db );<br></pre>
-<p>Third, call ParseSchema() to parse the schema and then
-ExecuteSchema() to apply it to the database. You must pass
-ParseSchema() the path and filename of your schema file.</p>
-<pre class="listing">$schema-&gt;ParseSchema( $schemaFile ); <br>$schema-&gt;ExecuteSchema();</pre>
-<p>Execute the above code and then log into your database. If you've
-done all this right, you should see your tables, indexes, and SQL.</p>
-<p>You can find the source files for this tutorial in the examples
-directory as tutorial_shema.xml and tutorial.php. See the class
-documentation for a more detailed description of the adoSchema methods,
-including methods and schema elements that are not described in this
-tutorial.</p>
-<h3>XML Schema Version 3</h3>
-<p>In March 2006, we added adodb-xmlschema03.inc.php to the release, which supports version 3 of XML Schema. 
-The adodb-xmlschema.inc.php remains the same as previous releases, and supports version 2 of XML Schema. 
-Version 3 provides some enhancements:
-
-<ul>
-     <li> Support for updating table data during an upgrade.
-     <li> Support for platform-specific table options and platform negation.
-     <li> Support for unsigned fields.
-     <li> Fixed opt and constraint support
-     <li> Many other fixes such as OPT tag, which allows you to set optional platform settings:
-</ul>
-
-<p>Example usage:
-<pre>&lt;?xml version="1.0"?>
-<b>&lt;schema version="0.3"></b>
- &lt;table name="ats_kb">
-  &lt;descr>ATS KnowledgeBase&lt;/descr>
-  &lt;opt platform="mysql">TYPE=INNODB&lt;/opt>
-  &lt;field name="recid" type="I"/>
-  &lt;field name="organization_code" type="I4"/> 
-  &lt;field name="sub_code" type="C" size="20"/>
-  etc...
-</pre>
-<p>To use it, change your code to include adodb-xmlschema03.inc.php.
-
-<h3>Upgrading</h3>
-<p>
-If your schema version is older, than XSLT is used to transform the
-schema to the newest version. This means that if you are using an older
-XML schema format, you need to have the XSLT extension installed.
-If you do not want to require your users to have the XSLT extension
-installed, make sure you modify your XML schema to conform to the
-latest version.
-<hr />
-<address>If you have any questions or comments, please email them to
-Richard at richtl#arscognita.com.
-</address>
-</body>
-</html>
Index: admin/include/lib/adodb/docs/old-changelog.htm
===================================================================
--- admin/include/lib/adodb/docs/old-changelog.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/old-changelog.htm	(working copy)
@@ -1,822 +0,0 @@
-<html><title>Old Changelog: ADOdb</title><body>
-<h3>Old Changelog</h3>
-
-</p><p><b>3.92 22 Sept 2003</b> 
-</p><p>Added GetAssoc and CacheGetAssoc to connection object.
-</p><p>Removed TextMax and CharMax functions from adodb.inc.php. 
-</p><p>HasFailedTrans() returned false when trans failed. Fixed. 
-</p><p>Moved perf driver classes into adodb/perf/*.php. 
-</p><p>Misc improvements to performance monitoring, including UI(). 
-</p><p>RETVAL in mssql Parameter(), we do not append @ now. 
-</p><p>Added Param($name) to connection class, returns '?' or ":$name", for defining 
-  bind parameters portably. 
-</p><p>LogSQL traps affected_rows() and saves its value properly now. Also fixed oci8 
-  _stmt and _affectedrows() bugs. 
-</p><p>Session code timestamp check for oci8 works now. Formerly default NLS_DATE_FORMAT 
-  stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). Also 
-  added new $conn-&gt;datetime field to oci8, controls whether MetaType() returns 
-  'D' ($this-&gt;datetime==false) or 'T' ($this-&gt;datetime == true) for DATE type. 
-</p><p>Fixed bugs in adodb-cryptsession.inc.php and adodb-session-clob.inc.php. 
-</p><p>Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL(). 
-</p><p>Tuned include_once handling to reduce file-system checking overhead. 
-</p><p><b>3.91 9 Sept 2003</b> 
-</p><p>Only released to InterAkt 
-</p><p>Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override factory 
-  for driver instantiation. 
-</p><p>Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com 
-</p><p>Added portable substr support. 
-</p><p>Now rs2html() has new parameter, $echo. Set to false to return $html instead 
-  of echoing it. 
-</p><p><b>3.90 5 Sept 2003</b> 
-</p><p>First beta of performance monitoring released. 
-</p><p>MySQL supports MetaTable() masking. 
-</p><p>Fixed key_exists() bug in adodb-lib.inc.php 
-</p><p>Added sp_executesql Prepare() support to mssql. 
-</p><p>Added bind support to db2. 
-</p><p>Added swedish language file - Christian Tiberg" christian#commsoft.nu 
-</p><p>Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer Bitterlich. 
-</p><p>Left join setting for oci8 was wrong. Thx to johnwilk#juno.com 
-</p><p><b>3.80 27 Aug 2003</b> 
-</p><p>Patch for PHP 4.3.3 cached recordset csv2rs() fread loop incompatibility. 
-</p><p>Added matching mask for MetaTables. Only for oci8, mssql and postgres currently. 
-</p><p>Rewrite of "oracle" driver connection code, merging with "oci8", by Gaetano. 
-</p><p>Added better debugging for Smart Transactions. 
-</p><p>Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP. 
-</p><p>ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define 
-  it after including adodb.inc.php. 
-</p><p>Added portugese (brazilian) to languages. Thx to "Levi Fukumori". 
-</p><p>Removed arg3 parameter from Execute/SelectLimit/Cache* functions. 
-</p><p>Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute() 
-  to note change in sql query counting with 2-d arrays. 
-</p><p>Added MONEY to MetaType in PostgreSQL. 
-</p><p>Added more debugging output to CacheFlush(). 
-</p><p><b>3.72 9 Aug 2003</b> 
-</p><p>Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes 
-  and does the right thing... 
-</p><p>Fixed CacheFlush() bug - Thx to martin#gmx.de 
-</p><p>Walt Boring contributed MetaForeignKeys for postgres7. 
-</p><p>_fetch() called _BlobDecode() wrongly in interbase. Fixed. 
-</p><p>adodb_time bug fixed with dates after 2038 fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980 
-</p><p><b>3.71 4 Aug 2003</b> 
-</p><p>The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner 
-  == false. 
-</p><p>Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru. 
-</p><p>Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com. 
-</p><p>Error handling in oci8 bugfix - if there was an error in Execute(), then when 
-  calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but 
-  the 2nd call would return no error. 
-</p><p>Error handling in odbc bugfix. ODBC would always return the last error, even 
-  if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 
-  0 everytime before CacheExecute() and Execute(). 
-</p><p><b>3.70 29 July 2003</b> 
-</p><p>Added new SQLite driver. Tested on PHP 4.3 and PHP 5. 
-</p><p>Added limited "sapdb" driver support - mainly date support. 
-</p><p>The oci8 driver did not identify NUMBER with no defined precision correctly. 
-</p><p>Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls 
-  in GetInsertSQL/GetUpdateSQL. 
-</p><p>DBDate() and DBTimeStamp() format for postgresql had problems. Fixed. 
-</p><p>Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit. 
-</p><p>Added charset support to postgresql. Thx to Julian Tarkhanov. 
-</p><p>Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS) 
-</p><p>Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn. 
-</p><p>adodb-cryptsession.php includes wrong. Fixed. 
-</p><p>Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8. 
-</p><p>Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring. 
-</p><p>adodb_getcount() did not init qryRecs to 0. Missing "WHERE" clause checking 
-  in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn. 
-</p><p>Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring. 
-</p><p>Upgraded to adodb-xmlschema.inc.php 0.0.2. 
-</p><p>NConnect for mysql now returns value. Thx to Dennis Verspuij. 
-</p><p>ADODB_FETCH_BOTH support added to interbase/firebird. 
-</p><p>Czech language file contributed by Kamil Jakubovic jake#host.sk. 
-</p><p>PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec. 
-</p><p>Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it 
-</p><p>ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed. 
-</p><p><b>3.60 16 June 2003</b> 
-</p><p>We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with 
-  mssql driver. 
-</p><p>The property $emptyDate missing from connection class. Also changed 1903 to 
-  constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn. 
-</p><p>ADOdb speedup optimization - we now return all arrays by reference. 
-</p><p>Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter. 
-  Suggested by vincent. 
-</p><p>Added GetArray() to connection class. 
-</p><p>Added not_null check in informix metacolumns(). 
-</p><p>Connection parameters for postgresql did not work correctly when port was defined. 
-</p><p>DB2 is now a tested driver, making adodb 100% compatible. Extensive changes 
-  to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching 
-  to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit() 
-  fixes. 
-</p><p>The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed. 
-</p><p>Some bugs in adodb_backtrace() fixed. 
-</p><p>Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql 
-  properly. 
-</p><p>MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions 
-  to odbc MetaColumns() for vfp and db2 compat. 
-</p><p>Added unsigned support to mysql datadict class. Thx to iamsure. 
-</p><p>Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to 
-  Josh R, Night_Wulfe#hotmail.com. 
-</p><p>ChangeTableSQL contributed by Florian Buzin. 
-</p><p>The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with 
-  mssql driver. 
-</p>
-
-<p><b>3.50 19 May 2003</b></p>
-<p>Fixed mssql compat with FreeTDS. FreeTDS does not implement mssql_fetch_assoc(). 
-<p>Merged back connection and recordset code into adodb.inc.php. 
-<p>ADOdb sessions using oracle clobs contributed by achim.gosse#ddd.de. See adodb-session-clob.php. 
-<p>Added /s modifier to preg_match everywhere, which ensures that regex does not 
-  stop at /n. Thx Pao-Hsi Huang. 
-<p>Fixed error in metacolumns() for mssql. 
-<p>Added time format support for SQLDate. 
-<p>Image => B added to metatype. 
-<p>MetaType now checks empty($this->blobSize) instead of empty($this). 
-<p>Datadict has beta support for informix, sybase (mapped to mssql), db2 and generic 
-  (which is a fudge). 
-<p>BlobEncode for postgresql uses pg_escape_bytea, if available. Needed for compat 
-  with 7.3. 
-<p>Added $ADODB_LANG, to support multiple languages in MetaErrorMsg(). 
-<p>Datadict can now parse table definition as declarative text. 
-<p>For DataDict, oci8 autoincrement trigger missing semi-colon. Fixed. 
-<p>For DataDict, when REPLACE flag enabled, drop sequence in datadict for autoincrement 
-  field in postgres and oci8.s 
-<p>Postgresql defaults to template1 database if no database defined in connect/pconnect. 
-<p>We now clear _resultid in postgresql if query fails. 
-<p><b>3.40 19 May 2003</b></p>
-<p>Added insert_id for odbc_mssql. 
-<p>Modified postgresql UpdateBlobFile() because it did not work in safe mode. 
-<p>Now connection object is passed to raiseErrorFn as last parameter. Needed by 
-  StartTrans(). 
-<p>Added StartTrans() and CompleteTrans(). It is recommended that you do not modify 
-  transOff, but use the above functions. 
-<p>oci8po now obeys ADODB_ASSOC_CASE settings. 
-<p>Added virtualized error codes, using PEAR DB equivalents. Requires you to manually 
-  include adodb-error.inc.php yourself, with MetaError() and MetaErrorMsg($errno). 
-<p>GetRowAssoc for mysql and pgsql were flawed. Fix by Ross Smith. 
-<p>Added to datadict types I1, I2, I4 and I8. Changed datadict type 'T' to map 
-  to timestamp instead of datetime for postgresql. 
-<p>Error handling in ExecuteSQLArray(), adodb-datadict.inc.php did not work. 
-<p>We now auto-quote postgresql connection parameters when building connection 
-  string. 
-<p>Added session expiry notification. 
-<p>We now test with odbc mysql - made some changes to odbc recordset constructor. 
-<p>MetaColumns now special cases access and other databases for odbc. 
-<p><b>3.31 17 March 2003</b></p>
-<p>Added row checking for _fetch in postgres. 
-<p>Added Interval type to MetaType for postgres. 
-<p>Remapped postgres driver to call postgres7 driver internally. 
-<p>Adorecordset_array::getarray() did not return array when nRows >= 0. 
-<p>Postgresql: at times, no error message returned by pg_result_error() but error 
-  message returned in pg_last_error(). Recoded again. 
-<p>Interbase blob's now use chunking for updateblob. 
-<p>Move() did not set EOF correctly. Reported by Jorma T. 
-<p>We properly support mysql timestamp fields when we are creating mysql tables 
-  using the data-dict interface. 
-<p>Table regex includes backticks character now. 
-<p><b>3.30 3 March 2003</b></p>
-<p>Added $ADODB_EXTENSION and $ADODB_COMPAT_FETCH constant. 
-<p>Made blank1stItem configurable using syntax "value:text" in GetMenu/GetMenu2. 
-  Thx to Gabriel Birke. 
-<p>Previously ADOdb differed from the Microsoft standard because it did not define 
-  what to set $this->fields when EOF was reached. Now at EOF, ADOdb sets $this->fields 
-  to false for all databases, which is consist with Microsoft's implementation. 
-  Postgresql and mysql have always worked this way (in 3.11 and earlier). If you 
-  are experiencing compatibility problems (and you are not using postgresql nor 
-  mysql) on upgrading to 3.30, try setting the global variables $ADODB_COUNTRECS 
-  = true (which is the default) and $ADODB_FETCH_COMPAT = true (this is a new 
-  global variable). 
-<p>We now check both pg_result_error and pg_last_error as sometimes pg_result_error 
-  does not display anything. Iman Mayes 
-<p> We no longer check for magic quotes gpc in Quote(). 
-<p> Misc fixes for table creation in adodb-datadict.inc.php. Thx to iamsure. 
-<p> Time calculations use adodb_time library for all negative timestamps due to 
-  problems in Red Hat 7.3 or later. Formerly, only did this for Windows. 
-<p> In mssqlpo, we now check if $sql in _query is a string before we change || 
-  to +. This is to support prepared stmts. 
-<p> Move() and MoveLast() internals changed to support to support EOF and $this->fields 
-  change. 
-<p> Added ADODB_FETCH_BOTH support to mssql. Thx to Angel Fradejas afradejas#mediafusion.es 
-<p> We now check if link resource exists before we run mysql_escape_string in 
-  qstr(). 
-<p> Before we flock in csv code, we check that it is not a http url. 
-<p><b>3.20 17 Feb 2003</b></p>
-<p>Added new Data Dictionary classes for creating tables and indexes. Warning 
-  - this is very much alpha quality code. The API can still change. See adodb/tests/test-datadict.php 
-  for more info. 
-<p>We now ignore $ADODB_COUNTRECS for mysql, because PHP truncates incomplete 
-  recordsets when mysql_unbuffered_query() is called a second time. 
-<p>Now postgresql works correctly when $ADODB_COUNTRECS = false. 
-<p>Changed _adodb_getcount to properly support SELECT DISTINCT. 
-<p>Discovered that $ADODB_COUNTRECS=true has some problems with prepared queries 
-  - suspect PHP bug. 
-<p>Now GetOne and GetRow run in $ADODB_COUNTRECS=false mode for better performance. 
-<p>Added support for mysql_real_escape_string() and pg_escape_string() in qstr(). 
-<p>Added an intermediate variable for mysql _fetch() and MoveNext() to store fields, 
-  to prevent overwriting field array with boolean when mysql_fetch_array() returns 
-  false. 
-<p>Made arrays for getinsertsql and getupdatesql case-insensitive. Suggested by 
-  Tim Uckun" tim#diligence.com 
-<p><b>3.11 11 Feb 2003</b></p>
-<p>Added check for ADODB_NEVER_PERSIST constant in PConnect(). If defined, then 
-  PConnect() will actually call non-persistent Connect(). 
-<p>Modified interbase to properly work with Prepare(). 
-<p>Added $this->ibase_timefmt to allow you to change the date and time format. 
-<p>Added support for $input_array parameter in CacheFlush(). 
-<p>Added experimental support for dbx, which was then removed when i found that 
-  it was slower than using native calls. 
-<p>Added MetaPrimaryKeys for mssql and ibase/firebird. 
-<p>Added new $trim parameter to GetCol and CacheGetCol 
-<p>Uses updated adodb-time.inc.php 0.06. 
-<p><b>3.10 27 Jan 2003</b> 
-<p>Added adodb_date(), adodb_getdate(), adodb_mktime() and adodb-time.inc.php. 
-<p>For interbase, added code to handle unlimited number of bind parameters. From 
-  Daniel Hasan daniel#hasan.cl. 
-<p>Added BlobDecode and UpdateBlob for informix. Thx to Fernando Ortiz. 
-<p>Added constant ADODB_WINDOWS. If defined, means that running on Windows. 
-<p>Added constant ADODB_PHPVER which stores php version as a hex num. Removed 
-  $ADODB_PHPVER variable. 
-<p>Felho Bacsi reported a minor white-space regular expression problem in GetInsertSQL. 
-<p>Modified ADO to use variant to store _affectedRows 
-<p>Changed ibase to use base class Replace(). Modified base class Replace() to 
-  support ibase. 
-<p>Changed odbc to auto-detect when 0 records returned is wrong due to bad odbc 
-  drivers. 
-<p>Changed mssql to use datetimeconvert ini setting only when 4.30 or later (does 
-  not work in 4.23). 
-<p>ExecuteCursor($stmt, $cursorname, $params) now accepts a new $params array 
-  of additional bind parameters -- William Lovaton walovaton#yahoo.com.mx. 
-<p>Added support for sybase_unbuffered_query if ADODB_COUNTRECS == false. Thx 
-  to chuck may. 
-<p>Fixed FetchNextObj() bug. Thx to Jorma Tuomainen. 
-<p>We now use SCOPE_IDENTITY() instead of @@IDENTITY for mssql - thx to marchesini#eside.it 
-<p>Changed postgresql movenext logic to prevent illegal row number from being 
-  passed to pg_fetch_array(). 
-<p>Postgresql initrs bug found by "Bogdan RIPA" bripa#interakt.ro $f1 accidentally 
-  named $f 
-<p><b>3.00 6 Jan 2003</b> 
-<p>Fixed adodb-pear.inc.php syntax error. 
-<p>Improved _adodb_getcount() to use SELECT COUNT(*) FROM ($sql) for languages 
-  that accept it. 
-<p>Fixed _adodb_getcount() caching error. 
-<p>Added sql to retrive table and column info for odbc_mssql. 
-<p><strong>2.91 3 Jan 2003</strong> 
-<p>Revised PHP version checking to use $ADODB_PHPVER with legal values 0x4000, 
-  0x4050, 0x4200, 0x4300. 
-<p>Added support for bytea fields and oid blobs in postgres by allowing BlobDecode() 
-  to detect and convert non-oid fields. Also added BlobEncode to postgres when 
-  you want to encode oid blobs. 
-<p>Added blobEncodeType property for connections to inform phpLens what encoding 
-  method to use for blobs. 
-<p>Added BlobDecode() and BlobEncode() to base ADOConnection class. 
-<p>Added umask() to _gencachename() when creating directories. 
-<p>Added charPage for ado drivers, so you can set the code page. 
-<pre>
-$conn->charPage = CP_UTF8;
-$conn->Connect($dsn);
-</pre>
-<p>Modified _seek in mysql to check for num rows=0. 
-<p>Added to metatypes new informix types for IDS 9.30. Thx Fernando Ortiz. 
-<p>_maxrecordcount returned in CachePageExecute $rsreturn 
-<p>Fixed sybase cacheselectlimit( ) problems 
-<p>MetaColumns() max_length should use precision for types X and C for ms access. 
-  Fixed. 
-<p>Speedup of odbc non-SELECT sql statements. 
-<p>Added support in MetaColumns for Wide Char types for ODBC. We halve max_length 
-  if unicode/wide char. 
-<p>Added 'B' to types handled by GetUpdateSQL/GetInsertSQL. 
-<p>Fixed warning message in oci8 driver with $persist variable when using PConnect. 
-<p><b>2.90 11 Dec 2002</b> 
-<p>Mssql and mssqlpo and oci8po now support ADODB_ASSOC_CASE. 
-<p>Now MetaType() can accept a field object as the first parameter. 
-<p>New $arr = $db-&gt;ServerInfo( ) function. Returns $arr['description'] which 
-  is the string description, and $arr['version']. 
-<p>PostgreSQL and MSSQL speedups for insert/updates. 
-<p> Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE. 
-  Each connection has independant fetchMode. 
-<p>ADODB_ASSOC_CASE now defaults to 2, use native defaults. This is because we 
-  would break backward compat for too many applications otherwise. 
-<p>Patched encrypted sessions to use replace() 
-<p>The qstr function supports quoting of nulls when escape character is \ 
-<p>Rewrote bits and pieces of session code to check for time synch and improve 
-  reliability. 
-<p>Added property ADOConnection::hasTransactions = true/false; 
-<p>Added CreateSequence and DropSequence functions 
-<p>Found misplaced MoveNext() in adodb-postgres.inc.php. Fixed. 
-<p>Sybase SelectLimit not reliable because 'set rowcount' not cached - fixed. 
-<p>Moved ADOConnection to adodb-connection.inc.php and ADORecordSet to adodb-recordset.inc.php. 
-  This allows us to use doxygen to generate documentation. Doxygen doesn't like 
-  the classes in the main adodb.inc.php file for some mysterious reason. 
-<p><b>2.50, 14 Nov 2002</b> 
-<p>Added transOff and transCnt properties for disabling (transOff = true) and 
-  tracking transaction status (transCnt>0). 
-<p>Added inputarray handling into _adodb_pageexecute_all_rows - "Ross Smith" RossSmith#bnw.com. 
-<p>Fixed postgresql inconsistencies in date handling. 
-<p>Added support for mssql_fetch_assoc. 
-<p>Fixed $ADODB_FETCH_MODE bug in odbc MetaTables() and MetaPrimaryKeys(). 
-<p>Accidentally declared UnixDate() twice, making adodb incompatible with php 
-  4.3.0. Fixed. 
-<p>Fixed pager problems with some databases that returned -1 for _currentRow on 
-  MoveLast() by switching to MoveNext() in adodb-lib.inc.php. 
-<p>Also fixed uninited $discard in adodb-lib.inc.php. 
-<p><b>2.43, 25 Oct 2002</b></p>
-Added ADODB_ASSOC_CASE constant to better support ibase and odbc field names. 
-<p>Added support for NConnect() for oracle OCINLogin. 
-<p>Fixed NumCols() bug. 
-<p>Changed session handler to use Replace() on write. 
-<p>Fixed oci8 SelectLimit aggregate function bug again. 
-<p>Rewrote pivoting code. 
-<p><b>2.42, 4 Oct 2002</b></p>
-<p>Fixed ibase_fetch() problem with nulls. Also interbase now does automatic blob 
-  decoding, and is backward compatible. Suggested by Heinz Hombergs heinz#hhombergs.de. 
-<p>Fixed postgresql MoveNext() problems when called repeatedly after EOF. Also 
-  suggested by Heinz Hombergs. 
-<p>PageExecute() does not rewrite queries if SELECT DISTINCT is used. Requested 
-  by hans#velum.net 
-<p>Added additional fixes to oci8 SelectLimit handling with aggregate functions 
-  - thx to Christian Bugge for reporting the problem. 
-<p><b>2.41, 2 Oct 2002</b></p>
-<p>Fixed ADODB_COUNTRECS bug in odbc. Thx to Joshua Zoshi jzoshi#hotmail.com. 
-<p>Increased buffers for adodb-csvlib.inc.php for extremely long sql from 8192 
-  to 32000. 
-<p>Revised pivottable.inc.php code. Added better support for aggregate fields. 
-<p>Fixed mysql text/blob types problem in MetaTypes base class - thx to horacio 
-  degiorgi. 
-<p>Added SQLDate($fmt,$date) function, which allows an sql date format string 
-  to be generated - useful for group by's. 
-<p>Fixed bug in oci8 SelectLimit when offset>100. 
-<p><b>2.40 4 Sept 2002</b></p>
-<p>Added new NLS_DATE_FORMAT property to oci8. Suggested by Laurent NAVARRO ln#altidev.com 
-<p>Now use bind parameters in oci8 selectlimit for better performance. 
-<p>Fixed interbase replaceQuote for dialect != 1. Thx to "BEGUIN Pierre-Henri 
-  - INFOCOB" phb#infocob.com. 
-<p>Added white-space check to QA. 
-<p>Changed unixtimestamp to support fractional seconds (we always round down/floor 
-  the seconds). Thanks to beezly#beezly.org.uk. 
-<p>Now you can set the trigger_error type your own user-defined type in adodb-errorhandler.inc.php. 
-  Suggested by Claudio Bustos clbustos#entelchile.net. 
-<p>Added recordset filters with rsfilter.inc.php. 
-<p>$conn->_rs2rs does not create a new recordset when it detects it is of type 
-  array. Some trickery there as there seems to be a bug in Zend Engine 
-<p>Added render_pagelinks to adodb-pager.inc.php. Code by "Pablo Costa" pablo#cbsp.com.br. 
-<p>MetaType() speedup in adodb.inc.php by using hashing instead of switch. Best 
-  performance if constant arrays are supported, as they are in PHP5. 
-<p>adodb-session.php now updates only the expiry date if the crc32 check indicates 
-  that the data has not been modified. 
-<p><b>2.31 20 Aug 2002</b></p>
-<p>Made changes to pivottable.inc.php due to daniel lucuzaeu's suggestions (we sum the pivottable column if desired).
-<p>Fixed ErrorNo() in postgres so it does not depend on _errorMsg property.
-<p>Robert Tuttle added support for oracle cursors. See ExecuteCursor().
-<p>Fixed Replace() so it works with mysql when updating record where data has not changed. Reported by
-Cal Evans (cal#calevans.com).
-<p><b>2.30 1 Aug 2002</b></p>
-<p>Added pivottable.inc.php. Thanks to daniel.lucazeau#ajornet.com for the original 
-  concept.
-<p>Added ADOConnection::outp($msg,$newline) to output error and debugging messages. Now 
-you can override this using the ADODB_OUTP constant and use your own output handler.
-<p>Changed == to === for 'null' comparison. Reported by ericquil#yahoo.com 
-<p>Fixed mssql SelectLimit( ) bug when distinct used.
-<p><b>2.30 1 Aug 2002</b></p>
-<p>New GetCol() and CacheGetCol() from ross#bnw.com that returns the first field as a 1 dim array.
-<p>We have an empty recordset, but RecordCount() could return -1. Fixed. Reported by  "Jonathan Polansky" jonathan#polansky.com.
-<p>We now check for session variable changes using strlen($sessval).crc32($sessval). 
-Formerly we only used crc32().
-<p>Informix SelectLimit() problem with $ADODB_COUNTRECS fixed.
-<p>Fixed informix SELECT FIRST x DISTINCT, and not SELECT DISTINCT FIRST x - reported by F Riosa
-<p>Now default adodb error handlers ignores error if @ used.
-<p>If you set $conn->autoRollback=true, we auto-rollback persistent connections for odbc, mysql, oci8, mssql. 
-Default for autoRollback is false. No need to do so for postgres. 
-As interbase requires a transaction id (what a flawed api), we don't do it for interbase.
-<p>Changed PageExecute() to use non-greedy preg_match when searching for "FROM" keyword.
-<p><b>2.20 9 July 2002</b></p>
-<p>Added CacheGetOne($secs2cache,$sql), CacheGetRow($secs2cache,$sql), CacheGetAll($secs2cache,$sql).
-<p>Added $conn->OffsetDate($dayFraction,$date=false) to generate sql that calcs 
-  date offsets. Useful for scheduling appointments.
-<p>Added connection properties: leftOuter, rightOuter that hold left and right 
-  outer join operators.
-<p>Added connection property: ansiOuter to indicate whether ansi outer joins supported.
-<p>New driver <i>mssqlpo</i>, the portable mssql driver, which converts string 
-  concat operator from || to +.
-<p>Fixed ms access bug - SelectLimit() did not support ties - fixed.
-<p>Karsten Kraus (Karsten.Kraus#web.de), contributed error-handling code to ADONewConnection. 
-  Unfortunately due to backward compat problems, had to rollback most of the changes.
-<p>Added new parameter to GetAssoc() to allow returning an array of key-value pairs, 
-ignoring any additional columns in the recordset. Off by default.
-<p>Corrected mssql $conn->sysDate to return only date using convert().
-<p>CacheExecute() improved debugging output.
-<p>Changed rs2html() so newlines are converted to BR tags. Also optimized rs2html() based
-on feedback by "Jerry Workman" jerry#mtncad.com.
-<p>Added support for Replace() with Interbase, using DELETE and INSERT.
-<p>Some minor optimizations (mostly removing & references when passing arrays).
-<p>Changed  GenID() to allows id's larger than the size of an integer.
-<p>Added force_session property to oci8 for better updateblob() support.
-<p>Fixed PageExecute() which did not work properly with sql containing GROUP BY.
-<p><b>2.12 12 June 2002</b></p>
-<p>Added toexport.inc.php to export recordsets in CSV and tab-delimited format.
-<p>CachePageExecute() does not work - fixed - thx John Huong.
-<p>Interbase aliases not set properly in FetchField() - fixed. Thx Stefan Goethals.
-<p>Added cache property to adodb pager class. The number of secs to cache recordsets.
-<p>SQL rewriting bug in pageexecute() due to skipping of newlines due to missing /s modifier. Fixed.
-<p>Max size of cached recordset due to a bug was 256000 bytes. Fixed.
-<p>Speedup of 1st invocation of CacheExecute() by tuning code.
-<p>We compare $rewritesql with $sql in pageexecute code in case of rewrite failure.
-<p><b>2.11 7 June 2002</b></p>
-<p>Fixed PageExecute() rewrite sql problem - COUNT(*) and ORDER BY don't go together with
-	mssql, access and postgres. Thx to Alexander Zhukov alex#unipack.ru
-<p>DB2 support for CHARACTER type added - thx John Huong huongch#bigfoot.com
-<p>For ado, $argProvider not properly checked. Fixed - kalimero#ngi.it
-<p>Added $conn->Replace() function for update with automatic insert if the record does not exist. 
-	Supported by all databases except interbase.
-<p><b>2.10 4 June 2002</b></p>
-<p>Added uniqueSort property to indicate mssql ORDER BY cols must be unique.
-<p>Optimized session handler by crc32 the data. We only write if session data has changed.
-<p>adodb_sess_read in adodb-session.php now returns ''correctly - thanks to Jorma Tuomainen, webmaster#wizactive.com
-<p>Mssql driver did not throw EXECUTE errors correctly because ErrorMsg() and ErrorNo() called in wrong order. 
-Pointed out by Alexios Fakos. Fixed.
-<p>Changed ado to use client cursors. This fixes BeginTran() problems with ado.
-<p>Added handling of timestamp type in ado.
-<p>Added to ado_mssql support for insert_id() and affected_rows().
-<p>Added support for mssql.datetimeconvert=0, available since php 4.2.0.
-<p>Made UnixDate() less strict, so that the time is ignored if present.
-<p>Changed quote() so that it checks for magic_quotes_gpc.
-<p>Changed maxblobsize for odbc to default to 64000.
-<p><b>2.00 13 May 2002</b></p>
-<p>Added drivers <i>informix72</i> for pre-7.3 versions, and <i>oci805</i> for 
-  oracle 8.0.5, and postgres64 for postgresql 6.4 and earlier. The postgres and postgres7 drivers
-  are now identical.
-<p>Interbase now partially supports ADODB_FETCH_BOTH, by defaulting to ASSOC mode.
-<p>Proper support for blobs in mssql. Also revised blob support code 
-is base class. Now UpdateBlobFile() calls UpdateBlob() for consistency.
-<p>Added support for changed odbc_fetch_into api in php 4.2.0 
-with $conn-&gt;_has_stupid_odbc_fetch_api_change.
-<p>Fixed spelling of tablock locking hint in GenID( ) for mssql. 
-<p>Added RowLock( ) to several databases, including oci8, informix, sybase, etc. 
-  Fixed where error in mssql RowLock().
-<p>Added sysDate and sysTimeStamp properties to most database drivers. These are the sql
-functions/constants for that database that return the current date and current timestamp, and 
-are useful for portable inserts and updates.
-<p>Support for RecordCount() caused date handling in sybase and mssql to break. 
-Fixed, thanks to Toni Tunkkari, by creating derived classes for ADORecordSet_array for
-both databases. Generalized using arrayClass property. Also to support RecordCount(), 
-changed metatype handling for ado drivers. Now the type returned in FetchField 
-  is no longer a number, but the 1-char data type returned by MetaType.
-  At the same time, fixed a lot of date handling. Now mssql support dmy and mdy date formats. 
-Also speedups in sybase and mssql with preg_match and ^ in date/timestamp handling.
-Added support in sybase and mssql for 24 hour clock in timestamps (no AM/PM).
-<p>Extensive revisions to informix driver - thanks to Samuel CARRIERE samuel_carriere#hotmail.com 
-<p>Added $ok parameter to CommitTrans($ok) for easy rollbacks.
-<p>Fixed odbc MetaColumns and MetaTables to save and restore $ADODB_FETCH_MODE.
-<p>Some odbc drivers did not call the base connection class constructor. Fixed.
-<p>Fixed regex for GetUpdateSQL() and GetInsertSQL() to support more legal character combinations.
-
-<p><b>1.99 21 April 2002</b></p>
-<p>Added emulated RecordCount() to all database drivers if $ADODB_COUNTRECS = true 
-  (which it is by default). Inspired by Cristiano Duarte (cunha17#uol.com.br). 
-<p>Unified stored procedure support for mssql and oci8. Parameter() and PrepareSP() 
-  functions implemented. 
-<p>Added support for SELECT FIRST in informix, modified hasTop property to support 
-  this. 
-<p>Changed csv driver to handle updates/deletes/inserts properly (when Execute() returns true).
-Bind params also work now, and raiseErrorFn with csv driver. Added csv driver to QA process. 
-<p>Better error checking in oci8 UpdateBlob() and UpdateBlobFile().
-<p>Added TIME type to MySQL - patch by Manfred h9125297#zechine.wu-wien.ac.at
-<p>Prepare/Execute implemented for Interbase/Firebird 
-<p>Changed some regular expressions to be anchored by /^ $/ for speed.
-<p>Added UnixTimeStamp() and UnixDate() to ADOConnection(). Now these functions 
-  are in both ADOConnection and ADORecordSet classes.
-<p>Empty recordsets were not cached - fixed.
-<p>Thanks to Gaetano Giunta (g.giunta#libero.it) for the oci8 code review. We 
-  didn't agree on everything, but i hoped we agreed to disagree! 
-<p><b>1.90 6 April 2002</b></p>
-<p>Now all database drivers support fetch modes ADODB_FETCH_NUM and ADODB_FETCH_ASSOC, though
-	still not fully tested. Eg. Frontbase, Sybase, Informix.
-<p>NextRecordSet() support for mssql. Contributed by "Sven Axelsson" sven.axelsson#bokochwebb.se
-<p>Added blob support for SQL Anywhere. Contributed by Wade Johnson wade#wadejohnson.de
-<p>Fixed some security loopholes in server.php. Server.php also supports fetch mode.
-<p>Generalized GenID() to support odbc and mssql drivers. Mssql no longer generates GUID's.
-<p>Experimental RowLock($table,$where) for mssql.
-<p>Properly implemented Prepare() in oci8 and ODBC.
-<p>Added Bind() support to oci8 to support Prepare().
-<p>Improved error handler. Catches CacheExecute() and GenID() errors now.
-<p>Now if you are running php from the command line, debugging messages do not output html formating.
-Not 100% complete, but getting there.
-<p><b>1.81 22 March 2002</b></p>
-<p>Restored default $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT for backward compatibility.
-<p>SelectLimit for oci8 improved - Our FIRST_ROWS optimization now does not overwrite existing hint.
-<p>New Sybase SQL Anywhere driver. Contributed by Wade Johnson wade#wadejohnson.de
-<p><b>1.80 15 March 2002</b></p>
-<p>Redesigned directory structure of ADOdb files. Added new driver directory where
-all database drivers reside.
-<p>Changed caching algorithm to create subdirectories. Now we scale better.
-<p>Informix driver now supports insert_id(). Contribution by "Andrea Pinnisi" pinnisi#sysnet.it
-<p>Added experimental ISO date and FetchField support for informix.
-<p>Fixed a quoting bug in Execute() with bind parameters, causing problems with blobs.
-<p>Mssql driver speedup by 10-15%.
-<p>Now in CacheExecute($secs2cache,$sql,...), $secs2cache is optional. If missing, it will
-take the value defined in $connection->cacheSecs (default is 3600 seconds). Note that
-CacheSelectLimit(), the secs2cache is still compulsory - sigh.
-<p>Sybase SQL Anywhere driver (using ODBC) contributed by Wade Johnson wade#wadejohnson.de
-<p><b>1.72 8 March 2002</b></p>
-<p>Added @ when returning Fields() to prevent spurious error - "Michael William Miller" mille562#pilot.msu.edu
-<p>MetaDatabases() for postgres contributed by Phil pamelant#nerim.net
- <p>Mitchell T. Young (mitch#youngfamily.org) contributed informix driver.
- <p>Fixed rs2html() problem. I cannot reproduce, so probably a problem with pre PHP 4.1.0 versions,
-  when supporting new ADODB_FETCH_MODEs.
- <p>Mattia Rossi (mattia#technologist.com) contributed BlobDecode() and UpdateBlobFile() for postgresql
- using the postgres specific pg_lo_import()/pg_lo_open() - i don't use them but hopefully others will
- find this useful. See <a href="http://phplens.com/lens/lensforum/msgs.php?id=1262">this posting</a>
- for an example of usage.
- <p>Added UpdateBlobFile() for uploading files to a database.
- <p>Made UpdateBlob() compatible with oci8po driver.
- <p>Added noNullStrings support to oci8 driver. Oracle changes all ' ' strings to nulls,
-  so you need to set strings to ' ' to prevent the nullifying of strings. $conn->noNullStrings = true;
-  will do this for you automatically. This is useful when you define a char column as NOT NULL.
-  <p>Fixed UnixTimeStamp() bug - wasn't setting minutes and seconds properly. Patch from Agusti Fita i Borrell agusti#anglatecnic.com.
-  <p>Toni Tunkkari added patch for sybase dates. Problem with spaces in day part of date fixed.
- <p><b>1.71 18 Jan 2002</b></p>
- <p>Sequence start id support. Now $conn->Gen_ID('seqname', 50) to start sequence from 50.
- <p>CSV driver fix for selectlimit, from Andreas - akaiser#vocote.de.
-<P>Gam3r spotted that a global variable was undefined in the session handler. 
-<p>Mssql date regex had error. Fixed - reported by Minh Hoang vb_user#yahoo.com.
-<p>DBTimeStamp() and DBDate() now accept iso dates and unix timestamps. This means
-that the PostgreSQL handling of dates in GetInsertSQL() and GetUpdateSQL() can
-be removed. Also if these functions are passed '' or null or false, we return a SQL null.
-<p>GetInsertSQL() and GetUpdateSQL() now accept a new parameter, $magicq to 
-indicate whether quotes should be inserted based on magic quote settings - suggested by
-dj#4ict.com.
-<p>Reformated docs slightly based on suggestions by Chris Small.
- <p><b>1.65 28 Dec 2001</b></p>
- <p>Fixed borland_ibase class naming bug.
- <p>Now instead of using $rs->fields[0] internally, we use reset($rs->fields) so 
- that we are compatible with ADODB_FETCH_ASSOC mode. Reported by Nico S.
- <p>Changed recordset constructor and _initrs() for oci8 so that it returns the field definitions even
- if no rows in the recordset. Reported by Rick Hickerson (rhickers#mv.mv.com).
- <p>Improved support for postgresql in GetInsertSQL and GetUpdateSQL by
-  "mike" mike#partner2partner.com  and "Ryan Bailey" rebel#windriders.com
- <p><b>1.64 20 Dec 2001</b></p>
-<p>Danny Milosavljevic &lt;danny.milo#gmx.net> added some patches for MySQL error handling
-and displaying default values.
-<p>Fixed some ADODB_FETCH_BOTH inconsistencies in odbc and interbase.
-<p>Added more tests to test suite to cover ADODB_FETCH_* and ADODB_ERROR_HANDLER.
-<p>Added firebird (ibase) driver
-<p>Added borland_ibase driver for interbase 6.5
-<p><b>1.63 13 Dec 2001</b></p>
-Absolute to the adodb-lib.inc.php file not set properly. Fixed.<p>
-
-<p><b>1.62 11 Dec 2001</b></p>
-<p>Major speedup of ADOdb for low-end web sites by reducing the php code loading and compiling
-cycle. We conditionally compile not so common functions. 
-Moved csv code to adodb-csvlib.inc.php to reduce adodb.inc.php parsing. This file
-is loaded only when the csv/proxy driver is used, or CacheExecute() is run.
-Also moved PageExecute(), GetSelectSQL() and GetUpdateSQL() core code to adodb-lib.inc.php.
-This reduced the 70K main adodb.inc.php file to 55K, and since at least 20K of the file
-is comments, we have reduced 50K of code in adodb.inc.php to 35K. There
- should be 35% reduction in memory and thus 35% speedup in compiling the php code for the
-main adodb.inc.php file.
-<p>Highly tuned SelectLimit() for oci8 for massive speed improvements on large files. 
-Selecting 20 rows starting from the 20,000th row of a table is now 7 times faster. 
-Thx to Tomas V V Cox.
-<p>Allow . and # in table definitions in GetInsertSQL and GetUpdateSQL.
- See ADODB_TABLE_REGEX constant. Thx to Ari Kuorikoski.
-<p>Added ADODB_PREFETCH_ROWS constant, defaulting to 10. This determines the number
-of records to prefetch in a SELECT statement. Only used by oci8.</p>
-<p>Added high portability Oracle class called oci8po. This uses ? for bind variables, and 
-lower cases column names.</p>
-<p>Now all database drivers support $ADODB_FETCH_MODE, including interbase, ado, and odbc:
-ADODB_FETCH_NUM and ADODB_FETCH_ASSOC. ADODB_FETCH_BOTH is not fully implemented for all 
-database drivers.
-<p><b>1.61 Nov 2001</b></p>
-<p>Added PO_RecordCount() and PO_Insert_ID(). PO stands for portable. Pablo Roca 
-  [pabloroca#mvps.org]</p>
-<p>GenID now returns 0 if not available. Safer is that you should check $conn->hasGenID 
-  for availability.</p>
-<p>M'soft ADO we now correctly close recordset in _close() peterd#telephonetics.co.uk</p>
-<p>MSSQL now supports GenID(). It generates a 16-byte GUID from mssql newid() 
-  function.</p>
-<p>Changed ereg_replace to preg_replace in SelectLimit. This is a fix for mssql. 
-  Ereg doesn't support t or n! Reported by marino Carlos xaplo#postnuke-espanol.org</p>
-<p>Added $recordset->connection. This is the ADOConnection object for the recordset. 
-Works with cached and normal recordsets. Surprisingly, this had no affect on performance!</p>
-<p><b>1.54 15 Nov 2001</b></p>
-Fixed some more bugs in PageExecute().  I am getting sick of bug in this and will have to 
-reconsider my QA here. The main issue is that I don't use PageExecute() and 
-to check whether it is working requires a visual inspection of the html generated currently.
-It is possible to write a test script but it would be quite complicated :(
-<p> More speedups of SelectLimit() for DB2, Oci8, access, vfp, mssql.
-<p>
-
-<p><b>1.53 7 Nov 2001</b></p>
-Added support for ADODB_FETCH_ASSOC for ado and odbc drivers.<p>
-Tuned GetRowAssoc(false) in postgresql and mysql.<p>
-Stephen Van Dyke contributed ADOdb icon, accepted with some minor mods.<p>
-Enabled Affected_Rows() for postgresql<p>
-Speedup for Concat() using implode() - Benjamin Curtis ben_curtis#yahoo.com<p>
-Fixed some more bugs in PageExecute() to prevent infinite loops<p>
-<p><b>1.52 5 Nov 2001</b></p>
-Spelling error in CacheExecute() caused it to fail. $ql should be $sql in line 625!<p>
-Added fixes for parsing [ and ] in GetUpdateSQL().
-<p><b>1.51 5 Nov 2001</b></p>
-<p>Oci8 SelectLimit() speedup by using OCIFetch().
-<p>Oci8 was mistakenly reporting errors when $db->debug = true.
-<p>If a connection failed with ODBC, it was not correctly reported - fixed.
-<p>_connectionID was inited to -1, changed to false.
-<p>Added $rs->FetchRow(), to simplify API, ala PEAR DB
-<p>Added PEAR DB compat mode, which is still faster than PEAR! See adodb-pear.inc.php.
-<p>Removed postgres pconnect debugging statement.
-<p><b>1.50 31 Oct 2001</b></p>
-<p>ADOdbConnection renamed to ADOConnection, and ADOdbFieldObject to ADOFieldObject.
-<p>PageExecute() now checks for empty $rs correctly, and the errors in the docs on this subject have been fixed.
-<p>odbc_error() does not return 6 digit error correctly at times. Implemented workaround.
-<p>Added ADORecordSet_empty class. This will speedup INSERTS/DELETES/UPDATES because the return
-object created is much smaller.
-<p>Added Prepare() to odbc, and oci8 (but doesn't work properly for oci8 still).
-<p>Made pgsql a synonym for postgre7, and changed SELECT LIMIT to use OFFSET for compat with 
-postgres 7.2.
-<p>Revised adodb-cryptsession.php thanks to Ari.
-<p>Set resources to false on _close, to force freeing of resources.
-<p>Added adodb-errorhandler.inc.php, adodb-errorpear.inc.php and raiseErrorFn on Freek's urging.
-<p>GetRowAssoc($toUpper=true): $toUpper added as default.
-<p>Errors when connecting to a database were not captured formerly. Now we do it correctly.
-<p><b>1.40 19 September 2001</b></p>
-<p>PageExecute() to implement page scrolling added. Code and idea by Iv&aacute;n Oliva.</p>
-<p>Some minor postgresql fixes.</p>
-<p>Added sequence support using GenID() for postgresql, oci8, mysql, interbase.</p>
-<p>Added UpdateBlob support for interbase (untested).</p>
-<p>Added encrypted sessions (see adodb-cryptsession.php). By Ari Kuorikoski &lt;kuoriari#finebyte.com></p>
-<p><b>1.31 21 August 2001</b></p>
-<p>Many bug fixes thanks to "GaM3R (Cameron)" &lt;gamr#outworld.cx>. Some session changes due to Gam3r.
-<p>Fixed qstr() to quote  also.
-<p>rs2html() now pretty printed.
-<p>Jonathan Younger jyounger#unilab.com contributed the great idea GetUpdateSQL() and GetInsertSQL() which
-generates SQL to update and insert into a table from a recordset. Modify the recordset fields
-array, then can this function to generate the SQL (the SQL is not executed).
-<p>"Nicola Fankhauser" &lt;nicola.fankhauser#couniq.com> found some bugs in date handling for mssql.</p>
-<p>Added minimal Oracle support for LOBs. Still under development.</p>
-Added $ADODB_FETCH_MODE so you can control whether recordsets return arrays which are
-numeric, associative or both. This is a global variable you set. Currently only MySQL, Oci8, Postgres
-drivers support this.
-<p>PostgreSQL properly closes recordsets now. Reported by several people.
-<p>
-Added UpdateBlob() for Oracle. A hack to make it easier to save blobs.
-<p>
-Oracle timestamps did not display properly. Fixed.
-<p><b>1.20 6 June 2001</b></p>
-<p>Now Oracle can connect using tnsnames.ora or server and service name</p>
-<p>Extensive Oci8 speed optimizations. 
-Oci8 code revised to support variable binding, and /*+ FIRST_ROWS */ hint.</p>
-<p>Worked around some 4.0.6 bugs in odbc_fetch_into().</p>
-<p>Paolo S. Asioli paolo.asioli#libero.it suggested GetRowAssoc().</p>
-<p>Escape quotes for oracle wrongly set to '. Now '' is used.</p>
-<p>Variable binding now works in ODBC also.</p>
-<p>Jumped to version 1.20 because I don't like 13 :-)</p>
-<p><b>1.12 6 June 2001</b></p>
-<p>Changed $ADODB_DIR to ADODB_DIR constant to plug a security loophole.</p>
-<p>Changed _close() to close persistent connections also. Prevents connection leaks.</p>
-<p>Major revision of oracle and oci8 drivers. 
-Added OCI_RETURN_NULLS and OCI_RETURN_LOBS to OCIFetchInto(). BLOB, CLOB and VARCHAR2 recognition
-in MetaType() improved. MetaColumns() returns columns in correct sort order.</p>
-<p>Interbase timestamp input format was wrong. Fixed.</p>
-<p><b>1.11 20 May 2001</b></p>
-<p>Improved file locking for Windows.</p>
-<p>Probabilistic flushing of cache to avoid avalanche updates when cache timeouts.</p>
-<p>Cached recordset timestamp not saved in some scenarios. Fixed.</p>
-<p><b>1.10 19 May 2001</b></p>
-<p>Added caching. CacheExecute() and CacheSelectLimit().
-<p>Added csv driver. See <a href="http://php.weblogs.com/adodb_csv">http://php.weblogs.com/ADODB_csv</a>. 
-<p>Fixed SelectLimit(), SELECT TOP not working under certain circumstances.
-<p>Added better Frontbase support of MetaTypes() by Frank M. Kromann.
-<p><b>1.01 24 April 2001</b></p>
-<p>Fixed SelectLimit bug.  not quoted properly.
-<p>SelectLimit: SELECT TOP -1 * FROM TABLE not support by Microsoft. Fixed.</p>
-<p>GetMenu improved by glen.davies#cce.ac.nz to support multiple hilited items<p>
-<p>FetchNextObject() did not work with only 1 record returned. Fixed bug reported by $tim#orotech.net</p>
-<p>Fixed mysql field max_length problem. Fix suggested by Jim Nicholson (jnich#att.com)</p>
-<p><b>1.00 16 April 2001</b></p>
-<p>Given some brilliant suggestions on how to simplify ADOdb by akul. You no longer need to
-setup $ADODB_DIR yourself, and ADOLoadCode() is automatically called by ADONewConnection(), 
-simplifying the startup code.</p>
-<p>FetchNextObject() added. Suggested by Jakub Marecek. This makes FetchObject() obsolete, as
-this is more flexible and powerful.</p>
-<p>Misc fixes to SelectLimit() to support Access (top must follow distinct) and Fields() 
-in the array recordset. From Reinhard Balling.</p>
-<p><b>0.96 27 Mar 2001</b></p>
-<p>ADOConnection Close() did not return a value correctly. Thanks to akul#otamedia.com.</p>
-<p>When the horrible magic_quotes is enabled, back-slash () is changed to double-backslash (\).
-This doesn't make sense for Microsoft/Sybase databases. We fix this in qstr().</p>
-<p>Fixed Sybase date problem in UnixDate() thanks to Toni Tunkkari. Also fixed MSSQL problem
-in UnixDate() - thanks to milhouse31#hotmail.com.</p>
-<p>MoveNext() moved to leaf classes for speed in MySQL/PostgreSQL. 10-15% speedup.</p>
-<p>Added null handling in bindInputArray in Execute() -- Ron Baldwin suggestion.</p>
-<p>Fixed some option tags. Thanks to john#jrmstudios.com.</p>
-<p><b>0.95 13 Mar 2001</b></p>
-<p>Added postgres7 database driver which supports LIMIT and other version 7 stuff in the future.</p>
-<p>Added SelectLimit to ADOConnection to simulate PostgreSQL's "select * from table limit 10 offset 3".
-Added helper function GetArrayLimit() to ADORecordSet.</p>
-<p>Fixed mysql metacolumns bug. Thanks to Freek Dijkstra (phpeverywhere#macfreek.com).</p>
-<p>Also many PostgreSQL changes by Freek. He almost rewrote the whole PostgreSQL driver!</p>
-<p>Added fix to input parameters in Execute for non-strings by Ron Baldwin.</p>
-<p>Added new metatype, X for TeXt. Formerly, metatype B for Blob also included
-text fields. Now 'B' is for binary/image data. 'X' for textual data.</p>
-<p>Fixed $this->GetArray() in GetRows().</p>
-<p>Oracle and OCI8: 1st parameter is always blank -- now warns if it is filled.</p>
-<p>Now <i>hasLimit</i> and <i>hasTop</i> added to indicate whether 
-SELECT * FROM TABLE LIMIT 10 or SELECT TOP 10 * FROM TABLE are supported.</p>
-<p><b>0.94 04 Feb 2001</b></p>
-<p>Added ADORecordSet::GetRows() for compatibility with Microsoft ADO. Synonym for GetArray().</p>
-<p>Added new metatype 'R' to represent autoincrement numbers.</p>
-<p>Added ADORecordSet.FetchObject() to return a row as an object.</p>
-<p>Finally got a Linux box to test PostgreSql. Many fixes.</p>
-<p>Fixed copyright misspellings in 0.93.</p>
-<p>Fixed mssql MetaColumns type bug.</p>
-<p>Worked around odbc bug in PHP4 for sessions.</p>
-<p>Fixed many documentation bugs (affected_rows, metadatabases, qstr).</p>
-<p>Fixed MySQL timestamp format (removed comma).</p>
-<p>Interbase driver did not call ibase_pconnect(). Fixed.</p>
-<p><b>0.93 18 Jan 2002</b></p>
-<p>Fixed GetMenu bug.</p>
-<p>Simplified Interbase commit and rollback.</p>
-<p>Default behaviour on closing a connection is now to rollback all active transactions.</p>
-<p>Added field object handling for array recordset for future XML compatibility.</p>
-<p>Added arr2html() to convert array to html table.</p>
-<p><b>0.92 2 Jan 2002</b></p>
-<p>Interbase Commit and Rollback should be working again.</p>
-<p>Changed initialisation of ADORecordSet. This is internal and should not affect users. We
-are doing this to support cached recordsets in the future.</p>
-
-<p>Implemented ADORecordSet_array class. This allows you to simulate a database recordset
-with an array.</p>
-<p>Added UnixDate() and UnixTimeStamp() to ADORecordSet.</p>
-<p><b>0.91 21 Dec 2000</b></p>
-<p>Fixed ODBC so ErrorMsg() is working.</p>
-<p>Worked around ADO unrecognised null (0x1) value problem in COM.</p>
-<p>Added Sybase support for FetchField() type</p>
-<p>Removed debugging code and unneeded html from various files</p>
-<p>Changed to javadoc style comments to adodb.inc.php.</p>
-<p>Added maxsql as synonym for mysqlt</p>
-<p>Now ODBC downloads first 8K of blob by default
-<p><b>0.90 15 Nov 2000</b></p>
-<p>Lots of testing of Microsoft ADO. Should be more stable now.</p>
-<p>Added $ADODB_COUNTREC. Set to false for high speed selects.</p>
-<p>Added Sybase support. Contributed by Toni Tunkkari (toni.tunkkari#finebyte.com). Bug in Sybase 
-  API: GetFields is unable to determine date types.</p>
-<p>Changed behaviour of RecordSet.GetMenu() to support size parameter (listbox) properly.</p>
-<p>Added emptyDate and emptyTimeStamp to RecordSet class that defines how to represent 
-  empty dates.</p>
-<p>Added MetaColumns($table) that returns an array of ADOFieldObject's listing 
-  the columns of a table.</p>
-<p>Added transaction support for PostgresSQL -- thanks to "Eric G. Werk" egw#netguide.dk.</p>
-<p>Added adodb-session.php for session support.</p>
-<p><b>0.80 30 Nov 2000</b></p>
-<p>Added support for charSet for interbase. Implemented MetaTables for most databases. 
-  PostgreSQL more extensively tested.</p>
-<p><b>0.71 22 Nov 2000</b></p>
-<p>Switched from using require_once to include/include_once for backward compatability with PHP 4.02 and earlier.</p>
-<p><b>0.70 15 Nov 2000</b></p>
-<p>Calls by reference have been removed (call_time_pass_reference=Off) to ensure compatibility with future versions of PHP, 
-except in Oracle 7 driver due to a bug in php_oracle.dll.</p>
-<p>PostgreSQL database driver contributed by Alberto Cerezal (acerezalp#dbnet.es). 
-</p>
-<p>Oci8 driver for Oracle 8 contributed by George Fourlanos (fou#infomap.gr).</p>
-<p>Added <i>mysqlt</i> database driver to support MySQL 3.23 which has transaction 
- support. </p>
-<p>Oracle default date format (DD-MON-YY) did not match ADOdb default date format (which is YYYY-MM-DD). Use ALTER SESSION to force the default date.</p>
-<p>Error message checking is now included in test suite.</p>
-<p>MoveNext() did not check EOF properly -- fixed.</p>
-<p><b>0.60 Nov 8 2000</b></p>
-<p>Fixed some constructor bugs in ODBC and ADO. Added ErrorNo function to ADOConnection 
- class. </p>
-<p><b>0.51 Oct 18 2000</b></p>
-<p>Fixed some interbase bugs.</p>
-<p><b>0.50 Oct 16 2000</b></p>
-<p>Interbase commit/rollback changed to be compatible with PHP 4.03. </p>
-<p>CommitTrans( ) will now return true if transactions not supported. </p>
-<p>Conversely RollbackTrans( ) will return false if transactions not supported. 
-</p>
-<p><b>0.46 Oct 12</b></p>
-Many Oracle compatibility issues fixed. 
-<p><b>0.40 Sept 26</b></p>
-<p>Many bug fixes</p>
-<p>Now Code for BeginTrans, CommitTrans and RollbackTrans is working. So is the Affected_Rows
-and Insert_ID. Added above functions to test.php.</p>
-<p>ADO type handling was busted in 0.30. Fixed.</p>
-<p>Generalised Move( ) so it works will all databases, including ODBC.</p>
-<p><b>0.30 Sept 18</b></p>
-<p>Renamed ADOLoadDB to ADOLoadCode. This is clearer.</p>
-<p>Added BeginTrans, CommitTrans and RollbackTrans functions.</p>
-<p>Added Affected_Rows() and Insert_ID(), _affectedrows() and _insertID(), ListTables(), 
- ListDatabases(), ListColumns().</p>
-<p>Need to add New_ID() and hasInsertID and hasAffectedRows, autoCommit </p>
-<p><b>0.20 Sept 12</b></p>
-<p>Added support for Microsoft's ADO.</p>
-<p>Added new field to ADORecordSet -- canSeek</p>
-<p>Added new parameter to _fetch($ignore_fields = false). Setting to true will 
- not update fields array for faster performance.</p>
-<p>Added new field to ADORecordSet/ADOConnection -- dataProvider to indicate whether 
- a class is derived from odbc or ado.</p>
-<p>Changed class ODBCFieldObject to ADOFieldObject -- not documented currently.</p>
-<p>Added benchmark.php and testdatabases.inc.php to the test suite.</p>
-<p>Added to ADORecordSet FastForward( ) for future high speed scrolling. Not documented.</p>
-<p>Realised that ADO's Move( ) uses relative positioning. ADOdb uses absolute. 
-</p>
-<p><b>0.10 Sept 9 2000</b></p>
-<p>First release</p>
-</body></html>
\ No newline at end of file
Index: admin/include/lib/adodb/docs/docs-session.old.htm
===================================================================
--- admin/include/lib/adodb/docs/docs-session.old.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/docs-session.old.htm	(working copy)
@@ -1,313 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>ADODB Old Session Management Manual</title>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-  <style type="text/css">
-body, td {
-/*font-family: Arial, Helvetica, sans-serif;*/
-font-size: 11pt;
-}
-pre {
-font-size: 9pt;
-background-color: #EEEEEE; padding: .5em; margin: 0px;
-}
-.toplink {
-font-size: 8pt;
-}
-  </style>
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<h3>ADODB Session Management Manual</h3>
-<p>
-V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my)
-</p>
-<p> <font size="1">This software is dual licensed using BSD-Style and
-LGPL. This means you can use it in compiled proprietary and commercial
-products. </font>
-<p>Useful ADOdb links: <a href="http://adodb.sourceforge.net/#download">Download</a>
-&nbsp; <a href="http://adodb.sourceforge.net/#docs">Other Docs</a>
-</p>
-<h3>Introduction</h3>
-<p>This documentation discusses the old adodb-session.php. 
-Here is the <a href=docs-session.htm>new documentation</a> on the newer adodb-session2.php.
-<p> We store state information specific to a user or web client in
-session variables. These session variables persist throughout a
-session, as the user moves from page to page. </p>
-<p>To use session variables, call session_start() at the beginning of
-your web page, before your HTTP headers are sent. Then for every
-variable you want to keep alive for the duration of the session, call
-session_register($variable_name). By default, the session handler will
-keep track of the session by using a cookie. You can save objects or
-arrays in session variables also.
-</p>
-<p>The default method of storing sessions is to store it in a file.
-However if you have special needs such as you:
-</p>
-<ul>
-  <li>Have multiple web servers that need to share session info</li>
-  <li>Need to do special processing of each session</li>
-  <li>Require notification when a session expires</li>
-</ul>
-<p>The ADOdb session handler provides you with the above
-additional capabilities by storing the session information as records
-in a database table that can be shared across multiple servers. </p>
-<p>These records will be garbage collected based on the php.ini [session] timeout settings. 
-You can register a notification function to notify you when the record has expired and 
-is about to be freed by the garbage collector.</p>
-<p><b>Important Upgrade Notice:</b> Since ADOdb 4.05, the session files
-have been moved to its own folder, adodb/session. This is a rewrite
-of the session code by Ross Smith. The old session code is in
-adodb/session/old. </p>
-<h4>ADOdb Session Handler Features</h4>
-<ul>
-  <li>Ability to define a notification function that is called when a
-session expires. Typically
-used to detect session logout and release global resources. </li>
-  <li>Optimization of database writes. We crc32 the session data and
-only perform an update
-to the session data if there is a data change. </li>
-  <li>Support for large amounts of session data with CLOBs (see
-adodb-session-clob.php). Useful
-for Oracle. </li>
-  <li>Support for encrypted session data, see
-adodb-cryptsession.php. Enabling encryption is simply a matter of
-including adodb-cryptsession.php instead of adodb-session.php. </li>
-</ul>
-<h3>Setup</h3>
-<p>There are 3 session management files that you can use:
-</p>
-<pre>adodb-session.php        : The default<br>adodb-session-clob.php   : Use this if you are storing DATA in clobs<br>adodb-cryptsession.php   : Use this if you want to store encrypted session data in the database<br><br>
-</pre>
-<p><strong>Examples</strong>
-<p><pre>
- <font
- color="#004040">    include('adodb/adodb.inc.php');<br>    <br><b>    $ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>    $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    $ADODB_SESSION_DB ='sessiondb';</b><br>    <br>    <b>include('adodb/session/adodb-session.php');</b><br>    session_start();<br>    <br>    #<br>    # Test session vars, the following should increment on refresh<br>    #<br>    $_SESSION['AVAR'] += 1;<br>    print "&lt;p&gt;\$_SESSION['AVAR']={$_SESSION['AVAR']}&lt;/p&gt;";<br></font></pre>
- 
-<p>To force non-persistent connections, call adodb_session_open() first before session_start():
-<p>
- <pre>
- <font color="#004040"><br>    include('adodb/adodb.inc.php');<br>    <br><b>    $ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>    $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    $ADODB_SESSION_DB ='sessiondb';</b><br>    <br>    <b>include('adodb/session/adodb-session.php');<br>    adodb_sess_open(false,false,false);</b><br>    session_start();<br> </font>
- </pre>
-<p> The 3rd parameter to adodb_sess_open($path, $sessname, $connectMode)  sets the connection method. You can pass in the following:</p>
-<table width="50%" border="1">
-  <tr>
-    <td><b>$connectMode</b></td>
-    <td><b>Connection Method</b></td>
-  </tr>
-  <tr>
-    <td>true</td>
-    <td><p>PConnect( )</p></td>
-  </tr>
-  <tr>
-    <td>false</td>
-    <td>Connect( )</td>
-  </tr>
-  <tr>
-    <td>'N'</td>
-    <td>NConnect( )</td>
-  </tr>
-  <tr>
-    <td>'P'</td>
-    <td>PConnect( )</td>
-  </tr>
-  <tr>
-    <td>'C'</td>
-    <td>Connect( )</td>
-  </tr>
-</table>
-<p>To use a encrypted sessions, simply replace the file adodb-session.php:</p>
- <pre> <font
- color="#004040"><br>    include('adodb/adodb.inc.php');<br>    <br><b>    $ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>    $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    $ADODB_SESSION_DB ='sessiondb';<br>    <br>    include('adodb/session/adodb-cryptsession.php');</b><br>    session_start();</font><br>
- </pre>
- <p>And the same technique for adodb-session-clob.php:</p>
- <pre>  <font
- color="#004040"><br>    include('adodb/adodb.inc.php');<br>    <br><b>    $ADODB_SESSION_DRIVER='mysql';<br>    $ADODB_SESSION_CONNECT='localhost';<br>    $ADODB_SESSION_USER ='scott';<br>    $ADODB_SESSION_PWD ='tiger';<br>    $ADODB_SESSION_DB ='sessiondb';<br>    <br>    include('adodb/session/adodb-session-clob.php');</b><br>    session_start();</font>
- </pre>
- <p>An alternative way to set persistant or non-persistent connections is to call the following function before session_start() is called.
- <pre>
- 	ADODB_Session::persist('P'); # 'C' for non-persistent connections
- </pre>
- <h4>Installation</h4>
-<p>1. Create this table in your database (MySQL syntax):
-<p><pre> <a
- name="sessiontab"></a> <font color="#004040">
-   create table sessions (
-       SESSKEY char(32) not null,
-       EXPIRY int(11) unsigned not null,
-       EXPIREREF varchar(64),
-	   DATA text not null,
-	   primary key (sesskey)
-	   );</font>
- </pre>
-
- <p>You may want to rename the 'data' field to 'session_data' as
-	'data' appears to be a reserved word for one or more of the following:
-	<ul>
-	<li>	ANSI SQL
-	<li>	IBM DB2
-	<li>	MS SQL Server
-	<li>	Postgres
-	<li>	SAP
-		</ul>
-<p>
-	If you do, then execute:
-<pre>
-		ADODB_Session::dataFieldName('session_data');
-</pre>
- <p> For the adodb-session-clob.php version, create this:
-<p>  <pre>
-    <font
- color="#004040"><br>    create table sessions (<br>       SESSKEY char(32) not null,<br>       EXPIRY int(11) unsigned not null,<br>       EXPIREREF varchar(64),<br>       DATA CLOB,<br>      primary key (sesskey)<br>  );</font>
- </pre>
- <p>2. Then define the following parameters. You can either modify this file, or define them before this file is included:
- <pre>      <font
- color="#004040"><br>    $ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';<br>    $ADODB_SESSION_CONNECT='server to connect to';<br>    $ADODB_SESSION_USER ='user';<br>    $ADODB_SESSION_PWD ='password';<br>    $ADODB_SESSION_DB ='database';<br>    $ADODB_SESSION_TBL = 'sessions'; # setting this is optional<br>	</font>
- </pre><p>
-     When the session is created, $<b>ADODB_SESS_CONN</b> holds the connection object.<br>    <br>  3. Recommended is PHP 4.0.6 or later. There are documented session bugs in earlier versions of PHP.
-<h3>Notifications</h3>
-<p>You can receive notification when your session is cleaned up by the session garbage collector or
-when you call session_destroy().
-<p>PHP's session extension will automatically run a special garbage collection function based on
-your php.ini session.cookie_lifetime and session.gc_probability settings. This will in turn call
-adodb's garbage collection function, which can be setup to do notification.
-<p>
-<pre>
-	PHP Session --> ADOdb Session  --> Find all recs  --> Send          --> Delete queued
-	GC Function     GC Function        to be deleted      notification      records
-	executed at     called by                             for all recs
-	random time     Session Extension                     queued for deletion
-</pre>
-<p>When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically 
-the userid of the session. Later when the session has expired,  just before the record is deleted,
-we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which 
-is the userid of the person being logged off.
-<p>ADOdb uses a global variable $ADODB_SESSION_EXPIRE_NOTIFY that you must predefine before session
-start to store the notification configuration. 
-$ADODB_SESSION_EXPIRE_NOTIFY is an array with 2 elements, the
-first being the name of the session variable you would like to store in
-the EXPIREREF field, and the 2nd is the notification function's name. </p>
-<p>For example, suppose we want to be notified when a user's session has expired,
-based on the userid. When the user logs in, we store the id in the global session variable
-$USERID. The function name is 'NotifyFn'. 
-<p>
-So we define (before session_start() is called): </p>
-<pre> <font color="#004040">
-	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-</font></pre>
-And when the NotifyFn is called (when the session expires), the
-$USERID is passed in as the first parameter, eg. NotifyFn($userid, $sesskey). The
-session key (which is the primary key of the record in the sessions
-table) is the 2nd parameter.
-<p> Here is an example of a Notification function that deletes some
-records in the database and temporary files: </p>
-<pre><font color="#004040">
-	function NotifyFn($expireref, $sesskey)
-	{
-		global $ADODB_SESS_CONN; # the session connection object
-		$user = $ADODB_SESS_CONN-&gt;qstr($expireref);
-		
-		$ADODB_SESS_CONN-&gt;Execute("delete from shopping_cart where user=$user");          
-		system("rm /work/tmpfiles/$expireref/*");
-	}</font>  
-			  </pre>
-<p> NOTE 1: If you have register_globals disabled in php.ini, then you
-will have to manually set the EXPIREREF. E.g. </p>
-<pre> <font color="#004040">
-$GLOBALS['USERID'] = GetUserID();
-$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');</font>
-</pre>
-<p> NOTE 2: If you want to change the EXPIREREF after the session
-record has been created, you will need to modify any session variable
-to force a database record update.
-</p>
-<h4>Neat Notification Tricks</h4>
-<p><i>ExpireRef</i> normally holds the user id of the current session.
-</p>
-<p>1. You can then write a session monitor, scanning expireref to see
-who is currently logged on.
-</p>
-<p>2. If you delete the sessions record for a specific user, eg.
-</p>
-<pre>delete from sessions where expireref = '$USER'<br></pre>
-then the user is logged out. Useful for ejecting someone from a
-site.
-<p>3. You can scan the sessions table to ensure no user
-can be logged in twice. Useful for security reasons.
-</p>
-<h3>Using Oracle CLOBs</h3>
-<p>Suppose you are storing the DATA field in a CLOB:
- <pre><font color="#004040">
-   CREATE TABLE sessions (
-       SESSKEY VARCHAR(32) NOT NULL,
-       EXPIRY NUMBER(16)  NOT NULL,
-       EXPIREREF VARCHAR(64),
-       DATA CLOB,
-      PRIMARY KEY (sesskey)
-  );</font>
- </pre> 
- <p>Then your PHP code could look like this:
-	 <pre>
-	ADODB_SESSION_DRIVER='oci8';
-	$ADODB_SESSION_CONNECT=$tnsname;
-	$ADODB_SESSION_USER ='scott';
-	$ADODB_SESSION_PWD = 'tiger';
-	$ADODB_SESSION_DB ='';
-	
-	$ADODB_SESSION_USE_LOBS = 'clob';
-	$ADODB_SESSION_TBL = 'sessions';
-	
-	$ADODB_SESS_DEBUG=0;
-	
-	include(ADODB_DIR.'/session/adodb-session.php');
-	
-	ADODB_Session::persist('P'); # use 'C' for non-persistent connects
-	
-	session_start();
- </pre>
- <p>Note that you can set persistance using ADODB_Session::persist('P').
- 
-<h3>Compression/Encryption Schemes</h3>
-Since ADOdb 4.05, thanks to Ross Smith, multiple encryption and
-compression schemes are supported. Currently, supported are:
-<p>
-<pre>  MD5Crypt (crypt.inc.php)<br>  MCrypt<br>  Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)<br>  GZip<br>  BZip2<br></pre>
-<p>These are stackable. E.g.
-<p><pre>ADODB_Session::filter(new ADODB_Compress_Bzip2());<br>ADODB_Session::filter(new ADODB_Encrypt_MD5());<br></pre>
-will compress and then encrypt the record in the database.
-<h3>adodb_session_regenerate_id()</h3>
-<p>Dynamically change the current session id with a newly generated one and update database. Currently only
-works with cookies. Useful to improve security by reducing the risk of session-hijacking.
-See this article on <a href=http://shiflett.org/articles/security-corner-feb2004>Session Fixation</a> for more info 
-on the theory behind this feature. Usage:
-<pre>
-	$ADODB_SESSION_DRIVER='mysql';
-	$ADODB_SESSION_CONNECT='localhost';
-	$ADODB_SESSION_USER ='root';
-	$ADODB_SESSION_PWD ='abc';
-	$ADODB_SESSION_DB ='phplens';
-	
-	include('path/to/adodb/session/adodb-session.php');
-	
-	session_start();
-	# Every 10 page loads, reset cookie for safety.
-	# This is extremely simplistic example, better 
-	# to regenerate only when the user logs in or changes
-	# user privilege levels.
-	if ((rand()%10) == 0) adodb_session_regenerate_id(); 
-</pre>
-<p>This function calls session_regenerate_id() internally or simulates it if the function does not exist.
-<h3>Vacuum/Optimize Database</h3>
-<p>During session garbage collection, if postgresql is detected,
-  ADOdb can be set to run VACUUM. If mysql is detected, then optimize database
-  could be called.You can turn this on or off using:</p>
-<pre>$turnOn = true; # or false
-ADODB_Session::optimize($turnOn);
-</pre>
-<p>The default for optimization is it is disabled.</p>
-<h2>More Info</h2>
-<p>Also see the <a href="docs-adodb.htm">core ADOdb documentation</a>.
-</p>
-</body>
-</html>
Index: admin/include/lib/adodb/docs/tips_portable_sql.htm
===================================================================
--- admin/include/lib/adodb/docs/tips_portable_sql.htm	(revision 6370)
+++ admin/include/lib/adodb/docs/tips_portable_sql.htm	(working copy)
@@ -1,367 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>Tips on Writing Portable SQL for Multiple Databases for PHP</title>
-</head>
-
-<body bgcolor=white>
-<table width=100% border=0><tr><td><h2>Tips on Writing Portable SQL &nbsp;</h2></td><td>
- <div align=right><img src="cute_icons_for_site/adodb.gif"></div></td></tr></table>
-  <p>Updated 6 Oct 2006. Added OffsetDate example.
-  <p>Updated 18 Sep 2003. Added Portable Native SQL section.
-<p>
-
- If you are writing an application that is used in multiple environments and 
-  operating systems, you need to plan to support multiple databases. This article 
-  is based on my experiences with multiple database systems, stretching from 4th 
-  Dimension in my Mac days, to the databases I currently use, which are: Oracle, 
-  FoxPro, Access, MS SQL Server and MySQL. Although most of the advice here applies 
-  to using SQL with Perl, Python and other programming languages, I will focus on PHP and how 
-  the <a href="http://adodb.sourceforge.net/">ADOdb</a> database abstraction library 
-  offers some solutions.<p></p>
-<p>Most database vendors practice product lock-in. The best or fastest way to 
-  do things is often implemented using proprietary extensions to SQL. This makes 
-  it extremely hard to write portable SQL code that performs well under all conditions. 
-  When the first ANSI committee got together in 1984 to standardize SQL, the database 
-  vendors had such different implementations that they could only agree on the 
-  core functionality of SQL. Many important application specific requirements 
-  were not standardized, and after so many years since the ANSI effort began, 
-  it looks as if much useful database functionality will never be standardized. 
-  Even though ANSI-92 SQL has codified much more, we still have to implement portability 
-  at the application level.</p>
-<h3><b>Selects</b></h3>
-<p>The SELECT statement has been standardized to a great degree. Nearly every 
-  database supports the following:</p>
-<p>SELECT [cols] FROM [tables]<br>
-  &nbsp;&nbsp;[WHERE conditions]<br>
-  &nbsp; [GROUP BY cols]<br>
-  &nbsp; [HAVING conditions] <br>
-  &nbsp; [ORDER BY cols]</p>
-<p>But so many useful techniques can only be implemented by using proprietary 
-  extensions. For example, when writing SQL to retrieve the first 10 rows for 
-  paging, you could write...</p>
-<table width="80%" border="1" cellspacing="0" cellpadding="0" align="center">
-  <tr> 
-	<td><b>Database</b></td>
-	<td><b>SQL Syntax</b></td>
-  </tr>
-  <tr> 
-	<td>DB2</td>
-	<td>select * from table fetch first 10 rows only</td>
-  </tr>
-  <tr> 
-	<td>Informix</td>
-	<td>select first 10 * from table</td>
-  </tr>
-  <tr> 
-	<td>Microsoft SQL Server and Access</td>
-	<td>select top 10 * from table</td>
-  </tr>
-  <tr> 
-	<td>MySQL and PostgreSQL</td>
-	<td>select * from table limit 10</td>
-  </tr>
-  <tr> 
-	<td>Oracle 8i</td>
-	<td>select * from (select * from table) where rownum &lt;= 10</td>
-  </tr>
-</table>
-<p>This feature of getting a subset of data is so useful that in the PHP class 
-  library ADOdb, we have a SelectLimit( ) function that allows you to hide the 
-  implementation details within a function that will rewrite your SQL for you:</p>
-<pre>$connection-&gt;SelectLimit('select * from table', 10);
-</pre>
-<p><b>Selects: Fetch Modes</b></p>
-<p>PHP allows you to retrieve database records as arrays. You can choose to have 
-  the arrays indexed by field name or number. However different low-level PHP 
-  database drivers are inconsistent in their indexing efforts. ADOdb allows you 
-  to determine your prefered mode. You set this by setting the variable $ADODB_FETCH_MODE 
-  to either of the constants ADODB_FETCH_NUM (for numeric indexes) or ADODB_FETCH_ASSOC 
-  (using field names as an associative index).</p>
-<p>The default behaviour of ADOdb varies depending on the database you are using. 
-  For consistency, set the fetch mode to either ADODB_FETCH_NUM (for speed) or 
-  ADODB_FETCH_ASSOC (for convenience) at the beginning of your code. </p>
-<p><b>Selects: Counting Records</b></p>
-<p>Another problem with SELECTs is that some databases do not return the number 
-  of rows retrieved from a select statement. This is because the highest performance 
-  databases will return records to you even before the last record has been found. 
-</p>
-<p>In ADOdb, RecordCount( ) returns the number of rows returned, or will emulate 
-  it by buffering the rows and returning the count after all rows have been returned. 
-  This can be disabled for performance reasons when retrieving large recordsets 
-  by setting the global variable $ADODB_COUNTRECS = false. This variable is checked 
-  every time a query is executed, so you can selectively choose which recordsets 
-  to count.</p>
-<p>If you prefer to set $ADODB_COUNTRECS = false, ADOdb still has the PO_RecordCount( 
-  ) function. This will return the number of rows, or if it is not found, it will 
-  return an estimate using SELECT COUNT(*):</p>
-<pre>$rs = $db-&gt;Execute(&quot;select * from table where state=$state&quot;);
-$numrows = $rs-&gt;PO_RecordCount('table', &quot;state=$state&quot;);</pre>
-<p><b>Selects: Locking</b> </p>
-<p>SELECT statements are commonly used to implement row-level locking of tables. 
-  Other databases such as Oracle, Interbase, PostgreSQL and MySQL with InnoDB 
-  do not require row-level locking because they use versioning to display data 
-  consistent with a specific point in time.</p>
-<p>Currently, I recommend encapsulating the row-level locking in a separate function, 
-  such as RowLock($table, $where):</p>
-<pre>$connection-&gt;BeginTrans( );
-$connection-&gt;RowLock($table, $where); </pre>
-<pre><font color=green># some operation</font></pre>
-<pre>if ($ok) $connection-&gt;CommitTrans( );
-else $connection-&gt;RollbackTrans( );
-</pre>
-<p><b>Selects: Outer Joins</b></p>
-<p>Not all databases support outer joins. Furthermore the syntax for outer joins 
-  differs dramatically between database vendors. One portable (and possibly slower) 
-  method of implementing outer joins is using UNION.</p>
-<p>For example, an ANSI-92 left outer join between two tables t1 and t2 could 
-  look like:</p>
-<pre>SELECT t1.col1, t1.col2, t2.cola <br>  FROM t1 <i>LEFT JOIN</i> t2 ON t1.col = t2.col</pre>
-<p>This can be emulated using:</p>
-<pre>SELECT t1.col1, t1.col2, t2.cola FROM t1, t2 <br>	   WHERE t1.col = t2.col 
-   UNION ALL
-SELECT col1, col2, null FROM t1 <br>	   WHERE t1.col not in (select distinct col from t2)
-</pre>
-<p>Since ADOdb 2.13, we provide some hints in the connection object as to legal 
-  join variations. This is still incomplete and sometimes depends on the database 
-  version you are using, but is useful as a general guideline:</p>
-<p><font face="Courier New, Courier, mono">$conn-&gt;leftOuter</font>: holds the 
-  operator used for left outer joins (eg. '*='), or false if not known or not 
-  available.<br>
-  <font face="Courier New, Courier, mono">$conn-&gt;rightOuter</font>: holds the 
-  operator used for right outer joins (eg '=*'), or false if not known or not 
-  available.<br>
-  <font face="Courier New, Courier, mono">$conn-&gt;ansiOuter</font>: boolean 
-  that if true means that ANSI-92 style outer joins are supported, or false if 
-  not known.</p>
-<h3><b>Inserts</b> </h3>
-<p>When you create records, you need to generate unique id's for each record. 
-  There are two common techniques: (1) auto-incrementing columns and (2) sequences. 
-</p>
-<p>Auto-incrementing columns are supported by MySQL, Sybase and Microsoft Access 
-  and SQL Server. However most other databases do not support this feature. So 
-  for portability, you have little choice but to use sequences. Sequences are 
-  special functions that return a unique incrementing number every time you call 
-  it, suitable to be used as database keys. In ADOdb, we use the GenID( ) function. 
-  It has takes a parameter, the sequence name. Different tables can have different 
-  sequences. </p>
-<pre>$id = $connection-&gt;GenID('sequence_name');<br>$connection-&gt;Execute(&quot;insert into table (id, firstname, lastname) <br>			   values ($id, $firstname, $lastname)&quot;);</pre>
-<p>For databases that do not support sequences natively, ADOdb emulates sequences 
-  by creating a table for every sequence.</p>
-<h3><b>Binding</b></h3>
-<p>Binding variables in an SQL statement is another tricky feature. Binding is 
-  useful because it allows pre-compilation of SQL. When inserting multiple records 
-  into a database in a loop, binding can offer a 50% (or greater) speedup. However 
-  many databases such as Access and MySQL do not support binding natively and 
-  there is some overhead in emulating binding. Furthermore, different databases 
-  (specificly Oracle!) implement binding differently. My recommendation is to 
-  use binding if your database queries are too slow, but make sure you are using 
-  a database that supports it like Oracle. </p>
-<p>ADOdb supports portable Prepare/Execute with:</p>
-<pre>$stmt = $db-&gt;Prepare('select * from customers where custid=? and state=?');
-$rs = $db-&gt;Execute($stmt, array($id,'New York'));</pre>
-<p>Oracle uses named bind placeholders, not "?", so to support portable binding, we have Param() that generates 
-the correct placeholder (available since ADOdb 3.92):
-<pre><font color="#000000">$sql = <font color="#993300">'insert into table (col1,col2) values ('</font>.$DB-&gt;Param('a').<font color="#993300">','</font>.$DB-&gt;Param('b').<font color="#993300">')'</font>;
-<font color="#006600"># generates 'insert into table (col1,col2) values (?,?)'
-# or        'insert into table (col1,col2) values (:a,:b)</font>'
-$stmt = $DB-&gt;Prepare($sql);
-$stmt = $DB-&gt;Execute($stmt,array('one','two'));
-</font></pre>
-<a name="native"></a>
-<h2>Portable Native SQL</h2>
-<p>ADOdb provides the following functions for portably generating SQL functions 
-  as strings to be merged into your SQL statements (some are only available since 
-  ADOdb 3.92): </p>
-<table width="75%" border="1" align=center>
-  <tr> 
-    <td width=30%><b>Function</b></td>
-    <td><b>Description</b></td>
-  </tr>
-  <tr> 
-    <td>DBDate($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a date 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>DBTimeStamp($date)</td>
-    <td>Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp 
-      string formatted for INSERT/UPDATE</td>
-  </tr>
-  <tr> 
-    <td>SQLDate($date, $fmt)</td>
-    <td>Portably generate a date formatted using $fmt mask, for use in SELECT 
-      statements.</td>
-  </tr>
-  <tr> 
-    <td>OffsetDate($date, $ndays)</td>
-    <td>Portably generate a $date offset by $ndays.</td>
-  </tr>
-  <tr> 
-    <td>Concat($s1, $s2, ...)</td>
-    <td>Portably concatenate strings. Alternatively, for mssql use mssqlpo driver, 
-      which allows || operator.</td>
-  </tr>
-  <tr> 
-    <td>IfNull($fld, $replaceNull)</td>
-    <td>Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.</td>
-  </tr>
-  <tr>
-    <td>Param($name)</td>
-    <td>Generates bind placeholders, using ? or named conventions as appropriate.</td>
-  </tr>
-  <tr><td>$db->sysDate</td><td>Property that holds the SQL function that returns today's date</td>
-</tr>
-<tr><td>$db->sysTimeStamp</td><td>Property that holds the SQL function that returns the current
-timestamp (date+time).
-</td>
-</tr>
-<tr>
-<td>$db->concat_operator</td><td>Property that holds the concatenation operator
-</td>
-</tr>
-<tr><td>$db->length</td><td>Property that holds the name of the SQL strlen function.
-</td></tr>
-
-<tr><td>$db->upperCase</td><td>Property that holds the name of the SQL strtoupper function.
-</td></tr>
-<tr><td>$db->random</td><td>Property that holds the SQL to generate a random number between 0.00 and 1.00.
-</td>
-</tr>
-<tr><td>$db->substr</td><td>Property that holds the name of the SQL substring function.
-</td></tr>
-</table>
-<p>&nbsp; </p>
-<h2>DDL and Tuning</h2>
-There are database design tools such as ERWin or Dezign that allow you to generate data definition language commands such as ALTER TABLE or CREATE INDEX from Entity-Relationship diagrams. 
-<p>
-However if you prefer to use a PHP-based table creation scheme, adodb provides you with this feature. Here is the code to generate the SQL to create a table with: 
-<ol>
-	<li> Auto-increment primary key 'ID', </li>
-	<li>The person's 'NAME' VARCHAR(32) NOT NULL and defaults to '', </li>
-	<li>The date and time of record creation 'CREATED', </li>
-	<li> The person's 'AGE', defaulting to 0, type NUMERIC(16). </li>
-</ol>
-<p>
-Also create a compound index consisting of 'NAME' and 'AGE': 
-<pre>
-$datadict = <strong>NewDataDictionary</strong>($connection);
-$flds = " 
-<font color="#660000">  ID I AUTOINCREMENT PRIMARY,
-  NAME C(32) DEFAULT '' NOTNULL,
-  CREATED T DEFTIMESTAMP,
-  AGE N(16) DEFAULT 0</font>
-";
-$sql1 = $datadict-><strong>CreateTableSQL</strong>('tabname', $flds);
-$sql2 = $datadict-><strong>CreateIndexSQL</strong>('idx_name_age', 'tabname', 'NAME,AGE');
-</pre>
-
-<h3>Data Types</h3>
-<p>Stick to a few data types that are available in most databases. Char, varchar 
-  and numeric/number are supported by most databases. Most other data types (including 
-  integer, boolean and float) cannot be relied on being available. I recommend 
-  using char(1) or number(1) to hold booleans. </p>
-<p>Different databases have different ways of representing dates and timestamps/datetime. 
-  ADOdb attempts to display all dates in ISO (YYYY-MM-DD) format. ADOdb also provides 
-  DBDate( ) and DBTimeStamp( ) to convert dates to formats that are acceptable 
-  to that database. Both functions accept Unix integer timestamps and date strings 
-  in ISO format.</p>
-<pre>$date1 = $connection-&gt;DBDate(time( ));<br>$date2 = $connection-&gt;DBTimeStamp('2002-02-23 13:03:33');</pre>
-<p>We also provide functions to convert database dates to Unix timestamps:</p>
-<pre>$unixts = $recordset-&gt;UnixDate('#2002-02-30#'); <font color="green"># MS Access date =&gt; unix timestamp</font></pre>
-<p>For date calculations, we have OffsetDate which allows you to calculate dates such as <i>yesterday</i> and <i>next week</i> in a RDBMS independant fashion. For example, if we want to set a field to 6 hour from now, use:
-<pre>
-$sql = 'update table set dtimefld='.$db-&gt;OffsetDate($db-&gtsysTimeStamp, 6/24).' where ...';
-</pre>
-<p>The maximum length of a char/varchar field is also database specific. You can 
-  only assume that field lengths of up to 250 characters are supported. This is 
-  normally impractical for web based forum or content management systems. You 
-  will need to be familiar with how databases handle large objects (LOBs). ADOdb 
-  implements two functions, UpdateBlob( ) and UpdateClob( ) that allow you to 
-  update fields holding Binary Large Objects (eg. pictures) and Character Large 
-  Objects (eg. HTML articles):</p>
-<pre><font color=green># for oracle </font>
-$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1,empty_blob())'); 
-$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1'); 
-   
-<font color=green># non-oracle databases</font>
-$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); 
-$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
-</pre>
-<p>Null handling is another area where differences can occur. This is a mine-field, 
-  because 3-value logic is tricky.
-<p>In general, I avoid using nulls except for dates and default all my numeric 
-  and character fields to 0 or the empty string. This maintains consistency with 
-  PHP, where empty strings and zero are treated as equivalent, and avoids SQL 
-  ambiguities when you use the ANY and EXISTS operators. However if your database 
-  has significant amounts of missing or unknown data, using nulls might be a good 
-  idea. 
-  <p>
-  ADOdb also supports a portable <a href=http://phplens.com/adodb/reference.functions.concat.html#ifnull>IfNull</a> function, so you can define what to display
-  if the field contains a null.
-<h3><b>Stored Procedures</b></h3>
-<p>Stored procedures are another problem area. Some databases allow recordsets 
-  to be returned in a stored procedure (Microsoft SQL Server and Sybase), and 
-  others only allow output parameters to be returned. Stored procedures sometimes 
-  need to be wrapped in special syntax. For example, Oracle requires such code 
-  to be wrapped in an anonymous block with BEGIN and END. Also internal sql operators 
-  and functions such as +, ||, TRIM( ), SUBSTR( ) or INSTR( ) vary between vendors. 
-</p>
-<p>An example of how to call a stored procedure with 2 parameters and 1 return 
-  value follows:</p>
-<pre>	switch ($db->databaseType) {
-	case '<font color="#993300">mssql</font>':
-	  $sql = <font color="#000000"><font color="#993333">'<font color="#993300">SP_RUNSOMETHING</font>'</font></font>; break;
-	case '<font color="#993300">oci8</font>':
-	  $sql = 
-<font color="#993300">	  </font><font color="#000000"><font color="#993300">&quot;declare RETVAL integer;begin :RETVAL := </font><font color="#000000"><font color="#993333"><font color="#993300">SP_RUNSOMETHING</font></font></font><font color="#993300">(:myid,:group);end;&quot;;
-</font>	  break;</font>
-	default:
-	  die('<font color="#993300">Unsupported feature</font>');
-	}
-<font color="#000000"><font color="green">	# @RETVAL = SP_RUNSOMETHING @myid,@group</font>
-	$stmt = $db-&gt;PrepareSP($sql);	<br>	$db-&gt;Parameter($stmt,$id,'<font color="#993300">myid</font>'); 
-	$db-&gt;Parameter($stmt,$group,'<font color="#993300">group</font>');
-	<font color="green"># true indicates output parameter<br>	</font>$db-&gt;Parameter($stmt,$ret,'<font color="#993300">RETVAL</font>',true); 
-	$db-&gt;Execute($stmt); </font></pre>
-<p>As you can see, the ADOdb API is the same for both databases. But the stored 
-  procedure SQL syntax is quite different between databases and is not portable, 
-  so be forewarned! However sometimes you have little choice as some systems only 
-  allow data to be accessed via stored procedures. This is when the ultimate portability 
-  solution might be the only solution: <i>treating portable SQL as a localization 
-  exercise...</i></p>
-<h3><b>SQL as a Localization Exercise</b></h3>
-<p> In general to provide real portability, you will have to treat SQL coding 
-  as a localization exercise. In PHP, it has become common to define separate 
-  language files for English, Russian, Korean, etc. Similarly, I would suggest 
-  you have separate Sybase, Intebase, MySQL, etc files, and conditionally include 
-  the SQL based on the database. For example, each MySQL SQL statement would be 
-  stored in a separate variable, in a file called 'mysql-lang.inc.php'.</p>
-<pre>$sqlGetPassword = '<font color="#993300">select password from users where userid=%s</font>';
-$sqlSearchKeyword = &quot;<font color="#993300">SELECT * FROM articles WHERE match (title,body) against (%s</font>)&quot;;</pre>
-<p>In our main PHP file:</p>
-<pre><font color=green># define which database to load...</font>
-<b>$database = '<font color="#993300">mysql</font>';
-include_once(&quot;<font color="#993300">$database-lang.inc.php</font>&quot;);</b>
-
-$db = &amp;NewADOConnection($database);
-$db->PConnect(...) or die('<font color="#993300">Failed to connect to database</font>');
-
-<font color=green># search for a keyword $word</font>
-$rs = $db-&gt;Execute(sprintf($sqlSearchKeyWord,$db-&gt;qstr($word)));</pre>
-<p>Note that we quote the $word variable using the qstr( ) function. This is because 
-  each database quotes strings using different conventions.</p>
-<p>
-<h3>Final Thoughts</h3>
-<p>The best way to ensure that you have portable SQL is to have your data tables designed using 
-sound principles. Learn the theory of normalization and entity-relationship diagrams and model 
-your data carefully. Understand how joins and indexes work and how they are used to tune performance.
-<p> Visit the following page for more references on database theory and vendors: 
-  <a href="http://php.weblogs.com/sql_tutorial">http://php.weblogs.com/sql_tutorial</a>. 
-  Also read this article on <a href=http://phplens.com/lens/php-book/optimizing-debugging-php.php>Optimizing PHP</a>.
-<p>
-<font size=1>(c) 2002-2003 John Lim.</font>
-
-</body>
-</html>
Index: admin/include/lib/adodb/xmlschema.dtd
===================================================================
--- admin/include/lib/adodb/xmlschema.dtd	(revision 6370)
+++ admin/include/lib/adodb/xmlschema.dtd	(working copy)
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE adodb_schema [
-<!ELEMENT schema (table*, sql*)>
-<!ATTLIST schema version CDATA #REQUIRED>
-<!ELEMENT table ((field+|DROP), CONSTRAINT*, descr?, index*, data*)>
-<!ELEMENT field ((NOTNULL|KEY|PRIMARY)?, (AUTO|AUTOINCREMENT)?, (DEFAULT|DEFDATE|DEFTIMESTAMP)?, 
-NOQUOTE?, CONSTRAINT*, descr?)>
-<!ELEMENT data (row+)>
-<!ELEMENT row (f+)>
-<!ELEMENT f (#CDATA)>
-<!ELEMENT descr (#CDATA)>
-<!ELEMENT NOTNULL EMPTY>
-<!ELEMENT KEY EMPTY>
-<!ELEMENT PRIMARY EMPTY>
-<!ELEMENT AUTO EMPTY>
-<!ELEMENT AUTOINCREMENT EMPTY>
-<!ELEMENT DEFAULT EMPTY>
-<!ELEMENT DEFDATE EMPTY>
-<!ELEMENT DEFTIMESTAMP EMPTY>
-<!ELEMENT NOQUOTE EMPTY>
-<!ELEMENT DROP EMPTY>
-<!ELEMENT CONSTRAINT (#CDATA)>
-<!ATTLIST table name CDATA #REQUIRED platform CDATA #IMPLIED version CDATA #IMPLIED>
-<!ATTLIST field name CDATA #REQUIRED type (C|C2|X|X2|B|D|T|L|I|F|N) #REQUIRED size CDATA #IMPLIED>
-<!ATTLIST data platform CDATA #IMPLIED>
-<!ATTLIST f name CDATA #IMPLIED>
-<!ATTLIST DEFAULT VALUE CDATA #REQUIRED>
-<!ELEMENT index ((col+|DROP), CLUSTERED?, BITMAP?, UNIQUE?, FULLTEXT?, HASH?, descr?)>
-<!ELEMENT col (#CDATA)>
-<!ELEMENT CLUSTERED EMPTY>
-<!ELEMENT BITMAP EMPTY>
-<!ELEMENT UNIQUE EMPTY>
-<!ELEMENT FULLTEXT EMPTY>
-<!ELEMENT HASH EMPTY>
-<!ATTLIST index name CDATA #REQUIRED platform CDATA #IMPLIED>
-<!ELEMENT sql (query+, descr?)>
-<!ELEMENT query (#CDATA)>
-<!ATTLIST sql name CDATA #IMPLIED platform CDATA #IMPLIED, key CDATA, prefixmethod (AUTO|MANUAL|NONE) >
-] >
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-pear.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-pear.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-pear.inc.php	(working copy)
@@ -1,374 +0,0 @@
-<?php
-/** 
- * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
- * PEAR DB Emulation Layer for ADODB.
- *
- * The following code is modelled on PEAR DB code by Stig Bakken <ssb@fast.no>								   |
- * and Tomas V.V.Cox <cox@idecnet.com>.	Portions (c)1997-2002 The PHP Group.
- */
-
- /*
- We support:
- 
- DB_Common
- ---------
- 	query - returns PEAR_Error on error
-	limitQuery - return PEAR_Error on error
-	prepare - does not return PEAR_Error on error
-	execute - does not return PEAR_Error on error
-	setFetchMode - supports ASSOC and ORDERED
-	errorNative
-	quote
-	nextID
-	disconnect
-	
-	getOne
-	getAssoc
-	getRow
-	getCol
-	getAll
-	
- DB_Result
- ---------
- 	numRows - returns -1 if not supported
-	numCols
-	fetchInto - does not support passing of fetchmode
-	fetchRows - does not support passing of fetchmode
-	free
- */
- 
-define('ADODB_PEAR',dirname(__FILE__));
-include_once "PEAR.php";
-include_once ADODB_PEAR."/adodb-errorpear.inc.php";
-include_once ADODB_PEAR."/adodb.inc.php";
-
-if (!defined('DB_OK')) {
-define("DB_OK",	1);
-define("DB_ERROR",-1);
-
-// autoExecute constants
-define('DB_AUTOQUERY_INSERT', 1);
-define('DB_AUTOQUERY_UPDATE', 2);
-
-/**
- * This is a special constant that tells DB the user hasn't specified
- * any particular get mode, so the default should be used.
- */
-
-define('DB_FETCHMODE_DEFAULT', 0);
-
-/**
- * Column data indexed by numbers, ordered from 0 and up
- */
-
-define('DB_FETCHMODE_ORDERED', 1);
-
-/**
- * Column data indexed by column names
- */
-
-define('DB_FETCHMODE_ASSOC', 2);
-
-/* for compatibility */
-
-define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED);
-define('DB_GETMODE_ASSOC',   DB_FETCHMODE_ASSOC);
-
-/**
- * these are constants for the tableInfo-function
- * they are bitwised or'ed. so if there are more constants to be defined
- * in the future, adjust DB_TABLEINFO_FULL accordingly
- */
-
-define('DB_TABLEINFO_ORDER', 1);
-define('DB_TABLEINFO_ORDERTABLE', 2);
-define('DB_TABLEINFO_FULL', 3);
-}
-
-/**
- * The main "DB" class is simply a container class with some static
- * methods for creating DB objects as well as some utility functions
- * common to all parts of DB.
- *
- */
-
-class DB
-{
-	/**
-	 * Create a new DB object for the specified database type
-	 *
-	 * @param $type string database type, for example "mysql"
-	 *
-	 * @return object a newly created DB object, or a DB error code on
-	 * error
-	 */
-
-	function &factory($type)
-	{
-		include_once(ADODB_DIR."/drivers/adodb-$type.inc.php");
-		$obj = &NewADOConnection($type);
-		if (!is_object($obj)) $obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
-		return $obj;
-	}
-
-	/**
-	 * Create a new DB object and connect to the specified database
-	 *
-	 * @param $dsn mixed "data source name", see the DB::parseDSN
-	 * method for a description of the dsn format.  Can also be
-	 * specified as an array of the format returned by DB::parseDSN.
-	 *
-	 * @param $options mixed if boolean (or scalar), tells whether
-	 * this connection should be persistent (for backends that support
-	 * this).  This parameter can also be an array of options, see
-	 * DB_common::setOption for more information on connection
-	 * options.
-	 *
-	 * @return object a newly created DB connection object, or a DB
-	 * error object on error
-	 *
-	 * @see DB::parseDSN
-	 * @see DB::isError
-	 */
-	function &connect($dsn, $options = false)
-	{
-		if (is_array($dsn)) {
-			$dsninfo = $dsn;
-		} else {
-			$dsninfo = DB::parseDSN($dsn);
-		}
-		switch ($dsninfo["phptype"]) {
-			case 'pgsql': 	$type = 'postgres7'; break;
-			case 'ifx':		$type = 'informix9'; break;
-			default: 		$type = $dsninfo["phptype"]; break;
-		}
-
-		if (is_array($options) && isset($options["debug"]) &&
-			$options["debug"] >= 2) {
-			// expose php errors with sufficient debug level
-			 @include_once("adodb-$type.inc.php");
-		} else {
-			 @include_once("adodb-$type.inc.php");
-		}
-
-		@$obj =& NewADOConnection($type);
-		if (!is_object($obj)) {
-			$obj =& new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1);
-			return $obj;
-		}
-		if (is_array($options)) {
-			foreach($options as $k => $v) {
-				switch(strtolower($k)) {
-				case 'persist':
-				case 'persistent': 	$persist = $v; break;
-				#ibase
-				case 'dialect': 	$obj->dialect = $v; break;
-				case 'charset':		$obj->charset = $v; break;
-				case 'buffers':		$obj->buffers = $v; break;
-				#ado
-				case 'charpage':	$obj->charPage = $v; break;
-				#mysql
-				case 'clientflags': $obj->clientFlags = $v; break;
-				}
-			}
-		} else {
-		   	$persist = false;
-		}
-
-		if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket'];
-		else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port'];
-		
-		if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
-		else  $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']);
-		
-		if (!$ok) $obj = ADODB_PEAR_Error();
-		return $obj;
-	}
-
-	/**
-	 * Return the DB API version
-	 *
-	 * @return int the DB API version number
-	 */
-	function apiVersion()
-	{
-		return 2;
-	}
-
-	/**
-	 * Tell whether a result code from a DB method is an error
-	 *
-	 * @param $value int result code
-	 *
-	 * @return bool whether $value is an error
-	 */
-	function isError($value)
-	{
-		if (!is_object($value)) return false;
-		$class = get_class($value);
-		return $class == 'pear_error' || is_subclass_of($value, 'pear_error') || 
-				$class == 'db_error' || is_subclass_of($value, 'db_error');
-	}
-
-
-	/**
-	 * Tell whether a result code from a DB method is a warning.
-	 * Warnings differ from errors in that they are generated by DB,
-	 * and are not fatal.
-	 *
-	 * @param $value mixed result value
-	 *
-	 * @return bool whether $value is a warning
-	 */
-	function isWarning($value)
-	{
-		return false;
-		/*
-		return is_object($value) &&
-			(get_class( $value ) == "db_warning" ||
-			 is_subclass_of($value, "db_warning"));*/
-	}
-
-	/**
-	 * Parse a data source name
-	 *
-	 * @param $dsn string Data Source Name to be parsed
-	 *
-	 * @return array an associative array with the following keys:
-	 *
-	 *  phptype: Database backend used in PHP (mysql, odbc etc.)
-	 *  dbsyntax: Database used with regards to SQL syntax etc.
-	 *  protocol: Communication protocol to use (tcp, unix etc.)
-	 *  hostspec: Host specification (hostname[:port])
-	 *  database: Database to use on the DBMS server
-	 *  username: User name for login
-	 *  password: Password for login
-	 *
-	 * The format of the supplied DSN is in its fullest form:
-	 *
-	 *  phptype(dbsyntax)://username:password@protocol+hostspec/database
-	 *
-	 * Most variations are allowed:
-	 *
-	 *  phptype://username:password@protocol+hostspec:110//usr/db_file.db
-	 *  phptype://username:password@hostspec/database_name
-	 *  phptype://username:password@hostspec
-	 *  phptype://username@hostspec
-	 *  phptype://hostspec/database
-	 *  phptype://hostspec
-	 *  phptype(dbsyntax)
-	 *  phptype
-	 *
-	 * @author Tomas V.V.Cox <cox@idecnet.com>
-	 */
-	function parseDSN($dsn)
-	{
-		if (is_array($dsn)) {
-			return $dsn;
-		}
-
-		$parsed = array(
-			'phptype'  => false,
-			'dbsyntax' => false,
-			'protocol' => false,
-			'hostspec' => false,
-			'database' => false,
-			'username' => false,
-			'password' => false
-		);
-
-		// Find phptype and dbsyntax
-		if (($pos = strpos($dsn, '://')) !== false) {
-			$str = substr($dsn, 0, $pos);
-			$dsn = substr($dsn, $pos + 3);
-		} else {
-			$str = $dsn;
-			$dsn = NULL;
-		}
-
-		// Get phptype and dbsyntax
-		// $str => phptype(dbsyntax)
-		if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
-			$parsed['phptype'] = $arr[1];
-			$parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
-		} else {
-			$parsed['phptype'] = $str;
-			$parsed['dbsyntax'] = $str;
-		}
-
-		if (empty($dsn)) {
-			return $parsed;
-		}
-
-		// Get (if found): username and password
-		// $dsn => username:password@protocol+hostspec/database
-		if (($at = strpos($dsn,'@')) !== false) {
-			$str = substr($dsn, 0, $at);
-			$dsn = substr($dsn, $at + 1);
-			if (($pos = strpos($str, ':')) !== false) {
-				$parsed['username'] = urldecode(substr($str, 0, $pos));
-				$parsed['password'] = urldecode(substr($str, $pos + 1));
-			} else {
-				$parsed['username'] = urldecode($str);
-			}
-		}
-
-		// Find protocol and hostspec
-		// $dsn => protocol+hostspec/database
-		if (($pos=strpos($dsn, '/')) !== false) {
-			$str = substr($dsn, 0, $pos);
-			$dsn = substr($dsn, $pos + 1);
-		} else {
-			$str = $dsn;
-			$dsn = NULL;
-		}
-
-		// Get protocol + hostspec
-		// $str => protocol+hostspec
-		if (($pos=strpos($str, '+')) !== false) {
-			$parsed['protocol'] = substr($str, 0, $pos);
-			$parsed['hostspec'] = urldecode(substr($str, $pos + 1));
-		} else {
-			$parsed['hostspec'] = urldecode($str);
-		}
-
-		// Get dabase if any
-		// $dsn => database
-		if (!empty($dsn)) {
-			$parsed['database'] = $dsn;
-		}
-
-		return $parsed;
-	}
-
-	/**
-	 * Load a PHP database extension if it is not loaded already.
-	 *
-	 * @access public
-	 *
-	 * @param $name the base name of the extension (without the .so or
-	 * .dll suffix)
-	 *
-	 * @return bool true if the extension was already or successfully
-	 * loaded, false if it could not be loaded
-	 */
-	function assertExtension($name)
-	{
-		if (!extension_loaded($name)) {
-			$dlext = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : '.so';
-			@dl($name . $dlext);
-		}
-		if (!extension_loaded($name)) {
-			return false;
-		}
-		return true;
-	}
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-active-record.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-active-record.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-active-record.inc.php	(working copy)
@@ -1,625 +0,0 @@
-<?php
-/*
-
-@version V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Latest version is available at http://adodb.sourceforge.net
- 
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Active Record implementation. Superset of Zend Framework's.
-  
-  Version 0.07
-  
-  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
-  	for info on Ruby on Rails Active Record implementation
-*/
-
-global $_ADODB_ACTIVE_DBS;
-global $ADODB_ACTIVE_CACHESECS; // set to true to enable caching of metadata such as field info
-global $ACTIVE_RECORD_SAFETY; // set to false to disable safety checks
-
-// array of ADODB_Active_DB's, indexed by ADODB_Active_Record->_dbat
-$_ADODB_ACTIVE_DBS = array();
-$ACTIVE_RECORD_SAFETY = true;
-
-class ADODB_Active_DB {
-	var $db; // ADOConnection
-	var $tables; // assoc array of ADODB_Active_Table objects, indexed by tablename
-}
-
-class ADODB_Active_Table {
-	var $name; // table name
-	var $flds; // assoc array of adofieldobjs, indexed by fieldname
-	var $keys; // assoc array of primary keys, indexed by fieldname
-	var $_created; // only used when stored as a cached file
-}
-
-// returns index into $_ADODB_ACTIVE_DBS
-function ADODB_SetDatabaseAdapter(&$db)
-{
-	global $_ADODB_ACTIVE_DBS;
-	
-		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
-			if (PHP_VERSION >= 5) {
-				if ($d->db === $db) return $k;
-			} else {
-				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) 
-					return $k;
-			}
-		}
-		
-		$obj = new ADODB_Active_DB();
-		$obj->db =& $db;
-		$obj->tables = array();
-		
-		$_ADODB_ACTIVE_DBS[] = $obj;
-		
-		return sizeof($_ADODB_ACTIVE_DBS)-1;
-}
-
-
-class ADODB_Active_Record {
-	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
-	var $_table; // tablename, if set in class definition then use it as table name
-	var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat]
-	var $_where; // where clause set in Load()
-	var $_saved = false; // indicates whether data is already inserted.
-	var $_lasterr = false; // last error message
-	var $_original = false; // the original values loaded or inserted, refreshed on update
-	
-	// should be static
-	function SetDatabaseAdapter(&$db) 
-	{
-		return ADODB_SetDatabaseAdapter($db);
-	}
-	
-	// php4 constructor
-	function ADODB_Active_Record($table = false, $pkeyarr=false, $db=false)
-	{
-		ADODB_Active_Record::__construct($table,$pkeyarr,$db);
-	}
-	
-	// php5 constructor
-	function __construct($table = false, $pkeyarr=false, $db=false)
-	{
-	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS;
-	
-		if ($db == false && is_object($pkeyarr)) {
-			$db = $pkeyarr;
-			$pkeyarr = false;
-		}
-		
-		if (!$table) { 
-			if (!empty($this->_table)) $table = $this->_table;
-			else $table = $this->_pluralize(get_class($this));
-		}
-		if ($db) {
-			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
-		} else
-			$this->_dbat = sizeof($_ADODB_ACTIVE_DBS)-1;
-		
-		
-		if ($this->_dbat < 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor');
-		
-		$this->_table = $table;
-		$this->_tableat = $table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future
-		$this->UpdateActiveTable($pkeyarr);
-	}
-	
-	function __wakeup()
-	{
-  		$class = get_class($this);
-  		new $class;
-	}
-	
-	function _pluralize($table)
-	{
-		$ut = strtoupper($table);
-		$len = strlen($table);
-		$lastc = $ut[$len-1];
-		$lastc2 = substr($ut,$len-2);
-		switch ($lastc) {
-		case 'S':
-			return $table.'es';	
-		case 'Y':
-			return substr($table,0,$len-1).'ies';
-		case 'X':	
-			return $table.'es';
-		case 'H': 
-			if ($lastc2 == 'CH' || $lastc2 == 'SH')
-				return $table.'es';
-		default:
-			return $table.'s';
-		}
-	}
-	
-	//////////////////////////////////
-	
-	// update metadata
-	function UpdateActiveTable($pkeys=false,$forceUpdate=false)
-	{
-	global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS;
-	
-		$activedb =& $_ADODB_ACTIVE_DBS[$this->_dbat];
-
-		$table = $this->_table;
-		$tables = $activedb->tables;
-		$tableat = $this->_tableat;
-		if (!$forceUpdate && !empty($tables[$tableat])) {
-			$tobj =& $tables[$tableat];
-			foreach($tobj->flds as $name => $fld) 
-				$this->$name = null;
-			return;
-		}
-		
-		$db =& $activedb->db;
-		$fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache';
-		if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) {
-			$fp = fopen($fname,'r');
-			@flock($fp, LOCK_SH);
-			$acttab = unserialize(fread($fp,100000));
-			fclose($fp);
-			if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { 
-				// abs(rand()) randomizes deletion, reducing contention to delete/refresh file
-				// ideally, you should cache at least 32 secs
-				$activedb->tables[$table] = $acttab;
-				
-				//if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname");
-			  	return;
-			} else if ($db->debug) {
-				ADOConnection::outp("Refreshing cached active record file: $fname");
-			}
-		}
-		$activetab = new ADODB_Active_Table();
-		$activetab->name = $table;
-		
-		
-		$cols = $db->MetaColumns($table);
-		if (!$cols) {
-			$this->Error("Invalid table name: $table",'UpdateActiveTable'); 
-			return false;
-		}
-		$fld = reset($cols);
-		if (!$pkeys) {
-			if (isset($fld->primary_key)) {
-				$pkeys = array();
-				foreach($cols as $name => $fld) {
-					if (!empty($fld->primary_key)) $pkeys[] = $name;
-				}
-			} else	
-				$pkeys = $this->GetPrimaryKeys($db, $table);
-		}
-		if (empty($pkeys)) {
-			$this->Error("No primary key found for table $table",'UpdateActiveTable');
-			return false;
-		}
-		
-		$attr = array();
-		$keys = array();
-		
-		switch($ADODB_ASSOC_CASE) {
-		case 0:
-			foreach($cols as $name => $fldobj) {
-				$name = strtolower($name);
-				$this->$name = null;
-				$attr[$name] = $fldobj;
-			}
-			foreach($pkeys as $k => $name) {
-				$keys[strtolower($name)] = strtolower($name);
-			}
-			break;
-			
-		case 1: 
-			foreach($cols as $name => $fldobj) {
-				$name = strtoupper($name);
-				$this->$name = null;
-				$attr[$name] = $fldobj;
-			}
-			
-			foreach($pkeys as $k => $name) {
-				$keys[strtoupper($name)] = strtoupper($name);
-			}
-			break;
-		default:
-			foreach($cols as $name => $fldobj) {
-				$name = ($fldobj->name);
-				$this->$name = null;
-				$attr[$name] = $fldobj;
-			}
-			foreach($pkeys as $k => $name) {
-				$keys[$name] = $cols[$name]->name;
-			}
-			break;
-		}
-		
-		$activetab->keys = $keys;
-		$activetab->flds = $attr;
-
-		if ($ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR) {
-			$activetab->_created = time();
-			$s = serialize($activetab);
-			if (!function_exists('adodb_write_file')) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-			adodb_write_file($fname,$s);
-		}
-		$activedb->tables[$table] = $activetab;
-	}
-	
-	function GetPrimaryKeys(&$db, $table)
-	{
-		return $db->MetaPrimaryKeys($table);
-	}
-	
-	// error handler for both PHP4+5. 
-	function Error($err,$fn)
-	{
-	global $_ADODB_ACTIVE_DBS;
-	
-		$fn = get_class($this).'::'.$fn;
-		$this->_lasterr = $fn.': '.$err;
-		
-		if ($this->_dbat < 0) $db = false;
-		else {
-			$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
-			$db =& $activedb->db;
-		}
-		
-		if (function_exists('adodb_throw')) {	
-			if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
-			else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
-		} else
-			if (!$db || $db->debug) ADOConnection::outp($this->_lasterr);
-		
-	}
-	
-	// return last error message
-	function ErrorMsg()
-	{
-		if (!function_exists('adodb_throw')) {
-			if ($this->_dbat < 0) $db = false;
-			else $db = $this->DB();
-		
-			// last error could be database error too
-			if ($db && $db->ErrorMsg()) return $db->ErrorMsg();
-		}
-		return $this->_lasterr;
-	}
-	
-	function ErrorNo() 
-	{
-		if ($this->_dbat < 0) return -9999; // no database connection...
-		$db = $this->DB();
-		
-		return (int) $db->ErrorNo();
-	}
-
-
-	// retrieve ADOConnection from _ADODB_Active_DBs
-	function &DB()
-	{
-	global $_ADODB_ACTIVE_DBS;
-	
-		if ($this->_dbat < 0) {
-			$false = false;
-			$this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB");
-			return $false;
-		}
-		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
-		$db =& $activedb->db;
-		return $db;
-	}
-	
-	// retrieve ADODB_Active_Table
-	function &TableInfo()
-	{
-	global $_ADODB_ACTIVE_DBS;
-	
-		$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
-		$table =& $activedb->tables[$this->_tableat];
-		return $table;
-	}
-	
-	// set a numeric array (using natural table field ordering) as object properties
-	function Set(&$row)
-	{
-	global $ACTIVE_RECORD_SAFETY;
-	
-		$db =& $this->DB();
-		
-		if (!$row) {
-			$this->_saved = false;		
-			return false;
-		}
-		
-		$this->_saved = true;
-		
-		$table =& $this->TableInfo();
-		if ($ACTIVE_RECORD_SAFETY && sizeof($table->flds) != sizeof($row)) {
-			$this->Error("Table structure of $this->_table has changed","Load");
-			return false;
-		}
-		
-		$cnt = 0;
-		foreach($table->flds as $name=>$fld) {
-			$this->$name = $row[$cnt];
-			$cnt += 1;
-		}
-		$this->_original = $row;
-		return true;
-	}
-	
-	// get last inserted id for INSERT
-	function LastInsertID(&$db,$fieldname)
-	{
-		if ($db->hasInsertID)
-			$val = $db->Insert_ID($this->_table,$fieldname);
-		else
-			$val = false;
-			
-		if (is_null($val) || $val === false) {
-			// this might not work reliably in multi-user environment
-			return $db->GetOne("select max(".$fieldname.") from ".$this->_table);
-		}
-		return $val;
-	}
-	
-	// quote data in where clause
-	function doquote(&$db, $val,$t)
-	{
-		switch($t) {
-		case 'D':
-		case 'T':
-			if (empty($val)) return 'null';
-			
-		case 'C':
-		case 'X':
-			if (is_null($val)) return 'null';
-			
-			if (strncmp($val,"'",1) != 0 && substr($val,strlen($val)-1,1) != "'") { 
-				return $db->qstr($val);
-				break;
-			}
-		default:
-			return $val;
-			break;
-		}
-	}
-	
-	// generate where clause for an UPDATE/SELECT
-	function GenWhere(&$db, &$table)
-	{
-		$keys = $table->keys;
-		$parr = array();
-		
-		foreach($keys as $k) {
-			$f = $table->flds[$k];
-			if ($f) {
-				$parr[] = $k.' = '.$this->doquote($db,$this->$k,$db->MetaType($f->type));
-			}
-		}
-		return implode(' and ', $parr);
-	}
-	
-	
-	//------------------------------------------------------------ Public functions below
-	
-	function Load($where,$bindarr=false)
-	{
-		$db =& $this->DB(); if (!$db) return false;
-		$this->_where = $where;
-		
-		$save = $db->SetFetchMode(ADODB_FETCH_NUM);
-		$row = $db->GetRow("select * from ".$this->_table.' WHERE '.$where,$bindarr);
-		$db->SetFetchMode($save);
-		
-		return $this->Set($row);
-	}
-	
-	// false on error
-	function Save()
-	{
-		if ($this->_saved) $ok = $this->Update();
-		else $ok = $this->Insert();
-		
-		return $ok;
-	}
-	
-	// false on error
-	function Insert()
-	{
-		$db =& $this->DB(); if (!$db) return false;
-		$cnt = 0;
-		$table =& $this->TableInfo();
-		
-		$valarr = array();
-		$names = array();
-		$valstr = array();
-
-		foreach($table->flds as $name=>$fld) {
-			$val = $this->$name;
-			if(!is_null($val) || !array_key_exists($name, $table->keys)) {
-				$valarr[] = $val;
-				$names[] = $name;
-				$valstr[] = $db->Param($cnt);
-				$cnt += 1;
-			}
-		}
-		
-		if (empty($names)){
-			foreach($table->flds as $name=>$fld) {
-				$valarr[] = null;
-				$names[] = $name;
-				$valstr[] = $db->Param($cnt);
-				$cnt += 1;
-			}
-		}
-		$sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')';
-		$ok = $db->Execute($sql,$valarr);
-		
-		if ($ok) {
-			$this->_saved = true;
-			$autoinc = false;
-			foreach($table->keys as $k) {
-				if (is_null($this->$k)) {
-					$autoinc = true;
-					break;
-				}
-			}
-			if ($autoinc && sizeof($table->keys) == 1) {
-				$k = reset($table->keys);
-				$this->$k = $this->LastInsertID($db,$k);
-			}
-		}
-		
-		$this->_original = $valarr;
-		return !empty($ok);
-	}
-	
-	function Delete()
-	{
-		$db =& $this->DB(); if (!$db) return false;
-		$table =& $this->TableInfo();
-		
-		$where = $this->GenWhere($db,$table);
-		$sql = 'DELETE FROM '.$this->_table.' WHERE '.$where;
-		$ok = $db->Execute($sql);
-		
-		return $ok ? true : false;
-	}
-	
-	// returns an array of active record objects
-	function &Find($whereOrderBy,$bindarr=false,$pkeysArr=false)
-	{
-		$db =& $this->DB(); if (!$db || empty($this->_table)) return false;
-		$arr =& $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr);
-		return $arr;
-	}
-	
-	// returns 0 on error, 1 on update, 2 on insert
-	function Replace()
-	{
-	global $ADODB_ASSOC_CASE;
-		
-		$db =& $this->DB(); if (!$db) return false;
-		$table =& $this->TableInfo();
-		
-		$pkey = $table->keys;
-		
-		foreach($table->flds as $name=>$fld) {
-			$val = $this->$name;
-			/*
-			if (is_null($val)) {
-				if (isset($fld->not_null) && $fld->not_null) {
-					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
-					else {
-						$this->Error("Cannot update null into $name","Replace");
-						return false;
-					}
-				}
-			}*/
-			if (is_null($val) && !empty($fld->auto_increment)) {
-            	continue;
-            }
-			$t = $db->MetaType($fld->type);
-			$arr[$name] = $this->doquote($db,$val,$t);
-			$valarr[] = $val;
-		}
-		
-		if (!is_array($pkey)) $pkey = array($pkey);
-		
-		
-		if ($ADODB_ASSOC_CASE == 0) 
-			foreach($pkey as $k => $v)
-				$pkey[$k] = strtolower($v);
-		elseif ($ADODB_ASSOC_CASE == 0) 
-			foreach($pkey as $k => $v)
-				$pkey[$k] = strtoupper($v);
-				
-		$ok = $db->Replace($this->_table,$arr,$pkey);
-		if ($ok) {
-			$this->_saved = true; // 1= update 2=insert
-			if ($ok == 2) {
-				$autoinc = false;
-				foreach($table->keys as $k) {
-					if (is_null($this->$k)) {
-						$autoinc = true;
-						break;
-					}
-				}
-				if ($autoinc && sizeof($table->keys) == 1) {
-					$k = reset($table->keys);
-					$this->$k = $this->LastInsertID($db,$k);
-				}
-			}
-			
-			$this->_original =& $valarr;
-		} 
-		return $ok;
-	}
-
-	// returns 0 on error, 1 on update, -1 if no change in data (no update)
-	function Update()
-	{
-		$db =& $this->DB(); if (!$db) return false;
-		$table =& $this->TableInfo();
-		
-		$where = $this->GenWhere($db, $table);
-		
-		if (!$where) {
-			$this->error("Where missing for table $table", "Update");
-			return false;
-		}
-		$valarr = array(); 
-		$neworig = array();
-		$pairs = array();
-		$i = -1;
-		$cnt = 0;
-		foreach($table->flds as $name=>$fld) {
-			$i += 1;
-			$val = $this->$name;
-			$neworig[] = $val;
-			
-			if (isset($table->keys[$name])) {
-				continue;
-			}
-			
-			if (is_null($val)) {
-				if (isset($fld->not_null) && $fld->not_null) {
-					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
-					else {
-						$this->Error("Cannot set field $name to NULL","Update");
-						return false;
-					}
-				}
-			}
-			
-			if (isset($this->_original[$i]) && $val == $this->_original[$i]) {
-				continue;
-			}			
-			$valarr[] = $val;
-			$pairs[] = $name.'='.$db->Param($cnt);
-			$cnt += 1;
-		}
-		
-		
-		if (!$cnt) return -1;
-		$sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where;
-		$ok = $db->Execute($sql,$valarr);
-		if ($ok) {
-			$this->_original =& $neworig;
-			return 1;
-		}
-		return 0;
-	}
-	
-	function GetAttributeNames()
-	{
-		$table =& $this->TableInfo();
-		if (!$table) return false;
-		return array_keys($table->flds);
-	}
-	
-};
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/server.php
===================================================================
--- admin/include/lib/adodb/server.php	(revision 6370)
+++ admin/include/lib/adodb/server.php	(working copy)
@@ -1,100 +0,0 @@
-<?php
-
-/** 
- * @version V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
- */
- 
-/* Documentation on usage is at http://php.weblogs.com/adodb_csv
- *
- * Legal query string parameters:
- * 
- * sql = holds sql string
- * nrows = number of rows to return 
- * offset = skip offset rows of data
- * fetch = $ADODB_FETCH_MODE
- * 
- * example:
- *
- * http://localhost/php/server.php?select+*+from+table&nrows=10&offset=2
- */
-
-
-/* 
- * Define the IP address you want to accept requests from 
- * as a security measure. If blank we accept anyone promisciously!
- */
-$ACCEPTIP = '127.0.0.1';
-
-/*
- * Connection parameters
- */
-$driver = 'mysql';
-$host = 'localhost'; // DSN for odbc
-$uid = 'root';
-$pwd = 'garbase-it-is';
-$database = 'test';
-
-/*============================ DO NOT MODIFY BELOW HERE =================================*/
-// $sep must match csv2rs() in adodb.inc.php
-$sep = ' :::: ';
-
-include('./adodb.inc.php');
-include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-
-function err($s)
-{
-	die('**** '.$s.' ');
-}
-
-// undo stupid magic quotes
-function undomq(&$m) 
-{
-	if (get_magic_quotes_gpc()) {
-		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
-		
-	}
-	return $m;
-}
-
-///////////////////////////////////////// DEFINITIONS
-
-
-$remote = $_SERVER["REMOTE_ADDR"]; 
- 
-
-if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
- 	err("Unauthorised client: '$remote'");
-	
-	
-if (empty($_REQUEST['sql'])) err('No SQL');
-
-
-$conn = &ADONewConnection($driver);
-
-if (!$conn->Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
-$sql = undomq($_REQUEST['sql']);
-
-if (isset($_REQUEST['fetch']))
-	$ADODB_FETCH_MODE = $_REQUEST['fetch'];
-	
-if (isset($_REQUEST['nrows'])) {
-	$nrows = $_REQUEST['nrows'];
-	$offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
-	$rs = $conn->SelectLimit($sql,$nrows,$offset);
-} else 
-	$rs = $conn->Execute($sql);
-if ($rs){ 
-	//$rs->timeToLive = 1;
-	echo _rs2serialize($rs,$conn,$sql);
-	$rs->Close();
-} else
-	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/license.txt
===================================================================
--- admin/include/lib/adodb/license.txt	(revision 6370)
+++ admin/include/lib/adodb/license.txt	(working copy)
@@ -1,182 +0,0 @@
-ADOdb is dual licensed using BSD and LGPL. 
-
-In plain English, you do not need to distribute your application  in source code form, nor do you need to distribute ADOdb source code, provided you follow the rest of terms of the BSD license.
-
-For more info about ADOdb, visit http://adodb.sourceforge.net/
-
-BSD Style-License
-=================
-
-Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list 
-of conditions and the following disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list 
-of conditions and the following disclaimer in the documentation and/or other materials 
-provided with the distribution. 
-
-Neither the name of the John Lim nor the names of its contributors may be used to 
-endorse or promote products derived from this software without specific prior written 
-permission. 
-
-DISCLAIMER:
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-JOHN LIM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-==========================================================
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999 
- 
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
- 
- 
-Preamble
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
-
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
-
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
-
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
-
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
-
-
-a) The modified work must itself be a software library. 
-b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
-c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
-d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
-(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
-
-In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
-
-
-a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
-b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
-c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
-d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
-e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
-
-
-a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
-b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
-
-NO WARRANTY 
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-
-
-END OF TERMS AND CONDITIONS
\ No newline at end of file
Index: admin/include/lib/adodb/tests/test-php5.php
===================================================================
--- admin/include/lib/adodb/tests/test-php5.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test-php5.php	(working copy)
@@ -1,108 +0,0 @@
-<?php
-/*
-  V4.81 3 May 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
- */
-
-
-error_reporting(E_ALL);
-
-$path = dirname(__FILE__);
-
-include("$path/../adodb-exceptions.inc.php");
-include("$path/../adodb.inc.php");	
-
-echo "<h3>PHP ".PHP_VERSION."</h3>\n";
-try {
-
-$dbt = 'mysql';
-
-try {
-switch($dbt) {
-case 'oci8po':
-	$db = NewADOConnection("oci8po");
-	
-	$db->Connect('','scott','natsoft');
-	break;
-default:
-case 'mysql':
-	$db = NewADOConnection("mysql");
-	$db->Connect('localhost','root','','northwind');
-	break;
-	
-case 'mysqli':
-	$db = NewADOConnection("mysqli://root:@localhost/northwind");
-	//$db->Connect('localhost','root','','test');
-	break;
-}
-} catch (exception $e){
-	echo "Connect Failed";
-	adodb_pr($e);
-	die();
-}
-
-$db->debug=1;
-
-$cnt = $db->GetOne("select count(*) from adoxyz where ?<id and id<?",array(10,20));
-$stmt = $db->Prepare("select * from adoxyz where ?<id and id<?");
-if (!$stmt) echo $db->ErrorMsg(),"\n";
-$rs = $db->Execute($stmt,array(10,20));
-
-echo  "<hr /> Foreach Iterator Test (rand=".rand().")<hr />";
-$i = 0;
-foreach($rs as $v) {
-	$i += 1;
-	echo "rec $i: "; $s1 = adodb_pr($v,true); $s2 = adodb_pr($rs->fields,true);
-	if ($s1 != $s2 && !empty($v)) {adodb_pr($s1); adodb_pr($s2);}
-	else echo "passed<br>";
-	flush();
-}
-
-
-if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
-else echo "Count $i is correct<br>";
-
-$rs = $db->Execute("select bad from badder");
-
-} catch (exception $e) {
-	adodb_pr($e);
-	echo "<h3>adodb_backtrace:</h3>\n";
-	$e = adodb_backtrace($e->gettrace());
-}
-
-$rs = $db->Execute("select distinct id, firstname,lastname from adoxyz order by id");
-echo "Result=\n",$rs,"</p>";
-
-echo "<h3>Active Record</h3>";
-try {
-	include_once("../adodb-active-record.inc.php");
-	class City extends ADOdb_Active_Record{};
-	$a = new City();
-
-} catch(exception $e){
-	echo $e->getMessage();
-}
-
-try {
-	
-	ADOdb_Active_Record::SetDatabaseAdapter($db);
-	$a = new City();
-	
-	echo "<p>Successfully created City()<br>";
-	var_dump($a->GetPrimaryKeys());
-	$a->city = 'Kuala Lumpur';
-	$a->Save();
-	$a->Update();
-	$a->SetPrimaryKeys(array('city'));	
-	$a->country = "M'sia";
-	$a->save();
-	$a->Delete();
-} catch(exception $e){
-	echo $e->getMessage();
-}
-
-include_once("test-active-record.php");
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/xmlschema.xml
===================================================================
--- admin/include/lib/adodb/tests/xmlschema.xml	(revision 6370)
+++ admin/include/lib/adodb/tests/xmlschema.xml	(working copy)
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<schema version="0.3">
-  <table name="mytable">
-    <field name="row1" type="I">
-      <descr>An integer row that's a primary key and autoincrements</descr>
-      <KEY/>
-      <AUTOINCREMENT/>
-    </field>
-    <field name="row2" type="C" size="16">
-      <descr>A 16 character varchar row that can't be null</descr>
-      <NOTNULL/>
-    </field>
-    <index name="myindex">
-      <col>row1</col>
-      <col>row2</col>
-    </index>
-  </table>
-  <sql>
-    <descr>SQL to be executed only on specific platforms</descr>
-    <query platform="postgres|postgres7">
-      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
-    </query>
-    <query platform="mysql">
-      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
-    </query>
-	<query platform="mssql">
-      insert into mytable ( row1, row2 ) values ( 12, 'Microsoft stuff' )
-    </query>
-  </sql>
-  <table name="obsoletetable">
-    <DROP/>
-  </table>
-</schema>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/benchmark.php
===================================================================
--- admin/include/lib/adodb/tests/benchmark.php	(revision 6370)
+++ admin/include/lib/adodb/tests/benchmark.php	(working copy)
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>ADODB Benchmarks</title>
-</head> 
-
-<body>
-<?php 
-/*
-V4.81 3 May 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Benchmark code to test the speed to the ADODB library with different databases.
-  This is a simplistic benchmark to be used as the basis for further testing.
-  It should not be used as proof of the superiority of one database over the other.
-*/ 
- 
-$testmssql = true;
-//$testvfp = true;
-$testoracle = true;
-$testado = true; 
-$testibase = true;
-$testaccess = true;
-$testmysql = true;
-$testsqlite = true;;
-
-set_time_limit(240); // increase timeout
-
-include("../tohtml.inc.php");
-include("../adodb.inc.php");
-
-function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
-{
-GLOBAL $ADODB_version,$ADODB_FETCH_MODE;
-
-	adodb_backtrace();
-	
-	$max = 100;
-	$sql = 'select * from ADOXYZ';
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-	//print "<h3>ADODB Version: $ADODB_version Host: <i>$db->host</i> &nbsp; Database: <i>$db->database</i></h3>";
-	
-	// perform query once to cache results so we are only testing throughput 
-	$rs = $db->Execute($sql);
-	if (!$rs){
-		print "Error in recordset<p>";
-		return;
-	}	
-	$arr = $rs->GetArray();
-	//$db->debug = true;
-	global $ADODB_COUNTRECS;
-	$ADODB_COUNTRECS = false;
-	$start = microtime();
-	for ($i=0; $i < $max; $i++) {
-		$rs =& $db->Execute($sql);	
-		$arr =& $rs->GetArray();
-	   //		 print $arr[0][1];
-	}
-	$end =  microtime();
-	$start = explode(' ',$start);
-	$end = explode(' ',$end);
-	
-	//print_r($start);
-	//print_r($end);
-	
-	  //  print_r($arr);
-	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
-	printf ("<p>seconds = %8.2f for %d iterations each with %d records</p>",$total,$max, sizeof($arr));
-	flush();
-
-
-		//$db->Close();
-}
-include("testdatabases.inc.php");
-
-?>
-
-
-</body>
-</html>
Index: admin/include/lib/adodb/tests/test-datadict.php
===================================================================
--- admin/include/lib/adodb/tests/test-datadict.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test-datadict.php	(working copy)
@@ -1,248 +0,0 @@
-<?php
-/*
-
-  V4.81 3 May 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
-
-*/
-
-error_reporting(E_ALL);
-include_once('../adodb.inc.php');
-
-foreach(array('sapdb','sybase','mysql','access','oci8po','postgres','odbc_mssql','odbc','db2','firebird','informix') as $dbType) {
-	echo "<h3>$dbType</h3><p>";
-	$db = NewADOConnection($dbType);
-	$dict = NewDataDictionary($db);
-
-	if (!$dict) continue;
-	$dict->debug = 1;
-	
-	$opts = array('REPLACE','mysql' => 'ENGINE=INNODB', 'oci8' => 'TABLESPACE USERS');
-	
-/*	$flds = array(
-		array('id',	'I',								
-							'AUTO','KEY'),
-							
-		array('name' => 'firstname', 'type' => 'varchar','size' => 30,
-							'DEFAULT'=>'Joan'),
-							
-		array('lastname','varchar',28,
-							'DEFAULT'=>'Chen','key'),
-							
-		array('averylonglongfieldname','X',1024,
-							'NOTNULL','default' => 'test'),
-							
-		array('price','N','7.2',
-							'NOTNULL','default' => '0.00'),
-							
-		array('MYDATE', 'D', 
-							'DEFDATE'),
-		array('TS','T',
-							'DEFTIMESTAMP')
-	);*/
-	
-	$flds = "
-ID            I           AUTO KEY,
-FIRSTNAME     VARCHAR(30) DEFAULT 'Joan' INDEX idx_name,
-LASTNAME      VARCHAR(28) DEFAULT 'Chen' key INDEX idx_name,
-averylonglongfieldname X(1024) DEFAULT 'test',
-price         N(7.2)  DEFAULT '0.00',
-MYDATE        D      DEFDATE INDEX idx_date,
-BIGFELLOW     X      NOTNULL,
-TS            T      DEFTIMESTAMP";
-
-
-	$sqla = $dict->CreateDatabase('KUTU',array('postgres'=>"LOCATION='/u01/postdata'"));
-	$dict->SetSchema('KUTU');
-	
-	$sqli = ($dict->CreateTableSQL('testtable',$flds, $opts));
-	$sqla = array_merge($sqla,$sqli);
-	
-	$sqli = $dict->CreateIndexSQL('idx','testtable','price,firstname,lastname',array('BITMAP','FULLTEXT','CLUSTERED','HASH'));
-	$sqla = array_merge($sqla,$sqli);
-	$sqli = $dict->CreateIndexSQL('idx2','testtable','price,lastname');//,array('BITMAP','FULLTEXT','CLUSTERED'));
-	$sqla = array_merge($sqla,$sqli);
-	
-	$addflds = array(array('height', 'F'),array('weight','F'));
-	$sqli = $dict->AddColumnSQL('testtable',$addflds);
-	$sqla = array_merge($sqla,$sqli);
-	$addflds = array(array('height', 'F','NOTNULL'),array('weight','F','NOTNULL'));
-	$sqli = $dict->AlterColumnSQL('testtable',$addflds);
-	$sqla = array_merge($sqla,$sqli);
-	
-	
-	printsqla($dbType,$sqla);
-	
-	if (file_exists('d:\inetpub\wwwroot\php\phplens\adodb\adodb.inc.php'))
-	if ($dbType == 'mysqlt') {
-		$db->Connect('localhost', "root", "", "test");
-		$dict->SetSchema('');
-		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
-		if ($sqla2) printsqla($dbType,$sqla2);
-	}
-	if ($dbType == 'postgres') {
-		if (@$db->Connect('localhost', "tester", "test", "test"));
-		$dict->SetSchema('');
-		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
-		if ($sqla2) printsqla($dbType,$sqla2);
-	}
-	
-	if ($dbType == 'odbc_mssql') {
-		$dsn = $dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=localhost;Database=northwind;";
-		if (@$db->Connect($dsn, "sa", "natsoft", "test"));
-		$dict->SetSchema('');
-		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
-		if ($sqla2) printsqla($dbType,$sqla2);
-	}
-	
-	
-	
-	adodb_pr($dict->databaseType);
-	printsqla($dbType, $dict->DropColumnSQL('table',array('my col','`col2_with_Quotes`','A_col3','col3(10)')));
-	printsqla($dbType, $dict->ChangeTableSQL('adoxyz','LASTNAME varchar(32)'));
-	
-}
-
-function printsqla($dbType,$sqla)
-{
-	print "<pre>";
-	//print_r($dict->MetaTables());
-	foreach($sqla as $s) {
-		$s = htmlspecialchars($s);
-		print "$s;\n";
-		if ($dbType == 'oci8') print "/\n";
-	}
-	print "</pre><hr />";
-}
-
-/***
-
-Generated SQL:
-
-mysql
-
-CREATE DATABASE KUTU;
-DROP TABLE KUTU.testtable;
-CREATE TABLE KUTU.testtable (
-id               INTEGER NOT NULL AUTO_INCREMENT,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) NOT NULL DEFAULT 'Chen',
-averylonglongfieldname LONGTEXT NOT NULL,
-price            NUMERIC(7,2) NOT NULL DEFAULT 0.00,
-MYDATE           DATE DEFAULT CURDATE(),
-                 PRIMARY KEY (id, lastname)
-)TYPE=ISAM;
-CREATE FULLTEXT INDEX idx ON KUTU.testtable (firstname,lastname);
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-ALTER TABLE KUTU.testtable  ADD height           DOUBLE;
-ALTER TABLE KUTU.testtable  ADD weight           DOUBLE;
-ALTER TABLE KUTU.testtable  MODIFY COLUMN height           DOUBLE NOT NULL;
-ALTER TABLE KUTU.testtable  MODIFY COLUMN weight           DOUBLE NOT NULL;
-
-
---------------------------------------------------------------------------------
-
-oci8
-
-CREATE USER KUTU IDENTIFIED BY tiger;
-/
-GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO KUTU;
-/
-DROP TABLE KUTU.testtable CASCADE CONSTRAINTS;
-/
-CREATE TABLE KUTU.testtable (
-id               NUMBER(16) NOT NULL,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
-averylonglongfieldname CLOB NOT NULL,
-price            NUMBER(7,2) DEFAULT 0.00 NOT NULL,
-MYDATE           DATE DEFAULT TRUNC(SYSDATE),
-                 PRIMARY KEY (id, lastname)
-)TABLESPACE USERS;
-/
-DROP SEQUENCE KUTU.SEQ_testtable;
-/
-CREATE SEQUENCE KUTU.SEQ_testtable;
-/
-CREATE OR REPLACE TRIGGER KUTU.TRIG_SEQ_testtable BEFORE insert ON KUTU.testtable 
-		FOR EACH ROW
-		BEGIN
-		  select KUTU.SEQ_testtable.nextval into :new.id from dual;
-		END;
-/
-CREATE BITMAP INDEX idx ON KUTU.testtable (firstname,lastname);
-/
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-/
-ALTER TABLE testtable ADD (
- height           NUMBER,
- weight           NUMBER);
-/
-ALTER TABLE testtable MODIFY(
- height           NUMBER NOT NULL,
- weight           NUMBER NOT NULL);
-/
-
-
---------------------------------------------------------------------------------
-
-postgres
-AlterColumnSQL not supported for PostgreSQL
-
-
-CREATE DATABASE KUTU LOCATION='/u01/postdata';
-DROP TABLE KUTU.testtable;
-CREATE TABLE KUTU.testtable (
-id               SERIAL,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
-averylonglongfieldname TEXT NOT NULL,
-price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
-MYDATE           DATE DEFAULT CURRENT_DATE,
-                 PRIMARY KEY (id, lastname)
-);
-CREATE INDEX idx ON KUTU.testtable USING HASH (firstname,lastname);
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-ALTER TABLE KUTU.testtable  ADD height           FLOAT8;
-ALTER TABLE KUTU.testtable  ADD weight           FLOAT8;
-
-
---------------------------------------------------------------------------------
-
-odbc_mssql
-
-CREATE DATABASE KUTU;
-DROP TABLE KUTU.testtable;
-CREATE TABLE KUTU.testtable (
-id               INT IDENTITY(1,1) NOT NULL,
-firstname        VARCHAR(30) DEFAULT 'Joan',
-lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
-averylonglongfieldname TEXT NOT NULL,
-price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
-MYDATE           DATETIME DEFAULT GetDate(),
-                 PRIMARY KEY (id, lastname)
-);
-CREATE CLUSTERED INDEX idx ON KUTU.testtable (firstname,lastname);
-CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
-ALTER TABLE KUTU.testtable  ADD
- height           REAL,
- weight           REAL;
-ALTER TABLE KUTU.testtable  ALTER COLUMN height           REAL NOT NULL;
-ALTER TABLE KUTU.testtable  ALTER COLUMN weight           REAL NOT NULL;
-
-
---------------------------------------------------------------------------------
-*/
-
-
-echo "<h1>Test XML Schema</h1>";
-$ff = file('xmlschema.xml');
-echo "<pre>";
-foreach($ff as $xml) echo htmlspecialchars($xml);
-echo "</pre>";
-include_once('test-xmlschema.php');
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/time.php
===================================================================
--- admin/include/lib/adodb/tests/time.php	(revision 6370)
+++ admin/include/lib/adodb/tests/time.php	(working copy)
@@ -1,17 +0,0 @@
-<?php
-
-include_once('../adodb-time.inc.php');
-//adodb_date_test();
-?>
-<?php 
-//require("adodb-time.inc.php"); 
-
-$datestring = "1963-12-04"; // string normally from mySQL 
-$stringArray = explode("-", $datestring);
-$date = adodb_mktime(0,0,0,$stringArray[1],$stringArray[2],$stringArray[0]); 
-
-$convertedDate = date("d-M-Y", $date); // converted string to UK style date
-
-echo( "Birthday: $convertedDate" ); //why is string returned as one day (3 not 4) less for this example??
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/test-xmlschema.php
===================================================================
--- admin/include/lib/adodb/tests/test-xmlschema.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test-xmlschema.php	(working copy)
@@ -1,54 +0,0 @@
-<?PHP
-
-// V4.50 6 July 2004
-
-error_reporting(E_ALL);
-include_once( "../adodb.inc.php" );
-include_once( "../adodb-xmlschema03.inc.php" );
-
-// To build the schema, start by creating a normal ADOdb connection:
-$db = ADONewConnection( 'mysql' );
-$db->Connect( 'localhost', 'root', '', 'test' ) || die('fail connect1');
-
-// To create a schema object and build the query array.
-$schema = new adoSchema( $db );
-
-// To upgrade an existing schema object, use the following 
-// To upgrade an existing database to the provided schema,
-// uncomment the following line:
-#$schema->upgradeSchema();
-
-print "<b>SQL to build xmlschema.xml</b>:\n<pre>";
-// Build the SQL array
-$sql = $schema->ParseSchema( "xmlschema.xml" );
-
-var_dump( $sql );
-print "</pre>\n";
-
-// Execute the SQL on the database
-//$result = $schema->ExecuteSchema( $sql );
-
-// Finally, clean up after the XML parser
-// (PHP won't do this for you!)
-//$schema->Destroy();
-
-
-
-print "<b>SQL to build xmlschema-mssql.xml</b>:\n<pre>";
-
-$db2 = ADONewConnection('mssql');
-$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
-
-$db2->Execute("drop table simple_table");
-
-$schema = new adoSchema( $db2 );
-$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-$db2->debug=1;
-
-foreach ($sql as $s)
-$db2->Execute($s);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/testmssql.php
===================================================================
--- admin/include/lib/adodb/tests/testmssql.php	(revision 6370)
+++ admin/include/lib/adodb/tests/testmssql.php	(working copy)
@@ -1,76 +0,0 @@
-<?php
-
-/** 
- * @version V4.50 6 July 2004 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
- * Latest version is available at http://php.weblogs.com
- *
- * Test GetUpdateSQL and GetInsertSQL.
- */
- 
-error_reporting(E_ALL);
-
-
-include('../adodb.inc.php');
-include('../tohtml.inc.php');
-
-//==========================
-// This code tests an insert
-
-
-
-$conn = &ADONewConnection("mssql");  // create a connection
-$conn->Connect('127.0.0.1','adodb','natsoft','northwind') or die('Fail');
-
-$conn->debug =1;
-$query = 'select * from products';
-$conn->SetFetchMode(ADODB_FETCH_ASSOC);
-$rs = $conn->Execute($query);
-echo "<pre>";
-while( !$rs->EOF ) {
-	$output[] = $rs->fields;
-	var_dump($rs->fields);
-	$rs->MoveNext();
-	print "<p>";
-}
-die();
-
-
-$p = $conn->Prepare('insert into products (productname,unitprice,dcreated) values (?,?,?)');
-echo "<pre>";
-print_r($p);
-
-$conn->debug=1;
-$conn->Execute($p,array('John'.rand(),33.3,$conn->DBDate(time())));
-
-$p = $conn->Prepare('select * from products where productname like ?');
-$arr = $conn->getarray($p,array('V%'));
-print_r($arr);
-die();
-
-//$conn = &ADONewConnection("mssql");
-//$conn->Connect('mangrove','sa','natsoft','ai');
-
-//$conn->Connect('mangrove','sa','natsoft','ai');
-$conn->debug=1;
-$conn->Execute('delete from blobtest');
-
-$conn->Execute('insert into blobtest (id) values(1)');
-$conn->UpdateBlobFile('blobtest','b1','../cute_icons_for_site/adodb.gif','id=1');
-$rs = $conn->Execute('select b1 from blobtest where id=1');
-
-$output = "c:\\temp\\test_out-".date('H-i-s').".gif"; 
-print "Saving file <b>$output</b>, size=".strlen($rs->fields[0])."<p>";
-$fd = fopen($output, "wb"); 
-fwrite($fd, $rs->fields[0]); 
-fclose($fd); 
-
-print " <a href=file://$output>View Image</a>";
-//$rs = $conn->Execute('SELECT id,SUBSTRING(b1, 1, 10) FROM blobtest');
-//rs2html($rs);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/testdatabases.inc.php
===================================================================
--- admin/include/lib/adodb/tests/testdatabases.inc.php	(revision 6370)
+++ admin/include/lib/adodb/tests/testdatabases.inc.php	(working copy)
@@ -1,442 +0,0 @@
-<?php
-  
-/*
-V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-*/ 
- 
- /* this file is used by the ADODB test program: test.php */
- ?>
-
-<table><tr valign=top><td>
-<form method=get>
-<input type=checkbox name="testaccess" value=1 <?php echo !empty($testaccess) ? 'checked' : '' ?>> <b>Access</b><br>
-<input type=checkbox name="testibase" value=1 <?php echo !empty($testibase) ? 'checked' : '' ?>> <b>Interbase</b><br>
-<input type=checkbox name="testmssql" value=1 <?php echo !empty($testmssql) ? 'checked' : '' ?>> <b>MSSQL</b><br>
- <input type=checkbox name="testmysql" value=1 <?php echo !empty($testmysql) ? 'checked' : '' ?>> <b>MySQL</b><br>
-<input type=checkbox name="testmysqlodbc" value=1 <?php echo !empty($testmysqlodbc) ? 'checked' : '' ?>> <b>MySQL ODBC</b><br>
-<input type=checkbox name="testmysqli" value=1 <?php echo !empty($testmysqli) ? 'checked' : '' ?>> <b>MySQLi</b>
-<br>
-<td><input type=checkbox name="testsqlite" value=1 <?php echo !empty($testsqlite) ? 'checked' : '' ?>> <b>SQLite</b><br>
-<input type=checkbox name="testproxy" value=1 <?php echo !empty($testproxy) ? 'checked' : '' ?>> <b>MySQL Proxy</b><br>
-<input type=checkbox name="testoracle" value=1 <?php echo !empty($testoracle) ? 'checked' : '' ?>> <b>Oracle (oci8)</b> <br>
-<input type=checkbox name="testpostgres" value=1 <?php echo !empty($testpostgres) ? 'checked' : '' ?>> <b>PostgreSQL</b><br>
-<input type=checkbox name="testpgodbc" value=1 <?php echo !empty($testpgodbc) ? 'checked' : '' ?>> <b>PostgreSQL ODBC</b><br>
-<td>
-<input type=checkbox name="testpdopgsql" value=1 <?php echo !empty($testpdopgsql) ? 'checked' : '' ?>> <b>PgSQL PDO</b><br>
-<input type=checkbox name="testpdomysql" value=1 <?php echo !empty($testpdomysql) ? 'checked' : '' ?>> <b>MySQL PDO</b><br>
-<input type=checkbox name="testpdosqlite" value=1 <?php echo !empty($testpdosqlite) ? 'checked' : '' ?>> <b>SQLite PDO</b><br>
-<input type=checkbox name="testpdoaccess" value=1 <?php echo !empty($testpdoaccess) ? 'checked' : '' ?>> <b>Access PDO</b><br>
-<input type=checkbox name="testpdomssql" value=1 <?php echo !empty($testpdomssql) ? 'checked' : '' ?>> <b>MSSQL PDO</b><br>
-
-<input type=checkbox name="testpdoora" value=1 <?php echo !empty($testpdoora) ? 'checked' : '' ?>> <b>OCI PDO</b><br>
-
-<td><input type=checkbox name="testdb2" value=1 <?php echo !empty($testdb2) ? 'checked' : '' ?>> DB2<br>
-<input type=checkbox name="testvfp" value=1 <?php echo !empty($testvfp) ? 'checked' : '' ?>> VFP+ODBTP<br>
-<input type=checkbox name="testado" value=1 <?php echo !empty($testado) ? 'checked' : '' ?>> ADO (for mssql and access)<br>
-<input type=checkbox name="nocountrecs" value=1 <?php echo !empty($nocountrecs) ? 'checked' : '' ?>> $ADODB_COUNTRECS=false<br>
-<input type=checkbox name="nolog" value=1 <?php echo !empty($nolog) ? 'checked' : '' ?>> No SQL Logging<br>
-<input type=checkbox name="time" value=1 <?php echo !empty($_GET['time']) ? 'checked' : '' ?>> ADOdb time test
-</table>
-<input type=submit>
-</form>
-
-<?php
-
-if ($ADODB_FETCH_MODE != ADODB_FETCH_DEFAULT) print "<h3>FETCH MODE IS NOT ADODB_FETCH_DEFAULT</h3>";
-
-if (isset($nocountrecs)) $ADODB_COUNTRECS = false;
-
-// cannot test databases below, but we include them anyway to check
-// if they parse ok...
-
-if (!strpos(PHP_VERSION,'5') === 0) {
-	ADOLoadCode("sybase");
-	//ADOLoadCode("postgres");
-	//ADOLoadCode("postgres7");
-	ADOLoadCode("firebird");
-	ADOLoadCode("borland_ibase");
-	ADOLoadCode("informix");
-	ADOLoadCode("sqlanywhere");
-//	ADOLoadCode('mysqli');
-}
-
-
-flush();
-if (!empty($testpostgres)) {
-	//ADOLoadCode("postgres");
-
-	$db = &ADONewConnection('postgres');
-	print "<h1>Connecting $db->databaseType...</h1>";
-	if ($db->Connect("localhost","tester","test","test")) {
-		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname varchar,created date)");
-	}else
-		print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.<BR>".$db->ErrorMsg();
-}
-
-if (!empty($testpgodbc)) { 
-	
-	$db = &ADONewConnection('odbc');
-	$db->hasTransactions = false;
-	print "<h1>Connecting $db->databaseType...</h1>";
-	
-	if ($db->PConnect('Postgresql')) {
-		$db->hasTransactions = true;
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
-	} else print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.<BR>".$db->ErrorMsg();
-}
-
-if (!empty($testibase)) {
-	//$_GET['nolog'] = true;
-	$db = &ADONewConnection('firebird');
-	print "<h1>Connecting $db->databaseType...</h1>";
-	if ($db->PConnect("localhost:d:\\firebird\\151\\examples\\EMPLOYEE.fdb", "sysdba", "masterkey", ""))
-		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname char(24),price numeric(12,2),created date)");
-	 else print "ERROR: Interbase test requires a database called employee.gdb".'<BR>'.$db->ErrorMsg();
-	
-}
-
-
-if (!empty($testsqlite)) {
-	$path =urlencode('d:\inetpub\adodb\sqlite.db');
-	$dsn = "sqlite://$path/";
-	$db = ADONewConnection($dsn);
-	//echo $dsn;
-	
-	//$db = &ADONewConnection('sqlite');
-	
-
-	if ($db && $db->PConnect("d:\\inetpub\\adodb\\sqlite.db", "", "", "")) {
-		print "<h1>Connecting $db->databaseType...</h1>";
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	} else 
-		print "ERROR: SQLite";
-	
-}
-
-if (!empty($testpdopgsql)) {
-	$connstr = "pgsql:dbname=test";
-	$u = 'tester';$p='test';
-	$db = &ADONewConnection('pdo');
-	print "<h1>Connecting $db->databaseType...</h1>";
-	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
-}
-
-if (!empty($testpdomysql)) {
-	$connstr = "mysql:dbname=northwind";
-	$u = 'root';$p='';
-	$db = &ADONewConnection('pdo');
-	print "<h1>Connecting $db->databaseType...</h1>";
-	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	
-	testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
-}
-
-if (!empty($testpdomssql)) {
-	$connstr = "mssql:dbname=northwind";
-	$u = 'sa';$p='natsoft';
-	$db = &ADONewConnection('pdo');
-	print "<h1>Connecting $db->databaseType...</h1>";
-	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	
-	testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
-}
-
-if (!empty($testpdosqlite)) {
-	$connstr = "sqlite:d:/inetpub/adodb/sqlite-pdo.db3";
-	$u = '';$p='';
-	$db = &ADONewConnection('pdo');
-	$db->hasTransactions = false;
-	print "<h1>Connecting $db->databaseType...</h1>";
-	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
-}
-
-if (!empty($testpdoaccess)) {
-	$connstr = 'odbc:nwind';
-	$u = '';$p='';
-	$db = &ADONewConnection('pdo');
-	$db->hasTransactions = false;
-	print "<h1>Connecting $db->databaseType...</h1>";
-	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
-}
-
-if (!empty($testpdoora)) {
-	$connstr = 'oci:';
-	$u = 'scott';$p='natsoft';
-	$db = &ADONewConnection('pdo');
-	#$db->hasTransactions = false;
-	print "<h1>Connecting $db->databaseType...</h1>";
-	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
-}
-
-// REQUIRES ODBC DSN CALLED nwind
-if (!empty($testaccess)) {
-	$db = &ADONewConnection('access');
-	print "<h1>Connecting $db->databaseType...</h1>";
-	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
-	$dsn = "nwind";
-	$dsn = "Driver={Microsoft Access Driver (*.mdb)};Dbq=$access;Uid=Admin;Pwd=;";
-	
-	//$dsn =  'Provider=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=' . $access . ';';
-	if ($db->PConnect($dsn, "", "", ""))
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	else print "ERROR: Access test requires a Windows ODBC DSN=nwind, Access driver";
-	
-}
-
-if (!empty($testaccess) && !empty($testado)) { // ADO ACCESS
-
-	$db = &ADONewConnection("ado_access");
-	print "<h1>Connecting $db->databaseType...</h1>";
-	
-	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
-	$myDSN =  'PROVIDER=Microsoft.Jet.OLEDB.4.0;'
-		. 'DATA SOURCE=' . $access . ';';
-		//. 'USER ID=;PASSWORD=;';
-	$_GET['nolog'] = 1;
-	if ($db->PConnect($myDSN, "", "", "")) {
-		print "ADO version=".$db->_connectionID->version."<br>";
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	} else print "ERROR: Access test requires a Access database $access".'<BR>'.$db->ErrorMsg();
-	
-}
-
-if (!empty($testvfp)) { // ODBC
-	$db = &ADONewConnection('vfp');
-	print "<h1>Connecting $db->databaseType...</h1>";flush();
-
-	if ( $db->PConnect("vfp-adoxyz")) {
-		testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
-	 } else print "ERROR: Visual FoxPro test requires a Windows ODBC DSN=vfp-adoxyz, VFP driver";
-	
-	echo "<hr />";
-	$db = &ADONewConnection('odbtp');
-	
-	if ( $db->PConnect('localhost','DRIVER={Microsoft Visual FoxPro Driver};SOURCETYPE=DBF;SOURCEDB=d:\inetpub\adodb;EXCLUSIVE=NO;')) {
-	print "<h1>Connecting $db->databaseType...</h1>";flush();
-	testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
-	 } else print "ERROR: Visual FoxPro odbtp requires a Windows ODBC DSN=vfp-adoxyz, VFP driver";
-	
-}
-
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysql)) { // MYSQL
-
-
-	if (PHP_VERSION >= 5 || $_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
-	else $server = "mangrove";
-	$user = 'root'; $password = ''; $database = 'northwind';
-	$db = &ADONewConnection("mysqlt://$user:$password@$server/$database?persist");
-	print "<h1>Connecting $db->databaseType...</h1>";
-	
-	if (true || $db->PConnect($server, "root", "", "northwind")) {
-		//$db->Execute("DROP TABLE ADOXYZ") || die('fail drop');
-		//$db->debug=1;$db->Execute('drop table ADOXYZ');
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) Type=InnoDB");
-	} else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
-}
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysqli)) { // MYSQL
-
-	$db = &ADONewConnection('mysqli');
-	print "<h1>Connecting $db->databaseType...</h1>";
-	if (PHP_VERSION >= 5 || $_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
-	else $server = "mangrove";
-	if ($db->PConnect($server, "root", "", "northwind")) {
-		//$db->debug=1;$db->Execute('drop table ADOXYZ');
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
-	} else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
-}
-
-
-// REQUIRES MySQL server at localhost with database 'test'
-if (!empty($testmysqlodbc)) { // MYSQL
-	
-	$db = &ADONewConnection('odbc');
-	$db->hasTransactions = false;
-	print "<h1>Connecting $db->databaseType...</h1>";
-	if ($_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
-	else $server = "mangrove";
-	if ($db->PConnect('mysql', "root", ""))
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
-	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
-}
-
-if (!empty($testproxy)){
-	$db = &ADONewConnection('proxy');
-	print "<h1>Connecting $db->databaseType...</h1>";
-	if ($_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
-
-	if ($db->PConnect('http://localhost/php/phplens/adodb/server.php'))
-		testdb($db,
-		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
-	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'<BR>'.$db->ErrorMsg();
-
-}
-
-ADOLoadCode('oci805');
-ADOLoadCode("oci8po");
-	
-if (!empty($testoracle)) {
-	$dsn = "oci8po://juris10:natsoft@sherkhan?persist";
-	$db = ADONewConnection($dsn );//'oci8');
-	
-	//$db->debug=1;
-	print "<h1>Connecting $db->databaseType...</h1>";
-	if (true || $db->Connect('', "scott", "natsoft",''))
-		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	else 
-		print "ERROR: Oracle test requires an Oracle server setup with scott/natsoft".'<BR>'.$db->ErrorMsg();
-
-}
-ADOLoadCode("oracle"); // no longer supported
-if (false && !empty($testoracle)) { 
-	
-	$db = ADONewConnection();
-	print "<h1>Connecting $db->databaseType...</h1>";
-	if ($db->PConnect("", "scott", "tiger", "natsoft.domain"))
-		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	else print "ERROR: Oracle test requires an Oracle server setup with scott/tiger".'<BR>'.$db->ErrorMsg();
-
-}
-
-ADOLoadCode("odbc_db2"); // no longer supported
-if (!empty($testdb2)) {
-	if (PHP_VERSION>=5.1) {
-		$db = ADONewConnection("db2");
-		print "<h1>Connecting $db->databaseType...</h1>";
-		
-		#$db->curMode = SQL_CUR_USE_ODBC;
-		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
-		if ($db->Connect('localhost','natsoft','guest','test')) {
-			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
-	} else { 
-		$db = ADONewConnection("odbc_db2");
-		print "<h1>Connecting $db->databaseType...</h1>";
-		
-		$dsn = "db2test";
-		#$db->curMode = SQL_CUR_USE_ODBC;
-		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
-		if ($db->Connect($dsn)) {
-			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
-	}
-echo "<hr />";
-flush();
-	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";
-	
-	$db = ADONewConnection('odbtp');
-	if ($db->Connect('127.0.0.1',$dsn)) {
-		
-		$db->debug=1;
-		 $arr = $db->GetArray( "||SQLProcedures" ); adodb_pr($arr);
-	     $arr = $db->GetArray( "||SQLProcedureColumns|||GET_ROUTINE_SAR" );adodb_pr($arr);
-	
-		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	} else echo ("ERROR Connection");
-	echo $db->ErrorMsg();
-}
-
-
-$server = 'sherkhan';
-
-
-
-ADOLoadCode("mssqlpo");
-if (!empty($testmssql)) { // MS SQL Server -- the extension is buggy -- probably better to use ODBC
-	$db = ADONewConnection("mssqlpo");
-	//$db->debug=1;
-	print "<h1>Connecting $db->databaseType...</h1>";
-	
-	$ok = $db->Connect('','adodb','natsoft','northwind');
-
-	if ($ok or $db->PConnect("mangrove", "sa", "natsoft", "ai")) {
-		AutoDetect_MSSQL_Date_Order($db);
-	//	$db->Execute('drop table adoxyz');
-		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
-	} else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='192.168.0.1', userid='adodb', password='natsoft', database='ai'".'<BR>'.$db->ErrorMsg();
-	
-}
-
-
-ADOLoadCode('odbc_mssql');
-if (!empty($testmssql)) { // MS SQL Server via ODBC
-	$db = ADONewConnection();
-	
-	print "<h1>Connecting $db->databaseType...</h1>";
-	
-	$dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=$server;Database=northwind;";
-	
-	if ($db->PConnect($dsn, "adodb", "natsoft", ""))  {
-		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
-	}
-	else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with DSN setup";
-
-}
-
-ADOLoadCode("ado_mssql");
-if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru ODBC -- DSN-less
-	
-	$db = &ADONewConnection("ado_mssql");
-	//$db->debug=1;
-	print "<h1>Connecting DSN-less $db->databaseType...</h1>";
-	
-	$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
-		. "SERVER=$server;DATABASE=NorthWind;UID=adodb;PWD=natsoft;Trusted_Connection=No";
-
-		
-	if ($db->PConnect($myDSN, "", "", ""))
-		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
-	else print "ERROR: MSSQL test 2 requires MS SQL 7";
-	
-}
-
-if (!empty($testmssql) && !empty($testado)) { // ADO ACCESS MSSQL with OLEDB provider
-
-	$db = &ADONewConnection("ado_mssql");
-	print "<h1>Connecting DSN-less OLEDB Provider $db->databaseType...</h1>";
-	//$db->debug=1;
-	$myDSN="SERVER=localhost;DATABASE=northwind;Trusted_Connection=yes";
-	if ($db->PConnect($myDSN, "adodb", "natsoft", 'SQLOLEDB')) {
-		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
-	} else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='mangrove', userid='sa', password='', database='ai'";
-
-}
-
-
-if (extension_loaded('odbtp') && !empty($testmssql)) { // MS SQL Server via ODBC
-	$db = ADONewConnection('odbtp');
-	
-	$dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=$server;Database=northwind;uid=adodb;pwd=natsoft";
-	
-	if ($db->PConnect('localhost',$dsn, "", ""))  {
-		print "<h1>Connecting $db->databaseType...</h1>";				
-		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
-	}
-	else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with DSN setup";
-
-}
-
-
-print "<h3>Tests Completed</h3>";
-
-?>
Index: admin/include/lib/adodb/tests/testoci8cursor.php
===================================================================
--- admin/include/lib/adodb/tests/testoci8cursor.php	(revision 6370)
+++ admin/include/lib/adodb/tests/testoci8cursor.php	(working copy)
@@ -1,111 +0,0 @@
-<?php
-/* 
-V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-	
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-/*
-	Test for Oracle Variable Cursors, which are treated as ADOdb recordsets.
-	
-	We have 2 examples. The first shows us using the Parameter statement. 
-	The second shows us using the new ExecuteCursor($sql, $cursorName)
-	function.
-	
-------------------------------------------------------------------
--- TEST PACKAGE YOU NEED TO INSTALL ON ORACLE - run from sql*plus
-------------------------------------------------------------------
-
-
--- TEST PACKAGE
-CREATE OR REPLACE PACKAGE adodb AS
-TYPE TabType IS REF CURSOR RETURN tab%ROWTYPE;
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar);
-PROCEDURE data_out(input IN varchar, output OUT varchar); 
-
-procedure myproc (p1 in number, p2 out number);
-END adodb;
-/
-
-CREATE OR REPLACE PACKAGE BODY adodb AS
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames in varchar) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM tab where tname like tablenames;
-	END open_tab;
-	
-PROCEDURE data_out(input IN varchar, output OUT varchar) IS
-	BEGIN
-		output := 'Cinta Hati '||input;
-	END;
-	
-procedure myproc (p1 in number, p2 out number) as
-begin
-p2 := p1;
-end;
-END adodb;
-/
-
-------------------------------------------------------------------
--- END PACKAGE
-------------------------------------------------------------------
-
-*/
-
-include('../adodb.inc.php');
-include('../tohtml.inc.php');
-
-	error_reporting(E_ALL);
-	$db = ADONewConnection('oci8');
-	$db->PConnect('','scott','natsoft');
-	$db->debug = 99;
-
-
-/*
-*/
-
-	define('MYNUM',5);
-	
-
-	$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS,'A%'); END;");
-	
-	if ($rs && !$rs->EOF) {
-		print "Test 1 RowCount: ".$rs->RecordCount()."<p>";
-	} else {
-		print "<b>Error in using Cursor Variables 1</b><p>";
-	}
-	
-	print "<h4>Testing Stored Procedures for oci8</h4>";
-	
-	$stid = $db->PrepareSP('BEGIN adodb.myproc('.MYNUM.', :myov); END;');
-	$db->OutParameter($stid, $myov, 'myov');
-	$db->Execute($stid);
-	if ($myov != MYNUM) print "<p><b>Error with myproc</b></p>";
-	
-	
-	$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;",true);
-	$a1 = 'Malaysia';
-	//$a2 = ''; # a2 doesn't even need to be defined!
-	$db->InParameter($stmt,$a1,'a1');
-	$db->OutParameter($stmt,$a2,'a2');
-	$rs = $db->Execute($stmt);
-	if ($rs) {
-		if ($a2 !== 'Cinta Hati Malaysia') print "<b>Stored Procedure Error: a2 = $a2</b><p>";
-		else echo  "OK: a2=$a2<p>";
-	} else {
-		print "<b>Error in using Stored Procedure IN/Out Variables</b><p>";
-	}
-	
-	
-	$tname = 'A%';
-	
-	$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
-	$db->Parameter($stmt,$tname,'tablename');
-	$rs = $db->Execute($stmt);
-	rs2html($rs);
-		
-		
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/test2.php
===================================================================
--- admin/include/lib/adodb/tests/test2.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test2.php	(working copy)
@@ -1,26 +0,0 @@
-<?php
-
-// BASIC ADO test
-
-	include_once('../adodb.inc.php');
-
-	$db = &ADONewConnection("ado_access");
-	$db->debug=1;
-	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
-	$myDSN =  'PROVIDER=Microsoft.Jet.OLEDB.4.0;'
-		. 'DATA SOURCE=' . $access . ';';
-		
-	echo "<p>PHP ",PHP_VERSION,"</p>";
-	
-	$db->Connect($myDSN) || die('fail');
-	
-	print_r($db->ServerInfo());
-	
-	try {
-	$rs = $db->Execute("select $db->sysTimeStamp,* from adoxyz where id>02xx");
-	print_r($rs->fields);
-	} catch(exception $e) {
-	print_r($e);
-	echo "<p> Date m/d/Y =",$db->UserDate($rs->fields[4],'m/d/Y');
-	}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/testoci8.php
===================================================================
--- admin/include/lib/adodb/tests/testoci8.php	(revision 6370)
+++ admin/include/lib/adodb/tests/testoci8.php	(working copy)
@@ -1,83 +0,0 @@
-<html>
-<body>
-<?php
-/* 
-V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-	
-  Latest version is available at http://adodb.sourceforge.net
-*/
-error_reporting(63);
-include("../adodb.inc.php");
-include("../tohtml.inc.php");
-
-if (0) {
-	$db = ADONewConnection('oci8po');
-	
-	$db->PConnect('','scott','natsoft');
-	if (!empty($testblob)) {
-		$varHoldingBlob = 'ABC DEF GEF John TEST';
-		$num = time()%10240;
-		// create table atable (id integer, ablob blob);
-		$db->Execute('insert into ATABLE (id,ablob) values('.$num.',empty_blob())');
-		$db->UpdateBlob('ATABLE', 'ablob', $varHoldingBlob, 'id='.$num, 'BLOB');
-		
-		$rs = &$db->Execute('select * from atable');
-		
-		if (!$rs) die("Empty RS");
-		if ($rs->EOF) die("EOF RS");
-		rs2html($rs);
-	}
-	$stmt = $db->Prepare('select * from adoxyz where id=?');
-	for ($i = 1; $i <= 10; $i++) {
-	$rs = &$db->Execute(
-		$stmt,
-		array($i));
-			
-		if (!$rs) die("Empty RS");
-		if ($rs->EOF) die("EOF RS");
-		rs2html($rs);
-	}
-}
-if (1) {
-	$db = ADONewConnection('oci8');
-	$db->PConnect('','scott','natsoft');
-	$db->debug = true;
-	$db->Execute("delete from emp where ename='John'");
-	print $db->Affected_Rows().'<BR>';
-	$stmt = &$db->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
-	$rs = $db->Execute($stmt,array('empno'=>4321,'ename'=>'John'));
-	// prepare not quite ready for prime time
-	//$rs = $db->Execute($stmt,array('empno'=>3775,'ename'=>'John'));
-	if (!$rs) die("Empty RS");
-	
-	$db->setfetchmode(ADODB_FETCH_NUM);
-	
-	$vv = 'A%';
-	$stmt = $db->PrepareSP("BEGIN adodb.open_tab2(:rs,:tt); END;",true);
-	$db->OutParameter($stmt, $cur, 'rs', -1, OCI_B_CURSOR);
-	$db->OutParameter($stmt, $vv, 'tt');
-	$rs = $db->Execute($stmt);
-	while (!$rs->EOF) {
-		adodb_pr($rs->fields);
-		$rs->MoveNext();
-	}
-	echo " val = $vv";
-
-}
-
-if (0) {
-	$db = ADONewConnection('odbc_oracle');
-	if (!$db->PConnect('local_oracle','scott','tiger')) die('fail connect');
-	$db->debug = true;
-	$rs = &$db->Execute(
-		'select * from adoxyz where firstname=? and trim(lastname)=?',
-		array('first'=>'Caroline','last'=>'Miranda'));
-	if (!$rs) die("Empty RS");
-	if ($rs->EOF) die("EOF RS");
-	rs2html($rs);
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/test3.php
===================================================================
--- admin/include/lib/adodb/tests/test3.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test3.php	(working copy)
@@ -1,44 +0,0 @@
-<?php
-/*
-  V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
- */
-
-
-error_reporting(E_ALL);
-
-$path = dirname(__FILE__);
-
-include("$path/../adodb-exceptions.inc.php");
-include("$path/../adodb.inc.php");	
-
-try {
-$db = NewADOConnection("oci8");
-$db->Connect('','scott','natsoft');
-$db->debug=1;
-
-$cnt = $db->GetOne("select count(*) from adoxyz");
-$rs = $db->Execute("select * from adoxyz order by id");
-
-$i = 0;
-foreach($rs as $k => $v) {
-	$i += 1;
-	echo $k; adodb_pr($v);
-	flush();
-}
-
-if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
-
-
-
-$rs = $db->Execute("select bad from badder");
-
-} catch (exception $e) {
-	adodb_pr($e);
-	$e = adodb_backtrace($e->trace);
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/testcache.php
===================================================================
--- admin/include/lib/adodb/tests/testcache.php	(revision 6370)
+++ admin/include/lib/adodb/tests/testcache.php	(working copy)
@@ -1,29 +0,0 @@
-<html>
-<body>
-<?php
-/* 
-V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-	
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-$ADODB_CACHE_DIR = dirname(tempnam('/tmp',''));
-include("../adodb.inc.php");
-
-if (isset($access)) {
-	$db=ADONewConnection('access');
-	$db->PConnect('nwind');
-} else {
-	$db = ADONewConnection('mysql');
-	$db->PConnect('mangrove','root','','xphplens');
-}
-if (isset($cache)) $rs = $db->CacheExecute(120,'select * from products');
-else $rs = $db->Execute('select * from products');
-
-$arr = $rs->GetArray();
-print sizeof($arr);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/test4.php
===================================================================
--- admin/include/lib/adodb/tests/test4.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test4.php	(working copy)
@@ -1,143 +0,0 @@
-<?php
-
-/** 
- * @version V4.50 6 July 2004 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
- * Latest version is available at http://php.weblogs.com
- *
- * Test GetUpdateSQL and GetInsertSQL.
- */
- 
-error_reporting(E_ALL);
-function testsql()
-{
-
-
-include('../adodb.inc.php');
-include('../tohtml.inc.php');
-
-global $ADODB_FORCE_TYPE;
-
-
-//==========================
-// This code tests an insert
-
-$sql = "
-SELECT * 
-FROM ADOXYZ WHERE id = -1"; 
-// Select an empty record from the database 
-
-
-#$conn = &ADONewConnection("mssql");  // create a connection
-#$conn->PConnect("", "sa", "natsoft", "northwind"); // connect to MySQL, testdb
-
-$conn = &ADONewConnection("mysql");  // create a connection
-$conn->PConnect("localhost", "root", "", "test"); // connect to MySQL, testdb
-
-
-#$conn =& ADONewConnection('oci8po');
-#$conn->Connect('','scott','natsoft');
-
-if (PHP_VERSION  >= 5) {
-	$connstr = "mysql:dbname=northwind";
-	$u = 'root';$p='';
-	$conn =& ADONewConnection('pdo');
-	$conn->Connect($connstr, $u, $p);
-}
-//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-
-
-$conn->debug=1;
-$conn->Execute("delete from adoxyz where lastname like 'Smi%'");
-
-$rs = $conn->Execute($sql); // Execute the query and get the empty recordset
-$record = array(); // Initialize an array to hold the record data to insert
-
-if (strpos($conn->databaseType,'mysql')===false) $record['id'] = 751;
-$record["firstname"] = 'Jann';
-$record["lastname"] = "Smitts";
-$record["created"] = time();
-
-$insertSQL = $conn->GetInsertSQL($rs, $record);
-$conn->Execute($insertSQL); // Insert the record into the database
-
-if (strpos($conn->databaseType,'mysql')===false) $record['id'] = 752;
-// Set the values for the fields in the record
-$record["firstname"] = 'anull';
-$record["lastname"] = "Smith\$@//";
-$record["created"] = time();
-
-if (isset($_GET['f'])) $ADODB_FORCE_TYPE = $_GET['f'];
-
-//$record["id"] = -1;
-
-// Pass the empty recordset and the array containing the data to insert
-// into the GetInsertSQL function. The function will process the data and return
-// a fully formatted insert sql statement.
-$insertSQL = $conn->GetInsertSQL($rs, $record);
-$conn->Execute($insertSQL); // Insert the record into the database
-
-
-
-$insertSQL2 = $conn->GetInsertSQL($table='ADOXYZ', $record);
-if ($insertSQL != $insertSQL2) echo "<p><b>Walt's new stuff failed</b>: $insertSQL2</p>";
-//==========================
-// This code tests an update
-
-$sql = "
-SELECT * 
-FROM ADOXYZ WHERE lastname=".$conn->Param('var'). " ORDER BY 1"; 
-// Select a record to update 
-
-$varr = array('var'=>$record['lastname'].'');
-$rs = $conn->Execute($sql,$varr); // Execute the query and get the existing record to update
-if (!$rs || $rs->EOF) print "<p><b>No record found!</b></p>";
-
-$record = array(); // Initialize an array to hold the record data to update
-
-
-// Set the values for the fields in the record
-$record["firstName"] = "Caroline".rand();
-//$record["lasTname"] = ""; // Update Caroline's lastname from Miranda to Smith
-$record["creAted"] = '2002-12-'.(rand()%30+1);
-$record['num'] = '';
-// Pass the single record recordset and the array containing the data to update
-// into the GetUpdateSQL function. The function will process the data and return
-// a fully formatted update sql statement.
-// If the data has not changed, no recordset is returned
-
-$updateSQL = $conn->GetUpdateSQL($rs, $record);
-$conn->Execute($updateSQL,$varr); // Update the record in the database
-if ($conn->Affected_Rows() != 1)print "<p><b>Error1 </b>: Rows Affected=".$conn->Affected_Rows().", should be 1</p>";
-
-$record["firstName"] = "Caroline".rand();
-$record["lasTname"] = "Smithy Jones"; // Update Caroline's lastname from Miranda to Smith
-$record["creAted"] = '2002-12-'.(rand()%30+1);
-$record['num'] = 331;
-$updateSQL = $conn->GetUpdateSQL($rs, $record);
-$conn->Execute($updateSQL,$varr); // Update the record in the database
-if ($conn->Affected_Rows() != 1)print "<p><b>Error 2</b>: Rows Affected=".$conn->Affected_Rows().", should be 1</p>";
-
-$rs = $conn->Execute("select * from ADOXYZ where lastname like 'Sm%'");
-//adodb_pr($rs);
-rs2html($rs);
-
-$record["firstName"] = "Carol-new-".rand();
-$record["lasTname"] = "Smithy"; // Update Caroline's lastname from Miranda to Smith
-$record["creAted"] = '2002-12-'.(rand()%30+1);
-$record['num'] = 331;
-
-$conn->AutoExecute('ADOXYZ',$record,'UPDATE', "lastname like 'Sm%'");
-$rs = $conn->Execute("select * from ADOXYZ where lastname like 'Sm%'");
-//adodb_pr($rs);
-rs2html($rs);
-}
-
-
-testsql();
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/test5.php
===================================================================
--- admin/include/lib/adodb/tests/test5.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test5.php	(working copy)
@@ -1,47 +0,0 @@
-<?php
-/* 
-V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-	
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-
-// Select an empty record from the database 
-
-include('../adodb.inc.php');
-include('../tohtml.inc.php');
-
-include('../adodb-errorpear.inc.php');
-
-if (0) {
-	$conn = &ADONewConnection('mysql');
-	$conn->debug=1;
-	$conn->PConnect("localhost","root","","xphplens");
-	print $conn->databaseType.':'.$conn->GenID().'<br>';
-}
-
-if (0) {
-	$conn = &ADONewConnection("oci8");  // create a connection
-	$conn->debug=1;
-	$conn->PConnect("falcon", "scott", "tiger", "juris8.ecosystem.natsoft.com.my"); // connect to MySQL, testdb
-	print $conn->databaseType.':'.$conn->GenID();
-}
-
-if (0) {
-	$conn = &ADONewConnection("ibase");  // create a connection
-	$conn->debug=1;
-	$conn->Connect("localhost:c:\\Interbase\\Examples\\Database\\employee.gdb", "sysdba", "masterkey", ""); // connect to MySQL, testdb
-	print $conn->databaseType.':'.$conn->GenID().'<br>';
-}
-
-if (0) {
-	$conn = &ADONewConnection('postgres');
-	$conn->debug=1;
-	@$conn->PConnect("susetikus","tester","test","test");
-	print $conn->databaseType.':'.$conn->GenID().'<br>';
-}
-?>
Index: admin/include/lib/adodb/tests/test-active-recs2.php
===================================================================
--- admin/include/lib/adodb/tests/test-active-recs2.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test-active-recs2.php	(working copy)
@@ -1,75 +0,0 @@
-<?php
-error_reporting(E_ALL);
-include('../adodb.inc.php');
-
-include('../adodb-active-record.inc.php');
-
-###########################
-
-$ADODB_ACTIVE_CACHESECS = 36;
-
-$DBMS = @$_GET['db'];
-if ($DBMS == 'mysql') {
-	$db = NewADOConnection('mysql://root@localhost/northwind');
-} else if ($DBMS == 'postgres') {
-	$db = NewADOConnection('postgres');
-	$db->Connect("localhost","tester","test","test");
-} else
-	$db = NewADOConnection('oci8://scott:natsoft@/');
-
-
-$arr = $db->ServerInfo();
-echo "<h3>$db->dataProvider: {$arr['description']}</h3>";
-
-$arr = $db->GetActiveRecords('products',' productid<10');
-adodb_pr($arr);
-
-ADOdb_Active_Record::SetDatabaseAdapter($db);
-if  (!$db)  die('failed');
-
-
-
-
-$rec = new ADODB_Active_Record('photos');
-
-$rec = new ADODB_Active_Record('products');
-
-
-adodb_pr($rec->getAttributeNames());
-
-echo "<hr>";
-
-
-$rec->load('productid=2');
-adodb_pr($rec);
-
-$db->debug=1;
-
-
-$rec->productname = 'Changie Chan'.rand();
-
-$rec->insert();
-$rec->update();
-
-$rec->productname = 'Changie Chan 99';
-$rec->replace();
-
-
-$rec2 = new ADODB_Active_Record('products');
-$rec->load('productid=3');
-$rec->save();
-
-$rec = new ADODB_Active_record('products');
-$rec->productname = 'John ActiveRec';
-$rec->notes = 22;
-#$rec->productid=0;
-$rec->discontinued=1;
-$rec->Save();
-$rec->supplierid=33;
-$rec->Save();
-$rec->discontinued=0;
-$rec->Save();
-$rec->Delete();
-
-echo "<p>Affected Rows after delete=".$db->Affected_Rows()."</p>";
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/test-active-record.php
===================================================================
--- admin/include/lib/adodb/tests/test-active-record.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test-active-record.php	(working copy)
@@ -1,82 +0,0 @@
-<?php
-
-	include_once('../adodb.inc.php');
-	include_once('../adodb-active-record.inc.php');
-	
-	// uncomment the following if you want to test exceptions
-	if (@$_GET['except']) {
-		if (PHP_VERSION >= 5) {
-			include('../adodb-exceptions.inc.php');
-			echo "<h3>Exceptions included</h3>";
-		}
-	}
-
-	$db = NewADOConnection('mysql://root@localhost/northwind');
-	$db->debug=1;
-	ADOdb_Active_Record::SetDatabaseAdapter($db);
-
-	$db->Execute("CREATE TEMPORARY TABLE `persons` (
-	                `id` int(10) unsigned NOT NULL auto_increment,
-	                `name_first` varchar(100) NOT NULL default '',
-	                `name_last` varchar(100) NOT NULL default '',
-	                `favorite_color` varchar(100) NOT NULL default '',
-	                PRIMARY KEY  (`id`)
-	            ) ENGINE=MyISAM;
-	           ");
-			   
-	class Person extends ADOdb_Active_Record{}
-	$person = new Person();
-	
-	echo "<p>Output of getAttributeNames: ";
-	var_dump($person->getAttributeNames());
-	
-	/**
-	 * Outputs the following:
-	 * array(4) {
-	 *    [0]=>
-	 *    string(2) "id"
-	 *    [1]=>
-	 *    string(9) "name_first"
-	 *    [2]=>
-	 *    string(8) "name_last"
-	 *    [3]=>
-	 *    string(13) "favorite_color"
-	 *  }
-	 */
-	
-	$person = new Person();
-	$person->name_first = 'Andi';
-	$person->name_last  = 'Gutmans';
-	$person->save(); // this save() will fail on INSERT as favorite_color is a must fill...
-	
-	
-	$person = new Person();
-	$person->name_first     = 'Andi';
-	$person->name_last      = 'Gutmans';
-	$person->favorite_color = 'blue';
-	$person->save(); // this save will perform an INSERT successfully
-	
-	echo "<p>The Insert ID generated:"; print_r($person->id);
-	
-	$person->favorite_color = 'red';
-	$person->save(); // this save() will perform an UPDATE
-	
-	$person = new Person();
-	$person->name_first     = 'John';
-	$person->name_last      = 'Lim';
-	$person->favorite_color = 'lavender';
-	$person->save(); // this save will perform an INSERT successfully
-	
-	// load record where id=2 into a new ADOdb_Active_Record
-	$person2 = new Person();
-	$person2->Load('id=2');
-	
-	var_dump($person2);
-	
-	$activeArr = $db->GetActiveRecordsClass($class = "Person",$table = "persons","id=".$db->Param(0),array(2));
-	$person2 =& $activeArr[0];
-	echo "<p>Name (should be John): ",$person->name_first, " <br> Class (should be Person): ",get_class($person2);	
-	
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/testpaging.php
===================================================================
--- admin/include/lib/adodb/tests/testpaging.php	(revision 6370)
+++ admin/include/lib/adodb/tests/testpaging.php	(working copy)
@@ -1,86 +0,0 @@
-<?php
-/* 
-V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-	
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-error_reporting(E_ALL);
-
-
-include_once('../adodb.inc.php');
-include_once('../adodb-pager.inc.php');
-
-$driver = 'oci8';
-$sql = 'select  ID, firstname as "First Name", lastname as "Last Name" from adoxyz  order  by  id';
-//$sql = 'select count(*),firstname from adoxyz group by firstname order by 2 ';
-//$sql = 'select distinct firstname, lastname from adoxyz  order  by  firstname';
-
-if ($driver == 'postgres') {
-	$db = NewADOConnection('postgres');
-	$db->PConnect('localhost','tester','test','test');
-}
-
-if ($driver == 'access') {
-	$db = NewADOConnection('access');
-	$db->PConnect("nwind", "", "", "");
-}
-
-if ($driver == 'ibase') {
-	$db = NewADOConnection('ibase');
-	$db->PConnect("localhost:e:\\firebird\\examples\\employee.gdb", "sysdba", "masterkey", "");
-	$sql = 'select distinct firstname, lastname  from adoxyz  order  by  firstname';
-
-}
-if ($driver == 'mssql') {
-	$db = NewADOConnection('mssql');
-	$db->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-}
-if ($driver == 'oci8') {
-	$db = NewADOConnection('oci8');
-	$db->Connect('','scott','natsoft');
-	
-$sql = "select * from (select  ID, firstname as \"First Name\", lastname as \"Last Name\" from adoxyz 
-	 order  by  1)";
-}
-
-if ($driver == 'access') {
-	$db = NewADOConnection('access');
-	$db->Connect('nwind');
-}
-
-if (empty($driver) or $driver == 'mysql') {
-	$db = NewADOConnection('mysql');
-	$db->Connect('localhost','root','','test');
-}
-
-//$db->pageExecuteCountRows = false;
-
-$db->debug = true;
-
-if (0) {
-$rs = &$db->Execute($sql);
-include_once('../toexport.inc.php');
-print "<pre>";
-print rs2csv($rs); # return a string
-
-print '<hr />';
-$rs->MoveFirst(); # note, some databases do not support MoveFirst
-print rs2tab($rs); # return a string
-
-print '<hr />';
-$rs->MoveFirst();
-rs2tabout($rs); # send to stdout directly
-print "</pre>";
-}
-
-$pager = new ADODB_Pager($db,$sql);
-$pager->showPageLinks = true;
-$pager->linksPerPage = 10;
-$pager->cache = 60;
-$pager->Render($rows=7);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/testsessions.php
===================================================================
--- admin/include/lib/adodb/tests/testsessions.php	(revision 6370)
+++ admin/include/lib/adodb/tests/testsessions.php	(working copy)
@@ -1,90 +0,0 @@
-<?php
-
-/* 
-V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-	
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-function NotifyExpire($ref,$key)
-{
-	print "<p><b>Notify Expiring=$ref, sessionkey=$key</b></p>";
-}
-
-//-------------------------------------------------------------------
-	
-error_reporting(E_ALL);
-
-
-ob_start();
-include('../session/adodb-cryptsession2.php');
-
-$options['debug'] = 99;
-$db = 'postgres';
-
-#### CONNECTION
-switch($db) {
-case 'oci8': 
-	$options['table'] = 'adodb_sessions2';
-	ADOdb_Session::config('oci8', '', 'jcollect', 'natsoft', '',$options);
-	break;
-
-case 'postgres':
-	ADOdb_Session::config('postgres', 'localhost', 'tester', 'test', 'test',$options);
-	break;
-	
-case 'mysql':
-default:
-	ADOdb_Session::config('mysql', 'localhost', 'root', '', 'xphplens_2',$options);
-	break;
-
-
-}
-	
-
-	
-#### SETUP NOTIFICATION
-	$USER = 'JLIM'.rand();
-	$ADODB_SESSION_EXPIRE_NOTIFY = array('USER','NotifyExpire');
-
-	adodb_session_create_table();
-	session_start();
-
-	adodb_session_regenerate_id();
-	
-### SETUP SESSION VARIABLES 
-	if (empty($_SESSION['MONKEY'])) $_SESSION['MONKEY'] = array(1,'abc',44.41);
-	else $_SESSION['MONKEY'][0] += 1;
-	if (!isset($_GET['nochange'])) @$_SESSION['AVAR'] += 1;
-
-	
-### START DISPLAY
-	print "<h3>PHP ".PHP_VERSION."</h3>";
-	print "<p><b>\$_SESSION['AVAR']={$_SESSION['AVAR']}</b></p>";
-	
-	print "<hr /> <b>Cookies</b>: ";
-	print_r($_COOKIE);
-	
-	var_dump($_SESSION['MONKEY']);
-	
-### RANDOMLY PERFORM Garbage Collection
-### In real-production environment, this is done for you
-### by php's session extension, which calls adodb_sess_gc()
-### automatically for you. See php.ini's
-### session.cookie_lifetime and session.gc_probability
-
-	if (rand() % 5 == 0) {
-	
-		print "<hr /><p><b>Garbage Collection</b></p>";
-		adodb_sess_gc(10);
-		
-		if (rand() % 2 == 0) {
-			print "<p>Random session destroy</p>";
-			session_destroy();
-		}
-	}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/test-perf.php
===================================================================
--- admin/include/lib/adodb/tests/test-perf.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test-perf.php	(working copy)
@@ -1,50 +0,0 @@
-<?php
-
-include_once('../adodb-perf.inc.php');
-
-error_reporting(E_ALL);
-session_start();
-
-if (isset($_GET)) {
-	foreach($_GET as $k => $v) {
-		if (strncmp($k,'test',4) == 0) $_SESSION['_db'] = $k;
-	}
-} 
-
-if (isset($_SESSION['_db'])) {
-	$_db = $_SESSION['_db'];
-	$_GET[$_db] = 1;
-	$$_db = 1;
-}
-
-echo "<h1>Performance Monitoring</h1>";
-include_once('testdatabases.inc.php');
-
-
-function testdb($db) 
-{
-	if (!$db) return;
-	echo "<font size=1>";print_r($db->ServerInfo()); echo " user=".$db->user."</font>";
-	
-	$perf = NewPerfMonitor($db); 
-	
-	# unit tests
-	if (0) {
-		//$DB->debug=1;
-		echo "Data Cache Size=".$perf->DBParameter('data cache size').'<p>';
-		echo $perf->HealthCheck();
-		echo($perf->SuspiciousSQL());
-		echo($perf->ExpensiveSQL());
-		echo($perf->InvalidSQL());
-		echo $perf->Tables();
-	
-		echo "<pre>";
-		echo $perf->HealthCheckCLI();
-		$perf->Poll(3);
-		die();
-	}
-	
-	if ($perf) $perf->UI(3);
-}
- 
-?>
Index: admin/include/lib/adodb/tests/client.php
===================================================================
--- admin/include/lib/adodb/tests/client.php	(revision 6370)
+++ admin/include/lib/adodb/tests/client.php	(working copy)
@@ -1,198 +0,0 @@
-<html>
-<body bgcolor=white>
-<?php
-/** 
- * V4.50 6 July 2004  (c) 2001-2002 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
- * 
- * set tabs to 8
- */
- 
- // documentation on usage is at http://php.weblogs.com/adodb_csv
- 
- echo PHP_VERSION,'<br>';
- var_dump(parse_url('odbc_mssql://userserver/'));
- die();
- 
-include('../adodb.inc.php');
-include('../tohtml.inc.php');
-
- function &send2server($url,$sql)
- {
-	$url .= '?sql='.urlencode($sql);
-	print "<p>$url</p>";
-	$rs = csv2rs($url,$err);
-	if ($err) print $err;
-	return $rs;
- }
- 
- function print_pre($s)
- {
- 	print "<pre>";print_r($s);print "</pre>";
- }
-
-
-$serverURL = 'http://localhost/php/phplens/adodb/server.php';
-$testhttp = false;
-
-$sql1 = "insertz into products (productname) values ('testprod 1')";
-$sql2 = "insert into products (productname) values ('testprod 1')";
-$sql3 = "insert into products (productname) values ('testprod 2')";
-$sql4 = "delete from products where productid>80";
-$sql5 = 'select * from products';
-	
-if ($testhttp) {
-	print "<a href=#c>Client Driver Tests</a><p>";
-	print "<h3>Test Error</h3>";
-	$rs = send2server($serverURL,$sql1);
-	print_pre($rs);
-	print "<hr />";
-	
-	print "<h3>Test Insert</h3>";
-	
-	$rs = send2server($serverURL,$sql2);
-	print_pre($rs);
-	print "<hr />";
-	
-	print "<h3>Test Insert2</h3>";
-	
-	$rs = send2server($serverURL,$sql3);
-	print_pre($rs);
-	print "<hr />";
-	
-	print "<h3>Test Delete</h3>";
-	
-	$rs = send2server($serverURL,$sql4);
-	print_pre($rs);
-	print "<hr />";
-	
-	
-	print "<h3>Test Select</h3>";
-	$rs = send2server($serverURL,$sql5);
-	if ($rs) rs2html($rs);
-	
-	print "<hr />";
-}
-
-
-print "<a name=c><h1>CLIENT Driver Tests</h1>";
-$conn = ADONewConnection('csv');
-$conn->Connect($serverURL);
-$conn->debug = true;
-
-print "<h3>Bad SQL</h3>";
-
-$rs = $conn->Execute($sql1);
-
-print "<h3>Insert SQL 1</h3>";
-$rs = $conn->Execute($sql2);
-
-print "<h3>Insert SQL 2</h3>";
-$rs = $conn->Execute($sql3);
-
-print "<h3>Select SQL</h3>";
-$rs = $conn->Execute($sql5);
-if ($rs) rs2html($rs);
-
-print "<h3>Delete SQL</h3>";
-$rs = $conn->Execute($sql4);
-
-print "<h3>Select SQL</h3>";
-$rs = $conn->Execute($sql5);
-if ($rs) rs2html($rs);
-
-
-/* EXPECTED RESULTS FOR HTTP TEST:
-
-Test Insert
-http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
-
-adorecordset Object
-(
-	[dataProvider] => native
-	[fields] => 
-	[blobSize] => 64
-	[canSeek] => 
-	[EOF] => 1
-	[emptyTimeStamp] =>  
-	[emptyDate] =>  
-	[debug] => 
-	[timeToLive] => 0
-	[bind] => 
-	[_numOfRows] => -1
-	[_numOfFields] => 0
-	[_queryID] => 1
-	[_currentRow] => -1
-	[_closed] => 
-	[_inited] => 
-	[sql] => insert into products (productname) values ('testprod')
-	[affectedrows] => 1
-	[insertid] => 81
-)
-
-
---------------------------------------------------------------------------------
-
-Test Insert2
-http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
-
-adorecordset Object
-(
-	[dataProvider] => native
-	[fields] => 
-	[blobSize] => 64
-	[canSeek] => 
-	[EOF] => 1
-	[emptyTimeStamp] =>  
-	[emptyDate] =>  
-	[debug] => 
-	[timeToLive] => 0
-	[bind] => 
-	[_numOfRows] => -1
-	[_numOfFields] => 0
-	[_queryID] => 1
-	[_currentRow] => -1
-	[_closed] => 
-	[_inited] => 
-	[sql] => insert into products (productname) values ('testprod')
-	[affectedrows] => 1
-	[insertid] => 82
-)
-
-
---------------------------------------------------------------------------------
-
-Test Delete
-http://localhost/php/adodb/server.php?sql=delete+from+products+where+productid%3E80
-
-adorecordset Object
-(
-	[dataProvider] => native
-	[fields] => 
-	[blobSize] => 64
-	[canSeek] => 
-	[EOF] => 1
-	[emptyTimeStamp] =>  
-	[emptyDate] =>  
-	[debug] => 
-	[timeToLive] => 0
-	[bind] => 
-	[_numOfRows] => -1
-	[_numOfFields] => 0
-	[_queryID] => 1
-	[_currentRow] => -1
-	[_closed] => 
-	[_inited] => 
-	[sql] => delete from products where productid>80
-	[affectedrows] => 2
-	[insertid] => 0
-)
-
-[more stuff deleted]
- .
- . 
- .
-*/
-?>
Index: admin/include/lib/adodb/tests/test.php
===================================================================
--- admin/include/lib/adodb/tests/test.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test.php	(working copy)
@@ -1,1743 +0,0 @@
-<?php
-/* 
-V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-	
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-
-if (!defined('E_STRICT')) define('E_STRICT',E_NOTICE);
-error_reporting(E_ALL|E_STRICT);
-
-$ADODB_FLUSH = true;
-
-define('ADODB_ASSOC_CASE',0);
-
-
-function getmicrotime()
-{
-	$t = microtime();
-	$t = explode(' ',$t);
-	return (float)$t[1]+ (float)$t[0];
-}
-
-
-if (PHP_VERSION < 5) include_once('../adodb-pear.inc.php');
-//--------------------------------------------------------------------------------------
-//define('ADODB_ASSOC_CASE',1);
-//
-function Err($msg)
-{
-	print "<b>$msg</b><br>";
-	flush();
-}
-
-function CheckWS($conn)
-{
-global $ADODB_EXTENSION;
-
-	include_once('../session/adodb-session.php');
-	if (defined('CHECKWSFAIL')){ echo " TESTING $conn ";flush();}
-	$saved = $ADODB_EXTENSION;
-	$db = ADONewConnection($conn);
-	$ADODB_EXTENSION = $saved;
-	if (headers_sent()) {
-		print "<p><b>White space detected in adodb-$conn.inc.php or include file...</b></p>";
-		//die();
-	}
-}
-
-function do_strtolower(&$arr)
-{
-	foreach($arr as $k => $v) {
-		if (is_object($v)) $arr[$k] = adodb_pr($v,true);
-		else $arr[$k] = strtolower($v);
-	}
-}
-
-
-function CountExecs($db, $sql, $inputarray)
-{
-global $EXECS;  $EXECS++;
-}
-
-function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
-{
-global $CACHED; $CACHED++;
-}
-
-// the table creation code is specific to the database, so we allow the user 
-// to define their own table creation stuff
-
-function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
-{
-GLOBAL $ADODB_vers,$ADODB_CACHE_DIR,$ADODB_FETCH_MODE,$ADODB_COUNTRECS;
-
-	//adodb_pr($db);
-	
-?>	<form method=GET>
-	</p>
-	<table width=100% ><tr><td bgcolor=beige>&nbsp;</td></tr></table>
-	</p>
-<?php  
-	$create =false;
-	/*$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-	$rs = $db->Execute('select lastname,firstname,lastname,id from ADOXYZ');
-	$arr = $rs->GetAssoc();
-	echo "<pre>";print_r($arr);
-	die();*/
-	
-	if (!$db) die("testdb: database not inited");
-	GLOBAL $EXECS, $CACHED;
-	
-	$EXECS = 0;
-	$CACHED = 0;
-	//$db->Execute("drop table adodb_logsql");
-	if ((rand()%3) == 0) @$db->Execute("delete from adodb_logsql");
-	$db->debug=1;
-	
-	$db->fnExecute = 'CountExecs';
-	$db->fnCacheExecute = 'CountCachedExecs';
-	
-	if (empty($_GET['nolog'])) {
-		echo "<h3>SQL Logging enabled</h3>";
-		$db->LogSQL();/*
-		$sql =
-"SELECT t1.sid, t1.sid, t1.title, t1.hometext, t1.notes, t1.aid, t1.informant, 
-t2.url, t2.email, t1.catid, t3.title, t1.topic, t4.topicname, t4.topicimage, 
-t4.topictext, t1.score, t1.ratings, t1.counter, t1.comments, t1.acomm 
-FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_topics` `t4` 
-	WHERE ((t2.aid=t1.aid) AND (t3.catid=t1.catid) AND (t4.topicid=t1.topic) 
-	AND ((t1.alanguage='german') OR (t1.alanguage='')) AND (t1.ihome='0')) 
-	ORDER BY t1.time DESC";
-		$db->SelectLimit($sql);
-		echo $db->ErrorMsg();*/
-	}
-	$ADODB_CACHE_DIR = dirname(TempNam('/tmp','testadodb'));
-	$db->debug = false;
-	//print $db->UnixTimeStamp('2003-7-22 23:00:00');
-	
-	$phpv = phpversion();
-	if (defined('ADODB_EXTENSION')) $ext = ' &nbsp; Extension '.ADODB_EXTENSION.' installed';
-	else $ext = '';
-	print "<h3>ADODB Version: $ADODB_vers Host: <i>$db->host</i> &nbsp; Database: <i>$db->database</i> &nbsp; PHP: $phpv $ext</h3>";
-	
-	flush();
-
-	if (function_exists('date_default_timezone_set')) date_default_timezone_set('Asia/Kuala_Lumpur');
-	
-	$arr = $db->ServerInfo();
-	print_r($arr);
-	echo E_ALL,' ',E_STRICT, "<br>";
-	$e = error_reporting(E_ALL | E_STRICT);
-	echo error_reporting(),'<p>';
-	flush();
-	#$db->debug=1;
-	$tt  = $db->Time(); 
-	if ($tt == 0) echo '<br><b>$db->Time failed</b>';
-	else echo "<br>db->Time: ".date('d-m-Y H:i:s',$tt);
-	echo '<br>';
-	
-	echo "Date=",$db->UserDate('2002-04-07'),'<br>';
-	print "<i>date1</i> (1969-02-20) = ".$db->DBDate('1969-2-20');
-	print "<br><i>date1</i> (1999-02-20) = ".$db->DBDate('1999-2-20');
-	print "<br><i>date1.1</i> 1999 = ".$db->DBDate("'1999'");
-	print "<br><i>date2</i> (1970-1-2) = ".$db->DBDate(24*3600)."<p>";
-	print "<i>ts1</i> (1999-02-20 13:40:50) = ".$db->DBTimeStamp('1999-2-20 1:40:50 pm');
-	print "<br><i>ts1.1</i> (1999-02-20 13:40:00) = ".$db->DBTimeStamp('1999-2-20 13:40');
-	print "<br><i>ts2</i> (1999-02-20) = ".$db->DBTimeStamp('1999-2-20');
-	print "<br><i>ts3</i> (1970-1-2 +/- timezone) = ".$db->DBTimeStamp(24*3600);
-	print "<br> Fractional TS (1999-2-20 13:40:50.91): ".$db->DBTimeStamp($db->UnixTimeStamp('1999-2-20 13:40:50.91+1'));
-	 $dd = $db->UnixDate('1999-02-20');
-	print "<br>unixdate</i> 1999-02-20 = ".date('Y-m-d',$dd)."<p>";
-	print "<br><i>ts4</i> =".($db->UnixTimeStamp("19700101000101")+8*3600);
-	print "<br><i>ts5</i> =".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
-	print "<br><i>ts6</i> =".$db->UserTimeStamp("20040110092123");
-	print "<br><i>ts7</i> =".$db->DBTimeStamp("20040110092123");
-	flush();
-	// mssql too slow in failing bad connection
-	if (false && $db->databaseType != 'mssql') {
-		print "<p>Testing bad connection. Ignore following error msgs:<br>";
-		$db2 = ADONewConnection();
-		$rez = $db2->Connect("bad connection");
-		$err = $db2->ErrorMsg();
-		print "<i>Error='$err'</i></p>";
-		if ($rez) print "<b>Cannot check if connection failed.</b> The Connect() function returned true.</p>";
-	}
-	#error_reporting($e);
-	flush();
-
-	//$ADODB_COUNTRECS=false;
-	$rs=$db->Execute('select * from ADOXYZ order by id');
-	if($rs === false) $create = true;
-	else $rs->Close();
-	
-	//if ($db->databaseType !='vfp') $db->Execute("drop table ADOXYZ");
-	
-	if ($create) {
-		if (false && $db->databaseType == 'ibase') {
-			print "<b>Please create the following table for testing:</b></p>$createtab</p>";
-			return;
-		} else {
-			$db->debug = 99;
-		#	$e = error_reporting(E_ALL-E_WARNING);
-			$db->Execute($createtab);
-		#	error_reporting($e);
-		}
-	}
-	#error_reporting(E_ALL);
-	echo "<p>Testing Metatypes</p>";
-	$t = $db->MetaType('varchar');
-	if ($t != 'C') Err("Bad Metatype for varchar");
-	
-	$rs = $db->Execute("delete from ADOXYZ"); // some ODBC drivers will fail the drop so we delete
-	if ($rs) {
-		if(! $rs->EOF) print "<b>Error: </b>RecordSet returned by Execute('delete...') should show EOF</p>";
-		$rs->Close();
-	} else print "err=".$db->ErrorMsg();
-
-	print "<p>Test select on empty table, FetchField when EOF, and GetInsertSQL</p>";
-	$rs = $db->Execute("select id,firstname from ADOXYZ where id=9999");
-	if ($rs && !$rs->EOF) print "<b>Error: </b>RecordSet returned by Execute(select...') on empty table should show EOF</p>";
-	if ($rs->EOF && (($ox = $rs->FetchField(0)) && !empty($ox->name))) {
-		$record['id'] = 99;
-		$record['firstname'] = 'John';
-		$sql =  $db->GetInsertSQL($rs, $record);
-		if (strtoupper($sql) != strtoupper("INSERT INTO ADOXYZ ( id, firstname ) VALUES ( 99, 'John' )")) Err("GetInsertSQL does not work on empty table: $sql");
-	} else {
-		Err("FetchField does not work on empty recordset, meaning GetInsertSQL will fail...");
-	}
-	if ($rs) $rs->Close();
-	flush();
-	//$db->debug=true;	
-	print "<p>Testing Commit: ";
-	$time = $db->DBDate(time());
-	if (!$db->BeginTrans()) {
-		print '<b>Transactions not supported</b></p>';
-		if ($db->hasTransactions) Err("hasTransactions should be false");
-	} else { /* COMMIT */
-		if (!$db->hasTransactions) Err("hasTransactions should be true");
-		if ($db->transCnt != 1) Err("Invalid transCnt = $db->transCnt (should be 1)");
-		$rs = $db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (99,'Should Not','Exist (Commit)',$time)");
-		if ($rs && $db->CommitTrans()) {
-			$rs->Close();
-			$rs = $db->Execute("select * from ADOXYZ where id=99");
-			if ($rs === false || $rs->EOF) {
-				print '<b>Data not saved</b></p>';
-				$rs = $db->Execute("select * from ADOXYZ where id=99");
-				print_r($rs);
-				die();
-			} else print 'OK</p>';
-			if ($rs) $rs->Close();
-		} else {
-			if (!$rs) {
-				print "<b>Insert failed</b></p>";
-				$db->RollbackTrans();
-			} else print "<b>Commit failed</b></p>";
-		}
-		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
-		
-		/* ROLLBACK */	
-		if (!$db->BeginTrans()) print "<p><b>Error in BeginTrans</b>()</p>";
-		print "<p>Testing Rollback: ";
-		$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (100,'Should Not','Exist (Rollback)',$time)");
-		if ($db->RollbackTrans()) {
-			$rs = $db->Execute("select * from ADOXYZ where id=100");
-			if ($rs && !$rs->EOF) print '<b>Fail: Data should rollback</b></p>';
-			else print 'OK</p>';
-			if ($rs) $rs->Close();
-		} else
-			print "<b>Commit failed</b></p>";
-			
-		$rs = $db->Execute('delete from ADOXYZ where id>50');
-		if ($rs) $rs->Close();
-		
-		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
-	}
-	
-	if (1) {
-		print "<p>Testing MetaDatabases()</p>";
-		print_r( $db->MetaDatabases());
-
-		print "<p>Testing MetaTables() and MetaColumns()</p>";
-		$a = $db->MetaTables();
-		if ($a===false) print "<b>MetaTables not supported</b></p>";
-		else {
-			print "Array of tables and views: "; 
-			foreach($a as $v) print " ($v) ";
-			print '</p>';
-		}
-		
-		$a = $db->MetaTables('VIEW');
-		if ($a===false) print "<b>MetaTables not supported (views)</b></p>";
-		else {
-			print "Array of views: "; 
-			foreach($a as $v) print " ($v) ";
-			print '</p>';
-		}
-		
-		$a = $db->MetaTables(false,false,'aDo%');
-		if ($a===false) print "<b>MetaTables not supported (mask)</b></p>";
-		else {
-			print "Array of ado%: "; 
-			foreach($a as $v) print " ($v) ";
-			print '</p>';
-		}
-		
-		$a = $db->MetaTables('TABLE');
-		if ($a===false) print "<b>MetaTables not supported</b></p>";
-		else {
-			print "Array of tables: "; 
-			foreach($a as $v) print " ($v) ";
-			print '</p>';
-		}
-		
-		$db->debug=0;
-		$rez = $db->MetaColumns("NOSUCHTABLEHERE");
-		if ($rez !== false) {
-			Err("MetaColumns error handling failed");
-			var_dump($rez);
-		}
-		$db->debug=1;
-		$a = $db->MetaColumns('ADOXYZ');
-		if ($a===false) print "<b>MetaColumns not supported</b></p>";
-		else {
-			print "<p>Columns of ADOXYZ: <font size=1><br>";
-			foreach($a as $v) {print_r($v); echo "<br>";}
-			echo "</font>";
-		}
-		
-		print "<p>Testing MetaIndexes</p>";
-		
-		$a = $db->MetaIndexes(('ADOXYZ'),true);
-		if ($a===false) print "<b>MetaIndexes not supported</b></p>";
-		else {
-			print "<p>Indexes of ADOXYZ: <font size=1><br>";
-			adodb_pr($a);
-			echo "</font>";
-		}
-		print "<p>Testing MetaPrimaryKeys</p>";
-		$a = $db->MetaPrimaryKeys('ADOXYZ');
-		var_dump($a);
-	}
-	$rs = $db->Execute('delete from ADOXYZ');
-	if ($rs) $rs->Close();
-	
-	$db->debug = false;
-	
-	
-	switch ($db->databaseType) {
-	case 'vfp':
-		
-		if (0) {
-			// memo test
-			$rs = $db->Execute("select data from memo");
-			rs2html($rs);
-		}
-		break;
-
-	case 'postgres7':
-	case 'postgres64':
-	case 'postgres':
-	case 'ibase':
-		print "<p>Encode=".$db->BlobEncode("abc\0d\"'
-ef")."</p>";//'
-
-		print "<p>Testing Foreign Keys</p>";
-		$arr = $db->MetaForeignKeys('ADOXYZ',false,true);
-		print_r($arr);
-		if (!$arr) Err("No MetaForeignKeys");
-		break;
-	
-	case 'odbc_mssql':
-	case 'mssqlpo':
-		print "<p>Testing Foreign Keys</p>";
-		$arr = $db->MetaForeignKeys('Orders',false,true);
-		print_r($arr);
-		if (!$arr) Err("Bad MetaForeignKeys");
-		if ($db->databaseType == 'odbc_mssql') break;
-	
-	case 'mssql': 
-	
-		
-/*
-ASSUME Northwind available...
-
-CREATE PROCEDURE SalesByCategory
-	@CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
-AS
-IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998' 
-BEGIN
-	SELECT @OrdYear = '1998'
-END
-
-SELECT ProductName,
-	TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * (1-OD.Discount) * OD.UnitPrice)), 0)
-FROM [Order Details] OD, Orders O, Products P, Categories C
-WHERE OD.OrderID = O.OrderID 
-	AND OD.ProductID = P.ProductID 
-	AND P.CategoryID = C.CategoryID
-	AND C.CategoryName = @CategoryName
-	AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
-GROUP BY ProductName
-ORDER BY ProductName
-GO
-
-
-CREATE PROCEDURE ADODBTestSP
-@a nvarchar(25)
-AS
-SELECT GETDATE() AS T, @a AS A
-GO
-*/
-		print "<h4>Testing Stored Procedures for mssql</h4>";
-		$saved = $db->debug;
-		$db->debug=true;
-		$assoc = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		$cmd = $db->PrepareSP('ADODBTestSP');
-		$ss = "You should see me in the output.";
-		$db->InParameter($cmd,$ss,'a');
-		$rs = $db->Execute($cmd);
-		#var_dump($rs->fields);
-		echo $rs->fields['T']." --- ".$rs->fields['A']."---<br>";
-
-		$cat = 'Dairy Products';
-		$yr = '1998';
-		
-		$stmt = $db->PrepareSP('SalesByCategory');
-		$db->InParameter($stmt,$cat,'CategoryName');
-		$db->InParameter($stmt,$yr,'OrdYear');
-		$rs = $db->Execute($stmt);
-		rs2html($rs);
-		
-		$cat = 'Grains/Cereals';
-		$yr = 1998;
-		
-		$stmt = $db->PrepareSP('SalesByCategory');
-		$db->InParameter($stmt,$cat,'CategoryName');
-		$db->InParameter($stmt,$yr,'OrdYear');
-		$rs = $db->Execute($stmt);
-		rs2html($rs);
-		
-		$ADODB_FETCH_MODE = $assoc;
-		
-		/*
-		Test out params - works in PHP 4.2.3 and 4.3.3 and 4.3.8 but not 4.3.0:
-		
-			CREATE PROCEDURE at_date_interval 
-				@days INTEGER, 
-				@start VARCHAR(20) OUT, 
-				@end VARCHAR(20) OUT 	
-			AS 
-			BEGIN 
-				set @start = CONVERT(VARCHAR(20), getdate(), 101) 
-				set @end =CONVERT(VARCHAR(20), dateadd(day, @days, getdate()), 101 ) 
-			END
-			GO
-		*/
-		$db->debug=1;
-		$stmt = $db->PrepareSP('at_date_interval');
-		$days = 10;
-		$begin_date = '';
-		$end_date = '';
-		$db->InParameter($stmt,$days,'days', 4, SQLINT4); 
-		$db->OutParameter($stmt,$begin_date,'start', 20, SQLVARCHAR ); 
-		$db->OutParameter($stmt,$end_date,'end', 20, SQLVARCHAR ); 
-		$db->Execute($stmt);
-		if (empty($begin_date) or empty($end_date) or $begin_date == $end_date) {
-			Err("MSSQL SP Test for OUT Failed");
-			print "begin=$begin_date end=$end_date<p>";
-		} else print "(Today +10days) = (begin=$begin_date end=$end_date)<p>";
-	
-		$db->debug = $saved;
-		break;
-	case 'oci8': 
-	case 'oci8po':
-		
-		if (0) {
-		$t = getmicrotime();
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$arr = $db->GetArray('select * from abalone_tree');
-		$arr = $db->GetArray('select * from abalone_tree');
-		$arr = $db->GetArray('select * from abalone_tree');
-		echo "<p>t = ",getmicrotime() - $t,"</p>";
-		die();
-		}
-		
-		# cleanup
-		$db->Execute("delete from photos where id=99 or id=1");
-		$db->Execute("insert into photos (id) values(1)");
-		$db->Execute("update photos set photo=null,descclob=null where id=1");
-		
-		$saved = $db->debug;
-		$db->debug=true;
-		
-		
-
-		/*
-		CREATE TABLE PHOTOS
-		(
-		  ID           NUMBER(16),
-		  PHOTO        BLOB,
-		  DESCRIPTION  VARCHAR2(4000 BYTE),
-		  DESCCLOB     CLOB
-		);
-		
-		INSERT INTO PHOTOS (ID) VALUES(1);
-		*/
-		$s = '';
-		for ($i = 0; $i <= 500; $i++) {
-			$s .= '1234567890';
-		}
-		
-		$sql = "INSERT INTO photos ( ID, photo) ".
-			"VALUES ( :id, empty_blob() )".
-			" RETURNING photo INTO :xx";
-
-		
-		$blob_data = $s;
-		$id = 99;
-		
- 		$stmt = $db->PrepareSP($sql);
-		$db->InParameter($stmt, $id, 'id');
-		$blob = $db->InParameter($stmt, $s, 'xx',-1, OCI_B_BLOB);
-		$db->StartTrans();
-		$result = $db->Execute($stmt);
-		$db->CompleteTrans();
-		
-		$s2= $db->GetOne("select photo from photos where id=99");
-		echo "<br>---$s2";
-		if ($s !== $s2) Err("insert blob does not match");
-
-		print "<h4>Testing Blob: size=".strlen($s)."</h4>";
-		$ok = $db->Updateblob('photos','photo',$s,'id=1');
-		if (!$ok) Err("Blob failed 1");
-		else {
-			$s2= $db->GetOne("select photo from photos where id=1");
-			if ($s !== $s2) Err("updateblob does not match");
-		}
-		
-		print "<h4>Testing Clob: size=".strlen($s)."</h4>";
-		$ok = $db->UpdateClob('photos','descclob',$s,'id=1');
-		if (!$ok) Err("Clob failed 1");
-		else {
-			$s2= $db->GetOne("select descclob from photos where id=1");
-			if ($s !== $s2) Err("updateclob does not match");
-		}
-		
-		
-		$s = '';
-		$s2 = '';
-		print "<h4>Testing Foreign Keys</h4>";
-		$arr = $db->MetaForeignKeys('emp','scott');
-		print_r($arr);
-		if (!$arr) Err("Bad MetaForeignKeys");
-/*
--- TEST PACKAGE
--- "Set scan off" turns off substitution variables. 
-Set scan off; 
-
-CREATE OR REPLACE PACKAGE Adodb AS
-TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR);
-PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) ;
-PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR);
-PROCEDURE data_in(input IN VARCHAR);
-PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER);
-END Adodb;
-/
-
-
-CREATE OR REPLACE PACKAGE BODY Adodb AS
-PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
-	END open_tab;
-
-	PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) IS
-	BEGIN
-		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
-		tablenames := 'TEST';
-	END open_tab2;
-
-PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
-	BEGIN
-		output := 'Cinta Hati '||input;
-	END;
-	
-PROCEDURE data_in(input IN VARCHAR) IS
-	ignore varchar(1000);
-	BEGIN
-		ignore := input;
-	END;
-
-PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER) AS
-BEGIN
-p2 := p1;
-END;
-END Adodb;
-/
-
-*/
-
-		print "<h4>Testing Cursor Variables</h4>";
-		$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:zz,'A%'); END;",'zz');
-	
-		if ($rs && !$rs->EOF) {
-			$v = $db->GetOne("SELECT count(*) FROM tab where tname like 'A%'");
-			if ($v == $rs->RecordCount()) print "Test 1 RowCount: OK<p>";
-			else Err("Test 1 RowCount ".$rs->RecordCount().", actual = $v");
-		} else {
-			print "<b>Error in using Cursor Variables 1</b><p>";
-		}
-		$rs->Close();
-		
-		print "<h4>Testing Stored Procedures for oci8</h4>";
-		
-		$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
-		$a1 = 'Malaysia';
-		//$a2 = ''; # a2 doesn't even need to be defined!
-		$db->InParameter($stmt,$a1,'a1');
-		$db->OutParameter($stmt,$a2,'a2');
-		$rs = $db->Execute($stmt);
-		if ($rs) {
-			if ($a2 !== 'Cinta Hati Malaysia') print "<b>Stored Procedure Error: a2 = $a2</b><p>";
-			else echo  "OK: a2=$a2<p>";
-		} else {
-			print "<b>Error in using Stored Procedure IN/Out Variables</b><p>";
-		}
-		
-		$tname = 'A%';
-		
-		$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
-		$db->Parameter($stmt,$tname,'tablename');
-		$rs = $db->Execute($stmt);
-		rs2html($rs);
-		
-		$stmt = $db->PrepareSP("begin adodb.data_in(:a1); end;");
-		$db->InParameter($stmt,$a1,'a1');
-		$db->Execute($stmt);
-		
-		$db->debug = $saved;
-		break;
-	
-	default:
-		break;
-	}
-	$arr = array(
-		array(1,'Caroline','Miranda'),
-		array(2,'John','Lim'),
-		array(3,'Wai Hun','See')
-	);
-	//$db->debug=1;
-	print "<p>Testing Bulk Insert of 3 rows</p>";
-
-	$sql = "insert into ADOXYZ (id,firstname,lastname) values (".$db->Param('0').",".$db->Param('1').",".$db->Param('2').")";
-	$db->StartTrans();
-	$db->Execute($sql,$arr);
-	$db->CompleteTrans();
-	$rs = $db->Execute('select * from ADOXYZ order by id');
-	if (!$rs || $rs->RecordCount() != 3) Err("Bad bulk insert");
-	
-	rs2html($rs);
-	
-	$db->Execute('delete from ADOXYZ');
-		
-	print "<p>Inserting 50 rows</p>";
-
-	for ($i = 0; $i < 5; $i++) {	
-
-	$time = $db->DBDate(time());
-	if (empty($_GET['hide'])) $db->debug = true;
-	switch($db->databaseType){
-	case 'mssqlpo':
-	case 'mssql':
-		$sqlt = "CREATE TABLE mytable (
-  row1 INT  IDENTITY(1,1) NOT NULL,
-  row2 varchar(16),
-  PRIMARY KEY  (row1))";
-  		//$db->debug=1;
-  		if (!$db->Execute("delete from mytable")) 
-			$db->Execute($sqlt);
-			
-		$ok = $db->Execute("insert into mytable (row2) values ('test')");
-		$ins_id=$db->Insert_ID();
-		echo "Insert ID=";var_dump($ins_id);
-		if ($ins_id == 0) Err("Bad Insert_ID()");
-		$ins_id2 = $db->GetOne("select row1 from mytable");
-		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-		
-		$arr = array(0=>'Caroline',1=>'Miranda');
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
-		break;
-	case 'mysqli':
-	case 'mysqlt':
-	case 'mysql':
-		$sqlt = "CREATE TABLE `mytable` (
-  `row1` int(11) NOT NULL auto_increment,
-  `row2` varchar(16) NOT NULL default '',
-  PRIMARY KEY  (`row1`),
-  KEY `myindex` (`row1`,`row2`)
-) ";
-		if (!$db->Execute("delete from mytable")) 
-			$db->Execute($sqlt);
-			
-		$ok = $db->Execute("insert into mytable (row2) values ('test')");
-		$ins_id=$db->Insert_ID();
-		echo "Insert ID=";var_dump($ins_id);
-		if ($ins_id == 0) Err("Bad Insert_ID()");
-		$ins_id2 = $db->GetOne("select row1 from mytable");
-		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
-		
-	default:
-		$arr = array(0=>'Caroline',1=>'Miranda');
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
-		break;
-	
-	case 'oci8':
-	case 'oci805':
-		$arr = array('first'=>'Caroline','last'=>'Miranda');
-		$amt = rand() % 100;
-		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,:first,:last,$time)";		
-		break;
-	}
-	if ($i & 1) {
-		$sql = $db->Prepare($sql);
-	}
-	$rs = $db->Execute($sql,$arr);
-		
-	if ($rs === false) Err( 'Error inserting with parameters');
-	else $rs->Close();
-	$db->debug = false;
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+1,'John','Lim',$time)");
-	/*$ins_id=$db->Insert_ID();
-	echo "Insert ID=";var_dump($ins_id);*/
-	if ($db->databaseType == 'mysql') if ($ins_id == 0) Err('Bad Insert_ID');
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+2,'Mary','Lamb',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+3,'George','Washington',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+4,'Mr. Alan','Tam',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+5,'Alan',".$db->quote("Turing'ton").",$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created)values ($i*10+6,'Serena','Williams',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+7,'Yat Sun','Sun',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+8,'Wai Hun','See',$time )");
-	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+9,'Steven','Oey',$time )");
-	} // for
-	if (1) {
-	$db->debug=1;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$cnt = $db->GetOne("select count(*) from ADOXYZ");
-	$rs = $db->Execute('update ADOXYZ set id=id+1');	
-	if (!is_object($rs)) {
-		print_r($rs);
-		err("Update should return object");
-	} 
-	if (!$rs) err("Update generated error");
-	
-	$nrows = $db->Affected_Rows();   
-	if ($nrows === false) print "<p><b>Affected_Rows() not supported</b></p>";
-	else if ($nrows != $cnt)  print "<p><b>Affected_Rows() Error: $nrows returned (should be 50) </b></p>";
-	else print "<p>Affected_Rows() passed</p>";
-	}
-	
-	if ($db->dataProvider == 'oci8')  $array = array('zid'=>1,'zdate'=>date('Y-m-d',time()));
-	else $array=array(1,date('Y-m-d',time()));
-	
-	
-	#$array = array(1,date('Y-m-d',time()));
-	$id = $db->GetOne("select id from ADOXYZ 
-		where id=".$db->Param('zid')." and created>=".$db->Param('ZDATE')."",
-		$array);
-	if ($id != 1) Err("Bad bind; id=$id");
-	else echo "<br>Bind date/integer 1 passed";
-	
-	$array =array(1,$db->BindDate(time()));
-	$id = $db->GetOne("select id from ADOXYZ 
-		where id=".$db->Param('0')." and created>=".$db->Param('1')."",
-		$array);
-	if ($id != 1) Err("Bad bind; id=$id");
-	else echo "<br>Bind date/integer 2 passed";
-	
-	$db->debug = false;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
- //////////////////////////////////////////////////////////////////////////////////////////
-	
-	$rs = $db->Execute("select * from ADOXYZ where firstname = 'not known'");
-	if (!$rs ||  !$rs->EOF) print "<p><b>Error on empty recordset</b></p>";
-	else if ($rs->RecordCount() != 0) {
-		print "<p><b>Error on RecordCount. Should be 0. Was ".$rs->RecordCount()."</b></p>"; 
-		print_r($rs->fields);
-	}
-	if ($db->databaseType !== 'odbc') {
-		$rs = $db->Execute("select id,firstname,lastname,created,".$db->random." from ADOXYZ order by id");
-		if ($rs) {
-			if ($rs->RecordCount() != 50) {
-				print "<p><b>RecordCount returns ".$rs->RecordCount().", should be 50</b></p>";
-				adodb_pr($rs->GetArray());
-				$poc = $rs->PO_RecordCount('ADOXYZ');
-				if ($poc == 50) print "<p> &nbsp; &nbsp; PO_RecordCount passed</p>";
-				else print "<p><b>PO_RecordCount returns wrong value: $poc</b></p>";
-			} else print "<p>RecordCount() passed</p>";
-			if (isset($rs->fields['firstname'])) print '<p>The fields columns can be indexed by column name.</p>';
-			else {
-				Err( '<p>The fields columns <i>cannot</i> be indexed by column name.</p>');
-				print_r($rs->fields);
-			}
-			if (empty($_GET['hide'])) rs2html($rs);
-		}
-		else print "<p><b>Error in Execute of SELECT with random</b></p>";
-	}
-	$val = $db->GetOne("select count(*) from ADOXYZ");
-	 if ($val == 50) print "<p>GetOne returns ok</p>";
-	 else print "<p><b>Fail: GetOne returns $val</b></p>";
-
-	 echo "<b>GetRow Test</b>";
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$val1 = $db->GetRow("select count(*) from ADOXYZ");
-	$val2 = $db->GetRow("select count(*) from ADOXYZ");
-	 if ($val1[0] == 50 and sizeof($val1) == 1 and $val2[0] == 50 and sizeof($val2) == 1) print "<p>GetRow returns ok</p>";
-	 else {
-	 	print_r($val);
-	 	print "<p><b>Fail: GetRow returns {$val2[0]}</b></p>";
-	}
-
-	print "<p>FetchObject/FetchNextObject Test</p>";
-	$rs = $db->Execute('select * from ADOXYZ');
-	if ($rs) {
-		if (empty($rs->connection)) print "<b>Connection object missing from recordset</b></br>";
-		
-		while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
-			if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
-				print_r($o);
-				print "<p><b>Firstname is not string</b></p>";
-				break;
-			}
-		}
-	} else {
-		print "<p><b>Failed rs</b></p>";
-		die("<p>ADOXYZ table cannot be read - die()");
-	}
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	print "<p>FetchObject/FetchNextObject Test 2</p>";
-	#$db->debug=99;
-	$rs = $db->Execute('select * from ADOXYZ');
-	if (empty($rs->connection)) print "<b>Connection object missing from recordset</b></br>";
-	print_r($rs->fields);
-	while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
-		if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
-			print_r($o);
-			print "<p><b>Firstname is not string</b></p>";
-			break;
-		}
-	}
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-	$savefetch = $ADODB_FETCH_MODE;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	
-	print "<p>CacheSelectLimit  Test...</p>";
-	$db->debug=1;
-	$rs = $db->CacheSelectLimit('select  id, firstname from  ADOXYZ order by id',2);
-	
-	if ($rs && !$rs->EOF) {
-		if (isset($rs->fields[0])) {
-			Err("ASSOC has numeric fields");
-			print_r($rs->fields);
-		}
-		if ($rs->fields['id'] != 1)  {Err("Error"); print_r($rs->fields);};
-		if (trim($rs->fields['firstname']) != 'Caroline')  {print Err("Error 2"); print_r($rs->fields);};
-		
-		$rs->MoveNext();
-		if ($rs->fields['id'] != 2)  {Err("Error 3"); print_r($rs->fields);};
-		$rs->MoveNext();
-		if (!$rs->EOF) {
-			Err("Error EOF");
-			print_r($rs);
-		}
-	}
-	
-	print "<p>FETCH_MODE = ASSOC: Should get 1, Caroline</p>";
-	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',2);
-	if ($rs && !$rs->EOF) {
-		if (ADODB_ASSOC_CASE == 2) {
-			$id = 'ID';
-			$fname = 'FIRSTNAME';
-		}else {
-			$id = 'id';
-			$fname = 'firstname';
-		}
-		if ($rs->fields[$id] != 1)  {Err("Error 1"); print_r($rs->fields);};
-		if (trim($rs->fields[$fname]) != 'Caroline')  {Err("Error 2"); print_r($rs->fields);};
-		$rs->MoveNext();
-		if ($rs->fields[$id] != 2)  {Err("Error 3"); print_r($rs->fields);};
-		$rs->MoveNext();
-		if (!$rs->EOF) Err("Error EOF");
-		else if (is_array($rs->fields) || $rs->fields) {
-			Err("Error: ## fields should be set to false on EOF");
-			print_r($rs->fields);
-		}
-	}
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	print "<p>FETCH_MODE = NUM: Should get 1, Caroline</p>";
-	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
-	if ($rs && !$rs->EOF) {
-		if (isset($rs->fields['id'])) Err("FETCH_NUM has ASSOC fields");
-		if ($rs->fields[0] != 1)  {Err("Error 1"); print_r($rs->fields);};
-		if (trim($rs->fields[1]) != 'Caroline')  {Err("Error 2");print_r($rs->fields);};
-		$rs->MoveNext();
-		if (!$rs->EOF) Err("Error EOF");
-
-	}
-	$ADODB_FETCH_MODE = $savefetch;
-	
-	$db->debug = false;
-	print "<p>GetRowAssoc Upper: Should get 1, Caroline</p>";
-	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
-	if ($rs && !$rs->EOF) {
-		$arr = $rs->GetRowAssoc();
-		if ($arr['ID'] != 1) {Err("Error 1");print_r($arr);};
-		if (trim($arr['FIRSTNAME']) != 'Caroline') {Err("Error 2"); print_r($arr);};
-		$rs->MoveNext();
-		if (!$rs->EOF) Err("Error EOF");
-
-	}
-	print "<p>GetRowAssoc Lower: Should get 1, Caroline</p>";
-	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
-	if ($rs && !$rs->EOF) {
-		$arr = $rs->GetRowAssoc(false);
-		if ($arr['id'] != 1) {Err("Error 1"); print_r($arr);};
-		if (trim($arr['firstname']) != 'Caroline') {Err("Error 2"); print_r($arr);};
-
-	}
-	
-	print "<p>GetCol Test</p>";
-	$col = $db->GetCol('select distinct firstname from ADOXYZ order by 1');
-	if (!is_array($col)) Err("Col size is wrong");
-	if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col elements wrong");
-
-	$db->debug = true;
-	
-		
-	echo "<p>Date Update Test</p>";
-	$zdate = date('Y-m-d',time()+3600*24);
-	$zdate = $db->DBDate($zdate);
-	$db->Execute("update ADOXYZ set created=$zdate where id=1");
-	$row = $db->GetRow("select created,firstname from ADOXYZ where id=1");
-	print_r($row); echo "<br>";
-	
-	
-	
-	print "<p>SelectLimit Distinct Test 1: Should see Caroline, John and Mary</p>";
-	$rs = $db->SelectLimit('select distinct * from ADOXYZ order by id',3);
-	
-	
-	if ($rs && !$rs->EOF) {
-		if (trim($rs->fields[1]) != 'Caroline') Err("Error 1 (exp Caroline), ".$rs->fields[1]);
-		$rs->MoveNext();
-		
-		if (trim($rs->fields[1]) != 'John') Err("Error 2 (exp John), ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'Mary') Err("Error 3 (exp Mary),".$rs->fields[1]);
-		$rs->MoveNext();
-		if (! $rs->EOF) Err("Error EOF");
-		//rs2html($rs);
-	} else Err("Failed SelectLimit Test 1");
-	
-	print "<p>SelectLimit Test 2: Should see Mary, George and Mr. Alan</p>";
-	$rs = $db->SelectLimit('select * from ADOXYZ order by id',3,2);
-	if ($rs && !$rs->EOF) {
-		if (trim($rs->fields[1]) != 'Mary') Err("Error 1 - No Mary, instead: ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'George')Err("Error 2 - No George, instead: ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'Mr. Alan') Err("Error 3 - No Mr. Alan, instead: ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (! $rs->EOF) Err("Error EOF");
-	//	rs2html($rs);
-	}
-	 else Err("Failed SelectLimit Test 2 ". ($rs ? 'EOF':'no RS'));
-	
-	print "<p>SelectLimit Test 3: Should see Wai Hun and Steven</p>";
-	$db->debug=1;
-	global $A; $A=1;
-	$rs = $db->SelectLimit('select * from ADOXYZ order by id',-1,48);
-	$A=0;
-	if ($rs && !$rs->EOF) {
-		if (empty($rs->connection)) print "<b>Connection object missing from recordset</b></br>";
-		if (trim($rs->fields[1]) != 'Wai Hun') Err("Error 1 ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (trim($rs->fields[1]) != 'Steven') Err("Error 2 ".$rs->fields[1]);
-		$rs->MoveNext();
-		if (! $rs->EOF) {
-			Err("Error EOF");
-		}
-		//rs2html($rs);
-	}
-	 else Err("Failed SelectLimit Test 3");
-		$db->debug = false;
-	
-	
-	$rs = $db->Execute("select * from ADOXYZ order by id");
-	print "<p>Testing Move()</p>";	
-	if (!$rs)Err( "Failed Move SELECT");
-	else {
-		if (!$rs->Move(2)) {
-			if (!$rs->canSeek) print "<p>$db->databaseType: <b>Move(), MoveFirst() nor MoveLast() not supported.</b></p>";
-			else print '<p><b>RecordSet->canSeek property should be set to false</b></p>';
-		} else {
-			$rs->MoveFirst();
-			if (trim($rs->Fields("firstname")) != 'Caroline') {
-				print "<p><b>$db->databaseType: MoveFirst failed -- probably cannot scroll backwards</b></p>";
-			}
-			else print "MoveFirst() OK<BR>";
-						
-						// Move(3) tests error handling -- MoveFirst should not move cursor
-			$rs->Move(3);
-			if (trim($rs->Fields("firstname")) != 'George') {
-				print '<p>'.$rs->Fields("id")."<b>$db->databaseType: Move(3) failed</b></p>";
-			} else print "Move(3) OK<BR>";
-						
-			$rs->Move(7);
-			if (trim($rs->Fields("firstname")) != 'Yat Sun') {
-				print '<p>'.$rs->Fields("id")."<b>$db->databaseType: Move(7) failed</b></p>";
-				print_r($rs);
-			} else print "Move(7) OK<BR>";
-			if ($rs->EOF) Err("Move(7) is EOF already");
-			$rs->MoveLast();
-			if (trim($rs->Fields("firstname")) != 'Steven'){
-				 print '<p>'.$rs->Fields("id")."<b>$db->databaseType: MoveLast() failed</b></p>";
-				 print_r($rs);
-			}else print "MoveLast() OK<BR>";
-			$rs->MoveNext();
-			if (!$rs->EOF) err("Bad MoveNext");
-			if ($rs->canSeek) {
-				$rs->Move(3);
-				if (trim($rs->Fields("firstname")) != 'George') {
-					print '<p>'.$rs->Fields("id")."<b>$db->databaseType: Move(3) after MoveLast failed</b></p>";
-					
-				} else print "Move(3) after MoveLast() OK<BR>";
-			}
-			
-			print "<p>Empty Move Test";
-			$rs = $db->Execute("select * from ADOXYZ where id > 0 and id < 0");
-			$rs->MoveFirst();
-			if (!$rs->EOF || $rs->fields) Err("Error in empty move first");
-		}
-	}
-	
-	$rs = $db->Execute('select * from ADOXYZ where id = 2');
-	if ($rs->EOF || !is_array($rs->fields)) Err("Error in select");
-	$rs->MoveNext();
-	if (!$rs->EOF) Err("Error in EOF (xx) ");
- //	$db->debug=true;
-	print "<p>Testing ADODB_FETCH_ASSOC and concat: concat firstname and lastname</p>";
-
-	$save = $ADODB_FETCH_MODE;
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	if ($db->dataProvider == 'postgres') {
-		$sql = "select ".$db->Concat('cast(firstname as varchar)',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
-		$rs = $db->Execute($sql);
-	} else {
-		$sql = "select distinct ".$db->Concat('firstname',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
-		$rs = $db->Execute($sql);
-	}
-	if ($rs) {
-		if (empty($_GET['hide'])) rs2html($rs);
-	} else {
-		Err( "Failed Concat:".$sql);
-	}
-	$ADODB_FETCH_MODE = $save;
-	print "<hr />Testing GetArray() ";
-	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	
-	$rs = $db->Execute("select * from ADOXYZ order by id");
-	if ($rs) {
-		$arr = $rs->GetArray(10);
-		if (sizeof($arr) != 10 || trim($arr[1][1]) != 'John' || trim($arr[1][2]) != 'Lim') print $arr[1][1].' '.$arr[1][2]."<b> &nbsp; ERROR</b><br>";
-		else print " OK<BR>";
-	}
-	
-	$arr = $db->GetArray("select x from ADOXYZ");
-	$e = $db->ErrorMsg(); $e2 = $db->ErrorNo();
-	echo "Testing error handling, should see illegal column 'x' error=<i>$e ($e2) </i><br>";
-	if (!$e || !$e2) Err("Error handling did not work");
-	print "Testing FetchNextObject for 1 object ";
-	$rs = $db->Execute("select distinct lastname,firstname from ADOXYZ where firstname='Caroline'");
-	$fcnt = 0;
-	if ($rs)
-	while ($o = $rs->FetchNextObject()) {
-		$fcnt += 1;	
-	}
-	if ($fcnt == 1) print " OK<BR>";
-	else print "<b>FAILED</b><BR>";
-	
-	$stmt = $db->Prepare("select * from ADOXYZ where id < 3");
-	$rs = $db->Execute($stmt);
-	if (!$rs) Err("Prepare failed");
-	else {
-		$arr = $rs->GetArray();
-		if (!$arr) Err("Prepare failed 2");
-		if (sizeof($arr) != 2) Err("Prepare failed 3");
-	}
-	print "Testing GetAssoc() ";
-	$savecrecs = $ADODB_COUNTRECS;
-	$ADODB_COUNTRECS = false;
-	//$arr = $db->GetArray("select  lastname,firstname from ADOXYZ");
-	//print_r($arr);
-	print "<hr />";
-	$rs = $db->Execute("select distinct lastname,firstname,created from ADOXYZ");
-	
-	if ($rs) {
-		$arr = $rs->GetAssoc();
-		//print_r($arr);
-		if (empty($arr['See']) || trim(reset($arr['See'])) != 'Wai Hun') print $arr['See']." &nbsp; <b>ERROR</b><br>";
-		else print " OK 1";
-	}
-	
-	$arr = $db->GetAssoc("select distinct lastname,firstname from ADOXYZ");
-	if ($arr) {
-		//print_r($arr);
-		if (empty($arr['See']) || trim($arr['See']) != 'Wai Hun') print $arr['See']." &nbsp; <b>ERROR</b><br>";
-		else print " OK 2<BR>";
-	}
-	// Comment this out to test countrecs = false
-	$ADODB_COUNTRECS = $savecrecs;
-	$db->debug=1;
-	$query = $db->Prepare("select count(*) from ADOXYZ");
-	$rs = $db->CacheExecute(10,$query);
-	if (reset($rs->fields) != 50) echo Err("$cnt wrong for Prepare/CacheGetOne");
-	
-	for ($loop=0; $loop < 1; $loop++) {
-	print "Testing GetMenu() and CacheExecute<BR>";
-	$db->debug = true;
-	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	
-	
-
-
-	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu('menu','Steven').'<BR>'; 
-	else print " Fail<BR>";
-	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	
-	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu('menu','Steven',false).'<BR>';
-	else print " Fail<BR>";
-	
-	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	
-	if ($rs) print ' 1st line set to **** , Steven selected: '. $rs->GetMenu('menu','Steven','1st:****').'<BR>';
-	else print " Fail<BR>";
-	
-
-	
-	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) print ' Multiple, Alan selected: '. $rs->GetMenu('menu','Alan',false,true).'<BR>';
-	else print " Fail<BR>";
-	print '</p><hr />';
-	
-	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) {
-		print ' Multiple, Alan and George selected: '. $rs->GetMenu('menu',array('Alan','George'),false,true);
-		if (empty($rs->connection)) print "<b>Connection object missing from recordset</b></br>";
-	} else print " Fail<BR>";
-	print '</p><hr />';
-	
-	print "Testing GetMenu3()<br>";
-	$rs = $db->Execute("select ".$db->Concat('firstname',"'-'",'id').",id, lastname from ADOXYZ order by lastname,id");
-	if ($rs) print "Grouped Menu: ".$rs->GetMenu3('name');
-	else Err('Grouped Menu GetMenu3()');
-	print "<hr />";
-
-	print "Testing GetMenu2() <BR>";
-	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu2('menu',('Oey')).'<BR>'; 
-	else print " Fail<BR>";
-	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
-	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu2('menu',('Oey'),false).'<BR>';
-	else print " Fail<BR>";
-	}
-	echo "<h3>CacheExecute</h3>";
-
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
-	print_r($rs->fields); echo $rs->fetchMode;echo "<br>";
-	echo $rs->Fields('firstname');
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
-	print_r($rs->fields);echo "<br>";
-	echo $rs->Fields('firstname');
-	$db->debug = false;
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	// phplens
-	
-	$sql = 'select * from ADOXYZ where 0=1';
-	echo "<p>**Testing '$sql' (phplens compat 1)</p>";
-	$rs = $db->Execute($sql);
-	if (!$rs) err( "<b>No recordset returned for '$sql'</b>");
-	if (!$rs->FieldCount()) err( "<b>No fields returned for $sql</b>");
-	if (!$rs->FetchField(1)) err( "<b>FetchField failed for $sql</b>");
-	
-	$sql = 'select * from ADOXYZ order by 1';
-	echo "<p>**Testing '$sql' (phplens compat 2)</p>";
-	$rs = $db->Execute($sql);
-	if (!$rs) err( "<b>No recordset returned for '$sql'<br>".$db->ErrorMsg()."</b>");
-	
-	
-	$sql = 'select * from ADOXYZ order by 1,1';
-	echo "<p>**Testing '$sql' (phplens compat 3)</p>";
-	$rs = $db->Execute($sql);
-	if (!$rs) err( "<b>No recordset returned for '$sql'<br>".$db->ErrorMsg()."</b>");
-	
-	
-	// Move
-	$rs1 = $db->Execute("select id from ADOXYZ where id <= 2 order by 1");
-	$rs2 = $db->Execute("select id from ADOXYZ where id = 3 or id = 4 order by 1");
-
-	if ($rs1) $rs1->MoveLast();
-	if ($rs2) $rs2->MoveLast();
-	
-	if (empty($rs1) || empty($rs2) || $rs1->fields[0] != 2 || $rs2->fields[0] != 4) {
-		$a = $rs1->fields[0];
-		$b = $rs2->fields[0];
-		print "<p><b>Error in multiple recordset test rs1=$a rs2=$b (should be rs1=2 rs2=4)</b></p>";
-	} else
-		print "<p>Testing multiple recordsets OK</p>";
-		
-	
-	echo "<p> GenID test: ";
-	for ($i=1; $i <= 10; $i++) 
-		echo  "($i: ",$val = $db->GenID($db->databaseType.'abcseq6' ,5), ") ";
-	if ($val == 0) Err("GenID not supported");
-	
-	if ($val) {
-		$db->DropSequence('abc_seq2');
-		$db->CreateSequence('abc_seq2');
-		$val = $db->GenID('abc_seq2');
-		$db->DropSequence('abc_seq2');
-		$db->CreateSequence('abc_seq2');
-		$val = $db->GenID('abc_seq2');
-		if ($val != 1) Err("Drop and Create Sequence not supported ($val)");
-	}
-	echo "<p>";
-	
-	if (substr($db->dataProvider,0,3) != 'notused') { // used to crash ado
-		$sql = "select firstnames from ADOXYZ";
-		print "<p>Testing execution of illegal statement: <i>$sql</i></p>";
-		if ($db->Execute($sql) === false) {
-			print "<p>This returns the following ErrorMsg(): <i>".$db->ErrorMsg()."</i> and ErrorNo(): ".$db->ErrorNo().'</p>';
-		} else 
-			print "<p><b>Error in error handling -- Execute() should return false</b></p>";
-	} else 
-		print "<p><b>ADO skipped error handling of bad select statement</b></p>";
-	
-	print "<p>ASSOC TEST 2<br>";
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->query('select * from ADOXYZ order by id');
-	if ($ee = $db->ErrorMsg()) {
-		Err("Error message=$ee");
-	}
-	if ($ee = $db->ErrorNo()) {
-		Err("Error No = $ee");
-	}
-	print_r($rs->fields);
-	for($i=0;$i<$rs->FieldCount();$i++) 
-	{ 
-		$fld=$rs->FetchField($i); 
-		print "<br> Field name is ".$fld->name; 
-		print " ".$rs->Fields($fld->name); 
-	} 
-
-		
-	print "<p>BOTH TEST 2<br>";
-	if ($db->dataProvider == 'ado') {
-		print "<b>ADODB_FETCH_BOTH not supported</b> for dataProvider=".$db->dataProvider."<br>";
-	} else {
-		$ADODB_FETCH_MODE = ADODB_FETCH_BOTH;
-		$rs = $db->query('select * from ADOXYZ order by id');
-		for($i=0;$i<$rs->FieldCount();$i++) 
-		{ 
-			$fld=$rs->FetchField($i); 
-			print "<br> Field name is ".$fld->name; 
-			print " ".$rs->Fields($fld->name); 
-		} 
-	}
-	
-	print "<p>NUM TEST 2<br>";
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	$rs = $db->query('select * from ADOXYZ order by id');
-	for($i=0;$i<$rs->FieldCount();$i++) 
-	{ 
-		$fld=$rs->FetchField($i); 
-		print "<br> Field name is ".$fld->name; 
-		print " ".$rs->Fields($fld->name); 
-	} 
-	
-	print "<p>ASSOC Test of SelectLimit<br>";
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->selectlimit('select * from ADOXYZ order by id',3,4);
-	$cnt = 0;
-	while ($rs && !$rs->EOF) {
-		$cnt += 1;
-		if (!isset($rs->fields['firstname'])) {
-			print "<br><b>ASSOC returned numeric field</b></p>";
-			break;
-		}
-		$rs->MoveNext();
-	}
-	if ($cnt != 3) print "<br><b>Count should be 3, instead it was $cnt</b></p>";
-	
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	if ($db->sysDate) {
-		$saved = $db->debug;
-		$db->debug = 1;
-		$rs = $db->Execute("select {$db->sysDate} from ADOXYZ where id=1");
-		if (ADORecordSet::UnixDate(date('Y-m-d')) != $rs->UnixDate($rs->fields[0])) {
-			print "<p><b>Invalid date {$rs->fields[0]}</b></p>";
-		} else
-			print "<p>Passed \$sysDate test ({$rs->fields[0]})</p>";
-		
-		print_r($rs->FetchField(0));
-		print time();
-		$db->debug=$saved;
-	} else {
-		print "<p><b>\$db->sysDate not defined</b></p>";
-	}
-
-	print "<p>Test CSV</p>";
-	include_once('../toexport.inc.php');
-	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\' he,\'"\' q  from ADOXYZ',10);	
-	
-	print "<pre>";
-	print rs2csv($rs);
-	print "</pre>";
-	
-	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'The	"young man", he said\' from ADOXYZ',10);	
-	
-	if (PHP_VERSION < 5) {
-		print "<pre>";
-		rs2tabout($rs);
-		print "</pre>";
-	}
-	print " CacheFlush ";
-	$db->CacheFlush();
-	
-	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A');
-	$sql = "SELECT $date from ADOXYZ";
-	print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
-	$rs = $db->SelectLimit($sql,1);
-	$d = date('d-m-M-Y-').'Q'.(ceil(date('m')/3.0)).date(' h:i:s A');
-	if (!$rs) Err("SQLDate query returned no recordset");
-	else if ($d != $rs->fields[0]) Err("SQLDate 1 failed expected: <br>act:$d <br>sql:".$rs->fields[0]);
-	
-	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
-	$sql = "SELECT $date from ADOXYZ";
-	print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
-	$db->debug=1;
-	$rs = $db->SelectLimit($sql,1);
-	$ts = ADOConnection::UnixDate('1974-02-25');
-	$d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s A',$ts);
-	if (!$rs) {
-		Err("SQLDate query returned no recordset");
-		echo $db->ErrorMsg(),'<br>';
-	} else if ($d != reset($rs->fields)) {
-		Err("SQLDate 2 failed expected: <br>act:$d <br>sql:".$rs->fields[0].' <br>'.$db->ErrorMsg());
-	}
-	
-	
-	print "<p>Test Filter</p>";
-	$db->debug = 1;
-	
-	$rs = $db->SelectLimit('select * from ADOXYZ where id < 3 order by id');
-	
-	$rs = RSFilter($rs,'do_strtolower');
-	if (trim($rs->fields[1]) != 'caroline'  && trim($rs->fields[2]) != 'miranda') {
-		err('**** RSFilter failed');
-		print_r($rs->fields);
-	}
-	
-	rs2html($rs);
-		
-	$db->debug=1;
-	
-	
-	print "<p>Test Replace</p>";
-	
-	$ret = $db->Replace('ADOXYZ', 
-		array('id'=>1,'firstname'=>'Caroline','lastname'=>'Miranda'),
-		array('id'),
-		$autoq = true);
-	if (!$ret) echo "<p>Error in replacing existing record</p>";
-	else {
-		$saved = $db->debug;
-		$db->debug = 0;
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = true;
-		$rs = $db->Execute('select * FROM ADOXYZ where id=1');
-		$db->debug = $saved;
-		if ($rs->RecordCount() != 1) {
-			$cnt = $rs->RecordCount();
-			rs2html($rs);
-			print "<b>Error - Replace failed, count=$cnt</b><p>";
-		}
-		$ADODB_COUNTRECS = $savec;
-	}
-	$ret = $db->Replace('ADOXYZ', 
-		array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
-		array('id','firstname'),
-		$autoq = true);
-	if ($ret != 2) print "<b>Replace failed: </b>";
-	print "test A return value=$ret (2 expected) <p>";
-	
-	$ret = $db->Replace('ADOXYZ', 
-		array('id'=>1000,'firstname'=>'Sherazade','lastname'=>'Al-Rashid'),
-		'id',
-		$autoq = true);
-	if ($ret != 1) 
-		if ($db->dataProvider == 'ibase' && $ret == 2);
-		else print "<b>Replace failed: </b>";
-	print "test B return value=$ret (1 or if ibase then 2 expected) <p>";
-	
-	print "<h3>rs2rs Test</h3>";
-	
-	$rs = $db->Execute('select * from ADOXYZ where id>= 1 order by id');
-	$rs = $db->_rs2rs($rs);
-	$rs->valueX = 'X';
-	$rs->MoveNext();
-	$rs = $db->_rs2rs($rs);
-	if (!isset($rs->valueX)) err("rs2rs does not preserve array recordsets");
-	if (reset($rs->fields) != 1) err("rs2rs does not move to first row: id=".reset($rs->fields));
-
-	/////////////////////////////////////////////////////////////
-	include_once('../pivottable.inc.php');
-	print "<h3>Pivot Test</h3>";
-	$db->debug=true;
- 	$sql = PivotTableSQL(
- 		$db,  			# adodb connection
- 		'ADOXYZ',  		# tables
-		'firstname',	# row fields
-		'lastname',		# column fields 
-		false,			# join
-		'ID', 			# sum
-		'Sum ',			# label for sum
-		'sum',			# aggregate function
-		true
-	);
-	$rs = $db->Execute($sql);
-	if ($rs) rs2html($rs);
-	else Err("Pivot sql error");
-	
-	$pear = true; //true;
-	$db->debug=false;
-	
-	if ($pear) {
-	// PEAR TESTS BELOW
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-	include_once "PEAR.php";
-	$rs = $db->query('select * from ADOXYZ where id>0 and id<10 order by id');
-	
-	$i = 0;
-	if ($rs && !$rs->EOF) {
-		while ($arr = $rs->fetchRow()) {
-			$i++;
-			//print "$i ";
-			if ($arr[0] != $i) {
-				print_r($arr);
-				print "<p><b>PEAR DB emulation error 1.</b></p>";
-				$pear = false;
-				break;
-			}
-		}
-		$rs->Close();
-	}
-	
-	
-	if ($i != $db->GetOne('select count(*) from ADOXYZ where id>0 and id<10')) {
-		print "<p><b>PEAR DB emulation error 1.1 EOF ($i)</b></p>";
-		$pear = false;
-	}
-	
-	$rs = $db->limitQuery('select * from ADOXYZ where id>0 order by id',$i=3,$top=3);
-	$i2 = $i;
-	if ($rs && !$rs->EOF) {
-
-		while (!is_object($rs->fetchInto($arr))) {
-			$i2++;
-			
-	//			print_r($arr);
-	//		print "$i ";print_r($arr);
-			if ($arr[0] != $i2) {
-				print "<p><b>PEAR DB emulation error 2.</b></p>";
-				$pear = false;
-				break;
-			}
-		}
-		$rs->Close();
-	}
-	if ($i2 != $i+$top) {
-		print "<p><b>PEAR DB emulation error 2.1 EOF (correct=$i+$top, actual=$i2)</b></p>";
-		$pear = false;
-	}
-	}
-	if ($pear) print "<p>PEAR DB emulation passed.</p>";
-	flush();
-
-	
-	$rs = $db->SelectLimit("select ".$db->sysDate." from ADOXYZ",1);
-	$date = $rs->fields[0];
-	if (!$date) Err("Bad sysDate");
-	else {
-		$ds = $db->UserDate($date,"d m Y");
-		if ($ds != date("d m Y")) Err("Bad UserDate: ".$ds.' expected='.date("d m Y"));
-		else echo "Passed UserDate: $ds<p>";
-	}
-	$db->debug=1;
-	if ($db->dataProvider == 'oci8') 
-		$rs = $db->SelectLimit("select to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from ADOXYZ",1);
-	else 
-		$rs = $db->SelectLimit("select ".$db->sysTimeStamp." from ADOXYZ",1);
-	$date = $rs->fields[0];
-	if (!$date) Err("Bad sysTimeStamp");
-	else {
-		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
-		if ($ds != date("H \\h\\r\\s-d m Y")) Err("Bad UserTimeStamp: ".$ds.", correct is ".date("H \\h\\r\\s-d m Y"));
-		else echo "Passed UserTimeStamp: $ds<p>";
-		
-		$date = 100;
-		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
-		$ds2 = date("H \\h\\r\\s-d m Y",$date);
-		if ($ds != $ds2) Err("Bad UserTimeStamp 2: $ds: $ds2");
-		else echo "Passed UserTimeStamp 2: $ds<p>";
-	}
-	flush();
-	
-	if ($db->hasTransactions) {
-		$db->debug=1;
-		echo "<p>Testing StartTrans CompleteTrans</p>";
-		$db->raiseErrorFn = false;
-		
-		$db->SetTransactionMode('SERIALIZABLE');
-		$db->StartTrans();
-		$rs = $db->Execute('select * from notable');
-			$db->StartTrans();
-				$db->BeginTrans();
-			$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
-				$db->CommitTrans();
-			$db->CompleteTrans();
-		$rez = $db->CompleteTrans();
-		$db->SetTransactionMode('');
-		$db->debug=0;
-		if ($rez !== false) {
-			if (is_null($rez)) Err("Error: _transOK not modified");
-			else Err("Error: CompleteTrans (1) should have failed");
-		} else {
-			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
-			if ($name == "Carolx") Err("Error: CompleteTrans (2) should have failed");
-			else echo "<p> -- Passed StartTrans test1 - rolling back</p>";
-		}
-		
-		$db->StartTrans();
-			$db->BeginTrans();
-		$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
-			$db->RollbackTrans();
-		$rez = $db->CompleteTrans();
-		if ($rez !== true) Err("Error: CompleteTrans (1) should have succeeded");
-		else {
-			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
-			if (trim($name) != "Carolx") Err("Error: CompleteTrans (2) should have succeeded, returned name=$name");
-			else echo "<p> -- Passed StartTrans test2 - commiting</p>";
-		}
-	}
-	flush();
-	$saved = $db->debug;
-	$db->debug=1;
-	$cnt = _adodb_getcount($db, 'select * from ADOXYZ where firstname in (select firstname from ADOXYZ)');
-	echo "<b>Count=</b> $cnt";
-	$db->debug=$saved;
-	
-	global $TESTERRS;
-	$debugerr = true;
-	
-	global $ADODB_LANG;$ADODB_LANG = 'fr';
-	$db->debug = false;
-	$TESTERRS = 0;
-	$db->raiseErrorFn = 'adodb_test_err';
-	global $ERRNO; // from adodb_test_err
-	$db->Execute('select * from nowhere');
-	$metae = $db->MetaError($ERRNO);
-	if ($metae !== DB_ERROR_NOSUCHTABLE) print "<p><b>MetaError=".$metae." wrong</b>, should be ".DB_ERROR_NOSUCHTABLE."</p>";
-	else print "<p>MetaError ok (".DB_ERROR_NOSUCHTABLE."): ".$db->MetaErrorMsg($metae)."</p>";
-	if ($TESTERRS != 1) print "<b>raiseErrorFn select nowhere failed</b><br>";
-	$rs = $db->Execute('select * from ADOXYZ');
-	if ($debugerr) print " Move";
-	$rs->Move(100);
-	$rs->_queryID = false;
-	if ($debugerr) print " MoveNext";
-	$rs->MoveNext();
-	if ($debugerr) print " $rs=false";
-	$rs = false;
-
-	flush();
-	
-	print "<p>SetFetchMode() tests</p>";
-	$db->SetFetchMode(ADODB_FETCH_ASSOC);
-	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
-	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;	
-	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
-	//var_dump($rs->fields);
-	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
-	
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;	
-	$db->SetFetchMode(ADODB_FETCH_NUM);
-	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
-	if (!isset($rs->fields[0])) Err("BAD FETCH NUM");
-	
-	flush();
-	
-	print "<p>Test MetaTables again with SetFetchMode()</p>";
-	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$db->SetFetchMode(ADODB_FETCH_ASSOC);
-	print_r($db->MetaTables());
-	print "<p>";
-	
-	////////////////////////////////////////////////////////////////////
-	
-	print "<p>Testing Bad Connection</p>";
-	flush();
-	
-	if (true || PHP_VERSION < 5)  {
-		if ($db->dataProvider == 'odbtp') $db->databaseType = 'odbtp';
-		$conn = NewADOConnection($db->databaseType);
-		$conn->raiseErrorFn = 'adodb_test_err';
-		if (1) $conn->PConnect('abc','baduser','badpassword');
-		if ($TESTERRS == 2) print "raiseErrorFn tests passed<br>";
-		else print "<b>raiseErrorFn tests failed ($TESTERRS)</b><br>";
-		
-		flush();
-	}
-	////////////////////////////////////////////////////////////////////
-	
-	global $nocountrecs;
-	
-	if (isset($nocountrecs) && $ADODB_COUNTRECS) err("Error: \$ADODB_COUNTRECS is set");
-	if (empty($nocountrecs) && $ADODB_COUNTRECS==false) err("Error: \$ADODB_COUNTRECS is not set");
-
-	flush();
-?>
-	</p>
-	<table width=100% ><tr><td bgcolor=beige>&nbsp;</td></tr></table>
-	</p></form>
-<?php
-
-	if ($rs1) $rs1->Close();
-	if ($rs2) $rs2->Close();
-	if ($rs) $rs->Close();
-	$db->Close();
-	
-	if ($db->transCnt != 0) Err("Error in transCnt=$db->transCnt (should be 0)");
-	
-	
-	printf("<p>Total queries=%d; total cached=%d</p>",$EXECS+$CACHED, $CACHED);
-	flush();
-}
-
-function adodb_test_err($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
-{
-global $TESTERRS,$ERRNO;
-
-	$ERRNO = $errno;
-	$TESTERRS += 1;
-	print "<i>** $dbms ($fn): errno=$errno &nbsp; errmsg=$errmsg ($p1,$p2)</i><br>";
-}
-
-//--------------------------------------------------------------------------------------
-
-
-@set_time_limit(240); // increase timeout
-
-include("../tohtml.inc.php");
-include("../adodb.inc.php");
-include("../rsfilter.inc.php");
-
-/* White Space Check */
-
-if (isset($_SERVER['argv'][1])) {
-	//print_r($_SERVER['argv']);
-	$_GET[$_SERVER['argv'][1]] = 1;
-}
-
-if (@$_SERVER['COMPUTERNAME'] == 'TIGRESS') {
-	CheckWS('mysqlt');
-	CheckWS('postgres');
-	CheckWS('oci8po');
-	
-	CheckWS('firebird');
-	CheckWS('sybase');
-	if (!ini_get('safe_mode')) CheckWS('informix');
-
-	CheckWS('ado_mssql');
-	CheckWS('ado_access');
-	CheckWS('mssql');
-	
-	CheckWS('vfp');
-	CheckWS('sqlanywhere');
-	CheckWS('db2');
-	CheckWS('access');
-	CheckWS('odbc_mssql');
-	CheckWS('firebird15');
-	//
-	CheckWS('oracle');
-	CheckWS('proxy');
-	CheckWS('fbsql');
-	print "White Space Check complete<p>";
-}
-if (sizeof($_GET) == 0) $testmysql = true;
-
-
-foreach($_GET as $k=>$v)  {
-	//global $$k;
-	$$k = $v;
-}	
-if (strpos(PHP_VERSION,'5') === 0) {
-	//$testaccess=1;
-	//$testmssql = 1;
-	//$testsqlite=1;
-}
-?>
-<html>
-<title>ADODB Testing</title>
-<body bgcolor=white>
-<H1>ADODB Test</H1>
-
-This script tests the following databases: Interbase, Oracle, Visual FoxPro, Microsoft Access (ODBC and ADO), MySQL, MSSQL (ODBC, native, ADO). 
-There is also support for Sybase, PostgreSQL.</p>
-For the latest version of ADODB, visit <a href=http://adodb.sourceforge.net/>adodb.sourceforge.net</a>.</p>
-
-Test <a href=test4.php>GetInsertSQL/GetUpdateSQL</a> &nbsp; 
-	<a href=testsessions.php>Sessions</a> &nbsp;
-	<a href=testpaging.php>Paging</a> &nbsp;
-	<a href=test-perf.php>Perf Monitor</a><p>
-<?php
-include('./testdatabases.inc.php');
-
-echo "<br>vers=",ADOConnection::Version();
-
-
-include_once('../adodb-time.inc.php');
-if (isset($_GET['time'])) adodb_date_test();
-
-?>
-<p><i>ADODB Database Library  (c) 2000-2007 John Lim. All rights reserved. Released under BSD and LGPL, PHP <?php echo PHP_VERSION ?>.</i></p>
-</body>
-</html>
Index: admin/include/lib/adodb/tests/test_rs_array.php
===================================================================
--- admin/include/lib/adodb/tests/test_rs_array.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test_rs_array.php	(working copy)
@@ -1,47 +0,0 @@
-<?php
-
-include_once('../adodb.inc.php');
-$rs = new ADORecordSet_array();
-
-$array = array(
-array ('Name', 'Age'),
-array ('John', '12'),
-array ('Jill', '8'),
-array ('Bill', '49')
-);
-
-$typearr = array('C','I');
-
-
-$rs->InitArray($array,$typearr);
-
-while (!$rs->EOF) {
-	print_r($rs->fields);echo "<br>";
-	$rs->MoveNext();
-}
-
-echo "<hr /> 1 Seek<br>";
-$rs->Move(1);
-while (!$rs->EOF) {
-	print_r($rs->fields);echo "<br>";
-	$rs->MoveNext();
-}
-
-echo "<hr /> 2 Seek<br>";
-$rs->Move(2);
-while (!$rs->EOF) {
-	print_r($rs->fields);echo "<br>";
-	$rs->MoveNext();
-}
-
-echo "<hr /> 3 Seek<br>";
-$rs->Move(3);
-while (!$rs->EOF) {
-	print_r($rs->fields);echo "<br>";
-	$rs->MoveNext();
-}
-
-
-
-die();
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/test-pgblob.php
===================================================================
--- admin/include/lib/adodb/tests/test-pgblob.php	(revision 6370)
+++ admin/include/lib/adodb/tests/test-pgblob.php	(working copy)
@@ -1,88 +0,0 @@
-<?php
-
-function getmicrotime()
-{
-	$t = microtime();
-	$t = explode(' ',$t);
-	return (float)$t[1]+ (float)$t[0];
-}
-
-function doloop()
-{
-global $db,$MAX;
-	
-	$sql = "select id,firstname,lastname from adoxyz where 
-		firstname not like ? and lastname not like ? and id=?";
-	$offset = 0;
-	/*$sql = "select * from juris9.employee join juris9.emp_perf_plan on epp_empkey = emp_id 
-		where emp_name not like ? and emp_name not like ? and emp_id=28000+?";
-	$offset = 28000;*/
-	for ($i=1; $i <= $MAX; $i++) {
-		$db->Param(false);
-		$x = (rand() % 10) + 1;
-		$db->debug= ($i==1);
-		$id = $db->GetOne($sql,
-			array('Z%','Z%',$x));
-		if($id != $offset+$x) {
-			print "<p>Error at $x";
-			break;
-		}
-	}
-}
-
-include_once('../adodb.inc.php');
-$db = NewADOConnection('postgres7');
-$db->PConnect('localhost','tester','test','test') || die("failed connection");
-
-$enc = "GIF89a%01%00%01%00%80%FF%00%C0%C0%C0%00%00%00%21%F9%04%01%00%00%00%00%2C%00%00%00%00%01%00%01%00%00%01%012%00%3Bt_clear.gif%0D";
-$val = rawurldecode($enc);
-
-$MAX = 1000;
-
-adodb_pr($db->ServerInfo());
-
-echo "<h4>Testing PREPARE/EXECUTE PLAN</h4>";
-
-
-$db->_bindInputArray = true; // requires postgresql 7.3+ and ability to modify database
-$t = getmicrotime();
-doloop();
-echo '<p>',$MAX,' times, with plan=',getmicrotime() - $t,'</p>';
-
-
-$db->_bindInputArray = false;
-$t = getmicrotime();
-doloop();
-echo '<p>',$MAX,' times, no plan=',getmicrotime() - $t,'</p>';
-
-
-
-echo "<h4>Testing UPDATEBLOB</h4>";
-$db->debug=1;
-
-### TEST BEGINS
-
-$db->Execute("insert into photos (id,name) values(9999,'dot.gif')");
-$db->UpdateBlob('photos','photo',$val,'id=9999');
-$v = $db->GetOne('select photo from photos where id=9999');
-
-
-### CLEANUP
-
-$db->Execute("delete from photos where id=9999");
-
-### VALIDATION
-
-if ($v !== $val) echo "<b>*** ERROR: Inserted value does not match downloaded val<b>";
-else echo "<b>*** OK: Passed</b>";
-
-echo "<pre>";
-echo "INSERTED: ", $enc;
-echo "<hr />";
-echo"RETURNED: ", rawurlencode($v);
-echo "<hr /><p>";
-echo "INSERTED: ", $val;
-echo "<hr />";
-echo "RETURNED: ", $v;
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/pdo.php
===================================================================
--- admin/include/lib/adodb/tests/pdo.php	(revision 6370)
+++ admin/include/lib/adodb/tests/pdo.php	(working copy)
@@ -1,94 +0,0 @@
-<?php
-error_reporting(E_ALL);
-include('../adodb.inc.php');
-
-echo "<pre>";
-try {
-	echo "New Connection\n";
-	
-	
-	$dsn = 'pdo_mysql://root:@localhost/northwind?persist';
-	
-	if (!empty($dsn)) {
-		$DB =& NewADOConnection($dsn) || die("CONNECT FAILED");
-		$connstr = $dsn;
-	} else {
-	
-		$DB = NewADOConnection('pdo');
-		
-		echo "Connect\n";
-		
-		$u = ''; $p = '';
-		/*
-		$connstr = 'odbc:nwind';
-		
-		$connstr = 'oci:';
-		$u = 'scott';
-		$p = 'natsoft';
-		
-		
-		$connstr ="sqlite:d:\inetpub\adodb\sqlite.db";
-		*/
-		
-		$connstr = "mysql:dbname=northwind";
-		$u = 'root';
-		
-		$connstr = "pgsql:dbname=test";
-		$u = 'tester';
-		$p = 'test';
-		
-		$DB->Connect($connstr,$u,$p) || die("CONNECT FAILED");
-	
-	}
-	
-	echo "connection string=$connstr\n Execute\n";
-	
-	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	$rs = $DB->Execute("select * from ADOXYZ where id<3");
-	if  ($DB->ErrorNo()) echo "*** errno=".$DB->ErrorNo() . " ".($DB->ErrorMsg())."\n";
-	
-	
-	//print_r(get_class_methods($DB->_stmt));
-	
-	if (!$rs) die("NO RS");
-	
-	echo "Meta\n";
-	for ($i=0; $i < $rs->NumCols(); $i++) {
-		var_dump($rs->FetchField($i));
-		echo "<br>";
-	}
-	
-	echo "FETCH\n";
-	$cnt = 0;
-	while (!$rs->EOF) {
-		adodb_pr($rs->fields); 
-		$rs->MoveNext();
-		if ($cnt++ > 1000) break;
-	}
-	
-	echo "<br>--------------------------------------------------------<br>\n\n\n";
-	
-	$stmt = $DB->PrepareStmt("select * from ADOXYZ");
-	
-	$rs = $stmt->Execute();
-	$cols = $stmt->NumCols(); // execute required
-	
-	echo "COLS = $cols";
-	for($i=1;$i<=$cols;$i++) {
-		$v = $stmt->_stmt->getColumnMeta($i);
-		var_dump($v);
-	}
-	
-	echo "e=".$stmt->ErrorNo() . " ".($stmt->ErrorMsg())."\n";
-	while ($arr = $rs->FetchRow()) {
-		adodb_pr($arr);
-	}
-	die("DONE\n");
-
-} catch (exception $e) {
-	echo "<pre>";
-	echo $e;
-	echo "</pre>";
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/tmssql.php
===================================================================
--- admin/include/lib/adodb/tests/tmssql.php	(revision 6370)
+++ admin/include/lib/adodb/tests/tmssql.php	(working copy)
@@ -1,80 +0,0 @@
-<?php
-error_reporting(E_ALL);
-ini_set('mssql.datetimeconvert',0); 
-
-function tmssql()
-{
-	print "<h3>mssql</h3>";
-	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
-	mssql_select_db('northwind',$db);
-	
-	$rs = mssql_query('select getdate() as date',$db);
-	$o = mssql_fetch_row($rs);
-	print_r($o);
-	mssql_free_result($rs);
-	
-	print "<p>Delete</p>"; flush();
-	$rs2 = mssql_query('delete from adoxyz',$db);
-	$p = mssql_num_rows($rs2);
-	mssql_free_result($rs2);
-
-}
-
-function tpear()
-{
-include_once('DB.php');
-
-	print "<h3>PEAR</h3>";
-	$username = 'adodb';
-	$password = 'natsoft';
-	$hostname = 'JAGUAR\vsdotnet';
-	$databasename = 'northwind';
-	
-	$dsn = "mssql://$username:$password@$hostname/$databasename";
-	$conn = &DB::connect($dsn);
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	@$conn->query('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->query('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-
-function tadodb()
-{
-include_once('../adodb.inc.php');
-
-	print "<h3>ADOdb</h3>";
-	$conn = NewADOConnection('mssql');
-	$conn->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-//	$conn->debug=1;
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	$conn->Execute('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->Execute('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-
-
-$ACCEPTIP = '127.0.0.1';
-
-$remote = $_SERVER["REMOTE_ADDR"]; 
-
-if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
- 	die("Unauthorised client: '$remote'");
-	
-?>
-<a href=tmssql.php?do=tmssql>mssql</a>
-<a href=tmssql.php?do=tpear>pear</a>
-<a href=tmssql.php?do=tadodb>adodb</a>
-<?php
-if (!empty($_GET['do'])) {
-	$do = $_GET['do'];
-	switch($do) {
-	case 'tpear':
-	case 'tadodb':
-	case 'tmssql':
-		$do();
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/testgenid.php
===================================================================
--- admin/include/lib/adodb/tests/testgenid.php	(revision 6370)
+++ admin/include/lib/adodb/tests/testgenid.php	(working copy)
@@ -1,36 +0,0 @@
-<?php
-/*
-	V4.50 6 July 2004 
-	
-	Run multiple copies of this php script at the same time
-	to test unique generation of id's in multiuser mode
-*/
-include_once('../adodb.inc.php');
-$testaccess = true;
-include_once('testdatabases.inc.php');
-
-function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
-{
-	$table = 'adodbseq';
-	
-	$db->Execute("drop table $table");
-	//$db->debug=true;
-	
-	$ctr = 5000;
-	$lastnum = 0;
-	
-	while (--$ctr >= 0) {
-		$num = $db->GenID($table);
-		if ($num === false) {	
-			print "GenID returned false";
-			break;
-		}
-		if ($lastnum + 1 == $num) print " $num ";
-		else {
-			print " <font color=red>$num</font> ";
-			flush();
-		}
-		$lastnum = $num;
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/testpear.php
===================================================================
--- admin/include/lib/adodb/tests/testpear.php	(revision 6370)
+++ admin/include/lib/adodb/tests/testpear.php	(working copy)
@@ -1,34 +0,0 @@
-<?php
-/* 
-V4.80 8 Mar 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-	
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-error_reporting(E_ALL);
-
-include_once('../adodb-pear.inc.php');
-$username = 'root';
-$password = '';
-$hostname = 'localhost';
-$databasename = 'xphplens';
-$driver = 'mysql';
-
-$dsn = "$driver://$username:$password@$hostname/$databasename";
-
-$db = DB::Connect($dsn);
-$db->setFetchMode(ADODB_FETCH_ASSOC);
-$rs = $db->Query('select firstname,lastname from adoxyz');
-$cnt = 0;
-while ($arr = $rs->FetchRow()) {
-	print_r($arr);
-	print "<br>";
-	$cnt += 1;
-}
-
-if ($cnt != 50) print "<b>Error in \$cnt = $cnt</b>";
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tests/xmlschema-mssql.xml
===================================================================
--- admin/include/lib/adodb/tests/xmlschema-mssql.xml	(revision 6370)
+++ admin/include/lib/adodb/tests/xmlschema-mssql.xml	(working copy)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<schema version="0.3">
-<table name="simple_table">
-<field name="id" type="I" size="11">
-<KEY/>
-<AUTOINCREMENT/>
-</field>
-<field name="name" type="C" size="3">
-<DEFAULT value="no"/>
-</field>
-<field name="description" type="X"></field>
-<index name="id">
-<UNIQUE/>
-<col>id</col>
-</index>
-<index name="id_2">
-<col>id</col>
-</index>
-<data>
-</data>
-</table>
-  <sql>
-    <descr>SQL to be executed only on specific platforms</descr>
-    <query platform="postgres|postgres7">
-      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
-    </query>
-    <query platform="mysql">
-      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
-    </query>
-	<query platform="mssql">
-      INSERT into simple_table ( name, description ) values ( '12', 'Microsoft stuff' )
-    </query>
-  </sql>
-</schema>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-time.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-time.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-time.inc.php	(working copy)
@@ -1,1337 +0,0 @@
-<?php
-/**
-ADOdb Date Library, part of the ADOdb abstraction library
-Download: http://phplens.com/phpeverywhere/
-
-PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix 
-and 1970-2038 on Windows due to integer overflow for dates beyond 
-those years. This library overcomes these limitations by replacing the 
-native function's signed integers (normally 32-bits) with PHP floating 
-point numbers (normally 64-bits).
-
-Dates from 100 A.D. to 3000 A.D. and later
-have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the 
-future, but this is a theoretical limit as the computation of that year 
-would take too long with the current implementation of adodb_mktime().
-
-This library replaces native functions as follows:
-
-<pre>	
-	getdate()  with  adodb_getdate()
-	date()     with  adodb_date() 
-	gmdate()   with  adodb_gmdate()
-	mktime()   with  adodb_mktime()
-	gmmktime() with  adodb_gmmktime()
-	strftime() with  adodb_strftime()
-	strftime() with  adodb_gmstrftime()
-</pre>
-	
-The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT, 
-and date() will convert from GMT to local time, but daylight savings is 
-not handled currently.
-
-This library is independant of the rest of ADOdb, and can be used
-as standalone code.
-
-PERFORMANCE
-
-For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside 
-the 32-bit signed integer range.
-
-GREGORIAN CORRECTION
-
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 
-October 4, 1582 (Julian) was followed immediately by Friday, October 15, 
-1582 (Gregorian). 
-
-Since 0.06, we handle this correctly, so:
-
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 
-	== 24 * 3600 (1 day)
-
-=============================================================================
-
-COPYRIGHT
-
-(c) 2003-2005 John Lim and released under BSD-style license except for code by 
-jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
-and originally found at http://www.php.net/manual/en/function.mktime.php
-
-=============================================================================
-
-BUG REPORTS
-
-These should be posted to the ADOdb forums at
-
-	http://phplens.com/lens/lensforum/topics.php?id=4
-
-=============================================================================
-
-FUNCTION DESCRIPTIONS
-
-
-** FUNCTION adodb_getdate($date=false)
-
-Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038. The local date/time format is derived from a 
-heuristic the first time adodb_getdate is called. 
-	 
-	 
-** FUNCTION adodb_date($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted local date. If $timestamp is not defined, the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-The format fields that adodb_date supports:
-
-<pre>
-	a - "am" or "pm" 
-	A - "AM" or "PM" 
-	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
-	D - day of the week, textual, 3 letters; e.g. "Fri" 
-	F - month, textual, long; e.g. "January" 
-	g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
-	G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
-	h - hour, 12-hour format; i.e. "01" to "12" 
-	H - hour, 24-hour format; i.e. "00" to "23" 
-	i - minutes; i.e. "00" to "59" 
-	j - day of the month without leading zeros; i.e. "1" to "31" 
-	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
-	L - boolean for whether it is a leap year; i.e. "0" or "1" 
-	m - month; i.e. "01" to "12" 
-	M - month, textual, 3 letters; e.g. "Jan" 
-	n - month without leading zeros; i.e. "1" to "12" 
-	O - Difference to Greenwich time in hours; e.g. "+0200" 
-	Q - Quarter, as in 1, 2, 3, 4 
-	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
-	s - seconds; i.e. "00" to "59" 
-	S - English ordinal suffix for the day of the month, 2 characters; 
-	   			i.e. "st", "nd", "rd" or "th" 
-	t - number of days in the given month; i.e. "28" to "31"
-	T - Timezone setting of this machine; e.g. "EST" or "MDT" 
-	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
-	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
-	Y - year, 4 digits; e.g. "1999" 
-	y - year, 2 digits; e.g. "99" 
-	z - day of the year; i.e. "0" to "365" 
-	Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
-	   			The offset for timezones west of UTC is always negative, 
-				and for those east of UTC is always positive. 
-</pre>
-
-Unsupported:
-<pre>
-	B - Swatch Internet time 
-	I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
-	W - ISO-8601 week number of year, weeks starting on Monday 
-
-</pre>
-
-
-** FUNCTION adodb_date2($fmt, $isoDateString = false)
-Same as adodb_date, but 2nd parameter accepts iso date, eg.
-
-  adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
-
-  
-** FUNCTION adodb_gmdate($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-
-** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])
-
-Converts a local date to a unix timestamp.  Unlike the function mktime(), it supports
-dates outside the 1901 to 2038 range. All parameters are optional.
-
-
-** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
-
-Converts a gmt date to a unix timestamp.  Unlike the function gmmktime(), it supports
-dates outside the 1901 to 2038 range. Differs from gmmktime() in that all parameters
-are currently compulsory.
-
-** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)
-Convert a timestamp to a formatted GMT date.
-
-** FUNCTION adodb_strftime($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted local date. Internally converts $fmt into 
-adodb_date format, then echo result.
-
-For best results, you can define the local date format yourself. Define a global
-variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
-adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
-
-    eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
-	
-	Supported format codes:
-
-<pre>
-	%a - abbreviated weekday name according to the current locale 
-	%A - full weekday name according to the current locale 
-	%b - abbreviated month name according to the current locale 
-	%B - full month name according to the current locale 
-	%c - preferred date and time representation for the current locale 
-	%d - day of the month as a decimal number (range 01 to 31) 
-	%D - same as %m/%d/%y 
-	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31') 
-	%h - same as %b
-	%H - hour as a decimal number using a 24-hour clock (range 00 to 23) 
-	%I - hour as a decimal number using a 12-hour clock (range 01 to 12) 
-	%m - month as a decimal number (range 01 to 12) 
-	%M - minute as a decimal number 
-	%n - newline character 
-	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale 
-	%r - time in a.m. and p.m. notation 
-	%R - time in 24 hour notation 
-	%S - second as a decimal number 
-	%t - tab character 
-	%T - current time, equal to %H:%M:%S 
-	%x - preferred date representation for the current locale without the time 
-	%X - preferred time representation for the current locale without the date 
-	%y - year as a decimal number without a century (range 00 to 99) 
-	%Y - year as a decimal number including the century 
-	%Z - time zone or name or abbreviation 
-	%% - a literal `%' character 
-</pre>	
-
-	Unsupported codes:
-<pre>
-	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99) 
-	%g - like %G, but without the century. 
-	%G - The 4-digit year corresponding to the ISO week number (see %V). 
-	     This has the same format and value as %Y, except that if the ISO week number belongs 
-		 to the previous or next year, that year is used instead. 
-	%j - day of the year as a decimal number (range 001 to 366) 
-	%u - weekday as a decimal number [1,7], with 1 representing Monday 
-	%U - week number of the current year as a decimal number, starting 
-	    with the first Sunday as the first day of the first week 
-	%V - The ISO 8601:1988 week number of the current year as a decimal number, 
-	     range 01 to 53, where week 1 is the first week that has at least 4 days in the 
-		 current year, and with Monday as the first day of the week. (Use %G or %g for 
-		 the year component that corresponds to the week number for the specified timestamp.) 
-	%w - day of the week as a decimal, Sunday being 0 
-	%W - week number of the current year as a decimal number, starting with the 
-	     first Monday as the first day of the first week 
-</pre>
-
-=============================================================================
-
-NOTES
-
-Useful url for generating test timestamps:
-	http://www.4webhelp.net/us/timestamp.php
-
-Possible future optimizations include 
-
-a. Using an algorithm similar to Plauger's in "The Standard C Library" 
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
-work outside 32-bit signed range, so i decided not to implement it.
-
-b. Implement daylight savings, which looks awfully complicated, see
-	http://webexhibits.org/daylightsaving/
-
-
-CHANGELOG
-- 19 March 2006 0.24
-Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
-
-- 10 Feb 2006 0.23
-PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000. 
-	In PHP4, we will still use -0000 for 100% compat with PHP4.
-
-- 08 Sept 2005 0.22
-In adodb_date2(), $is_gmt not supported properly. Fixed.
-
-- 18 July  2005 0.21
-In PHP 4.3.11, the 'r' format has changed. Leading 0 in day is added. Changed for compat.
-Added support for negative months in adodb_mktime().
-
-- 24 Feb 2005 0.20
-Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
-
-- 21 Dec 2004 0.17
-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false. 
-Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
-
-- 17 Nov 2004 0.16
-Removed intval typecast in adodb_mktime() for secs, allowing:
-	 adodb_mktime(0,0,0 + 2236672153,1,1,1934);
-Suggested by Ryan.
-
-- 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory. 
-This brings it more in line with mktime (still not identical).
-
-- 23 June 2004 0.14
-
-Allow you to define your own daylights savings function, adodb_daylight_sv.
-If the function is defined (somewhere in an include), then you can correct for daylights savings.
-
-In this example, we apply daylights savings in June or July, adding one hour. This is extremely
-unrealistic as it does not take into account time-zone, geographic location, current year.
-
-function adodb_daylight_sv(&$arr, $is_gmt)
-{
-	if ($is_gmt) return;
-	$m = $arr['mon'];
-	if ($m == 6 || $m == 7) $arr['hours'] += 1;
-}
-
-This is only called by adodb_date() and not by adodb_mktime(). 
-
-The format of $arr is
-Array ( 
-   [seconds] => 0 
-   [minutes] => 0 
-   [hours] => 0 
-   [mday] => 1      # day of month, eg 1st day of the month
-   [mon] => 2       # month (eg. Feb)
-   [year] => 2102 
-   [yday] => 31     # days in current year
-   [leap] =>        # true if leap year
-   [ndays] => 28    # no of days in current month
-   ) 
-   
-
-- 28 Apr 2004 0.13
-Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
-
-- 20 Mar 2004 0.12
-Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
-
-- 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to 
-January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
-
-- 9 Aug 2003 0.10
-Fixed bug with dates after 2038. 
-See http://phplens.com/lens/lensforum/msgs.php?id=6980
-
-- 1 July 2003 0.09
-Added support for Q (Quarter).
-Added adodb_date2(), which accepts ISO date in 2nd param
-
-- 3 March 2003 0.08
-Added support for 'S' adodb_date() format char. Added constant ADODB_ALLOW_NEGATIVE_TS
-if you want PHP to handle negative timestamps between 1901 to 1969.
-
-- 27 Feb 2003 0.07
-All negative numbers handled by adodb now because of RH 7.3+ problems.
-See http://bugs.php.net/bug.php?id=20048&edit=2
-
-- 4 Feb 2003 0.06
-Fixed a typo, 1852 changed to 1582! This means that pre-1852 dates
-are now correctly handled.
-
-- 29 Jan 2003 0.05
-
-Leap year checking differs under Julian calendar (pre 1582). Also
-leap year code optimized by checking for most common case first.
-
-We also handle month overflow correctly in mktime (eg month set to 13).
-
-Day overflow for less than one month's days is supported.
-
-- 28 Jan 2003 0.04
-
-Gregorian correction handled. In PHP5, we might throw an error if 
-mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
-Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
-
-- 27 Jan 2003 0.03
-
-Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970. 
-
-- 27 Jan 2003 0.02
-
-Changed _adodb_getdate() to inline leap year checking for better performance.
-Fixed problem with time-zones west of GMT +0000.
-
-- 24 Jan 2003 0.01
-
-First implementation.
-*/
-
-
-/* Initialization */
-
-/*
-	Version Number
-*/
-define('ADODB_DATE_VERSION',0.24);
-
-/*
-	This code was originally for windows. But apparently this problem happens 
-	also with Linux, RH 7.3 and later!
-	
-	glibc-2.2.5-34 and greater has been changed to return -1 for dates <
-	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
-	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
-	
-	References:
-	 http://bugs.php.net/bug.php?id=20048&edit=2
-	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
-*/
-
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
-
-function adodb_date_test_date($y1,$m,$d=13)
-{
-	$t = adodb_mktime(0,0,0,$m,$d,$y1);
-	$rez = adodb_date('Y-n-j H:i:s',$t);
-	if ("$y1-$m-$d 00:00:00" != $rez) {
-		print "<b>$y1 error, expected=$y1-$m-$d 00:00:00, adodb=$rez</b><br>";
-		return false;
-	}
-	return true;
-}
-
-function adodb_date_test_strftime($fmt)
-{
-	$s1 = strftime($fmt);
-	$s2 = adodb_strftime($fmt);
-	
-	if ($s1 == $s2) return true;
-	
-	echo "error for $fmt,  strftime=$s1, $adodb=$s2<br>";
-	return false;
-}
-
-/**
-	 Test Suite
-*/
-function adodb_date_test()
-{
-	
-	error_reporting(E_ALL);
-	print "<h4>Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."</h4>";
-	@set_time_limit(0);
-	$fail = false;
-	
-	// This flag disables calling of PHP native functions, so we can properly test the code
-	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
-	
-	adodb_date_test_strftime('%Y %m %x %X');
-	adodb_date_test_strftime("%A %d %B %Y");
-	adodb_date_test_strftime("%H %M S");
-	
-	$t = adodb_mktime(0,0,0);
-	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'<br>';
-	
-	$t = adodb_mktime(0,0,0,6,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
-	
-	$t = adodb_mktime(0,0,0,2,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
-	
-	
-	print "<p>Testing gregorian <=> julian conversion<p>";
-	$t = adodb_mktime(0,0,0,10,11,1492);
-	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
-	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing<br>';
-	
-	$t = adodb_mktime(0,0,0,2,29,1500);
-	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years<br>';
-	
-	$t = adodb_mktime(0,0,0,2,29,1700);
-	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years<br>';
-	
-	print  adodb_mktime(0,0,0,10,4,1582).' ';
-	print adodb_mktime(0,0,0,10,15,1582);
-	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
-	if ($diff != 3600*24) print " <b>Error in gregorian correction = ".($diff/3600/24)." days </b><br>";
-		
-	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : '<b>Error</b>')."<br>";
-	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : '<b>Error</b>')."<br>";
-	
-	print "<p>Testing overflow<p>";
-	
-	$t = adodb_mktime(0,0,0,3,33,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 <br>';
-	$t = adodb_mktime(0,0,0,4,33,1971);
-	if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day overflow 2 <br>';
-	$t = adodb_mktime(0,0,0,1,60,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day overflow 3 '.adodb_date('Y-m-d',$t).' <br>';
-	$t = adodb_mktime(0,0,0,12,32,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day overflow 4 '.adodb_date('Y-m-d',$t).' <br>';
-	$t = adodb_mktime(0,0,0,12,63,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
-	$t = adodb_mktime(0,0,0,13,3,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 <br>';
-	
-	print "Testing 2-digit => 4-digit year conversion<p>";
-	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
-	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";
-	if (adodb_year_digit_check(20) != 2020) print "Err 2-digit 2020<br>";
-	if (adodb_year_digit_check(30) != 2030) print "Err 2-digit 2030<br>";
-	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";
-	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";
-	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";
-	
-	// Test string formating
-	print "<p>Testing date formating</p>";
-	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
-	$s1 = date($fmt,0);
-	$s2 = adodb_date($fmt,0);
-	if ($s1 != $s2) {
-		print " date() 0 failed<br>$s1<br>$s2<br>";
-	}
-	flush();
-	for ($i=100; --$i > 0; ) {
-
-		$ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);
-		$s1 = date($fmt,$ts);
-		$s2 = adodb_date($fmt,$ts);
-		//print "$s1 <br>$s2 <p>";
-		$pos = strcmp($s1,$s2);
-
-		if (($s1) != ($s2)) {
-			for ($j=0,$k=strlen($s1); $j < $k; $j++) {
-				if ($s1[$j] != $s2[$j]) {
-					print substr($s1,$j).' ';
-					break;
-				}
-			}
-			print "<b>Error date(): $ts<br><pre> 
-&nbsp; \"$s1\" (date len=".strlen($s1).")
-&nbsp; \"$s2\" (adodb_date len=".strlen($s2).")</b></pre><br>";
-			$fail = true;
-		}
-		
-		$a1 = getdate($ts);
-		$a2 = adodb_getdate($ts);
-		$rez = array_diff($a1,$a2);
-		if (sizeof($rez)>0) {
-			print "<b>Error getdate() $ts</b><br>";
-				print_r($a1);
-			print "<br>";
-				print_r($a2);
-			print "<p>";
-			$fail = true;
-		}
-	}
-	
-	// Test generation of dates outside 1901-2038
-	print "<p>Testing random dates between 100 and 4000</p>";
-	adodb_date_test_date(100,1);
-	for ($i=100; --$i >= 0;) {
-		$y1 = 100+rand(0,1970-100);
-		$m = rand(1,12);
-		adodb_date_test_date($y1,$m);
-		
-		$y1 = 3000-rand(0,3000-1970);
-		adodb_date_test_date($y1,$m);
-	}
-	print '<p>';
-	$start = 1960+rand(0,10);
-	$yrs = 12;
-	$i = 365.25*86400*($start-1970);
-	$offset = 36000+rand(10000,60000);
-	$max = 365*$yrs*86400;
-	$lastyear = 0;
-	
-	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
-	// and check if the roundtrip broke the original timestamp value.
-	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
-	$cnt = 0;
-	for ($max += $i; $i < $max; $i += $offset) {
-		$ret = adodb_date('m,d,Y,H,i,s',$i);
-		$arr = explode(',',$ret);
-		if ($lastyear != $arr[2]) {
-			$lastyear = $arr[2];
-			print " $lastyear ";
-			flush();
-		}
-		$newi = adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);
-		if ($i != $newi) {
-			print "Error at $i, adodb_mktime returned $newi ($ret)";
-			$fail = true;
-			break;
-		}
-		$cnt += 1;
-	}
-	echo "Tested $cnt dates<br>";
-	if (!$fail) print "<p>Passed !</p>";
-	else print "<p><b>Failed</b> :-(</p>";
-}
-
-/**
-	Returns day of week, 0 = Sunday,... 6=Saturday. 
-	Algorithm from PEAR::Date_Calc
-*/
-function adodb_dow($year, $month, $day)
-{
-/*
-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and 
-proclaimed that from that time onwards 3 days would be dropped from the calendar 
-every 400 years.
-
-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 
-*/
-	if ($year <= 1582) {
-		if ($year < 1582 || 
-			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
-		 else
-			$greg_correction = 0;
-	} else
-		$greg_correction = 0;
-	
-	if($month > 2)
-	    $month -= 2;
-	else {
-	    $month += 10;
-	    $year--;
-	}
-	
-	$day =  floor((13 * $month - 1) / 5) +
-	        $day + ($year % 100) +
-	        floor(($year % 100) / 4) +
-	        floor(($year / 100) / 4) - 2 *
-	        floor($year / 100) + 77 + $greg_correction;
-	
-	return $day - 7 * floor($day / 7);
-}
-
-
-/**
- Checks for leap year, returns true if it is. No 2-digit year check. Also 
- handles julian calendar correctly.
-*/
-function _adodb_is_leap_year($year) 
-{
-	if ($year % 4 != 0) return false;
-	
-	if ($year % 400 == 0) {
-		return true;
-	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
-	} else if ($year > 1582 && $year % 100 == 0 ) {
-		return false;
-	} 
-	
-	return true;
-}
-
-
-/**
- checks for leap year, returns true if it is. Has 2-digit year check
-*/
-function adodb_is_leap_year($year) 
-{
-	return  _adodb_is_leap_year(adodb_year_digit_check($year));
-}
-
-/**
-	Fix 2-digit years. Works for any century.
- 	Assumes that if 2-digit is more than 30 years in future, then previous century.
-*/
-function adodb_year_digit_check($y) 
-{
-	if ($y < 100) {
-	
-		$yr = (integer) date("Y");
-		$century = (integer) ($yr /100);
-		
-		if ($yr%100 > 50) {
-			$c1 = $century + 1;
-			$c0 = $century;
-		} else {
-			$c1 = $century;
-			$c0 = $century - 1;
-		}
-		$c1 *= 100;
-		// if 2-digit year is less than 30 years in future, set it to this century
-		// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-		if (($y + $c1) < $yr+30) $y = $y + $c1;
-		else $y = $y + $c0*100;
-	}
-	return $y;
-}
-
-/**
- get local time zone offset from GMT
-*/
-function adodb_get_gmt_diff() 
-{
-static $TZ;
-	if (isset($TZ)) return $TZ;
-	
-	$TZ = mktime(0,0,0,1,2,1970,0) - gmmktime(0,0,0,1,2,1970,0);
-	return $TZ;
-}
-
-/**
-	Returns an array with date info.
-*/
-function adodb_getdate($d=false,$fast=false)
-{
-	if ($d === false) return getdate();
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
-				return @getdate($d);
-		}
-	}
-	return _adodb_getdate($d);
-}
-
-/*
-// generate $YRS table for _adodb_getdate()
-function adodb_date_gentable($out=true)
-{
-
-	for ($i=1970; $i >= 1600; $i-=10) {
-		$s = adodb_gmmktime(0,0,0,1,1,$i);
-		echo "$i => $s,<br>";	
-	}
-}
-adodb_date_gentable();
-
-for ($i=1970; $i > 1500; $i--) {
-
-echo "<hr />$i ";
-	adodb_date_test_date($i,1,1);
-}
-
-*/
-
-
-$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
-function adodb_validdate($y,$m,$d)
-{
-global $_month_table_normal,$_month_table_leaf;
-
-	if (_adodb_is_leap_year($y)) $marr =& $_month_table_leaf;
-	else $marr =& $_month_table_normal;
-	
-	if ($m > 12 || $m < 1) return false;
-	
-	if ($d > 31 || $d < 1) return false;
-	
-	if ($marr[$m] < $d) return false;
-	
-	if ($y < 1000 && $y > 3000) return false;
-	
-	return true;
-}
-
-/**
-	Low-level function that returns the getdate() array. We have a special
-	$fast flag, which if set to true, will return fewer array values,
-	and is much faster as it does not calculate dow, etc.
-*/
-function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
-{
-static $YRS;
-global $_month_table_normal,$_month_table_leaf;
-
-	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());
-	
-	$_day_power = 86400;
-	$_hour_power = 3600;
-	$_min_power = 60;
-	
-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
-	
-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
-	$d366 = $_day_power * 366;
-	$d365 = $_day_power * 365;
-	
-	if ($d < 0) {
-		
-		if (empty($YRS)) $YRS = array(
-			1970 => 0,
-			1960 => -315619200,
-			1950 => -631152000,
-			1940 => -946771200,
-			1930 => -1262304000,
-			1920 => -1577923200,
-			1910 => -1893456000,
-			1900 => -2208988800,
-			1890 => -2524521600,
-			1880 => -2840140800,
-			1870 => -3155673600,
-			1860 => -3471292800,
-			1850 => -3786825600,
-			1840 => -4102444800,
-			1830 => -4417977600,
-			1820 => -4733596800,
-			1810 => -5049129600,
-			1800 => -5364662400,
-			1790 => -5680195200,
-			1780 => -5995814400,
-			1770 => -6311347200,
-			1760 => -6626966400,
-			1750 => -6942499200,
-			1740 => -7258118400,
-			1730 => -7573651200,
-			1720 => -7889270400,
-			1710 => -8204803200,
-			1700 => -8520336000,
-			1690 => -8835868800,
-			1680 => -9151488000,
-			1670 => -9467020800,
-			1660 => -9782640000,
-			1650 => -10098172800,
-			1640 => -10413792000,
-			1630 => -10729324800,
-			1620 => -11044944000,
-			1610 => -11360476800,
-			1600 => -11676096000);
-
-		if ($is_gmt) $origd = $d;
-		// The valid range of a 32bit signed timestamp is typically from 
-		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
-		//
-		
-		# old algorithm iterates through all years. new algorithm does it in
-		# 10 year blocks
-		
-		/*
-		# old algo
-		for ($a = 1970 ; --$a >= 0;) {
-			$lastd = $d;
-			
-			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
-			else $d += $d365;
-			
-			if ($d >= 0) {
-				$year = $a;
-				break;
-			}
-		}
-		*/
-		
-		$lastsecs = 0;
-		$lastyear = 1970;
-		foreach($YRS as $year => $secs) {
-			if ($d >= $secs) {
-				$a = $lastyear;
-				break;
-			}
-			$lastsecs = $secs;
-			$lastyear = $year;
-		}
-		
-		$d -= $lastsecs;
-		if (!isset($a)) $a = $lastyear;
-		
-		//echo ' yr=',$a,' ', $d,'.';
-		
-		for (; --$a >= 0;) {
-			$lastd = $d;
-			
-			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
-			else $d += $d365;
-			
-			if ($d >= 0) {
-				$year = $a;
-				break;
-			}
-		}
-		/**/
-		
-		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
-		
-		$d = $lastd;
-		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 13 ; --$a > 0;) {
-			$lastd = $d;
-			$d += $mtab[$a] * $_day_power;
-			if ($d >= 0) {
-				$month = $a;
-				$ndays = $mtab[$a];
-				break;
-			}
-		}
-		
-		$d = $lastd;
-		$day = $ndays + ceil(($d+1) / ($_day_power));
-
-		$d += ($ndays - $day+1)* $_day_power;
-		$hour = floor($d/$_hour_power);
-	
-	} else {
-		for ($a = 1970 ;; $a++) {
-			$lastd = $d;
-			
-			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
-			else $d -= $d365;
-			if ($d < 0) {
-				$year = $a;
-				break;
-			}
-		}
-		$secsInYear = $lastd;
-		$d = $lastd;
-		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 1 ; $a <= 12; $a++) {
-			$lastd = $d;
-			$d -= $mtab[$a] * $_day_power;
-			if ($d < 0) {
-				$month = $a;
-				$ndays = $mtab[$a];
-				break;
-			}
-		}
-		$d = $lastd;
-		$day = ceil(($d+1) / $_day_power);
-		$d = $d - ($day-1) * $_day_power;
-		$hour = floor($d /$_hour_power);
-	}
-	
-	$d -= $hour * $_hour_power;
-	$min = floor($d/$_min_power);
-	$secs = $d - $min * $_min_power;
-	if ($fast) {
-		return array(
-		'seconds' => $secs,
-		'minutes' => $min,
-		'hours' => $hour,
-		'mday' => $day,
-		'mon' => $month,
-		'year' => $year,
-		'yday' => floor($secsInYear/$_day_power),
-		'leap' => $leaf,
-		'ndays' => $ndays
-		);
-	}
-	
-	
-	$dow = adodb_dow($year,$month,$day);
-
-	return array(
-		'seconds' => $secs,
-		'minutes' => $min,
-		'hours' => $hour,
-		'mday' => $day,
-		'wday' => $dow,
-		'mon' => $month,
-		'year' => $year,
-		'yday' => floor($secsInYear/$_day_power),
-		'weekday' => gmdate('l',$_day_power*(3+$dow)),
-		'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
-		0 => $origd
-	);
-}
-
-function adodb_gmdate($fmt,$d=false)
-{
-	return adodb_date($fmt,$d,true);
-}
-
-// accepts unix timestamp and iso date format in $d
-function adodb_date2($fmt, $d=false, $is_gmt=false)
-{
-	if ($d !== false) {
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
-
-		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
-	
-		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
-		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
-	}
-	
-	return adodb_date($fmt,$d,$is_gmt);
-}
-
-
-/**
-	Return formatted date based on timestamp $d
-*/
-function adodb_date($fmt,$d=false,$is_gmt=false)
-{
-static $daylight;
-
-	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
-				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
-
-		}
-	}
-	$_day_power = 86400;
-	
-	$arr = _adodb_getdate($d,true,$is_gmt);
-	
-	if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
-	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
-	
-	$year = $arr['year'];
-	$month = $arr['mon'];
-	$day = $arr['mday'];
-	$hour = $arr['hours'];
-	$min = $arr['minutes'];
-	$secs = $arr['seconds'];
-	
-	$max = strlen($fmt);
-	$dates = '';
-	
-	$isphp5 = PHP_VERSION >= 5;
-	
-	/*
-		at this point, we have the following integer vars to manipulate:
-		$year, $month, $day, $hour, $min, $secs
-	*/
-	for ($i=0; $i < $max; $i++) {
-		switch($fmt[$i]) {
-		case 'T': $dates .= date('T');break;
-		// YEAR
-		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
-		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
-		
-			// 4.3.11 uses '04 Jun 2004'
-			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
-				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
-			
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
-			
-			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
-			
-			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
-			
-			$gmt = adodb_get_gmt_diff();
-			if ($isphp5) 
-				$dates .= sprintf(' %s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
-			else
-				$dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
-			break;
-				
-		case 'Y': $dates .= $year; break;
-		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
-		// MONTH
-		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
-		case 'Q': $dates .= ($month+3)>>2; break;
-		case 'n': $dates .= $month; break;
-		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
-		case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
-		// DAY
-		case 't': $dates .= $arr['ndays']; break;
-		case 'z': $dates .= $arr['yday']; break;
-		case 'w': $dates .= adodb_dow($year,$month,$day); break;
-		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'j': $dates .= $day; break;
-		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
-		case 'S': 
-			$d10 = $day % 10;
-			if ($d10 == 1) $dates .= 'st';
-			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
-			else if ($d10 == 3) $dates .= 'rd';
-			else $dates .= 'th';
-			break;
-			
-		// HOUR
-		case 'Z':
-			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
-		case 'O': 
-			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
-			
-			if ($isphp5)
-				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
-			else
-				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
-			break;
-			
-		case 'H': 
-			if ($hour < 10) $dates .= '0'.$hour; 
-			else $dates .= $hour; 
-			break;
-		case 'h': 
-			if ($hour > 12) $hh = $hour - 12; 
-			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour;
-			}
-			
-			if ($hh < 10) $dates .= '0'.$hh;
-			else $dates .= $hh;
-			break;
-			
-		case 'G': 
-			$dates .= $hour;
-			break;
-			
-		case 'g':
-			if ($hour > 12) $hh = $hour - 12; 
-			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour; 
-			}
-			$dates .= $hh;
-			break;
-		// MINUTES
-		case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
-		// SECONDS
-		case 'U': $dates .= $d; break;
-		case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
-		// AM/PM
-		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
-		case 'a':
-			if ($hour>=12) $dates .= 'pm';
-			else $dates .= 'am';
-			break;
-		case 'A':
-			if ($hour>=12) $dates .= 'PM';
-			else $dates .= 'AM';
-			break;
-		default:
-			$dates .= $fmt[$i]; break;
-		// ESCAPE
-		case "\\": 
-			$i++;
-			if ($i < $max) $dates .= $fmt[$i];
-			break;
-		}
-	}
-	return $dates;
-}
-
-/**
-	Returns a timestamp given a GMT/UTC time. 
-	Note that $is_dst is not implemented and is ignored.
-*/
-function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
-{
-	return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true);
-}
-
-/**
-	Return a timestamp given a local time. Originally by jackbbs.
-	Note that $is_dst is not implemented and is ignored.
-	
-	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
-*/
-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 
-{
-	if (!defined('ADODB_TEST_DATES')) {
-
-		if ($mon === false) {
-			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
-		}
-		
-		// for windows, we don't check 1970 because with timezone differences, 
-		// 1 Jan 1970 could generate negative timestamp, which is illegal
-		if (1971 < $year && $year < 2038
-			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
-			) {
-				return $is_gmt ?
-					@gmmktime($hr,$min,$sec,$mon,$day,$year):
-					@mktime($hr,$min,$sec,$mon,$day,$year);
-			}
-	}
-	
-	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff();
-
-	/*
-	# disabled because some people place large values in $sec.
-	# however we need it for $mon because we use an array...
-	$hr = intval($hr);
-	$min = intval($min);
-	$sec = intval($sec);
-	*/
-	$mon = intval($mon);
-	$day = intval($day);
-	$year = intval($year);
-	
-	
-	$year = adodb_year_digit_check($year);
-
-	if ($mon > 12) {
-		$y = floor($mon / 12);
-		$year += $y;
-		$mon -= $y*12;
-	} else if ($mon < 1) {
-		$y = ceil((1-$mon) / 12);
-		$year -= $y;
-		$mon += $y*12;
-	}
-	
-	$_day_power = 86400;
-	$_hour_power = 3600;
-	$_min_power = 60;
-	
-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-	
-	$_total_date = 0;
-	if ($year >= 1970) {
-		for ($a = 1970 ; $a <= $year; $a++) {
-			$leaf = _adodb_is_leap_year($a);
-			if ($leaf == true) {
-				$loop_table = $_month_table_leaf;
-				$_add_date = 366;
-			} else {
-				$loop_table = $_month_table_normal;
-				$_add_date = 365;
-			}
-			if ($a < $year) { 
-				$_total_date += $_add_date;
-			} else {
-				for($b=1;$b<$mon;$b++) {
-					$_total_date += $loop_table[$b];
-				}
-			}
-		}
-		$_total_date +=$day-1;
-		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
-	
-	} else {
-		for ($a = 1969 ; $a >= $year; $a--) {
-			$leaf = _adodb_is_leap_year($a);
-			if ($leaf == true) {
-				$loop_table = $_month_table_leaf;
-				$_add_date = 366;
-			} else {
-				$loop_table = $_month_table_normal;
-				$_add_date = 365;
-			}
-			if ($a > $year) { $_total_date += $_add_date;
-			} else {
-				for($b=12;$b>$mon;$b--) {
-					$_total_date += $loop_table[$b];
-				}
-			}
-		}
-		$_total_date += $loop_table[$mon] - $day;
-		
-		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
-		$_day_time = $_day_power - $_day_time;
-		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
-		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
-		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
-	} 
-	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
-	return $ret;
-}
-
-function adodb_gmstrftime($fmt, $ts=false)
-{
-	return adodb_strftime($fmt,$ts,true);
-}
-
-// hack - convert to adodb_date
-function adodb_strftime($fmt, $ts=false,$is_gmt=false)
-{
-global $ADODB_DATE_LOCALE;
-
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0) // if windows, must be +ve integer
-				return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
-
-		}
-	}
-	
-	if (empty($ADODB_DATE_LOCALE)) {
-	/*
-		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
-		$sep = substr($tstr,2,1);
-		$hasAM = strrpos($tstr,'M') !== false;
-	*/
-		# see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24
-		$dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am
-		$sep = substr($dstr,2,1);
-		$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
-		$hasAM = strrpos($tstr,'M') !== false;
-		
-		$ADODB_DATE_LOCALE = array();
-		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
-		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
-			
-	}
-	$inpct = false;
-	$fmtdate = '';
-	for ($i=0,$max = strlen($fmt); $i < $max; $i++) {
-		$ch = $fmt[$i];
-		if ($ch == '%') {
-			if ($inpct) {
-				$fmtdate .= '%';
-				$inpct = false;
-			} else
-				$inpct = true;
-		} else if ($inpct) {
-		
-			$inpct = false;
-			switch($ch) {
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-			case 'E':
-			case 'O':
-				/* ignore format modifiers */
-				$inpct = true; 
-				break;
-				
-			case 'a': $fmtdate .= 'D'; break;
-			case 'A': $fmtdate .= 'l'; break;
-			case 'h':
-			case 'b': $fmtdate .= 'M'; break;
-			case 'B': $fmtdate .= 'F'; break;
-			case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
-			case 'C': $fmtdate .= '\C?'; break; // century
-			case 'd': $fmtdate .= 'd'; break;
-			case 'D': $fmtdate .= 'm/d/y'; break;
-			case 'e': $fmtdate .= 'j'; break;
-			case 'g': $fmtdate .= '\g?'; break; //?
-			case 'G': $fmtdate .= '\G?'; break; //?
-			case 'H': $fmtdate .= 'H'; break;
-			case 'I': $fmtdate .= 'h'; break;
-			case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd
-			case 'm': $fmtdate .= 'm'; break;
-			case 'M': $fmtdate .= 'i'; break;
-			case 'n': $fmtdate .= "\n"; break;
-			case 'p': $fmtdate .= 'a'; break;
-			case 'r': $fmtdate .= 'h:i:s a'; break;
-			case 'R': $fmtdate .= 'H:i:s'; break;
-			case 'S': $fmtdate .= 's'; break;
-			case 't': $fmtdate .= "\t"; break;
-			case 'T': $fmtdate .= 'H:i:s'; break;
-			case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-based
-			case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
-			case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
-			case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-based
-			case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'y': $fmtdate .= 'y'; break;
-			case 'Y': $fmtdate .= 'Y'; break;
-			case 'Z': $fmtdate .= 'T'; break;
-			}
-		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
-			$fmtdate .= "\\".$ch;
-		else
-			$fmtdate .= $ch;
-	}
-	//echo "fmt=",$fmtdate,"<br>";
-	if ($ts === false) $ts = time();
-	$ret = adodb_date($fmtdate, $ts, $is_gmt);
-	return $ret;
-}
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/tohtml.inc.php
===================================================================
--- admin/include/lib/adodb/tohtml.inc.php	(revision 6370)
+++ admin/include/lib/adodb/tohtml.inc.php	(working copy)
@@ -1,195 +0,0 @@
-<?php 
-/*
-  V4.93 10 Oct 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Some pretty-printing by Chris Oxenreider <oxenreid@state.net>
-*/ 
-  
-// specific code for tohtml
-GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
-
-$ADODB_ROUND=4; // rounding
-$gSQLMaxRows = 1000; // max no of rows to download
-$gSQLBlockRows=20; // max no of rows per table block
-
-// RecordSet to HTML Table
-//------------------------------------------------------------
-// Convert a recordset to a html table. Multiple tables are generated
-// if the number of rows is > $gSQLBlockRows. This is because
-// web browsers normally require the whole table to be downloaded
-// before it can be rendered, so we break the output into several
-// smaller faster rendering tables.
-//
-// $rs: the recordset
-// $ztabhtml: the table tag attributes (optional)
-// $zheaderarray: contains the replacement strings for the headers (optional)
-//
-//  USAGE:
-//	include('adodb.inc.php');
-//	$db = ADONewConnection('mysql');
-//	$db->Connect('mysql','userid','password','database');
-//	$rs = $db->Execute('select col1,col2,col3 from table');
-//	rs2html($rs, 'BORDER=2', array('Title1', 'Title2', 'Title3'));
-//	$rs->Close();
-//
-// RETURNS: number of rows displayed
-
-
-function rs2html(&$rs,$ztabhtml=false,$zheaderarray=false,$htmlspecialchars=true,$echo = true)
-{
-$s ='';$rows=0;$docnt = false;
-GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
-
-	if (!$rs) {
-		printf(ADODB_BAD_RS,'rs2html');
-		return false;
-	}
-	
-	if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";
-	//else $docnt = true;
-	$typearr = array();
-	$ncols = $rs->FieldCount();
-	$hdr = "<TABLE COLS=$ncols $ztabhtml><tr>\n\n";
-	for ($i=0; $i < $ncols; $i++) {	
-		$field = $rs->FetchField($i);
-		if ($field) {
-			if ($zheaderarray) $fname = $zheaderarray[$i];
-			else $fname = htmlspecialchars($field->name);	
-			$typearr[$i] = $rs->MetaType($field->type,$field->max_length);
- 			//print " $field->name $field->type $typearr[$i] ";
-		} else {
-			$fname = 'Field '.($i+1);
-			$typearr[$i] = 'C';
-		}
-		if (strlen($fname)==0) $fname = '&nbsp;';
-		$hdr .= "<TH>$fname</TH>";
-	}
-	$hdr .= "\n</tr>";
-	if ($echo) print $hdr."\n\n";
-	else $html = $hdr;
-	
-	// smart algorithm - handles ADODB_FETCH_MODE's correctly by probing...
-	$numoffset = isset($rs->fields[0]) ||isset($rs->fields[1]) || isset($rs->fields[2]);
-	while (!$rs->EOF) {
-		
-		$s .= "<TR valign=top>\n";
-		
-		for ($i=0; $i < $ncols; $i++) {
-			if ($i===0) $v=($numoffset) ? $rs->fields[0] : reset($rs->fields);
-			else $v = ($numoffset) ? $rs->fields[$i] : next($rs->fields);
-			
-			$type = $typearr[$i];
-			switch($type) {
-			case 'D':
-				if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
-				else if (!strpos($v,':')) {
-					$s .= "	<TD>".$rs->UserDate($v,"D d, M Y") ."&nbsp;</TD>\n";
-				}
-				break;
-			case 'T':
-				if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
-				else $s .= "	<TD>".$rs->UserTimeStamp($v,"D d, M Y, h:i:s") ."&nbsp;</TD>\n";
-			break;
-			
-			case 'N':
-				if (abs(abs($v) - round($v,0)) < 0.00000001)
-					$v = round($v);
-				else
-					$v = round($v,$ADODB_ROUND);
-			case 'I':
-				$s .= "	<TD align=right>".stripslashes((trim($v))) ."&nbsp;</TD>\n";
-			   	
-			break;
-			/*
-			case 'B':
-				if (substr($v,8,2)=="BM" ) $v = substr($v,8);
-				$mtime = substr(str_replace(' ','_',microtime()),2);
-				$tmpname = "tmp/".uniqid($mtime).getmypid();
-				$fd = @fopen($tmpname,'a');
-				@ftruncate($fd,0);
-				@fwrite($fd,$v);
-				@fclose($fd);
-				if (!function_exists ("mime_content_type")) {
-				  function mime_content_type ($file) {
-				    return exec("file -bi ".escapeshellarg($file));
-				  }
-				}
-				$t = mime_content_type($tmpname);
-				$s .= (substr($t,0,5)=="image") ? " <td><img src='$tmpname' alt='$t'></td>\\n" : " <td><a
-				href='$tmpname'>$t</a></td>\\n";
-				break;
-			*/
-
-			default:
-				if ($htmlspecialchars) $v = htmlspecialchars(trim($v));
-				$v = trim($v);
-				if (strlen($v) == 0) $v = '&nbsp;';
-				$s .= "	<TD>". str_replace("\n",'<br>',stripslashes($v)) ."</TD>\n";
-			  
-			}
-		} // for
-		$s .= "</TR>\n\n";
-			  
-		$rows += 1;
-		if ($rows >= $gSQLMaxRows) {
-			$rows = "<p>Truncated at $gSQLMaxRows</p>";
-			break;
-		} // switch
-
-		$rs->MoveNext();
-	
-	// additional EOF check to prevent a widow header
-		if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {
-	
-		//if (connection_aborted()) break;// not needed as PHP aborts script, unlike ASP
-			if ($echo) print $s . "</TABLE>\n\n";
-			else $html .= $s ."</TABLE>\n\n";
-			$s = $hdr;
-		}
-	} // while
-
-	if ($echo) print $s."</TABLE>\n\n";
-	else $html .= $s."</TABLE>\n\n";
-	
-	if ($docnt) if ($echo) print "<H2>".$rows." Rows</H2>";
-	
-	return ($echo) ? $rows : $html;
- }
- 
-// pass in 2 dimensional array
-function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
-{
-	if (!$ztabhtml) $ztabhtml = 'BORDER=1';
-	
-	$s = "<TABLE $ztabhtml>";//';print_r($arr);
-
-	if ($zheaderarray) {
-		$s .= '<TR>';
-		for ($i=0; $i<sizeof($zheaderarray); $i++) {
-			$s .= "	<TH>{$zheaderarray[$i]}</TH>\n";
-		}
-		$s .= "\n</TR>";
-	}
-	
-	for ($i=0; $i<sizeof($arr); $i++) {
-		$s .= '<TR>';
-		$a = &$arr[$i];
-		if (is_array($a)) 
-			for ($j=0; $j<sizeof($a); $j++) {
-				$val = $a[$j];
-				if (empty($val)) $val = '&nbsp;';
-				$s .= "	<TD>$val</TD>\n";
-			}
-		else if ($a) {
-			$s .=  '	<TD>'.$a."</TD>\n";
-		} else $s .= "	<TD>&nbsp;</TD>\n";
-		$s .= "\n</TR>\n";
-	}
-	$s .= '</TABLE>';
-	print $s;
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-time.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: admin/include/lib/adodb/adodb.inc.php
===================================================================
--- admin/include/lib/adodb/adodb.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb.inc.php	(working copy)
@@ -1,4231 +0,0 @@
-<?php 
-/*
- * Set tabs to 4 for best viewing.
- * 
- * Latest version is available at http://adodb.sourceforge.net/
- * 
- * This is the main include file for ADOdb.
- * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
- *
- * The ADOdb files are formatted so that doxygen can be used to generate documentation.
- * Doxygen is a documentation generation tool and can be downloaded from http://doxygen.org/
- */
-
-/**
-	\mainpage 	
-	
-	 @version V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-
-	Released under both BSD license and Lesser GPL library license. You can choose which license
-	you prefer.
-	
-	PHP's database access functions are not standardised. This creates a need for a database 
-	class library to hide the differences between the different database API's (encapsulate 
-	the differences) so we can easily switch databases.
-
-	We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, DB2,
-	Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland variants), Foxpro, Access,
-	ADO, SAP DB, SQLite and ODBC. We have had successful reports of connecting to Progress and
-	other databases via ODBC.
-
-	Latest Download at http://adodb.sourceforge.net/
-	  
- */
- 
- if (!defined('_ADODB_LAYER')) {
- 	define('_ADODB_LAYER',1);
-	
-	//==============================================================================================	
-	// CONSTANT DEFINITIONS
-	//==============================================================================================	
-
-
-	/** 
-	 * Set ADODB_DIR to the directory where this file resides...
-	 * This constant was formerly called $ADODB_RootPath
-	 */
-	if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__));
-	
-	//==============================================================================================	
-	// GLOBAL VARIABLES
-	//==============================================================================================	
-
-	GLOBAL 
-		$ADODB_vers, 		// database version
-		$ADODB_COUNTRECS,	// count number of records returned - slows down query
-		$ADODB_CACHE_DIR,	// directory to cache recordsets
-		$ADODB_EXTENSION,   // ADODB extension installed
-		$ADODB_COMPAT_FETCH, // If $ADODB_COUNTRECS and this is true, $rs->fields is available on EOF
-	 	$ADODB_FETCH_MODE,	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
-		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.	
-	
-	//==============================================================================================	
-	// GLOBAL SETUP
-	//==============================================================================================	
-	
-	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
-	
-	//********************************************************//
-	/*
-	Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
-	Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, nuko#mbnet.fi
-
- 		0 = ignore empty fields. All empty fields in array are ignored.
-		1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
-		2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
-		3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
-	*/
-        define('ADODB_FORCE_IGNORE',0);
-        define('ADODB_FORCE_NULL',1);
-        define('ADODB_FORCE_EMPTY',2);
-        define('ADODB_FORCE_VALUE',3);
-    //********************************************************//
-
-
-	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
-		
-		define('ADODB_BAD_RS','<p>Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;</p>');
-	
-	// allow [ ] @ ` " and . in table names
-		define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
-	
-	// prefetching used by oracle
-		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
-	
-	
-	/*
-	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
-	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
-	
- 		0 = assoc lowercase field names. $rs->fields['orderid']
-		1 = assoc uppercase field names. $rs->fields['ORDERID']
-		2 = use native-case field names. $rs->fields['OrderID']
-	*/
-	
-		define('ADODB_FETCH_DEFAULT',0);
-		define('ADODB_FETCH_NUM',1);
-		define('ADODB_FETCH_ASSOC',2);
-		define('ADODB_FETCH_BOTH',3);
-		
-		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
-	
-		// PHP's version scheme makes converting to numbers difficult - workaround
-		$_adodb_ver = (float) PHP_VERSION;
-		if ($_adodb_ver >= 5.2) {
-			define('ADODB_PHPVER',0x5200);
-		} else if ($_adodb_ver >= 5.0) {
-			define('ADODB_PHPVER',0x5000);
-		} else if ($_adodb_ver > 4.299999) { # 4.3
-			define('ADODB_PHPVER',0x4300);
-		} else if ($_adodb_ver > 4.199999) { # 4.2
-			define('ADODB_PHPVER',0x4200);
-		} else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
-			define('ADODB_PHPVER',0x4050);
-		} else {
-			define('ADODB_PHPVER',0x4000);
-		}
-	}
-	
-	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
-
-	
-	/**
-	 	Accepts $src and $dest arrays, replacing string $data
-	*/
-	function ADODB_str_replace($src, $dest, $data)
-	{
-		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
-		
-		$s = reset($src);
-		$d = reset($dest);
-		while ($s !== false) {
-			$data = str_replace($s,$d,$data);
-			$s = next($src);
-			$d = next($dest);
-		}
-		return $data;
-	}
-	
-	function ADODB_Setup()
-	{
-	GLOBAL 
-		$ADODB_vers, 		// database version
-		$ADODB_COUNTRECS,	// count number of records returned - slows down query
-		$ADODB_CACHE_DIR,	// directory to cache recordsets
-	 	$ADODB_FETCH_MODE,
-		$ADODB_FORCE_TYPE,
-		$ADODB_QUOTE_FIELDNAMES;
-		
-		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
-		$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
-
-
-		if (!isset($ADODB_CACHE_DIR)) {
-			$ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp';
-		} else {
-			// do not accept url based paths, eg. http:/ or ftp:/
-			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
-				die("Illegal path http:// or ftp://");
-		}
-		
-			
-		// Initialize random number generator for randomizing cache flushes
-		// -- note Since PHP 4.2.0, the seed  becomes optional and defaults to a random value if omitted.
-		 srand(((double)microtime())*1000000);
-		
-		/**
-		 * ADODB version as a string.
-		 */
-		$ADODB_vers = 'V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
-	
-		/**
-		 * Determines whether recordset->RecordCount() is used. 
-		 * Set to false for highest performance -- RecordCount() will always return -1 then
-		 * for databases that provide "virtual" recordcounts...
-		 */
-		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
-	}
-	
-	
-	//==============================================================================================	
-	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
-	//==============================================================================================	
-	
-	ADODB_Setup();
-
-	//==============================================================================================	
-	// CLASS ADOFieldObject
-	//==============================================================================================	
-	/**
-	 * Helper class for FetchFields -- holds info on a column
-	 */
-	class ADOFieldObject { 
-		var $name = '';
-		var $max_length=0;
-		var $type="";
-/*
-		// additional fields by dannym... (danny_milo@yahoo.com)
-		var $not_null = false; 
-		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
-		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
-
-		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
-			// others to come (dannym)
-		var $default_value; // default, if any, and supported. Check has_default first.
-*/
-	}
-	
-
-	
-	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
-	{
-		//print "Errorno ($fn errno=$errno m=$errmsg) ";
-		$thisConnection->_transOK = false;
-		if ($thisConnection->_oldRaiseFn) {
-			$fn = $thisConnection->_oldRaiseFn;
-			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
-		}
-	}
-	
-	//==============================================================================================	
-	// CLASS ADOConnection
-	//==============================================================================================	
-	
-	/**
-	 * Connection object. For connecting to databases, and executing queries.
-	 */ 
-	class ADOConnection {
-	//
-	// PUBLIC VARS 
-	//
-	var $dataProvider = 'native';
-	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
-	var $database = '';			/// Name of database to be used.	
-	var $host = ''; 			/// The hostname of the database server	
-	var $user = ''; 			/// The username which is used to connect to the database server. 
-	var $password = ''; 		/// Password for the username. For security, we no longer store it.
-	var $debug = false; 		/// if set to true will output sql statements
-	var $maxblobsize = 262144; 	/// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
-	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
-	var $substr = 'substr';		/// substring operator
-	var $length = 'length';		/// string length ofperator
-	var $random = 'rand()';		/// random function
-	var $upperCase = 'upper';		/// uppercase function
-	var $fmtDate = "'Y-m-d'";	/// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d, h:i:s A'"; /// used by DBTimeStamp as the default timestamp fmt.
-	var $true = '1'; 			/// string that represents TRUE for a database
-	var $false = '0'; 			/// string that represents FALSE for a database
-	var $replaceQuote = "\\'"; 	/// string to use to replace quotes
-	var $nameQuote = '"';		/// string to use to quote identifiers and names
-	var $charSet=false; 		/// character set to use - only for interbase, postgres and oci8
-	var $metaDatabasesSQL = '';
-	var $metaTablesSQL = '';
-	var $uniqueOrderBy = false; /// All order by columns have to be unique
-	var $emptyDate = '&nbsp;';
-	var $emptyTimeStamp = '&nbsp;';
-	var $lastInsID = false;
-	//--
-	var $hasInsertID = false; 		/// supports autoincrement ID?
-	var $hasAffectedRows = false; 	/// supports affected rows for update/delete?
-	var $hasTop = false;			/// support mssql/access SELECT TOP 10 * FROM TABLE
-	var $hasLimit = false;			/// support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	var $readOnly = false; 			/// this is a readonly database - used by phpLens
-	var $hasMoveFirst = false;  /// has ability to run MoveFirst(), scrolling backwards
-	var $hasGenID = false; 		/// can generate sequences using GenID();
-	var $hasTransactions = true; /// has transactions
-	//--
-	var $genID = 0; 			/// sequence id used by GenID();
-	var $raiseErrorFn = false; 	/// error function to call
-	var $isoDates = false; /// accepts dates in ISO format
-	var $cacheSecs = 3600; /// cache for 1 hour
-
-	// memcache
-	var $memCache = false; /// should we use memCache instead of caching in files
-	var $memCacheHost; /// memCache host
-	var $memCachePort = 11211; /// memCache port
-	var $memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib)
-
-	var $sysDate = false; /// name of function that returns the current date
-	var $sysTimeStamp = false; /// name of function that returns the current timestamp
-	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
-	
-	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
-	var $numCacheHits = 0; 
-	var $numCacheMisses = 0;
-	var $pageExecuteCountRows = true;
-	var $uniqueSort = false; /// indicates that all fields in order by must be unique
-	var $leftOuter = false; /// operator to use for left outer join in WHERE clause
-	var $rightOuter = false; /// operator to use for right outer join in WHERE clause
-	var $ansiOuter = false; /// whether ansi outer join syntax supported
-	var $autoRollback = false; // autoRollback on PConnect().
-	var $poorAffectedRows = false; // affectedRows not working or unreliable
-	
-	var $fnExecute = false;
-	var $fnCacheExecute = false;
-	var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
-	var $rsPrefix = "ADORecordSet_";
-	
-	var $autoCommit = true; 	/// do not modify this yourself - actually private
-	var $transOff = 0; 			/// temporarily disable transactions
-	var $transCnt = 0; 			/// count of nested transactions
-	
-	var $fetchMode=false;
-	
-	var $null2null = 'null'; // in autoexecute/getinsertsql/getupdatesql, this value will be converted to a null
-	 //
-	 // PRIVATE VARS
-	 //
-	var $_oldRaiseFn =  false;
-	var $_transOK = null;
-	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.	
-	var $_errorMsg = false;		/// A variable which was used to keep the returned last error message.  The value will
-								/// then returned by the errorMsg() function	
-	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8					
-	var $_queryID = false;		/// This variable keeps the last created result link identifier
-	
-	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
-	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
-	var $_evalAll = false;
-	var $_affected = false;
-	var $_logsql = false;
-	var $_transmode = ''; // transaction mode
-	
-
-	
-	/**
-	 * Constructor
-	 */
-	function ADOConnection()			
-	{
-		die('Virtual Class -- cannot instantiate');
-	}
-	
-	function Version()
-	{
-	global $ADODB_vers;
-	
-		return (float) substr($ADODB_vers,1);
-	}
-	
-	/**
-		Get server version info...
-		
-		@returns An array with 2 elements: $arr['string'] is the description string, 
-			and $arr[version] is the version (also a string).
-	*/
-	function ServerInfo()
-	{
-		return array('description' => '', 'version' => '');
-	}
-	
-	function IsConnected()
-	{
-    	return !empty($this->_connectionID);
-	}
-	
-	function _findvers($str)
-	{
-		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
-		else return '';
-	}
-	
-	/**
-	* All error messages go through this bottleneck function.
-	* You can define your own handler by defining the function name in ADODB_OUTP.
-	*/
-	function outp($msg,$newline=true)
-	{
-	global $ADODB_FLUSH,$ADODB_OUTP;
-	
-		if (defined('ADODB_OUTP')) {
-			$fn = ADODB_OUTP;
-			$fn($msg,$newline);
-			return;
-		} else if (isset($ADODB_OUTP)) {
-			$fn = $ADODB_OUTP;
-			$fn($msg,$newline);
-			return;
-		}
-		
-		if ($newline) $msg .= "<br>\n";
-		
-		if (isset($_SERVER['HTTP_USER_AGENT']) || !$newline) echo $msg;
-		else echo strip_tags($msg);
-	
-		
-		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
-		
-	}
-	
-	function Time()
-	{
-		$rs =& $this->_Execute("select $this->sysTimeStamp");
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
-		return false;
-	}
-	
-	/**
-	 * Connect to database
-	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
-	 * @param [forceNew]		force new connection
-	 *
-	 * @return true or false
-	 */	  
-	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
-	{
-		if ($argHostname != "") $this->host = $argHostname;
-		if ($argUsername != "") $this->user = $argUsername;
-		if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-		
-		$this->_isPersistentConnection = false;	
-		if ($forceNew) {
-			if ($rez=$this->_nconnect($this->host, $this->user, $this->password, $this->database)) return true;
-		} else {
-			 if ($rez=$this->_connect($this->host, $this->user, $this->password, $this->database)) return true;
-		}
-		if (isset($rez)) {
-			$err = $this->ErrorMsg();
-			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
-			$ret = false;
-		} else {
-			$err = "Missing extension for ".$this->dataProvider;
-			$ret = 0;
-		}
-		if ($fn = $this->raiseErrorFn) 
-			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		
-		
-		$this->_connectionID = false;
-		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
-		return $ret;
-	}	
-	
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
-	}
-	
-	
-	/**
-	 * Always force a new connection to database - currently only works with oracle
-	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
-	 *
-	 * @return true or false
-	 */	  
-	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
-	{
-		return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
-	}
-	
-	/**
-	 * Establish persistent connect to database
-	 *
-	 * @param [argHostname]		Host to connect to
-	 * @param [argUsername]		Userid to login
-	 * @param [argPassword]		Associated password
-	 * @param [argDatabaseName]	database
-	 *
-	 * @return return true or false
-	 */	
-	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
-	{
-		if (defined('ADODB_NEVER_PERSIST')) 
-			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-		
-		if ($argHostname != "") $this->host = $argHostname;
-		if ($argUsername != "") $this->user = $argUsername;
-		if ($argPassword != "") $this->password = $argPassword;
-		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
-			
-		$this->_isPersistentConnection = true;	
-		if ($rez = $this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
-		if (isset($rez)) {
-			$err = $this->ErrorMsg();
-			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
-			$ret = false;
-		} else {
-			$err = "Missing extension for ".$this->dataProvider;
-			$ret = 0;
-		}
-		if ($fn = $this->raiseErrorFn) {
-			$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
-		}
-		
-		$this->_connectionID = false;
-		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
-		return $ret;
-	}
-
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysDate;
-		return $col; // child class implement
-	}
-	
-	/**
-	 * Should prepare the sql statement and return the stmt resource.
-	 * For databases that do not support this, we return the $sql. To ensure
-	 * compatibility with databases that do not support prepare:
-	 *
-	 *   $stmt = $db->Prepare("insert into table (id, name) values (?,?)");
-	 *   $db->Execute($stmt,array(1,'Jill')) or die('insert failed');
-	 *   $db->Execute($stmt,array(2,'Joe')) or die('insert failed');
-	 *
-	 * @param sql	SQL to send to database
-	 *
-	 * @return return FALSE, or the prepared statement, or the original sql if
-	 * 			if the database does not support prepare.
-	 *
-	 */	
-	function Prepare($sql)
-	{
-		return $sql;
-	}
-	
-	/**
-	 * Some databases, eg. mssql require a different function for preparing
-	 * stored procedures. So we cannot use Prepare().
-	 *
-	 * Should prepare the stored procedure  and return the stmt resource.
-	 * For databases that do not support this, we return the $sql. To ensure
-	 * compatibility with databases that do not support prepare:
-	 *
-	 * @param sql	SQL to send to database
-	 *
-	 * @return return FALSE, or the prepared statement, or the original sql if
-	 * 			if the database does not support prepare.
-	 *
-	 */	
-	function PrepareSP($sql,$param=true)
-	{
-		return $this->Prepare($sql,$param);
-	}
-	
-	/**
-	* PEAR DB Compat
-	*/
-	function Quote($s)
-	{
-		return $this->qstr($s,false);
-	}
-	
-	/**
-	 Requested by "Karsten Dambekalns" <k.dambekalns@fishfarm.de>
-	*/
-	function QMagic($s)
-	{
-		return $this->qstr($s,get_magic_quotes_gpc());
-	}
-
-	function q(&$s)
-	{
-		#if (!empty($this->qNull)) if ($s == 'null') return $s;
-		$s = $this->qstr($s,false);
-	}
-	
-	/**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function ErrorNative()
-	{
-		return $this->ErrorNo();
-	}
-
-	
-   /**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function nextId($seq_name)
-	{
-		return $this->GenID($seq_name);
-	}
-
-	/**
-	*	 Lock a row, will escalate and lock the table if row locking not supported
-	*	will normally free the lock at the end of the transaction
-	*
-	*  @param $table	name of table to lock
-	*  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
-	*/
-	function RowLock($table,$where)
-	{
-		return false;
-	}
-	
-	function CommitLock($table)
-	{
-		return $this->CommitTrans();
-	}
-	
-	function RollbackLock($table)
-	{
-		return $this->RollbackTrans();
-	}
-	
-	/**
-	* PEAR DB Compat - do not use internally. 
-	*
-	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
-	* 	for easy porting :-)
-	*
-	* @param mode	The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
-	* @returns		The previous fetch mode
-	*/
-	function SetFetchMode($mode)
-	{	
-		$old = $this->fetchMode;
-		$this->fetchMode = $mode;
-		
-		if ($old === false) {
-		global $ADODB_FETCH_MODE;
-			return $ADODB_FETCH_MODE;
-		}
-		return $old;
-	}
-	
-
-	/**
-	* PEAR DB Compat - do not use internally. 
-	*/
-	function &Query($sql, $inputarr=false)
-	{
-		$rs = &$this->Execute($sql, $inputarr);
-		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-		return $rs;
-	}
-
-	
-	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function &LimitQuery($sql, $offset, $count, $params=false)
-	{
-		$rs = &$this->SelectLimit($sql, $count, $offset, $params); 
-		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
-		return $rs;
-	}
-
-	
-	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function Disconnect()
-	{
-		return $this->Close();
-	}
-	
-	/*
-		 Returns placeholder for parameter, eg.
-		 $DB->Param('a')
-		 
-		 will return ':a' for Oracle, and '?' for most other databases...
-		 
-		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
-		 	pass in Param(false) before setting the first parameter.
-	*/
-	function Param($name,$type='C')
-	{
-		return '?';
-	}
-	
-	/*
-		InParameter and OutParameter are self-documenting versions of Parameter().
-	*/
-	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
-		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
-	}
-	
-	/*
-	*/
-	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
-		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
-	
-	}
-
-	
-	/* 
-	Usage in oracle
-		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group',64);
-		$db->Execute();
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-
-	*/
-	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-	{
-		return false;
-	}
-	
-	
-	function IgnoreErrors($saveErrs=false)
-	{
-		if (!$saveErrs) {
-			$saveErrs = array($this->raiseErrorFn,$this->_transOK);
-			$this->raiseErrorFn = false;
-			return $saveErrs;
-		} else {
-			$this->raiseErrorFn = $saveErrs[0];
-			$this->_transOK = $saveErrs[1];
-		}
-	}
-	
-	/**
-		Improved method of initiating a transaction. Used together with CompleteTrans().
-		Advantages include:
-		
-		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
-		   Only the outermost block is treated as a transaction.<br>
-		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.<br>
-		c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block
-		   are disabled, making it backward compatible.
-	*/
-	function StartTrans($errfn = 'ADODB_TransMonitor')
-	{
-		if ($this->transOff > 0) {
-			$this->transOff += 1;
-			return;
-		}
-		
-		$this->_oldRaiseFn = $this->raiseErrorFn;
-		$this->raiseErrorFn = $errfn;
-		$this->_transOK = true;
-		
-		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
-		$this->BeginTrans();
-		$this->transOff = 1;
-	}
-	
-	
-	/**
-		Used together with StartTrans() to end a transaction. Monitors connection
-		for sql errors, and will commit or rollback as appropriate.
-		
-		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
-		and if set to false force rollback even if no SQL error detected.
-		@returns true on commit, false on rollback.
-	*/
-	function CompleteTrans($autoComplete = true)
-	{
-		if ($this->transOff > 1) {
-			$this->transOff -= 1;
-			return true;
-		}
-		$this->raiseErrorFn = $this->_oldRaiseFn;
-		
-		$this->transOff = 0;
-		if ($this->_transOK && $autoComplete) {
-			if (!$this->CommitTrans()) {
-				$this->_transOK = false;
-				if ($this->debug) ADOConnection::outp("Smart Commit failed");
-			} else
-				if ($this->debug) ADOConnection::outp("Smart Commit occurred");
-		} else {
-			$this->_transOK = false;
-			$this->RollbackTrans();
-			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
-		}
-		
-		return $this->_transOK;
-	}
-	
-	/*
-		At the end of a StartTrans/CompleteTrans block, perform a rollback.
-	*/
-	function FailTrans()
-	{
-		if ($this->debug) 
-			if ($this->transOff == 0) {
-				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
-			} else {
-				ADOConnection::outp("FailTrans was called");
-				adodb_backtrace();
-			}
-		$this->_transOK = false;
-	}
-	
-	/**
-		Check if transaction has failed, only for Smart Transactions.
-	*/
-	function HasFailedTrans()
-	{
-		if ($this->transOff > 0) return $this->_transOK == false;
-		return false;
-	}
-	
-	/**
-	 * Execute SQL 
-	 *
-	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
-	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
-	 * @return 		RecordSet or false
-	 */
-	function &Execute($sql,$inputarr=false) 
-	{
-		if ($this->fnExecute) {
-			$fn = $this->fnExecute;
-			$ret =& $fn($this,$sql,$inputarr);
-			if (isset($ret)) return $ret;
-		}
-		if ($inputarr) {
-			if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
-			$element0 = reset($inputarr);
-			# is_object check because oci8 descriptors can be passed in
-			$array_2d = is_array($element0) && !is_object(reset($element0));
-			//remove extra memory copy of input -mikefedyk
-			unset($element0);
-			
-			if (!is_array($sql) && !$this->_bindInputArray) {
-				$sqlarr = explode('?',$sql);
-					
-				if (!$array_2d) $inputarr = array($inputarr);
-				foreach($inputarr as $arr) {
-					$sql = ''; $i = 0;
-					//Use each() instead of foreach to reduce memory usage -mikefedyk
-					while(list(, $v) = each($arr)) {
-						$sql .= $sqlarr[$i];
-						// from Ron Baldwin <ron.baldwin#sourceprose.com>
-						// Only quote string types	
-						$typ = gettype($v);
-						if ($typ == 'string')
-							//New memory copy of input created here -mikefedyk
-							$sql .= $this->qstr($v);
-						else if ($typ == 'double')
-							$sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
-						else if ($typ == 'boolean')
-							$sql .= $v ? $this->true : $this->false;
-						else if ($typ == 'object') {
-							if (method_exists($v, '__toString')) $sql .= $this->qstr($v->__toString());
-							else $sql .= $this->qstr((string) $v);
-						} else if ($v === null)
-							$sql .= 'NULL';
-						else
-							$sql .= $v;
-						$i += 1;
-					}
-					if (isset($sqlarr[$i])) {
-						$sql .= $sqlarr[$i];
-						if ($i+1 != sizeof($sqlarr)) ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql));
-					} else if ($i != sizeof($sqlarr))	
-						ADOConnection::outp( "Input array does not match ?: ".htmlspecialchars($sql));
-		
-					$ret =& $this->_Execute($sql);
-					if (!$ret) return $ret;
-				}	
-			} else {
-				if ($array_2d) {
-					if (is_string($sql))
-						$stmt = $this->Prepare($sql);
-					else
-						$stmt = $sql;
-						
-					foreach($inputarr as $arr) {
-						$ret =& $this->_Execute($stmt,$arr);
-						if (!$ret) return $ret;
-					}
-				} else {
-					$ret =& $this->_Execute($sql,$inputarr);
-				}
-			}
-		} else {
-			$ret =& $this->_Execute($sql,false);
-		}
-
-		return $ret;
-	}
-	
-	
-	function &_Execute($sql,$inputarr=false)
-	{
-		if ($this->debug) {
-			global $ADODB_INCLUDED_LIB;
-			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-			$this->_queryID = _adodb_debug_execute($this, $sql,$inputarr);
-		} else {
-			$this->_queryID = @$this->_query($sql,$inputarr);
-		}
-		
-		/************************
-		// OK, query executed
-		*************************/
-
-		if ($this->_queryID === false) { // error handling if query fails
-			if ($this->debug == 99) adodb_backtrace(true,5);	
-			$fn = $this->raiseErrorFn;
-			if ($fn) {
-				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
-			} 
-			$false = false;
-			return $false;
-		} 
-		
-		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
-			$rs = new ADORecordSet_empty();
-			return $rs;
-		}
-		
-		// return real recordset from select statement
-		$rsclass = $this->rsPrefix.$this->databaseType;
-		$rs = new $rsclass($this->_queryID,$this->fetchMode);
-		$rs->connection = &$this; // Pablo suggestion
-		$rs->Init();
-		if (is_array($sql)) $rs->sql = $sql[0];
-		else $rs->sql = $sql;
-		if ($rs->_numOfRows <= 0) {
-		global $ADODB_COUNTRECS;
-			if ($ADODB_COUNTRECS) {
-				if (!$rs->EOF) { 
-					$rs = &$this->_rs2rs($rs,-1,-1,!is_array($sql));
-					$rs->_queryID = $this->_queryID;
-				} else
-					$rs->_numOfRows = 0;
-			}
-		}
-		return $rs;
-	}
-
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
-	}
-
-	function DropSequence($seqname='adodbseq')
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-
-	/**
-	 * Generates a sequence id and stores it in $this->genID;
-	 * GenID is only available if $this->hasGenID = true;
-	 *
-	 * @param seqname		name of sequence to use
-	 * @param startID		if sequence does not exist, start at this ID
-	 * @return		0 if not supported, otherwise a sequence id
-	 */
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		if (!$this->hasGenID) {
-			return 0; // formerly returns false pre 1.60
-		}
-		
-		$getnext = sprintf($this->_genIDSQL,$seqname);
-		
-		$holdtransOK = $this->_transOK;
-		
-		$save_handler = $this->raiseErrorFn;
-		$this->raiseErrorFn = '';
-		@($rs = $this->Execute($getnext));
-		$this->raiseErrorFn = $save_handler;
-		
-		if (!$rs) {
-			$this->_transOK = $holdtransOK; //if the status was ok before reset
-			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
-			$rs = $this->Execute($getnext);
-		}
-		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
-		else $this->genID = 0; // false
-	
-		if ($rs) $rs->Close();
-
-		return $this->genID;
-	}	
-
-	/**
-	 * @param $table string name of the table, not needed by all databases (eg. mysql), default ''
-	 * @param $column string name of the column, not needed by all databases (eg. mysql), default ''
-	 * @return  the last inserted ID. Not all databases support this.
-	 */ 
-	function Insert_ID($table='',$column='')
-	{
-		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
-		if ($this->hasInsertID) return $this->_insertid($table,$column);
-		if ($this->debug) {
-			ADOConnection::outp( '<p>Insert_ID error</p>');
-			adodb_backtrace();
-		}
-		return false;
-	}
-
-
-	/**
-	 * Portable Insert ID. Pablo Roca <pabloroca#mvps.org>
-	 *
-	 * @return  the last inserted ID. All databases support this. But aware possible
-	 * problems in multiuser environments. Heavy test this before deploying.
-	 */ 
-	function PO_Insert_ID($table="", $id="") 
-	{
-	   if ($this->hasInsertID){
-		   return $this->Insert_ID($table,$id);
-	   } else {
-		   return $this->GetOne("SELECT MAX($id) FROM $table");
-	   }
-	}
-
-	/**
-	* @return # rows affected by UPDATE/DELETE
-	*/ 
-	function Affected_Rows()
-	{
-		if ($this->hasAffectedRows) {
-			if ($this->fnExecute === 'adodb_log_sql') {
-				if ($this->_logsql && $this->_affected !== false) return $this->_affected;
-			}
-			$val = $this->_affectedrows();
-			return ($val < 0) ? false : $val;
-		}
-				  
-		if ($this->debug) ADOConnection::outp( '<p>Affected_Rows error</p>',false);
-		return false;
-	}
-	
-	
-	/**
-	 * @return  the last error message
-	 */
-	function ErrorMsg()
-	{
-		if ($this->_errorMsg) return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
-		else return '';
-	}
-	
-	
-	/**
-	 * @return the last error number. Normally 0 means no error.
-	 */
-	function ErrorNo() 
-	{
-		return ($this->_errorMsg) ? -1 : 0;
-	}
-	
-	function MetaError($err=false)
-	{
-		include_once(ADODB_DIR."/adodb-error.inc.php");
-		if ($err === false) $err = $this->ErrorNo();
-		return adodb_error($this->dataProvider,$this->databaseType,$err);
-	}
-	
-	function MetaErrorMsg($errno)
-	{
-		include_once(ADODB_DIR."/adodb-error.inc.php");
-		return adodb_errormsg($errno);
-	}
-	
-	/**
-	 * @returns an array with the primary key columns in it.
-	 */
-	function MetaPrimaryKeys($table, $owner=false)
-	{
-	// owner not used in base class - see oci8
-		$p = array();
-		$objs =& $this->MetaColumns($table);
-		if ($objs) {
-			foreach($objs as $v) {
-				if (!empty($v->primary_key))
-					$p[] = $v->name;
-			}
-		}
-		if (sizeof($p)) return $p;
-		if (function_exists('ADODB_VIEW_PRIMARYKEYS'))
-			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
-		return false;
-	}
-	
-	/**
-	 * @returns assoc array where keys are tables, and values are foreign keys
-	 */
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-		return false;
-	}
-	/**
-	 * Choose a database to connect to. Many databases do not support this.
-	 *
-	 * @param dbName 	is the name of the database to select
-	 * @return 		true or false
-	 */
-	function SelectDB($dbName) 
-	{return false;}
-	
-	
-	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
-	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
-	* BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]		is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($this->hasTop && $nrows > 0) {
-		// suggested by Reinhard Balling. Access requires top after distinct 
-		 // Informix requires first before distinct - F Riosa
-			$ismssql = (strpos($this->databaseType,'mssql') !== false);
-			if ($ismssql) $isaccess = false;
-			else $isaccess = (strpos($this->databaseType,'access') !== false);
-			
-			if ($offset <= 	0) {
-				
-					// access includes ties in result
-					if ($isaccess) {
-						$sql = preg_replace(
-						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
-
-						if ($secs2cache != 0) {
-							$ret =& $this->CacheExecute($secs2cache, $sql,$inputarr);
-						} else {
-							$ret =& $this->Execute($sql,$inputarr);
-						}
-						return $ret; // PHP5 fix
-					} else if ($ismssql){
-						$sql = preg_replace(
-						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
-					} else {
-						$sql = preg_replace(
-						'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
-					}
-			} else {
-				$nn = $nrows + $offset;
-				if ($isaccess || $ismssql) {
-					$sql = preg_replace(
-					'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
-				} else {
-					$sql = preg_replace(
-					'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
-				}
-			}
-		}
-		
-		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
-		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
-		global $ADODB_COUNTRECS;
-		
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-			
-		if ($offset>0){
-			if ($secs2cache != 0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-			else $rs = &$this->Execute($sql,$inputarr);
-		} else {
-			if ($secs2cache != 0) $rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-			else $rs = &$this->Execute($sql,$inputarr);
-		}
-		$ADODB_COUNTRECS = $savec;
-		if ($rs && !$rs->EOF) {
-			$rs =& $this->_rs2rs($rs,$nrows,$offset);
-		}
-		//print_r($rs);
-		return $rs;
-	}
-	
-	/**
-	* Create serializable recordset. Breaks rs link to connection.
-	*
-	* @param rs			the recordset to serialize
-	*/
-	function &SerializableRS(&$rs)
-	{
-		$rs2 =& $this->_rs2rs($rs);
-		$ignore = false;
-		$rs2->connection =& $ignore;
-		
-		return $rs2;
-	}
-	
-	/**
-	* Convert database recordset to an array recordset
-	* input recordset's cursor should be at beginning, and
-	* old $rs will be closed.
-	*
-	* @param rs			the recordset to copy
-	* @param [nrows]  	number of rows to retrieve (optional)
-	* @param [offset] 	offset by number of rows (optional)
-	* @return 			the new recordset
-	*/
-	function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true)
-	{
-		if (! $rs) {
-			$false = false;
-			return $false;
-		}
-		$dbtype = $rs->databaseType;
-		if (!$dbtype) {
-			$rs = &$rs;  // required to prevent crashing in 4.2.1, but does not happen in 4.3.1 -- why ?
-			return $rs;
-		}
-		if (($dbtype == 'array' || $dbtype == 'csv') && $nrows == -1 && $offset == -1) {
-			$rs->MoveFirst();
-			$rs = &$rs; // required to prevent crashing in 4.2.1, but does not happen in 4.3.1-- why ?
-			return $rs;
-		}
-		$flds = array();
-		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
-			$flds[] = $rs->FetchField($i);
-		}
-
-		$arr =& $rs->GetArrayLimit($nrows,$offset);
-		//print_r($arr);
-		if ($close) $rs->Close();
-		
-		$arrayClass = $this->arrayClass;
-		
-		$rs2 = new $arrayClass();
-		$rs2->connection = &$this;
-		$rs2->sql = $rs->sql;
-		$rs2->dataProvider = $this->dataProvider;
-		$rs2->InitArrayFields($arr,$flds);
-		$rs2->fetchMode = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
-		return $rs2;
-	}
-	
-	/*
-	* Return all rows. Compat with PEAR DB
-	*/
-	function &GetAll($sql, $inputarr=false)
-	{
-		$arr =& $this->GetArray($sql,$inputarr);
-		return $arr;
-	}
-	
-	function &GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
-	{
-		$rs =& $this->Execute($sql, $inputarr);
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		$arr =& $rs->GetAssoc($force_array,$first2cols);
-		return $arr;
-	}
-	
-	function &CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
-	{
-		if (!is_numeric($secs2cache)) {
-			$first2cols = $force_array;
-			$force_array = $inputarr;
-		}
-		$rs =& $this->CacheExecute($secs2cache, $sql, $inputarr);
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		$arr =& $rs->GetAssoc($force_array,$first2cols);
-		return $arr;
-	}
-	
-	/**
-	* Return first element of first row of sql statement. Recordset is disposed
-	* for you.
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function GetOne($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		$crecs = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		
-		$ret = false;
-		$rs = &$this->Execute($sql,$inputarr);
-		if ($rs) {	
-			if (!$rs->EOF) $ret = reset($rs->fields);
-			$rs->Close();
-		}
-		$ADODB_COUNTRECS = $crecs;
-		return $ret;
-	}
-	
-	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
-	{
-		$ret = false;
-		$rs = &$this->CacheExecute($secs2cache,$sql,$inputarr);
-		if ($rs) {		
-			if (!$rs->EOF) $ret = reset($rs->fields);
-			$rs->Close();
-		} 
-		
-		return $ret;
-	}
-	
-	function GetCol($sql, $inputarr = false, $trim = false)
-	{
-	  	$rv = false;
-	  	$rs = &$this->Execute($sql, $inputarr);
-	  	if ($rs) {
-			$rv = array();
-	   		if ($trim) {
-				while (!$rs->EOF) {
-					$rv[] = trim(reset($rs->fields));
-					$rs->MoveNext();
-		   		}
-			} else {
-				while (!$rs->EOF) {
-					$rv[] = reset($rs->fields);
-					$rs->MoveNext();
-		   		}
-			}
-	   		$rs->Close();
-	  	}
-	  	return $rv;
-	}
-	
-	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
-	{
-	  	$rv = false;
-	  	$rs = &$this->CacheExecute($secs, $sql, $inputarr);
-	  	if ($rs) {
-			if ($trim) {
-				while (!$rs->EOF) {
-					$rv[] = trim(reset($rs->fields));
-					$rs->MoveNext();
-		   		}
-			} else {
-				while (!$rs->EOF) {
-					$rv[] = reset($rs->fields);
-					$rs->MoveNext();
-		   		}
-			}
-	   		$rs->Close();
-	  	}
-	  	return $rv;
-	}
-	
-	function &Transpose(&$rs,$addfieldnames=true)
-	{
-		$rs2 =& $this->_rs2rs($rs);
-		$false = false;
-		if (!$rs2) return $false;
-		
-		$rs2->_transpose($addfieldnames);
-		return $rs2;
-	}
- 
-	/*
-		Calculate the offset of a date for a particular database and generate
-			appropriate SQL. Useful for calculating future/past dates and storing
-			in a database.
-			
-		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
-	*/
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		return  '('.$date.'+'.$dayFraction.')';
-	}
-	
-	
-	/**
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function &GetArray($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		$rs =& $this->Execute($sql,$inputarr);
-		$ADODB_COUNTRECS = $savec;
-		if (!$rs) 
-			if (defined('ADODB_PEAR')) {
-				$cls = ADODB_PEAR_Error();
-				return $cls;
-			} else {
-				$false = false;
-				return $false;
-			}
-		$arr =& $rs->GetArray();
-		$rs->Close();
-		return $arr;
-	}
-	
-	function &CacheGetAll($secs2cache,$sql=false,$inputarr=false)
-	{
-		$arr =& $this->CacheGetArray($secs2cache,$sql,$inputarr);
-		return $arr;
-	}
-	
-	function &CacheGetArray($secs2cache,$sql=false,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		
-		$savec = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
-		$ADODB_COUNTRECS = $savec;
-		
-		if (!$rs) 
-			if (defined('ADODB_PEAR')) {
-				$cls = ADODB_PEAR_Error();
-				return $cls;
-			} else {
-				$false = false;
-				return $false;
-			}
-		$arr =& $rs->GetArray();
-		$rs->Close();
-		return $arr;
-	}
-	
-	
-	
-	/**
-	* Return one row of sql statement. Recordset is disposed for you.
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
-	function &GetRow($sql,$inputarr=false)
-	{
-	global $ADODB_COUNTRECS;
-		$crecs = $ADODB_COUNTRECS;
-		$ADODB_COUNTRECS = false;
-		
-		$rs =& $this->Execute($sql,$inputarr);
-		
-		$ADODB_COUNTRECS = $crecs;
-		if ($rs) {
-			if (!$rs->EOF) $arr = $rs->fields;
-			else $arr = array();
-			$rs->Close();
-			return $arr;
-		}
-		
-		$false = false;
-		return $false;
-	}
-	
-	function &CacheGetRow($secs2cache,$sql=false,$inputarr=false)
-	{
-		$rs =& $this->CacheExecute($secs2cache,$sql,$inputarr);
-		if ($rs) {
-			$arr = false;
-			if (!$rs->EOF) $arr = $rs->fields;
-			$rs->Close();
-			return $arr;
-		}
-		$false = false;
-		return $false;
-	}
-	
-	/**
-	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
-	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
-	* Also note that no table locking is done currently, so it is possible that the
-	* record be inserted twice by two programs...
-	*
-	* $this->Replace('products', array('prodname' =>"'Nails'","price" => 3.99), 'prodname');
-	*
-	* $table		table name
-	* $fieldArray	associative array of data (you must quote strings yourself).
-	* $keyCol		the primary key field name or if compound key, array of field names
-	* autoQuote		set to true to use a hueristic to quote strings. Works with nulls and numbers
-	*					but does not work with dates nor SQL functions.
-	* has_autoinc	the primary key is an auto-inc field, so skip in insert.
-	*
-	* Currently blob replace not supported
-	*
-	* returns 0 = fail, 1 = update, 2 = insert 
-	*/
-	
-	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		
-		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
-	}
-	
-	
-	/**
-	* Will select, getting rows from $offset (1-based), for $nrows. 
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg. 
-	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
-	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]	is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
-	function &CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
-	{	
-		if (!is_numeric($secs2cache)) {
-			if ($sql === false) $sql = -1;
-			if ($offset == -1) $offset = false;
-									  // sql,	nrows, offset,inputarr
-			$rs =& $this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
-		} else {
-			if ($sql === false) ADOConnection::outp( "Warning: \$sql missing from CacheSelectLimit()");
-			$rs =& $this->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		}
-		return $rs;
-	}
-	
-	
-	/**
-	* Flush cached recordsets that match a particular $sql statement. 
-	* If $sql == false, then we purge all files in the cache.
- 	*/
-	
-	/**
-   * Flush cached recordsets that match a particular $sql statement. 
-   * If $sql == false, then we purge all files in the cache.
-    */
-	function CacheFlush($sql=false,$inputarr=false)
-	{
-	global $ADODB_CACHE_DIR;
-	
-		if ($this->memCache) {
-		global $ADODB_INCLUDED_MEMCACHE;
-		
-			$key = false;
-			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
-			if ($sql) $key = $this->_gencachename($sql.serialize($inputarr),false,true);
-			FlushMemCache($key, $this->memCacheHost, $this->memCachePort, $this->debug);
-			return;
-		}
-	
-		if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
-         /*if (strncmp(PHP_OS,'WIN',3) === 0)
-            $dir = str_replace('/', '\\', $ADODB_CACHE_DIR);
-         else */
-            $dir = $ADODB_CACHE_DIR;
-            
-         if ($this->debug) {
-            ADOConnection::outp( "CacheFlush: $dir<br><pre>\n". $this->_dirFlush($dir)."</pre>");
-         } else {
-            $this->_dirFlush($dir);
-         }
-         return;
-      } 
-      
-      global $ADODB_INCLUDED_CSV;
-      if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-      
-      $f = $this->_gencachename($sql.serialize($inputarr),false);
-      adodb_write_file($f,''); // is adodb_write_file needed?
-      if (!@unlink($f)) {
-         if ($this->debug) ADOConnection::outp( "CacheFlush: failed for $f");
-      }
-   }
-   
-   /**
-   * Private function to erase all of the files and subdirectories in a directory.
-   *
-   * Just specify the directory, and tell it if you want to delete the directory or just clear it out.
-   * Note: $kill_top_level is used internally in the function to flush subdirectories.
-   */
-   function _dirFlush($dir, $kill_top_level = false) 
-   {
-      if(!$dh = @opendir($dir)) return;
-      
-      while (($obj = readdir($dh))) {
-         if($obj=='.' || $obj=='..') continue;
-		$f = $dir.'/'.$obj;
-		
-		if (strpos($obj,'.cache')) @unlink($f);
-		if (is_dir($f)) $this->_dirFlush($f, true);
-      }
-      if ($kill_top_level === true) @rmdir($dir);
-      return true;
-   }
-   
-   
-	function xCacheFlush($sql=false,$inputarr=false)
-	{
-	global $ADODB_CACHE_DIR;
-	
-		if ($this->memCache) {
-			global $ADODB_INCLUDED_MEMCACHE;
-			$key = false;
-			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
-			if ($sql) $key = $this->_gencachename($sql.serialize($inputarr),false,true);
-			flushmemCache($key, $this->memCacheHost, $this->memCachePort, $this->debug);
-			return;
-		}
-
-		if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) {
-			if (strncmp(PHP_OS,'WIN',3) === 0) {
-				$cmd = 'del /s '.str_replace('/','\\',$ADODB_CACHE_DIR).'\adodb_*.cache';
-			} else {
-				//$cmd = 'find "'.$ADODB_CACHE_DIR.'" -type f -maxdepth 1 -print0 | xargs -0 rm -f';
-				$cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/'; 
-				// old version 'rm -f `find '.$ADODB_CACHE_DIR.' -name adodb_*.cache`';
-			}
-			if ($this->debug) {
-				ADOConnection::outp( "CacheFlush: $cmd<br><pre>\n", system($cmd),"</pre>");
-			} else {
-				exec($cmd);
-			}
-			return;
-		} 
-		
-		global $ADODB_INCLUDED_CSV;
-		if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-		
-		$f = $this->_gencachename($sql.serialize($inputarr),false);
-		adodb_write_file($f,''); // is adodb_write_file needed?
-		if (!@unlink($f)) {
-			if ($this->debug) ADOConnection::outp( "CacheFlush: failed for $f");
-		}
-	}
-	
-	/**
-	* Private function to generate filename for caching.
-	* Filename is generated based on:
-	*
-	*  - sql statement
-	*  - database type (oci8, ibase, ifx, etc)
-	*  - database name
-	*  - userid
-	*  - setFetchMode (adodb 4.23)
-	*
-	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
-	* Assuming that we can have 50,000 files per directory with good performance, 
-	* then we can scale to 12.8 million unique cached recordsets. Wow!
- 	*/
-	function _gencachename($sql,$createdir,$memcache=false)
-	{
-	global $ADODB_CACHE_DIR;
-	static $notSafeMode;
-		
-		if ($this->fetchMode === false) { 
-		global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		} else {
-			$mode = $this->fetchMode;
-		}
-		$m = md5($sql.$this->databaseType.$this->database.$this->user.$mode);
-		if ($memcache) return $m;
-		
-		if (!isset($notSafeMode)) $notSafeMode = !ini_get('safe_mode');
-		$dir = ($notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($m,0,2) : $ADODB_CACHE_DIR;
-			
-		if ($createdir && $notSafeMode && !file_exists($dir)) {
-			$oldu = umask(0);
-			if (!mkdir($dir,0771)) 
-				if ($this->debug) ADOConnection::outp( "Unable to mkdir $dir for $sql");
-			umask($oldu);
-		}
-		return $dir.'/adodb_'.$m.'.cache';
-	}
-	
-	
-	/**
-	 * Execute SQL, caching recordsets.
-	 *
-	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
-	 *					  This is an optional parameter.
-	 * @param sql		SQL statement to execute
-	 * @param [inputarr]	holds the input data  to bind to
-	 * @return 		RecordSet or false
-	 */
-	function &CacheExecute($secs2cache,$sql=false,$inputarr=false)
-	{
-
-			
-		if (!is_numeric($secs2cache)) {
-			$inputarr = $sql;
-			$sql = $secs2cache;
-			$secs2cache = $this->cacheSecs;
-		}
-		
-		if (is_array($sql)) {
-			$sqlparam = $sql;
-			$sql = $sql[0];
-		} else
-			$sqlparam = $sql;
-			
-		if ($this->memCache) {
-			global $ADODB_INCLUDED_MEMCACHE;
-			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
-			$md5file = $this->_gencachename($sql.serialize($inputarr),false,true);
-		} else {
-		global $ADODB_INCLUDED_CSV;
-			if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-			$md5file = $this->_gencachename($sql.serialize($inputarr),true);
-		}
-
-		$err = '';
-		
-		if ($secs2cache > 0){
-			if ($this->memCache)
-				$rs = &getmemCache($md5file,$err,$secs2cache, $this->memCacheHost, $this->memCachePort);
-			else
-				$rs = &csv2rs($md5file,$err,$secs2cache,$this->arrayClass);
-			$this->numCacheHits += 1;
-		} else {
-			$err='Timeout 1';
-			$rs = false;
-			$this->numCacheMisses += 1;
-		}
-		if (!$rs) {
-		// no cached rs found
-			if ($this->debug) {
-				if (get_magic_quotes_runtime() && !$this->memCache) {
-					ADOConnection::outp("Please disable magic_quotes_runtime - it corrupts cache files :(");
-				}
-				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (see sql below)");
-			}
-			
-			$rs = &$this->Execute($sqlparam,$inputarr);
-
-			if ($rs && $this->memCache) {
-				$rs = &$this->_rs2rs($rs); // read entire recordset into memory immediately
-				if(!putmemCache($md5file, $rs, $this->memCacheHost, $this->memCachePort, $this->memCacheCompress, $this->debug)) {
-					if ($fn = $this->raiseErrorFn)
-						$fn($this->databaseType,'CacheExecute',-32000,"Cache write error",$md5file,$sql,$this);
-					if ($this->debug) ADOConnection::outp( " Cache write error");
-				}
-			} else
-			if ($rs) {
-				$eof = $rs->EOF;
-				$rs = &$this->_rs2rs($rs); // read entire recordset into memory immediately
-				$txt = _rs2serialize($rs,false,$sql); // serialize
-		
-				if (!adodb_write_file($md5file,$txt,$this->debug)) {
-					if ($fn = $this->raiseErrorFn) {
-						$fn($this->databaseType,'CacheExecute',-32000,"Cache write error",$md5file,$sql,$this);
-					}
-					if ($this->debug) ADOConnection::outp( " Cache write error");
-				}
-				if ($rs->EOF && !$eof) {
-					$rs->MoveFirst();
-					//$rs = &csv2rs($md5file,$err);		
-					$rs->connection = &$this; // Pablo suggestion
-				}  
-				
-			} else
-			if (!$this->memCache)
-				@unlink($md5file);
-		} else {
-			$this->_errorMsg = '';
-			$this->_errorCode = 0;
-			
-			if ($this->fnCacheExecute) {
-				$fn = $this->fnCacheExecute;
-				$fn($this, $secs2cache, $sql, $inputarr);
-			}
-		// ok, set cached object found
-			$rs->connection = &$this; // Pablo suggestion
-			if ($this->debug){ 
-					
-				$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
-				$ttl = $rs->timeCreated + $secs2cache - time();
-				$s = is_array($sql) ? $sql[0] : $sql;
-				if ($inBrowser) $s = '<i>'.htmlspecialchars($s).'</i>';
-				
-				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
-			}
-		}
-		return $rs;
-	}
-	
-	
-	/* 
-		Similar to PEAR DB's autoExecute(), except that 
-		$mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
-		If $mode == 'UPDATE', then $where is compulsory as a safety measure.
-		
-		$forceUpdate means that even if the data has not changed, perform update.
-	 */
-	function& AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
-	{
-		$false = false;
-		$sql = 'SELECT * FROM '.$table;  
-		if ($where!==FALSE) $sql .= ' WHERE '.$where;
-		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
-			ADOConnection::outp('AutoExecute: Illegal mode=UPDATE with empty WHERE clause');
-			return $false;
-		}
-
-		$rs =& $this->SelectLimit($sql,1);
-		if (!$rs) return $false; // table does not exist
-		$rs->tableName = $table;
-		
-		switch((string) $mode) {
-		case 'UPDATE':
-		case '2':
-			$sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq);
-			break;
-		case 'INSERT':
-		case '1':
-			$sql = $this->GetInsertSQL($rs, $fields_values, $magicq);
-			break;
-		default:
-			ADOConnection::outp("AutoExecute: Unknown mode=$mode");
-			return $false;
-		}
-		$ret = false;
-		if ($sql) $ret = $this->Execute($sql);
-		if ($ret) $ret = true;
-		return $ret;
-	}
-	
-	
-	/**
-	 * Generates an Update Query based on an existing recordset.
-	 * $arrFields is an associative array of fields with the value
-	 * that should be assigned.
-	 *
-	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table and sql should only 
-	 *		 be a simple select stmt with no groupby/orderby/limit
-	 *
-	 * "Jonathan Younger" <jyounger@unilab.com>
-  	 */
-	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null)
-	{
-		global $ADODB_INCLUDED_LIB;
-
-        //********************************************************//
-        //This is here to maintain compatibility
-        //with older adodb versions. Sets force type to force nulls if $forcenulls is set.
-		if (!isset($force)) {
-				global $ADODB_FORCE_TYPE;
-			    $force = $ADODB_FORCE_TYPE;
-		}
-		//********************************************************//
-
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
-	}
-
-	/**
-	 * Generates an Insert Query based on an existing recordset.
-	 * $arrFields is an associative array of fields with the value
-	 * that should be assigned.
-	 *
-	 * Note: This function should only be used on a recordset
-	 *	   that is run against a single table.
-  	 */
-	function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
-	{	
-		global $ADODB_INCLUDED_LIB;
-		if (!isset($force)) {
-			global $ADODB_FORCE_TYPE;
-			$force = $ADODB_FORCE_TYPE;
-			
-		}
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
-	}
-	
-
-	/**
-	* Update a blob column, given a where clause. There are more sophisticated
-	* blob handling functions that we could have implemented, but all require
-	* a very complex API. Instead we have chosen something that is extremely
-	* simple to understand and use. 
-	*
-	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
-	*
-	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
-	* field blobtable.blobcolumn:
-	*
-	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
-	*
-	* Insert example:
-	*
-	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
-	}
-
-	/**
-	* Usage:
-	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB'
-	*
-	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-	*	$conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
-	*/
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
-	{
-		$fd = fopen($path,'rb');
-		if ($fd === false) return false;
-		$val = fread($fd,filesize($path));
-		fclose($fd);
-		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
-	}
-	
-	function BlobDecode($blob)
-	{
-		return $blob;
-	}
-	
-	function BlobEncode($blob)
-	{
-		return $blob;
-	}
-	
-	function SetCharSet($charset)
-	{
-		return false;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
-	}
-	
-	function LogSQL($enable=true)
-	{
-		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		
-		if ($enable) $this->fnExecute = 'adodb_log_sql';
-		else $this->fnExecute = false;
-		
-		$old = $this->_logsql;	
-		$this->_logsql = $enable;
-		if ($enable && !$old) $this->_affected = false;
-		return $old;
-	}
-	
-	function GetCharSet()
-	{
-		return false;
-	}
-	
-	/**
-	* Usage:
-	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
-	*
-	*	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
-	*	$conn->UpdateClob('clobtable','clobcol',$clob,'id=1');
-	*/
-	function UpdateClob($table,$column,$val,$where)
-	{
-		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
-	}
-	
-	// not the fastest implementation - quick and dirty - jlim
-	// for best performance, use the actual $rs->MetaType().
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		
-		if (empty($this->_metars)) {
-			$rsclass = $this->rsPrefix.$this->databaseType;
-			$this->_metars = new $rsclass(false,$this->fetchMode); 
-			$this->_metars->connection =& $this;
-		}
-		return $this->_metars->MetaType($t,$len,$fieldobj);
-	}
-	
-	
-	/**
-	*  Change the SQL connection locale to a specified locale.
-	*  This is used to get the date formats written depending on the client locale.
-	*/
-	function SetDateLocale($locale = 'En')
-	{
-		$this->locale = $locale;
-		switch (strtoupper($locale))
-		{
-			case 'EN':
-				$this->fmtDate="'Y-m-d'";
-				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
-				break;
-				
-			case 'US':
-				$this->fmtDate = "'m-d-Y'";
-				$this->fmtTimeStamp = "'m-d-Y H:i:s'";
-				break;
-				
-			case 'PT_BR': 	
-			case 'NL':
-			case 'FR':
-			case 'RO':
-			case 'IT':
-				$this->fmtDate="'d-m-Y'";
-				$this->fmtTimeStamp = "'d-m-Y H:i:s'";
-				break;
-				
-			case 'GE':
-				$this->fmtDate="'d.m.Y'";
-				$this->fmtTimeStamp = "'d.m.Y H:i:s'";
-				break;
-				
-			default:
-				$this->fmtDate="'Y-m-d'";
-				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
-				break;
-		}
-	}
-
-	function &GetActiveRecordsClass($class, $table,$whereOrderBy=false,$bindarr=false, $primkeyArr=false)
-	{
-	global $_ADODB_ACTIVE_DBS;
-	
-		$save = $this->SetFetchMode(ADODB_FETCH_NUM);
-		if (empty($whereOrderBy)) $whereOrderBy = '1=1';
-		$rows = $this->GetAll("select * from ".$table.' WHERE '.$whereOrderBy,$bindarr);
-		$this->SetFetchMode($save);
-		
-		$false = false;
-		
-		if ($rows === false) {	
-			return $false;
-		}
-		
-		
-		if (!isset($_ADODB_ACTIVE_DBS)) {
-			include(ADODB_DIR.'/adodb-active-record.inc.php');
-		}	
-		if (!class_exists($class)) {
-			ADOConnection::outp("Unknown class $class in GetActiveRcordsClass()");
-			return $false;
-		}
-		$arr = array();
-		foreach($rows as $row) {
-		
-			$obj = new $class($table,$primkeyArr,$this);
-			if ($obj->ErrorMsg()){
-				$this->_errorMsg = $obj->ErrorMsg();
-				return $false;
-			}
-			$obj->Set($row);
-			$arr[] = $obj;
-		}
-		return $arr;
-	}
-	
-	function &GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false)
-	{
-		$arr =& $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr);
-		return $arr;
-	}
-	
-	/**
-	 * Close Connection
-	 */
-	function Close()
-	{
-		$rez = $this->_close();
-		$this->_connectionID = false;
-		return $rez;
-	}
-	
-	/**
-	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
-	 *
-	 * @return true if succeeded or false if database does not support transactions
-	 */
-	function BeginTrans() 
-	{
-		if ($this->debug) ADOConnection::outp("BeginTrans: Transactions not supported for this driver");
-		return false;
-	}
-	
-	/* set transaction mode */
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
-		$this->_transmode  = $transaction_mode;
-	}
-/*
-http://msdn2.microsoft.com/en-US/ms173763.aspx
-http://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
-http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
-http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm
-*/
-	function MetaTransaction($mode,$db)
-	{
-		$mode = strtoupper($mode);
-		$mode = str_replace('ISOLATION LEVEL ','',$mode);
-		
-		switch($mode) {
-
-		case 'READ UNCOMMITTED':
-			switch($db) { 
-			case 'oci8':
-			case 'oracle':
-				return 'ISOLATION LEVEL READ COMMITTED';
-			default:
-				return 'ISOLATION LEVEL READ UNCOMMITTED';
-			}
-			break;
-					
-		case 'READ COMMITTED':
-				return 'ISOLATION LEVEL READ COMMITTED';
-			break;
-			
-		case 'REPEATABLE READ':
-			switch($db) {
-			case 'oci8':
-			case 'oracle':
-				return 'ISOLATION LEVEL SERIALIZABLE';
-			default:
-				return 'ISOLATION LEVEL REPEATABLE READ';
-			}
-			break;
-			
-		case 'SERIALIZABLE':
-				return 'ISOLATION LEVEL SERIALIZABLE';
-			break;
-			
-		default:
-			return $mode;
-		}
-	}
-	
-	/**
-	 * If database does not support transactions, always return true as data always commited
-	 *
-	 * @param $ok  set to false to rollback transaction, true to commit
-	 *
-	 * @return true/false.
-	 */
-	function CommitTrans($ok=true) 
-	{ return true;}
-	
-	
-	/**
-	 * If database does not support transactions, rollbacks always fail, so return false
-	 *
-	 * @return true/false.
-	 */
-	function RollbackTrans() 
-	{ return false;}
-
-
-	/**
-	 * return the databases that the driver can connect to. 
-	 * Some databases will return an empty array.
-	 *
-	 * @return an array of database names.
-	 */
-		function MetaDatabases() 
-		{
-		global $ADODB_FETCH_MODE;
-		
-			if ($this->metaDatabasesSQL) {
-				$save = $ADODB_FETCH_MODE; 
-				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-				
-				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-				
-				$arr = $this->GetCol($this->metaDatabasesSQL);
-				if (isset($savem)) $this->SetFetchMode($savem);
-				$ADODB_FETCH_MODE = $save; 
-			
-				return $arr;
-			}
-			
-			return false;
-		}
-	
-		
-	/**
-	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
-	 * 		If false, both views and tables are returned.
-	 *		"VIEW" returns only views
-	 *		"TABLE" returns only tables
-	 * @param showSchema returns the schema/user with the table name, eg. USER.TABLE
-	 * @param mask  is the input mask - only supported by oci8 and postgresql
-	 *
-	 * @return  array of tables for current database.
-	 */ 
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		
-		$false = false;
-		if ($mask) {
-			return $false;
-		}
-		if ($this->metaTablesSQL) {
-			$save = $ADODB_FETCH_MODE; 
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
-			
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			
-			$rs = $this->Execute($this->metaTablesSQL);
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save; 
-			
-			if ($rs === false) return $false;
-			$arr =& $rs->GetArray();
-			$arr2 = array();
-			
-			if ($hast = ($ttype && isset($arr[0][1]))) { 
-				$showt = strncmp($ttype,'T',1);
-			}
-			
-			for ($i=0; $i < sizeof($arr); $i++) {
-				if ($hast) {
-					if ($showt == 0) {
-						if (strncmp($arr[$i][1],'T',1) == 0) $arr2[] = trim($arr[$i][0]);
-					} else {
-						if (strncmp($arr[$i][1],'V',1) == 0) $arr2[] = trim($arr[$i][0]);
-					}
-				} else
-					$arr2[] = trim($arr[$i][0]);
-			}
-			$rs->Close();
-			return $arr2;
-		}
-		return $false;
-	}
-	
-	
-	function _findschema(&$table,&$schema)
-	{
-		if (!$schema && ($at = strpos($table,'.')) !== false) {
-			$schema = substr($table,0,$at);
-			$table = substr($table,$at+1);
-		}
-	}
-	
-	/**
-	 * List columns in a database as an array of ADOFieldObjects. 
-	 * See top of file for definition of object.
-	 *
-	 * @param $table	table name to query
-	 * @param $normalize	makes table name case-insensitive (required by some databases)
-	 * @schema is optional database schema to use - not supported by all databases.
-	 *
-	 * @return  array of ADOFieldObjects for current table.
-	 */
-	function &MetaColumns($table,$normalize=true) 
-	{
-	global $ADODB_FETCH_MODE;
-		
-		$false = false;
-		
-		if (!empty($this->metaColumnsSQL)) {
-		
-			$schema = false;
-			$this->_findschema($table,$schema);
-		
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,($normalize)?strtoupper($table):$table));
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			if ($rs === false || $rs->EOF) return $false;
-
-			$retarr = array();
-			while (!$rs->EOF) { //print_r($rs->fields);
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-				$fld->type = $rs->fields[1];
-				if (isset($rs->fields[3]) && $rs->fields[3]) {
-					if ($rs->fields[3]>0) $fld->max_length = $rs->fields[3];
-					$fld->scale = $rs->fields[4];
-					if ($fld->scale>0) $fld->max_length += 1;
-				} else
-					$fld->max_length = $rs->fields[2];
-					
-				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-				else $retarr[strtoupper($fld->name)] = $fld;
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return $false;
-	}
-	
-    /**
-      * List indexes on a table as an array.
-      * @param table  table name to query
-      * @param primary true to only show primary keys. Not actually used for most databases
-	  *
-      * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
-	  
-		 Array (
-		    [name_of_index] => Array
-		      (
-	          [unique] => true or false
-	          [columns] => Array
-	          (
-	          	[0] => firstname
-		      	[1] => lastname
-	          )
-		)		
-      */
-     function &MetaIndexes($table, $primary = false, $owner = false)
-     {
-	 		$false = false;
-            return $false;
-     }
-
-	/**
-	 * List columns names in a table as an array. 
-	 * @param table	table name to query
-	 *
-	 * @return  array of column names for current table.
-	 */ 
-	function &MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
-	{
-		$objarr =& $this->MetaColumns($table);
-		if (!is_array($objarr)) {
-			$false = false;
-			return $false;
-		}
-		$arr = array();
-		if ($numIndexes) {
-			$i = 0;
-			if ($useattnum) {
-				foreach($objarr as $v) 
-					$arr[$v->attnum] = $v->name;
-				
-			} else
-				foreach($objarr as $v) $arr[$i++] = $v->name;
-		} else
-			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
-		
-		return $arr;
-	}
-			
-	/**
-	 * Different SQL databases used different methods to combine strings together.
-	 * This function provides a wrapper. 
-	 * 
-	 * param s	variable number of string parameters
-	 *
-	 * Usage: $db->Concat($str1,$str2);
-	 * 
-	 * @return concatenated string
-	 */ 	 
-	function Concat()
-	{	
-		$arr = func_get_args();
-		return implode($this->concat_operator, $arr);
-	}
-	
-	
-	/**
-	 * Converts a date "d" to a string that the database can understand.
-	 *
-	 * @param d	a date in Unix date time format.
-	 *
-	 * @return  date string in database date format
-	 */
-	function DBDate($d)
-	{
-		if (empty($d) && $d !== 0) return 'null';
-
-		if (is_string($d) && !is_numeric($d)) {
-			if ($d === 'null' || strncmp($d,"'",1) === 0) return $d;
-			if ($this->isoDates) return "'$d'";
-			$d = ADOConnection::UnixDate($d);
-		}
-
-		return adodb_date($this->fmtDate,$d);
-	}
-	
-	function BindDate($d)
-	{
-		$d = $this->DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	function BindTimeStamp($d)
-	{
-		$d = $this->DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	
-	/**
-	 * Converts a timestamp "ts" to a string that the database can understand.
-	 *
-	 * @param ts	a timestamp in Unix date time format.
-	 *
-	 * @return  timestamp string in database timestamp format
-	 */
-	function DBTimeStamp($ts)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
-
-		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
-			return adodb_date($this->fmtTimeStamp,$ts);
-		
-		if ($ts === 'null') return $ts;
-		if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
-		
-		$ts = ADOConnection::UnixTimeStamp($ts);
-		return adodb_date($this->fmtTimeStamp,$ts);
-	}
-	
-	/**
-	 * Also in ADORecordSet.
-	 * @param $v is a date string in YYYY-MM-DD format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	function UnixDate($v)
-	{
-		if (is_object($v)) {
-		// odbtp support
-		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
-			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
-		}
-	
-		if (is_numeric($v) && strlen($v) !== 8) return $v;
-		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
-			($v), $rr)) return false;
-
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
-		// h-m-s-MM-DD-YY
-		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-	}
-	
-
-	/**
-	 * Also in ADORecordSet.
-	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	function UnixTimeStamp($v)
-	{
-		if (is_object($v)) {
-		// odbtp support
-		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
-			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
-		}
-		
-		if (!preg_match( 
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-			($v), $rr)) return false;
-			
-		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-	
-		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
-	}
-	
-	/**
-	 * Also in ADORecordSet.
-	 *
-	 * Format database date based on user defined format.
-	 *
-	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a date formated as user desires
-	 */
-	 
-	function UserDate($v,$fmt='Y-m-d',$gmt=false)
-	{
-		$tt = $this->UnixDate($v);
-
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		else if ($tt == 0) return $this->emptyDate;
-		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
-		}
-		
-		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-	
-	}
-	
-		/**
-	 *
-	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a timestamp formated as user desires
-	 */
-	function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false)
-	{
-		if (!isset($v)) return $this->emptyTimeStamp;
-		# strlen(14) allows YYYYMMDDHHMMSS format
-		if (is_numeric($v) && strlen($v)<14) return ($gmt) ? adodb_gmdate($fmt,$v) : adodb_date($fmt,$v);
-		$tt = $this->UnixTimeStamp($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		if ($tt == 0) return $this->emptyTimeStamp;
-		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
-	}
-	
-	function escape($s,$magic_quotes=false)
-	{
-		return $this->addq($s,$magic_quotes);
-	}
-	
-	/**
-	* Quotes a string, without prefixing nor appending quotes. 
-	*/
-	function addq($s,$magic_quotes=false)
-	{
-		if (!$magic_quotes) {
-		
-			if ($this->replaceQuote[0] == '\\'){
-				// only since php 4.0.5
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
-			}
-			return  str_replace("'",$this->replaceQuote,$s);
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
-			return $s;
-		else {// change \' to '' for sybase/mssql
-			$s = str_replace('\\\\','\\',$s);
-			return str_replace("\\'",$this->replaceQuote,$s);
-		}
-	}
-	
-	/**
-	 * Correctly quotes a string so that all strings are escaped. We prefix and append
-	 * to the string single-quotes.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
-	 *
-	 * @return  quoted string to be sent back to database
-	 */
-	function qstr($s,$magic_quotes=false)
-	{	
-		if (!$magic_quotes) {
-		
-			if ($this->replaceQuote[0] == '\\'){
-				// only since php 4.0.5
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
-			return "'$s'";
-		else {// change \' to '' for sybase/mssql
-			$s = str_replace('\\\\','\\',$s);
-			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-		}
-	}
-	
-	
-	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iv�n Oliva to provide recordset pagination.
-	*
-	* See readme.htm#ex8 for an example of usage.
-	*
-	* @param sql
-	* @param nrows		is the number of rows per page to get
-	* @param page		is the page number to get (1-based)
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
-	*
-	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
-	*
-	*/
-	function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		if ($this->pageExecuteCountRows) $rs =& _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
-		else $rs =& _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
-		return $rs;
-	}
-	
-		
-	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
-	* and/or last one of the recordset. Added by Iv�n Oliva to provide recordset pagination.
-	*
-	* @param secs2cache	seconds to cache data, set to 0 to force query
-	* @param sql
-	* @param nrows		is the number of rows per page to get
-	* @param page		is the page number to get (1-based)
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
-	*/
-	function &CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) 
-	{
-		/*switch($this->dataProvider) {
-		case 'postgres':
-		case 'mysql': 
-			break;
-		default: $secs2cache = 0; break;
-		}*/
-		$rs =& $this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache);
-		return $rs;
-	}
-
-} // end class ADOConnection
-	
-	
-	
-	//==============================================================================================	
-	// CLASS ADOFetchObj
-	//==============================================================================================	
-		
-	/**
-	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
-	*/
-	class ADOFetchObj {
-	};
-	
-	//==============================================================================================	
-	// CLASS ADORecordSet_empty
-	//==============================================================================================	
-	
-	/**
-	* Lightweight recordset when there are no records to be returned
-	*/
-	class ADORecordSet_empty
-	{
-		var $dataProvider = 'empty';
-		var $databaseType = false;
-		var $EOF = true;
-		var $_numOfRows = 0;
-		var $fields = false;
-		var $connection = false;
-		function RowCount() {return 0;}
-		function RecordCount() {return 0;}
-		function PO_RecordCount(){return 0;}
-		function Close(){return true;}
-		function FetchRow() {return false;}
-		function FieldCount(){ return 0;}
-		function Init() {}
-	}
-	
-	//==============================================================================================	
-	// DATE AND TIME FUNCTIONS
-	//==============================================================================================	
-	if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php');
-	
-	//==============================================================================================	
-	// CLASS ADORecordSet
-	//==============================================================================================	
-
-	if (PHP_VERSION < 5) include_once(ADODB_DIR.'/adodb-php4.inc.php');
-	else include_once(ADODB_DIR.'/adodb-iterator.inc.php');
-   /**
-	 * RecordSet class that represents the dataset returned by the database.
-	 * To keep memory overhead low, this class holds only the current row in memory.
-	 * No prefetching of data is done, so the RecordCount() can return -1 ( which
-	 * means recordcount not known).
-	 */
-	class ADORecordSet extends ADODB_BASE_RS {
-	/*
-	 * public variables	
-	 */
-	var $dataProvider = "native";
-	var $fields = false; 	/// holds the current row data
-	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
-							/// in other words, we use a text area for editing.
-	var $canSeek = false; 	/// indicates that seek is supported
-	var $sql; 				/// sql text
-	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
-	
-	var $emptyTimeStamp = '&nbsp;'; /// what to display when $time==0
-	var $emptyDate = '&nbsp;'; /// what to display when $time==0
-	var $debug = false;
-	var $timeCreated=0; 	/// datetime in Unix format rs created -- for cached recordsets
-
-	var $bind = false; 		/// used by Fields() to hold array - should be private?
-	var $fetchMode;			/// default fetch mode
-	var $connection = false; /// the parent connection
-	/*
-	 *	private variables	
-	 */
-	var $_numOfRows = -1;	/** number of rows, or -1 */
-	var $_numOfFields = -1;	/** number of fields in recordset */
-	var $_queryID = -1;		/** This variable keeps the result link identifier.	*/
-	var $_currentRow = -1;	/** This variable keeps the current row in the Recordset.	*/
-	var $_closed = false; 	/** has recordset been closed */
-	var $_inited = false; 	/** Init() should only be called once */
-	var $_obj; 				/** Used by FetchObj */
-	var $_names;			/** Used by FetchObj */
-	
-	var $_currentPage = -1;	/** Added by Iv�n Oliva to implement recordset pagination */
-	var $_atFirstPage = false;	/** Added by Iv�n Oliva to implement recordset pagination */
-	var $_atLastPage = false;	/** Added by Iv�n Oliva to implement recordset pagination */
-	var $_lastPageNo = -1; 
-	var $_maxRecordCount = 0;
-	var $datetime = false;
-	
-	/**
-	 * Constructor
-	 *
-	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
-	 *
-	 */
-	function ADORecordSet($queryID) 
-	{
-		$this->_queryID = $queryID;
-	}
-	
-	
-	
-	function Init()
-	{
-		if ($this->_inited) return;
-		$this->_inited = true;
-		if ($this->_queryID) @$this->_initrs();
-		else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-		}
-		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
-			
-			$this->_currentRow = 0;
-			if ($this->EOF = ($this->_fetch() === false)) {
-				$this->_numOfRows = 0; // _numOfRows could be -1
-			}
-		} else {
-			$this->EOF = true;
-		}
-	}
-	
-	
-	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the FIRST column.
-	 *
-	 * @param name  		name of SELECT tag
-	 * @param [defstr]		the value to hilite. Use an array for multiple hilites for listbox.
-	 * @param [blank1stItem]	true to leave the 1st item in list empty
-	 * @param [multiple]		true for listbox, false for popup
-	 * @param [size]		#rows to show for listbox. not used by popup
-	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
-	 *				useful for holding javascript onChange='...' handlers.
-	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
-	 *				column 0 (1st col) if this is true. This is not documented.
-	 *
-	 * @return HTML
-	 *
-	 * changes by glen.davies@cce.ac.nz to support multiple hilited items
-	 */
-	function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='',$compareFields0=true)
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,$compareFields0);
-	}
-	
-
-	
-	/**
-	 * Generate a SELECT tag string from a recordset, and return the string.
-	 * If the recordset has 2 cols, we treat the 1st col as the containing 
-	 * the text to display to the user, and 2nd col as the return value. Default
-	 * strings are compared with the SECOND column.
-	 *
-	 */
-	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
-	{
-		return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,false);
-	}
-	
-	/*
-		Grouped Menu
-	*/
-	function GetMenu3($name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='')
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple,
-			$size, $selectAttr,false);
-	}
-
-	/**
-	 * return recordset as a 2-dimensional array.
-	 *
-	 * @param [nRows]  is the number of rows to return. -1 means every row.
-	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
-	 */
-	function &GetArray($nRows = -1) 
-	{
-	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
-		$results = adodb_getall($this,$nRows);
-		return $results;
-	}
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nRows != $cnt) {
-			$results[] = $this->fields;
-			$this->MoveNext();
-			$cnt++;
-		}
-		return $results;
-	}
-	
-	function &GetAll($nRows = -1)
-	{
-		$arr =& $this->GetArray($nRows);
-		return $arr;
-	}
-	
-	/*
-	* Some databases allow multiple recordsets to be returned. This function
-	* will return true if there is a next recordset, or false if no more.
-	*/
-	function NextRecordSet()
-	{
-		return false;
-	}
-	
-	/**
-	 * return recordset as a 2-dimensional array. 
-	 * Helper function for ADOConnection->SelectLimit()
-	 *
-	 * @param offset	is the row to start calculations from (1-based)
-	 * @param [nrows]	is the number of rows to return
-	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
-	 */
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{	
-		if ($offset <= 0) {
-			$arr =& $this->GetArray($nrows);
-			return $arr;
-		} 
-		
-		$this->Move($offset);
-		
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-	
-	
-	/**
-	 * Synonym for GetArray() for compatibility with ADO.
-	 *
-	 * @param [nRows]  is the number of rows to return. -1 means every row.
-	 *
-	 * @return an array indexed by the rows (0-based) from the recordset
-	 */
-	function &GetRows($nRows = -1) 
-	{
-		$arr =& $this->GetArray($nRows);
-		return $arr;
-	}
-	
-	/**
-	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns. 
-	 * The first column is treated as the key and is not included in the array. 
-	 * If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
-	 * $force_array == true.
-	 *
-	 * @param [force_array] has only meaning if we have 2 data columns. If false, a 1 dimensional
-	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
-	 * 	read the source.
-	 *
-	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and 
-	 * instead of returning array[col0] => array(remaining cols), return array[col0] => col1
-	 *
-	 * @return an associative array indexed by the first column of the array, 
-	 * 	or false if the  data has less than 2 cols.
-	 */
-	function &GetAssoc($force_array = false, $first2cols = false) 
-	{
-	global $ADODB_EXTENSION;
-	
-		$cols = $this->_numOfFields;
-		if ($cols < 2) {
-			$false = false;
-			return $false;
-		}
-		$numIndex = isset($this->fields[0]);
-		$results = array();
-		
-		if (!$first2cols && ($cols > 2 || $force_array)) {
-			if ($ADODB_EXTENSION) {
-				if ($numIndex) {
-					while (!$this->EOF) {
-						$results[trim($this->fields[0])] = array_slice($this->fields, 1);
-						adodb_movenext($this);
-					}
-				} else {
-					while (!$this->EOF) {
-					// Fix for array_slice re-numbering numeric associative keys
-						$keys = array_slice(array_keys($this->fields), 1);
-						$sliced_array = array();
-
-						foreach($keys as $key) {
-							$sliced_array[$key] = $this->fields[$key];
-						}
-						
-						$results[trim(reset($this->fields))] = $sliced_array;
-						adodb_movenext($this);
-					}
-				}
-			} else {
-				if ($numIndex) {
-					while (!$this->EOF) {
-						$results[trim($this->fields[0])] = array_slice($this->fields, 1);
-						$this->MoveNext();
-					}
-				} else {
-					while (!$this->EOF) {
-					// Fix for array_slice re-numbering numeric associative keys
-						$keys = array_slice(array_keys($this->fields), 1);
-						$sliced_array = array();
-
-						foreach($keys as $key) {
-							$sliced_array[$key] = $this->fields[$key];
-						}
-						
-						$results[trim(reset($this->fields))] = $sliced_array;
-						$this->MoveNext();
-					}
-				}
-			}
-		} else {
-			if ($ADODB_EXTENSION) {
-				// return scalar values
-				if ($numIndex) {
-					while (!$this->EOF) {
-					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-						$results[trim(($this->fields[0]))] = $this->fields[1];
-						adodb_movenext($this);
-					}
-				} else {
-					while (!$this->EOF) {
-					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
-						$results[$v1] = $v2;
-						adodb_movenext($this);
-					}
-				}
-			} else {
-				if ($numIndex) {
-					while (!$this->EOF) {
-					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-						$results[trim(($this->fields[0]))] = $this->fields[1];
-						$this->MoveNext();
-					}
-				} else {
-					while (!$this->EOF) {
-					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
-						$v1 = trim(reset($this->fields));
-						$v2 = ''.next($this->fields); 
-						$results[$v1] = $v2;
-						$this->MoveNext();
-					}
-				}
-			}
-		}
-		
-		$ref =& $results; # workaround accelerator incompat with PHP 4.4 :(
-		return $ref; 
-	}
-	
-	
-	/**
-	 *
-	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a timestamp formated as user desires
-	 */
-	function UserTimeStamp($v,$fmt='Y-m-d H:i:s')
-	{
-		if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
-		$tt = $this->UnixTimeStamp($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		if ($tt === 0) return $this->emptyTimeStamp;
-		return adodb_date($fmt,$tt);
-	}
-	
-	
-	/**
-	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a date formated as user desires
-	 */
-	function UserDate($v,$fmt='Y-m-d')
-	{
-		$tt = $this->UnixDate($v);
-		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
-		if (($tt === false || $tt == -1) && $v != false) return $v;
-		else if ($tt == 0) return $this->emptyDate;
-		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
-		}
-		return adodb_date($fmt,$tt);
-	}
-	
-	
-	/**
-	 * @param $v is a date string in YYYY-MM-DD format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	function UnixDate($v)
-	{
-		return ADOConnection::UnixDate($v);
-	}
-	
-
-	/**
-	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
-	 *
-	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
-	 */
-	function UnixTimeStamp($v)
-	{
-		return ADOConnection::UnixTimeStamp($v);
-	}
-	
-	
-	/**
-	* PEAR DB Compat - do not use internally
-	*/
-	function Free()
-	{
-		return $this->Close();
-	}
-	
-	
-	/**
-	* PEAR DB compat, number of rows
-	*/
-	function NumRows()
-	{
-		return $this->_numOfRows;
-	}
-	
-	
-	/**
-	* PEAR DB compat, number of cols
-	*/
-	function NumCols()
-	{
-		return $this->_numOfFields;
-	}
-	
-	/**
-	* Fetch a row, returning false if no more rows. 
-	* This is PEAR DB compat mode.
-	*
-	* @return false or array containing the current record
-	*/
-	function &FetchRow()
-	{
-		if ($this->EOF) {
-			$false = false;
-			return $false;
-		}
-		$arr = $this->fields;
-		$this->_currentRow++;
-		if (!$this->_fetch()) $this->EOF = true;
-		return $arr;
-	}
-	
-	
-	/**
-	* Fetch a row, returning PEAR_Error if no more rows. 
-	* This is PEAR DB compat mode.
-	*
-	* @return DB_OK or error object
-	*/
-	function FetchInto(&$arr)
-	{
-		if ($this->EOF) return (defined('PEAR_ERROR_RETURN')) ? new PEAR_Error('EOF',-1): false;
-		$arr = $this->fields;
-		$this->MoveNext();
-		return 1; // DB_OK
-	}
-	
-	
-	/**
-	 * Move to the first row in the recordset. Many databases do NOT support this.
-	 *
-	 * @return true or false
-	 */
-	function MoveFirst() 
-	{
-		if ($this->_currentRow == 0) return true;
-		return $this->Move(0);			
-	}			
-
-	
-	/**
-	 * Move to the last row in the recordset. 
-	 *
-	 * @return true or false
-	 */
-	function MoveLast() 
-	{
-		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
-		if ($this->EOF) return false;
-		while (!$this->EOF) {
-			$f = $this->fields;
-			$this->MoveNext();
-		}
-		$this->fields = $f;
-		$this->EOF = false;
-		return true;
-	}
-	
-	
-	/**
-	 * Move to next record in the recordset.
-	 *
-	 * @return true if there still rows available, or false if there are no more rows (EOF).
-	 */
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_fetch()) return true;
-		}
-		$this->EOF = true;
-		/* -- tested error handling when scrolling cursor -- seems useless.
-		$conn = $this->connection;
-		if ($conn && $conn->raiseErrorFn && ($errno = $conn->ErrorNo())) {
-			$fn = $conn->raiseErrorFn;
-			$fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' ('.$this->sql.')',$conn->host,$conn->database);
-		}
-		*/
-		return false;
-	}
-	
-	
-	/**
-	 * Random access to a specific row in the recordset. Some databases do not support
-	 * access to previous rows in the databases (no scrolling backwards).
-	 *
-	 * @param rowNumber is the row to move to (0-based)
-	 *
-	 * @return true if there still rows available, or false if there are no more rows (EOF).
-	 */
-	function Move($rowNumber = 0) 
-	{
-		$this->EOF = false;
-		if ($rowNumber == $this->_currentRow) return true;
-		if ($rowNumber >= $this->_numOfRows)
-	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
-  				
-		if ($this->canSeek) { 
-	
-			if ($this->_seek($rowNumber)) {
-				$this->_currentRow = $rowNumber;
-				if ($this->_fetch()) {
-					return true;
-				}
-			} else {
-				$this->EOF = true;
-				return false;
-			}
-		} else {
-			if ($rowNumber < $this->_currentRow) return false;
-			global $ADODB_EXTENSION;
-			if ($ADODB_EXTENSION) {
-				while (!$this->EOF && $this->_currentRow < $rowNumber) {
-					adodb_movenext($this);
-				}
-			} else {
-			
-				while (! $this->EOF && $this->_currentRow < $rowNumber) {
-					$this->_currentRow++;
-					
-					if (!$this->_fetch()) $this->EOF = true;
-				}
-			}
-			return !($this->EOF);
-		}
-		
-		$this->fields = false;	
-		$this->EOF = true;
-		return false;
-	}
-	
-		
-	/**
-	 * Get the value of a field in the current row by column name.
-	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
-	 * 
-	 * @param colname  is the field to access
-	 *
-	 * @return the value of $colname column
-	 */
-	function Fields($colname)
-	{
-		return $this->fields[$colname];
-	}
-	
-	function GetAssocKeys($upper=true)
-	{
-		$this->bind = array();
-		for ($i=0; $i < $this->_numOfFields; $i++) {
-			$o = $this->FetchField($i);
-			if ($upper === 2) $this->bind[$o->name] = $i;
-			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
-		}
-	}
-	
-  /**
-   * Use associative array to get fields array for databases that do not support
-   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
-   *
-   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC
-   * before you execute your SQL statement, and access $rs->fields['col'] directly.
-   *
-   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by FetchField
-   */
-	function &GetRowAssoc($upper=1)
-	{
-		$record = array();
-	 //	if (!$this->fields) return $record;
-		
-	   	if (!$this->bind) {
-			$this->GetAssocKeys($upper);
-		}
-		
-		foreach($this->bind as $k => $v) {
-			$record[$k] = $this->fields[$v];
-		}
-
-		return $record;
-	}
-	
-	
-	/**
-	 * Clean up recordset
-	 *
-	 * @return true or false
-	 */
-	function Close() 
-	{
-		// free connection object - this seems to globally free the object
-		// and not merely the reference, so don't do this...
-		// $this->connection = false; 
-		if (!$this->_closed) {
-			$this->_closed = true;
-			return $this->_close();		
-		} else
-			return true;
-	}
-	
-	/**
-	 * synonyms RecordCount and RowCount	
-	 *
-	 * @return the number of rows or -1 if this is not supported
-	 */
-	function RecordCount() {return $this->_numOfRows;}
-	
-	
-	/*
-	* If we are using PageExecute(), this will return the maximum possible rows
-	* that can be returned when paging a recordset.
-	*/
-	function MaxRecordCount()
-	{
-		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
-	}
-	
-	/**
-	 * synonyms RecordCount and RowCount	
-	 *
-	 * @return the number of rows or -1 if this is not supported
-	 */
-	function RowCount() {return $this->_numOfRows;} 
-	
-
-	 /**
-	 * Portable RecordCount. Pablo Roca <pabloroca@mvps.org>
-	 *
-	 * @return  the number of records from a previous SELECT. All databases support this.
-	 *
-	 * But aware possible problems in multiuser environments. For better speed the table
-	 * must be indexed by the condition. Heavy test this before deploying.
-	 */ 
-	function PO_RecordCount($table="", $condition="") {
-		
-		$lnumrows = $this->_numOfRows;
-		// the database doesn't support native recordcount, so we do a workaround
-		if ($lnumrows == -1 && $this->connection) {
-			IF ($table) {
-				if ($condition) $condition = " WHERE " . $condition; 
-				$resultrows = &$this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
-				if ($resultrows) $lnumrows = reset($resultrows->fields);
-			}
-		}
-		return $lnumrows;
-	}
-	
-	
-	/**
-	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
-	 */
-	function CurrentRow() {return $this->_currentRow;}
-	
-	/**
-	 * synonym for CurrentRow -- for ADO compat
-	 *
-	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
-	 */
-	function AbsolutePosition() {return $this->_currentRow;}
-	
-	/**
-	 * @return the number of columns in the recordset. Some databases will set this to 0
-	 * if no records are returned, others will return the number of columns in the query.
-	 */
-	function FieldCount() {return $this->_numOfFields;}   
-
-
-	/**
-	 * Get the ADOFieldObject of a specific column.
-	 *
-	 * @param fieldoffset	is the column position to access(0-based).
-	 *
-	 * @return the ADOFieldObject for that column, or false.
-	 */
-	function &FetchField($fieldoffset = -1) 
-	{
-		// must be defined by child class
-		
-		$false = false;
-		return $false;
-	}	
-	
-	/**
-	 * Get the ADOFieldObjects of all columns in an array.
-	 *
-	 */
-	function& FieldTypesArray()
-	{
-		$arr = array();
-		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
-			$arr[] = $this->FetchField($i);
-		return $arr;
-	}
-	
-	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default case is lowercase field names.
-	*
-	* @return the object with the properties set to the fields of the current row
-	*/
-	function &FetchObj()
-	{
-		$o =& $this->FetchObject(false);
-		return $o;
-	}
-	
-	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default case is uppercase.
-	* 
-	* @param $isupper to set the object property names to uppercase
-	*
-	* @return the object with the properties set to the fields of the current row
-	*/
-	function &FetchObject($isupper=true)
-	{
-		if (empty($this->_obj)) {
-			$this->_obj = new ADOFetchObj();
-			$this->_names = array();
-			for ($i=0; $i <$this->_numOfFields; $i++) {
-				$f = $this->FetchField($i);
-				$this->_names[] = $f->name;
-			}
-		}
-		$i = 0;
-		if (PHP_VERSION >= 5) $o = clone($this->_obj);
-		else $o = $this->_obj;
-	
-		for ($i=0; $i <$this->_numOfFields; $i++) {
-			$name = $this->_names[$i];
-			if ($isupper) $n = strtoupper($name);
-			else $n = $name;
-			
-			$o->$n = $this->Fields($name);
-		}
-		return $o;
-	}
-	
-	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default is lower-case field names.
-	* 
-	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
-	*
-	* Fixed bug reported by tim@orotech.net
-	*/
-	function &FetchNextObj()
-	{
-		$o =& $this->FetchNextObject(false);
-		return $o;
-	}
-	
-	
-	/**
-	* Return the fields array of the current row as an object for convenience. 
-	* The default is upper case field names.
-	* 
-	* @param $isupper to set the object property names to uppercase
-	*
-	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
-	*
-	* Fixed bug reported by tim@orotech.net
-	*/
-	function &FetchNextObject($isupper=true)
-	{
-		$o = false;
-		if ($this->_numOfRows != 0 && !$this->EOF) {
-			$o = $this->FetchObject($isupper);	
-			$this->_currentRow++;
-			if ($this->_fetch()) return $o;
-		}
-		$this->EOF = true;
-		return $o;
-	}
-	
-	/**
-	 * Get the metatype of the column. This is used for formatting. This is because
-	 * many databases use different names for the same type, so we transform the original
-	 * type to our standardised version which uses 1 character codes:
-	 *
-	 * @param t  is the type passed in. Normally is ADOFieldObject->type.
-	 * @param len is the maximum length of that field. This is because we treat character
-	 * 	fields bigger than a certain size as a 'B' (blob).
-	 * @param fieldobj is the field object returned by the database driver. Can hold
-	 *	additional info (eg. primary_key for mysql).
-	 * 
-	 * @return the general type of the data: 
-	 *	C for character < 250 chars
-	 *	X for teXt (>= 250 chars)
-	 *	B for Binary
-	 * 	N for numeric or floating point
-	 *	D for date
-	 *	T for timestamp
-	 * 	L for logical/Boolean
-	 *	I for integer
-	 *	R for autoincrement counter/integer
-	 * 
-	 *
-	*/
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-	// changed in 2.32 to hashing instead of switch stmt for speed...
-	static $typeMap = array(
-		'VARCHAR' => 'C',
-		'VARCHAR2' => 'C',
-		'CHAR' => 'C',
-		'C' => 'C',
-		'STRING' => 'C',
-		'NCHAR' => 'C',
-		'NVARCHAR' => 'C',
-		'VARYING' => 'C',
-		'BPCHAR' => 'C',
-		'CHARACTER' => 'C',
-		'INTERVAL' => 'C',  # Postgres
-		'MACADDR' => 'C', # postgres
-		##
-		'LONGCHAR' => 'X',
-		'TEXT' => 'X',
-		'NTEXT' => 'X',
-		'M' => 'X',
-		'X' => 'X',
-		'CLOB' => 'X',
-		'NCLOB' => 'X',
-		'LVARCHAR' => 'X',
-		##
-		'BLOB' => 'B',
-		'IMAGE' => 'B',
-		'BINARY' => 'B',
-		'VARBINARY' => 'B',
-		'LONGBINARY' => 'B',
-		'B' => 'B',
-		##
-		'YEAR' => 'D', // mysql
-		'DATE' => 'D',
-		'D' => 'D',
-		##
-		'UNIQUEIDENTIFIER' => 'C', # MS SQL Server
-		##
-		'TIME' => 'T',
-		'TIMESTAMP' => 'T',
-		'DATETIME' => 'T',
-		'TIMESTAMPTZ' => 'T',
-		'T' => 'T',
-		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
-		##
-		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
-		'BIT' => 'L',
-		'L' => 'L',
-		##
-		'COUNTER' => 'R',
-		'R' => 'R',
-		'SERIAL' => 'R', // ifx
-		'INT IDENTITY' => 'R',
-		##
-		'INT' => 'I',
-		'INT2' => 'I',
-		'INT4' => 'I',
-		'INT8' => 'I',
-		'INTEGER' => 'I',
-		'INTEGER UNSIGNED' => 'I',
-		'SHORT' => 'I',
-		'TINYINT' => 'I',
-		'SMALLINT' => 'I',
-		'I' => 'I',
-		##
-		'LONG' => 'N', // interbase is numeric, oci8 is blob
-		'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
-		'DECIMAL' => 'N',
-		'DEC' => 'N',
-		'REAL' => 'N',
-		'DOUBLE' => 'N',
-		'DOUBLE PRECISION' => 'N',
-		'SMALLFLOAT' => 'N',
-		'FLOAT' => 'N',
-		'NUMBER' => 'N',
-		'NUM' => 'N',
-		'NUMERIC' => 'N',
-		'MONEY' => 'N',
-		
-		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
-		'SQLTEXT' => 'X',
-		 ## informix 10
-		"SQLINT8" => 'I8',
-		"SQLSERIAL8" => 'I8',
-		"SQLNCHAR" => 'C',
-		"SQLNVCHAR" => 'C',
-		"SQLLVARCHAR" => 'X',
-		"SQLBOOL" => 'L'
-		);
-		
-		$tmap = false;
-		$t = strtoupper($t);
-		$tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
-		switch ($tmap) {
-		case 'C':
-		
-			// is the char field is too long, return as text field... 
-			if ($this->blobSize >= 0) {
-				if ($len > $this->blobSize) return 'X';
-			} else if ($len > 250) {
-				return 'X';
-			}
-			return 'C';
-			
-		case 'I':
-			if (!empty($fieldobj->primary_key)) return 'R';
-			return 'I';
-		
-		case false:
-			return 'N';
-			
-		case 'B':
-			 if (isset($fieldobj->binary)) 
-				 return ($fieldobj->binary) ? 'B' : 'X';
-			return 'B';
-		
-		case 'D':
-			if (!empty($this->connection) && !empty($this->connection->datetime)) return 'T';
-			return 'D';
-			
-		default: 
-			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
-			return $tmap;
-		}
-	}
-	
-	
-	function _close() {}
-	
-	/**
-	 * set/returns the current recordset page when paginating
-	 */
-	function AbsolutePage($page=-1)
-	{
-		if ($page != -1) $this->_currentPage = $page;
-		return $this->_currentPage;
-	}
-	
-	/**
-	 * set/returns the status of the atFirstPage flag when paginating
-	 */
-	function AtFirstPage($status=false)
-	{
-		if ($status != false) $this->_atFirstPage = $status;
-		return $this->_atFirstPage;
-	}
-	
-	function LastPageNo($page = false)
-	{
-		if ($page != false) $this->_lastPageNo = $page;
-		return $this->_lastPageNo;
-	}
-	
-	/**
-	 * set/returns the status of the atLastPage flag when paginating
-	 */
-	function AtLastPage($status=false)
-	{
-		if ($status != false) $this->_atLastPage = $status;
-		return $this->_atLastPage;
-	}
-	
-} // end class ADORecordSet
-	
-	//==============================================================================================	
-	// CLASS ADORecordSet_array
-	//==============================================================================================	
-	
-	/**
-	 * This class encapsulates the concept of a recordset created in memory
-	 * as an array. This is useful for the creation of cached recordsets.
-	 * 
-	 * Note that the constructor is different from the standard ADORecordSet
-	 */
-	
-	class ADORecordSet_array extends ADORecordSet
-	{
-		var $databaseType = 'array';
-
-		var $_array; 	// holds the 2-dimensional data array
-		var $_types;	// the array of types of each column (C B I L M)
-		var $_colnames;	// names of each column in array
-		var $_skiprow1;	// skip 1st row because it holds column names
-		var $_fieldobjects; // holds array of field objects
-		var $canSeek = true;
-		var $affectedrows = false;
-		var $insertid = false;
-		var $sql = '';
-		var $compat = false;
-		/**
-		 * Constructor
-		 *
-		 */
-		function ADORecordSet_array($fakeid=1)
-		{
-		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
-		
-			// fetch() on EOF does not delete $this->fields
-			$this->compat = !empty($ADODB_COMPAT_FETCH);
-			$this->ADORecordSet($fakeid); // fake queryID		
-			$this->fetchMode = $ADODB_FETCH_MODE;
-		}
-		
-		function _transpose($addfieldnames=true)
-		{
-		global $ADODB_INCLUDED_LIB;
-			
-			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-			$hdr = true;
-			
-			$fobjs = $addfieldnames ? $this->_fieldobjects : false;
-			adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
-			//adodb_pr($newarr);
-			
-			$this->_skiprow1 = false;
-			$this->_array =& $newarr;
-			$this->_colnames = $hdr;
-			
-			adodb_probetypes($newarr,$this->_types);
-		
-			$this->_fieldobjects = array();
-			
-			foreach($hdr as $k => $name) {
-				$f = new ADOFieldObject();
-				$f->name = $name;
-				$f->type = $this->_types[$k];
-				$f->max_length = -1;
-				$this->_fieldobjects[] = $f;
-			}
-			$this->fields = reset($this->_array);
-			
-			$this->_initrs();
-			
-		}
-		
-		/**
-		 * Setup the array.
-		 *
-		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
-		 *			unless paramter $colnames is used.
-		 * @param typearr	holds an array of types. These are the same types 
-		 *			used in MetaTypes (C,B,L,I,N).
-		 * @param [colnames]	array of column names. If set, then the first row of
-		 *			$array should not hold the column names.
-		 */
-		function InitArray($array,$typearr,$colnames=false)
-		{
-			$this->_array = $array;
-			$this->_types = $typearr;	
-			if ($colnames) {
-				$this->_skiprow1 = false;
-				$this->_colnames = $colnames;
-			} else  {
-				$this->_skiprow1 = true;
-				$this->_colnames = $array[0];
-			}
-			$this->Init();
-		}
-		/**
-		 * Setup the Array and datatype file objects
-		 *
-		 * @param array		is a 2-dimensional array holding the data.
-		 *			The first row should hold the column names 
-		 *			unless paramter $colnames is used.
-		 * @param fieldarr	holds an array of ADOFieldObject's.
-		 */
-		function InitArrayFields(&$array,&$fieldarr)
-		{
-			$this->_array =& $array;
-			$this->_skiprow1= false;
-			if ($fieldarr) {
-				$this->_fieldobjects =& $fieldarr;
-			} 
-			$this->Init();
-		}
-		
-		function &GetArray($nRows=-1)
-		{
-			if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
-				return $this->_array;
-			} else {
-				$arr =& ADORecordSet::GetArray($nRows);
-				return $arr;
-			}
-		}
-		
-		function _initrs()
-		{
-			$this->_numOfRows =  sizeof($this->_array);
-			if ($this->_skiprow1) $this->_numOfRows -= 1;
-		
-			$this->_numOfFields =(isset($this->_fieldobjects)) ?
-				 sizeof($this->_fieldobjects):sizeof($this->_types);
-		}
-		
-		/* Use associative array to get fields array */
-		function Fields($colname)
-		{
-			$mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
-			
-			if ($mode & ADODB_FETCH_ASSOC) {
-				if (!isset($this->fields[$colname])) $colname = strtolower($colname);
-				return $this->fields[$colname];
-			}
-			if (!$this->bind) {
-				$this->bind = array();
-				for ($i=0; $i < $this->_numOfFields; $i++) {
-					$o = $this->FetchField($i);
-					$this->bind[strtoupper($o->name)] = $i;
-				}
-			}
-			return $this->fields[$this->bind[strtoupper($colname)]];
-		}
-		
-		function &FetchField($fieldOffset = -1) 
-		{
-			if (isset($this->_fieldobjects)) {
-				return $this->_fieldobjects[$fieldOffset];
-			}
-			$o =  new ADOFieldObject();
-			$o->name = $this->_colnames[$fieldOffset];
-			$o->type =  $this->_types[$fieldOffset];
-			$o->max_length = -1; // length not known
-			
-			return $o;
-		}
-			
-		function _seek($row)
-		{
-			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
-				$this->_currentRow = $row;
-				if ($this->_skiprow1) $row += 1;
-				$this->fields = $this->_array[$row];
-				return true;
-			}
-			return false;
-		}
-		
-		function MoveNext() 
-		{
-			if (!$this->EOF) {		
-				$this->_currentRow++;
-				
-				$pos = $this->_currentRow;
-				
-				if ($this->_numOfRows <= $pos) {
-					if (!$this->compat) $this->fields = false;
-				} else {
-					if ($this->_skiprow1) $pos += 1;
-					$this->fields = $this->_array[$pos];
-					return true;
-				}		
-				$this->EOF = true;
-			}
-			
-			return false;
-		}	
-	
-		function _fetch()
-		{
-			$pos = $this->_currentRow;
-			
-			if ($this->_numOfRows <= $pos) {
-				if (!$this->compat) $this->fields = false;
-				return false;
-			}
-			if ($this->_skiprow1) $pos += 1;
-			$this->fields = $this->_array[$pos];
-			return true;
-		}
-		
-		function _close() 
-		{
-			return true;	
-		}
-	
-	} // ADORecordSet_array
-
-	//==============================================================================================	
-	// HELPER FUNCTIONS
-	//==============================================================================================			
-	
-	/**
-	 * Synonym for ADOLoadCode. Private function. Do not use.
-	 *
-	 * @deprecated
-	 */
-	function ADOLoadDB($dbType) 
-	{ 
-		return ADOLoadCode($dbType);
-	}
-		
-	/**
-	 * Load the code for a specific database driver. Private function. Do not use.
-	 */
-	function ADOLoadCode($dbType) 
-	{
-	global $ADODB_LASTDB;
-	
-		if (!$dbType) return false;
-		$db = strtolower($dbType);
-		switch ($db) {
-			case 'ado': 
-				if (PHP_VERSION >= 5) $db = 'ado5';
-				$class = 'ado'; 
-				break;
-			case 'ifx':
-			case 'maxsql': $class = $db = 'mysqlt'; break;
-			case 'postgres':
-			case 'postgres8':
-			case 'pgsql': $class = $db = 'postgres7'; break;
-			default:
-				$class = $db; break;
-		}
-		
-		$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
-		@include_once($file);
-		$ADODB_LASTDB = $class;
-		if (class_exists("ADODB_" . $class)) return $class;
-		
-		//ADOConnection::outp(adodb_pr(get_declared_classes(),true));
-		if (!file_exists($file)) ADOConnection::outp("Missing file: $file");
-		else ADOConnection::outp("Syntax error in file: $file");
-		return false;
-	}
-
-	/**
-	 * synonym for ADONewConnection for people like me who cannot remember the correct name
-	 */
-	function &NewADOConnection($db='')
-	{
-		$tmp =& ADONewConnection($db);
-		return $tmp;
-	}
-	
-	/**
-	 * Instantiate a new Connection class for a specific database driver.
-	 *
-	 * @param [db]  is the database Connection object to create. If undefined,
-	 * 	use the last database driver that was loaded by ADOLoadCode().
-	 *
-	 * @return the freshly created instance of the Connection class.
-	 */
-	function &ADONewConnection($db='')
-	{
-	GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
-		
-		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
-		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
-		$false = false;
-		if ($at = strpos($db,'://')) {
-			$origdsn = $db;
-			if (PHP_VERSION < 5) $dsna = @parse_url($db);
-			else {
-				$fakedsn = 'fake'.substr($db,$at);
-				$dsna = @parse_url($fakedsn);
-				$dsna['scheme'] = substr($db,0,$at);
-			
-				if (strncmp($db,'pdo',3) == 0) {
-					$sch = explode('_',$dsna['scheme']);
-					if (sizeof($sch)>1) {
-						$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
-						$dsna['host'] = rawurlencode($sch[1].':host='.rawurldecode($dsna['host']));
-						$dsna['scheme'] = 'pdo';
-					}
-				}
-			}
-			
-			if (!$dsna) {
-				// special handling of oracle, which might not have host
-				$db = str_replace('@/','@adodb-fakehost/',$db);
-				$dsna = parse_url($db);
-				if (!$dsna) return $false;
-				$dsna['host'] = '';
-			}
-			$db = @$dsna['scheme'];
-			if (!$db) return $false;
-			$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
-			$dsna['user'] = isset($dsna['user']) ? rawurldecode($dsna['user']) : '';
-			$dsna['pass'] = isset($dsna['pass']) ? rawurldecode($dsna['pass']) : '';
-			$dsna['path'] = isset($dsna['path']) ? rawurldecode(substr($dsna['path'],1)) : ''; # strip off initial /
-			
-			if (isset($dsna['query'])) {
-				$opt1 = explode('&',$dsna['query']);
-				foreach($opt1 as $k => $v) {
-					$arr = explode('=',$v);
-					$opt[$arr[0]] = isset($arr[1]) ? rawurldecode($arr[1]) : 1;
-				}
-			} else $opt = array();
-		}
-	/*
-	 *  phptype: Database backend used in PHP (mysql, odbc etc.)
-	 *  dbsyntax: Database used with regards to SQL syntax etc.
-	 *  protocol: Communication protocol to use (tcp, unix etc.)
-	 *  hostspec: Host specification (hostname[:port])
-	 *  database: Database to use on the DBMS server
-	 *  username: User name for login
-	 *  password: Password for login
-	 */
-		if (!empty($ADODB_NEWCONNECTION)) {
-			$obj = $ADODB_NEWCONNECTION($db);
-
-		} else {
-		
-			if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
-			if (empty($db)) $db = $ADODB_LASTDB;
-			
-			if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
-			
-			if (!$db) {
-				if (isset($origdsn)) $db = $origdsn;
-				if ($errorfn) {
-					// raise an error
-					$ignore = false;
-					$errorfn('ADONewConnection', 'ADONewConnection', -998,
-							 "could not load the database driver for '$db'",
-							 $db,false,$ignore);
-				} else
-					 ADOConnection::outp( "<p>ADONewConnection: Unable to load database driver '$db'</p>",false);
-					
-				return $false;
-			}
-			
-			$cls = 'ADODB_'.$db;
-			if (!class_exists($cls)) {
-				adodb_backtrace();
-				return $false;
-			}
-			
-			$obj = new $cls();
-		}
-		
-		# constructor should not fail
-		if ($obj) {
-			if ($errorfn)  $obj->raiseErrorFn = $errorfn;
-			if (isset($dsna)) {
-				if (isset($dsna['port'])) $obj->port = $dsna['port'];
-				foreach($opt as $k => $v) {
-					switch(strtolower($k)) {
-					case 'new':
-										$nconnect = true; $persist = true; break;
-					case 'persist':
-					case 'persistent': 	$persist = $v; break;
-					case 'debug':		$obj->debug = (integer) $v; break;
-					#ibase
-					case 'role':		$obj->role = $v; break;
-					case 'dialect': 	$obj->dialect = (integer) $v; break;
-					case 'charset':		$obj->charset = $v; $obj->charSet=$v; break;
-					case 'buffers':		$obj->buffers = $v; break;
-					case 'fetchmode':   $obj->SetFetchMode($v); break;
-					#ado
-					case 'charpage':	$obj->charPage = $v; break;
-					#mysql, mysqli
-					case 'clientflags': $obj->clientFlags = $v; break;
-					#mysql, mysqli, postgres
-					case 'port': $obj->port = $v; break;
-					#mysqli
-					case 'socket': $obj->socket = $v; break;
-					#oci8
-					case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break;
-					}
-				}
-				if (empty($persist))
-					$ok = $obj->Connect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-				else if (empty($nconnect))
-					$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-				else
-					$ok = $obj->NConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
-					
-				if (!$ok) return $false;
-			}
-		}
-		return $obj;
-	}
-	
-	
-	
-	// $perf == true means called by NewPerfMonitor(), otherwise for data dictionary
-	function _adodb_getdriver($provider,$drivername,$perf=false)
-	{
-		switch ($provider) {
-		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); 
-		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); 
-		case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4);
-		case 'native':  break;
-		default:
-			return $provider;
-		}
-		
-		switch($drivername) {
-		case 'mysqlt':
-		case 'mysqli': 
-				$drivername='mysql'; 
-				break;
-		case 'postgres7':
-		case 'postgres8':
-				$drivername = 'postgres'; 
-				break;	
-		case 'firebird15': $drivername = 'firebird'; break;
-		case 'oracle': $drivername = 'oci8'; break;
-		case 'access': if ($perf) $drivername = ''; break;
-		case 'db2'   : break;
-		case 'sapdb' : break;
-		default:
-			$drivername = 'generic';
-			break;
-		}
-		return $drivername;
-	}
-	
-	function &NewPerfMonitor(&$conn)
-	{
-		$false = false;
-		$drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType,true);
-		if (!$drivername || $drivername == 'generic') return $false;
-		include_once(ADODB_DIR.'/adodb-perf.inc.php');
-		@include_once(ADODB_DIR."/perf/perf-$drivername.inc.php");
-		$class = "Perf_$drivername";
-		if (!class_exists($class)) return $false;
-		$perf = new $class($conn);
-		
-		return $perf;
-	}
-	
-	function &NewDataDictionary(&$conn,$drivername=false)
-	{
-		$false = false;
-		if (!$drivername) $drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType);
-
-		include_once(ADODB_DIR.'/adodb-lib.inc.php');
-		include_once(ADODB_DIR.'/adodb-datadict.inc.php');
-		$path = ADODB_DIR."/datadict/datadict-$drivername.inc.php";
-
-		if (!file_exists($path)) {
-			ADOConnection::outp("Dictionary driver '$path' not available");
-			return $false;
-		}
-		include_once($path);
-		$class = "ADODB2_$drivername";
-		$dict = new $class();
-		$dict->dataProvider = $conn->dataProvider;
-		$dict->connection = &$conn;
-		$dict->upperName = strtoupper($drivername);
-		$dict->quote = $conn->nameQuote;
-		if (!empty($conn->_connectionID))
-			$dict->serverInfo = $conn->ServerInfo();
-		
-		return $dict;
-	}
-
-
-	
-	/*
-		Perform a print_r, with pre tags for better formatting.
-	*/
-	function adodb_pr($var,$as_string=false)
-	{
-		if ($as_string) ob_start();
-		
-		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
-			echo " <pre>\n";print_r($var);echo "</pre>\n";
-		} else
-			print_r($var);
-			
-		if ($as_string) {
-			$s = ob_get_contents();
-			ob_end_clean();
-			return $s;
-		}
-	}
-	
-	/*
-		Perform a stack-crawl and pretty print it.
-		
-		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
-		@param levels Number of levels to display
-	*/
-	function adodb_backtrace($printOrArr=true,$levels=9999)
-	{
-		global $ADODB_INCLUDED_LIB;
-		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
-		return _adodb_backtrace($printOrArr,$levels);
-	}
-
-
-}
-?>
Index: admin/include/lib/adodb/adodb-memcache.lib.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-memcache.lib.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-memcache.lib.inc.php	(working copy)
@@ -1,118 +0,0 @@
-<?php
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-global $ADODB_INCLUDED_MEMCACHE;
-$ADODB_INCLUDED_MEMCACHE = 1;
-
-/* 
-
-  V4.90 8 June 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-*/
-
-	function &getmemcache($key,&$err, $timeout=0, $host, $port)
-	{
-		$false = false;
-		$err = false;
-
-		if (!function_exists('memcache_pconnect')) {
-			$err = 'Memcache module PECL extension not found!';
-			return $false;
-		}
-
-		$memcache = new Memcache;
-		if (!@$memcache->pconnect($host, $port)) {
-			$err = 'Can\'t connect to memcache server on: '.$host.':'.$port;
-			return $false;
-		}
-
-		$rs = $memcache->get($key);
-		if (!$rs) {
-			$err = 'Item with such key doesn\'t exists on the memcached server.';
-			return $false;
-		}
-
-		$tdiff = intval($rs->timeCreated+$timeout - time());
-		if ($tdiff <= 2) {
-			switch($tdiff) {
-				case 2: 
-					if ((rand() & 15) == 0) {
-						$err = "Timeout 2";
-						return $false;
-					}
-					break;
-				case 1:
-					if ((rand() & 3) == 0) {
-						$err = "Timeout 1";
-						return $false;
-					}
-					break;
-				default: 
-					$err = "Timeout 0";
-					return $false;
-			}
-		}
-		return $rs;
-	}
-
-	function putmemcache($key, $rs, $host, $port, $compress, $debug=false)
-	{
-		$false = false;
-		$true = true;
-
-		if (!function_exists('memcache_pconnect')) {
-			if ($debug) ADOConnection::outp(" Memcache module PECL extension not found!<br>\n");
-			return $false;
-		}
-
-		$memcache = new Memcache;
-		if (!@$memcache->pconnect($host, $port)) {
-			if ($debug) ADOConnection::outp(" Can't connect to memcache server on: $host:$port<br>\n");
-			return $false;
-		}
-
-		$rs->timeCreated = time();
-		if (!$memcache->set($key, $rs, $compress, 0)) {
-			if ($debug) ADOConnection::outp(" Failed to save data at the memcached server!<br>\n");
-			return $false;
-		}
-		return $true;
-	}
-
-	function flushmemcache($key=false, $host, $port, $debug=false)
-	{
-		if (!function_exists('memcache_pconnect')) {
-			if ($debug) ADOConnection::outp(" Memcache module PECL extension not found!<br>\n");
-			return;
-		}
-
-		$memcache = new Memcache;
-		if (!@$memcache->pconnect($host, $port)) {
-			if ($debug) ADOConnection::outp(" Can't connect to memcache server on: $host:$port<br>\n");
-			return;
-		}
-
-		if ($key) {
-			if (!$memcache->delete($key)) {
-				if ($debug) ADOConnection::outp("CacheFlush: $key entery doesn't exist on memcached server!<br>\n");
-			} else {
-				if ($debug) ADOConnection::outp("CacheFlush: $key entery flushed from memcached server!<br>\n");
-			}
-		} else {
-			if (!$memcache->flush()) {
-				if ($debug) ADOConnection::outp("CacheFlush: Failure flushing all enteries from memcached server!<br>\n");
-			} else {
-				if ($debug) ADOConnection::outp("CacheFlush: All enteries flushed from memcached server!<br>\n");
-			}
-		}
-		return;
-	}
-?>
Index: admin/include/lib/adodb/datadict/datadict-firebird.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-firebird.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-firebird.inc.php	(working copy)
@@ -1,151 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-class ADODB2_firebird extends ADODB_DataDict {
-	
-	var $databaseType = 'firebird';
-	var $seqField = false;
-	var $seqPrefix = 'gen_';
-	var $blobSize = 40000;	
- 	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL': return 'VARCHAR(32000)'; 
-		case 'X': return 'VARCHAR(4000)'; 
-		
-		case 'C2': return 'VARCHAR'; // up to 32K
-		case 'X2': return 'VARCHAR(4000)';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'INTEGER';
-		
-		case 'F': return 'DOUBLE PRECISION';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-	
-	function NameQuote($name = NULL)
-	{
-		if (!is_string($name)) {
-			return FALSE;
-		}
-		
-		$name = trim($name);
-		
-		if ( !is_object($this->connection) ) {
-			return $name;
-		}
-		
-		$quote = $this->connection->nameQuote;
-		
-		// if name is of the form `name`, quote it
-		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
-			return $quote . $matches[1] . $quote;
-		}
-		
-		// if name contains special characters, quote it
-		if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
-			return $quote . $name . $quote;
-		}
-		
-		return $quote . $name . $quote;
-	}
-
-	function CreateDatabase($dbname, $options=false)
-	{
-		$options = $this->_Options($options);
-		$sql = array();
-		
-		$sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
-		
-		return $sql;
-	}
-	
-	function _DropAutoIncrement($t)
-	{
-		if (strpos($t,'.') !== false) {
-			$tarr = explode('.',$t);
-			return 'DROP GENERATOR '.$tarr[0].'."gen_'.$tarr[1].'"';
-		}
-		return 'DROP GENERATOR "GEN_'.$t;
-	}
-	
-
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{
-		$suffix = '';
-		
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fautoinc) $this->seqField = $fname;
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
-		return $suffix;
-	}
-	
-/*
-CREATE or replace TRIGGER jaddress_insert
-before insert on jaddress
-for each row
-begin
-IF ( NEW."seqField" IS NULL OR NEW."seqField" = 0 ) THEN
-  NEW."seqField" = GEN_ID("GEN_tabname", 1);
-end;
-*/
-	function _Triggers($tabname,$tableoptions)
-	{	
-		if (!$this->seqField) return array();
-		
-		$tab1 = preg_replace( '/"/', '', $tabname );
-		if ($this->schema) {
-			$t = strpos($tab1,'.');
-			if ($t !== false) $tab = substr($tab1,$t+1);
-			else $tab = $tab1;
-			$seqField = $this->seqField;
-			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
-			$trigname = $this->schema.'.trig_'.$this->seqPrefix.$tab;
-		} else {
-			$seqField = $this->seqField;
-			$seqname = $this->seqPrefix.$tab1;
-			$trigname = 'trig_'.$seqname;
-		}
-		if (isset($tableoptions['REPLACE']))
-		{ $sql[] = "DROP GENERATOR \"$seqname\"";
-		  $sql[] = "CREATE GENERATOR \"$seqname\"";
-		  $sql[] = "ALTER TRIGGER \"$trigname\" BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
-		}
-		else
-		{ $sql[] = "CREATE GENERATOR \"$seqname\"";
-		  $sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
-		}
-		
-		$this->seqField = false;
-		return $sql;
-	}
-
-}
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-postgres.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-postgres.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-postgres.inc.php	(working copy)
@@ -1,371 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_postgres extends ADODB_DataDict {
-	
-	var $databaseType = 'postgres';
-	var $seqField = false;
-	var $seqPrefix = 'SEQ_';
-	var $addCol = ' ADD COLUMN';
-	var $quote = '"';
-	var $renameTable = 'ALTER TABLE %s RENAME TO %s'; // at least since 7.1
-	var $dropTable = 'DROP TABLE %s CASCADE';
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique && 
-			$fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
-		
-		switch (strtoupper($t)) {
-			case 'INTERVAL':
-			case 'CHAR':
-			case 'CHARACTER':
-			case 'VARCHAR':
-			case 'NAME':
-	   		case 'BPCHAR':
-				if ($len <= $this->blobSize) return 'C';
-			
-			case 'TEXT':
-				return 'X';
-	
-			case 'IMAGE': // user defined type
-			case 'BLOB': // user defined type
-			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
-			case 'VARBIT':
-			case 'BYTEA':
-				return 'B';
-			
-			case 'BOOL':
-			case 'BOOLEAN':
-				return 'L';
-			
-			case 'DATE':
-				return 'D';
-			
-			case 'TIME':
-			case 'DATETIME':
-			case 'TIMESTAMP':
-			case 'TIMESTAMPTZ':
-				return 'T';
-			
-			case 'INTEGER': return !$is_serial ? 'I' : 'R';
-			case 'SMALLINT': 
-			case 'INT2': return !$is_serial ? 'I2' : 'R';
-			case 'INT4': return !$is_serial ? 'I4' : 'R';
-			case 'BIGINT': 
-			case 'INT8': return !$is_serial ? 'I8' : 'R';
-				
-			case 'OID':
-			case 'SERIAL':
-				return 'R';
-			
-			case 'FLOAT4':
-			case 'FLOAT8':
-			case 'DOUBLE PRECISION':
-			case 'REAL':
-				return 'F';
-				
-			 default:
-			 	return 'N';
-		}
-	}
- 	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'TEXT';
-		
-		case 'B': return 'BYTEA';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'BOOLEAN';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'INT2';
-		case 'I4': return 'INT4';
-		case 'I8': return 'INT8';
-		
-		case 'F': return 'FLOAT8';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	/**
-	 * Adding a new Column 
-	 *
-	 * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
-	 *
-	 * @param string $tabname table-name
-	 * @param string $flds column-names and types for the changed columns
-	 * @return array with SQL strings
-	 */
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
-			if (($not_null = preg_match('/NOT NULL/i',$v))) {
-				$v = preg_replace('/NOT NULL/i','',$v);
-			}
-			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
-				list(,$colname,$default) = $matches;
-				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
-				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
-				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-			} else {				
-				$sql[] = $alter . $v;
-			}
-			if ($not_null) {
-				list($colname) = explode(' ',$v);
-				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
-			}
-		}
-		return $sql;
-	}
-	
-	/**
-	 * Change the definition of one column
-	 *
-	 * Postgres can't do that on it's own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		if (!$tableflds) {
-			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
-			return array();
-		}
-		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
-	}
-	
-	/**
-	 * Drop one column
-	 *
-	 * Postgres < 7.3 can't do that on it's own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		$has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
-		if (!$has_drop_column && !$tableflds) {
-			if ($this->debug) ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
-		return array();
-	}
-		if ($has_drop_column) {
-			return ADODB_DataDict::DropColumnSQL($tabname, $flds);
-		}
-		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
-	}
-	
-	/**
-	 * Save the content into a temp. table, drop and recreate the original table and copy the content back in
-	 *
-	 * We also take care to set the values of the sequenz and recreate the indexes.
-	 * All this is done in a transaction, to not loose the content of the table, if something went wrong!
-	 * @internal
-	 * @param string $tabname table-name
-	 * @param string $dropflds column-names to drop
-	 * @param string $tableflds complete defintion of the new table, eg. for postgres
-	 * @param array/string $tableoptions options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function _recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
-	{
-		if ($dropflds && !is_array($dropflds)) $dropflds = explode(',',$dropflds);
-		$copyflds = array();
-		foreach($this->MetaColumns($tabname) as $fld) {
-			if (!$dropflds || !in_array($fld->name,$dropflds)) {
-				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
-				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
-					in_array($fld->type,array('varchar','char','text','bytea'))) {
-					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
-				} else {
-					$copyflds[] = $fld->name;
-				}
-				// identify the sequence name and the fld its on
-				if ($fld->primary_key && $fld->has_default && 
-					preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
-					$seq_name = $matches[1];
-					$seq_fld = $fld->name;
-				}
-			}
-		}
-		$copyflds = implode(', ',$copyflds);
-		
-		$tempname = $tabname.'_tmp';
-		$aSql[] = 'BEGIN';		// we use a transaction, to make sure not to loose the content of the table
-		$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
-		$aSql = array_merge($aSql,$this->DropTableSQL($tabname));
-		$aSql = array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
-		$aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM $tempname";
-		if ($seq_name && $seq_fld) {	// if we have a sequence we need to set it again
-			$seq_name = $tabname.'_'.$seq_fld.'_seq';	// has to be the name of the new implicit sequence
-			$aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname";
-		}
-		$aSql[] = "DROP TABLE $tempname";
-		// recreate the indexes, if they not contain one of the droped columns
-		foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
-		{
-			if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) {
-				$aSql = array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
-					$idx_data['unique'] ? array('UNIQUE') : False));
-			}
-		}
-		$aSql[] = 'COMMIT';
-		return $aSql;
-	}
-	
-	function DropTableSQL($tabname)
-	{
-		$sql = ADODB_DataDict::DropTableSQL($tabname);
-		
-		$drop_seq = $this->_DropAutoIncrement($tabname);
-		if ($drop_seq) $sql[] = $drop_seq;
-		
-		return $sql;
-	}
-
-	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{
-		if ($fautoinc) {
-			$ftype = 'SERIAL';
-			return '';
-		}
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	// search for a sequece for the given table (asumes the seqence-name contains the table-name!)
-	// if yes return sql to drop it
-	// this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
-	function _DropAutoIncrement($tabname)
-	{
-		$tabname = $this->connection->quote('%'.$tabname.'%');
-
-		$seq = $this->connection->GetOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'");
-
-		// check if a tables depends on the sequenz and it therefor cant and dont need to be droped separatly
-		if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'")) {
-			return False;
-		}
-		return "DROP SEQUENCE ".$seq;
-	}
-	
-	/*
-	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
-	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
-	| table_constraint } [, ... ]
-	)
-	[ INHERITS ( parent_table [, ... ] ) ]
-	[ WITH OIDS | WITHOUT OIDS ]
-	where column_constraint is:
-	[ CONSTRAINT constraint_name ]
-	{ NOT NULL | NULL | UNIQUE | PRIMARY KEY |
-	CHECK (expression) |
-	REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL ]
-	[ ON DELETE action ] [ ON UPDATE action ] }
-	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
-	and table_constraint is:
-	[ CONSTRAINT constraint_name ]
-	{ UNIQUE ( column_name [, ... ] ) |
-	PRIMARY KEY ( column_name [, ... ] ) |
-	CHECK ( expression ) |
-	FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn [, ... ] ) ]
-	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
-	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
-	*/
-	
-	
-	/*
-	CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( column [ ops_name ] [, ...] )
-[ WHERE predicate ]
-CREATE [ UNIQUE ] INDEX index_name ON table
-[ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] )
-[ WHERE predicate ]
-	*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-		
-		if (isset($idxoptions['HASH']))
-			$s .= 'USING HASH ';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s .= '(' . $flds . ')';
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function _GetSize($ftype, $ty, $fsize, $fprec)
-	{
-		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty  != 'I' && strpos($ftype,'(') === false) {
-			$ftype .= "(".$fsize;
-			if (strlen($fprec)) $ftype .= ",".$fprec;
-			$ftype .= ')';
-		}
-		return $ftype;
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-sybase.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-sybase.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-sybase.inc.php	(working copy)
@@ -1,228 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_sybase extends ADODB_DataDict {
-	var $databaseType = 'sybase';
-	
-	var $dropIndex = 'DROP INDEX %2$s.%1$s';
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
-		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
-		}
-	}
-	
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NTEXT';
-		
-		case 'B': return 'IMAGE';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		case 'L': return 'BIT';
-		
-		case 'I': return 'INT'; 
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'REAL';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname $this->addCol";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		foreach($lines as $v) {
-			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
-		}
-
-		return $sql;
-	}
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		$f = array();
-		$s = "ALTER TABLE $tabname";
-		foreach($flds as $v) {
-			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		else if ($suffix == '') $suffix .= ' NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
-        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
-
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
-
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
-
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
-        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
-
-
-	*/
-	
-	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
-		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
-		}
-*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-db2.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-db2.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-db2.inc.php	(working copy)
@@ -1,143 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_db2 extends ADODB_DataDict {
-	
-	var $databaseType = 'db2';
-	var $seqField = false;
-	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL': return 'CLOB';
-		case 'X': return 'VARCHAR(3600)'; 
-
-		case 'C2': return 'VARCHAR'; // up to 32K
-		case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default page size too small
-
-		case 'B': return 'BLOB';
-
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'BIGINT';
-
-		case 'F': return 'DOUBLE';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if ($fautoinc) return ' GENERATED ALWAYS AS IDENTITY'; # as identity start with 
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-
-	function AlterColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
-	{
-		
-		/**
-		  Allow basic table changes to DB2 databases
-		  DB2 will fatally reject changes to non character columns 
-
-		*/
-		
-		$validTypes = array("CHAR","VARC");
-		$invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
-		// check table exists
-		$cols = &$this->MetaColumns($tablename);
-		if ( empty($cols)) { 
-			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
-		}
-		
-		// already exists, alter table instead
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
-		$sql = array();
-		
-		foreach ( $lines as $id => $v ) {
-			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
-				/**
-				  If the first field of $v is the fieldname, and
-				  the second is the field type/size, we assume its an
-				  attempt to modify the column size, so check that it is allowed
-				  $v can have an indeterminate number of blanks between the
-				  fields, so account for that too
-				 */
-				$vargs = explode(' ' , $v);
-				// assume that $vargs[0] is the field name.
-				$i=0;
-				// Find the next non-blank value;
-				for ($i=1;$i<sizeof($vargs);$i++)
-					if ($vargs[$i] != '')
-						break;
-				
-				// if $vargs[$i] is one of the following, we are trying to change the
-				// size of the field, if not allowed, simply ignore the request.
-				if (in_array(substr($vargs[$i],0,4),$invalidTypes)) 
-					continue;
-				// insert the appropriate DB2 syntax
-				if (in_array(substr($vargs[$i],0,4),$validTypes)) {
-					array_splice($vargs,$i,0,array('SET','DATA','TYPE'));
-				}
-
-				// Now Look for the NOT NULL statement as this is not allowed in
-				// the ALTER table statement. If it is in there, remove it
-				if (in_array('NOT',$vargs) && in_array('NULL',$vargs)) {
-					for ($i=1;$i<sizeof($vargs);$i++)
-					if ($vargs[$i] == 'NOT')
-						break;
-					array_splice($vargs,$i,2,'');
-				}
-				$v = implode(' ',$vargs);	
-				$sql[] = $alter . $this->alterCol . ' ' . $v;
-			} else {
-				$sql[] = $alter . $this->addCol . ' ' . $v;
-			}
-		}
-		
-		return $sql;
-	}
-	
-}
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-sapdb.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-sapdb.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-sapdb.inc.php	(working copy)
@@ -1,121 +0,0 @@
-<?php
-
-/**
-  V4.50 6 July 2004  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
-  
-  Modified from datadict-generic.inc.php for sapdb by RalfBecker-AT-outdoor-training.de
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_sapdb extends ADODB_DataDict {
-	
-	var $databaseType = 'sapdb';
-	var $seqField = false;	
-	var $renameColumn = 'RENAME COLUMN %s.%s TO %s';
- 	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'LONG';
-		
-		case 'C2': return 'VARCHAR UNICODE';
-		case 'X2': return 'LONG UNICODE';
-		
-		case 'B': return 'LONG';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'BOOLEAN';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'FIXED(3)';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'FIXED(20)';
-		
-		case 'F': return 'FLOAT(38)';
-		case 'N': return 'FIXED';
-		default:
-			return $meta;
-		}
-	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		static $maxdb_type2adodb = array(
-			'VARCHAR'	=> 'C',
-			'CHARACTER'	=> 'C',
-			'LONG'		=> 'X',		// no way to differ between 'X' and 'B' :-(
-			'DATE'		=> 'D',
-			'TIMESTAMP'	=> 'T',
-			'BOOLEAN'	=> 'L',
-			'INTEGER'	=> 'I4',
-			'SMALLINT'	=> 'I2',
-			'FLOAT'		=> 'F',
-			'FIXED'		=> 'N',
-		);
-		$type = isset($maxdb_type2adodb[$t]) ? $maxdb_type2adodb[$t] : 'C';
-
-		// convert integer-types simulated with fixed back to integer
-		if ($t == 'FIXED' && !$fieldobj->scale && ($len == 20 || $len == 3)) {
-			$type = $len == 20 ? 'I8' : 'I1';
-		}
-		if ($fieldobj->auto_increment) $type = 'R';
-
-		return $type;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
-		$suffix = '';
-		if ($funsigned) $suffix .= ' UNSIGNED';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fautoinc) $suffix .= ' DEFAULT SERIAL';
-		elseif (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', ',$lines) . ')' );
-	}
-	
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		return array( 'ALTER TABLE ' . $tabname . ' MODIFY (' . implode(', ',$lines) . ')' );
-	}
-
-	function DropColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		foreach($flds as $k => $v) {
-			$flds[$k] = $this->NameQuote($v);
-		}
-		return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
-	}	
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-informix.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-informix.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-informix.inc.php	(working copy)
@@ -1,80 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_informix extends ADODB_DataDict {
-	
-	var $databaseType = 'informix';
-	var $seqField = false;
-	
- 	
-	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';// 255
-		case 'XL':
-		case 'X': return 'TEXT'; 
-		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'TEXT';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'DATETIME YEAR TO SECOND';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'DECIMAL(20)';
-		
-		case 'F': return 'FLOAT';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-
-	function AlterColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{
-		if ($fautoinc) {
-			$ftype = 'SERIAL';
-			return '';
-		}
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-generic.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-generic.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-generic.inc.php	(working copy)
@@ -1,125 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_generic extends ADODB_DataDict {
-	
-	var $databaseType = 'generic';
-	var $seqField = false;
-	
- 	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'VARCHAR(250)';
-		
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'VARCHAR(250)';
-		
-		case 'B': return 'VARCHAR';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'DATE';
-		
-		case 'L': return 'DECIMAL(1)';
-		case 'I': return 'DECIMAL(10)';
-		case 'I1': return 'DECIMAL(3)';
-		case 'I2': return 'DECIMAL(5)';
-		case 'I4': return 'DECIMAL(10)';
-		case 'I8': return 'DECIMAL(20)';
-		
-		case 'F': return 'DECIMAL(32,8)';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-
-	function AlterColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-/*
-//db2
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'X': return 'VARCHAR'; 
-		
-		case 'C2': return 'VARCHAR'; // up to 32K
-		case 'X2': return 'VARCHAR';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'DOUBLE';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-	
-// ifx
-function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';// 255
-		case 'X': return 'TEXT'; 
-		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'TEXT';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'DATETIME';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'DECIMAL(20)';
-		
-		case 'F': return 'FLOAT';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-*/
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-mssql.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-mssql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-mssql.inc.php	(working copy)
@@ -1,282 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-/*
-In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
-
-	Note Delimiters are for identifiers only. Delimiters cannot be used for keywords, 
-	whether or not they are marked as reserved in SQL Server.
-	
-	Quoted identifiers are delimited by double quotation marks ("):
-	SELECT * FROM "Blanks in Table Name"
-	
-	Bracketed identifiers are delimited by brackets ([ ]):
-	SELECT * FROM [Blanks In Table Name]
-	
-	Quoted identifiers are valid only when the QUOTED_IDENTIFIER option is set to ON. By default, 
-	the Microsoft OLE DB Provider for SQL Server and SQL Server ODBC driver set QUOTED_IDENTIFIER ON 
-	when they connect. 
-	
-	In Transact-SQL, the option can be set at various levels using SET QUOTED_IDENTIFIER, 
-	the quoted identifier option of sp_dboption, or the user options option of sp_configure.
-	
-	When SET ANSI_DEFAULTS is ON, SET QUOTED_IDENTIFIER is enabled.
-	
-	Syntax
-	
-		SET QUOTED_IDENTIFIER { ON | OFF }
-
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_mssql extends ADODB_DataDict {
-	var $databaseType = 'mssql';
-	var $dropIndex = 'DROP INDEX %2$s.%1$s';
-	var $renameTable = "EXEC sp_rename '%s','%s'";
-	var $renameColumn = "EXEC sp_rename '%s.%s','%s'";
-
-	var $typeX = 'TEXT';  ## Alternatively, set it to VARCHAR(4000)
-	var $typeXL = 'TEXT';
-	
-	//var $alterCol = ' ALTER COLUMN ';
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'R':
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
-		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
-		}
-	}
-	
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-
-		case 'C': return 'VARCHAR';
-		case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
-		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NTEXT';
-		
-		case 'B': return 'IMAGE';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		case 'L': return 'BIT';
-		
-		case 'R':		
-		case 'I': return 'INT'; 
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'REAL';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname $this->addCol";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	/*
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		foreach($lines as $v) {
-			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
-		}
-
-		return $sql;
-	}
-	*/
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds))
-			$flds = explode(',',$flds);
-		$f = array();
-		$s = 'ALTER TABLE ' . $tabname;
-		foreach($flds as $v) {
-			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
-		}
-		$s .= implode(', ',$f);
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		else if ($suffix == '') $suffix .= ' NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-CREATE TABLE 
-    [ database_name.[ owner ] . | owner. ] table_name 
-    ( { < column_definition > 
-        | column_name AS computed_column_expression 
-        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
-
-            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
-    ) 
-
-[ ON { filegroup | DEFAULT } ] 
-[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
-
-< column_definition > ::= { column_name data_type } 
-    [ COLLATE < collation_name > ] 
-    [ [ DEFAULT constant_expression ] 
-        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
-    ] 
-    [ ROWGUIDCOL] 
-    [ < column_constraint > ] [ ...n ] 
-
-< column_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ NULL | NOT NULL ] 
-        | [ { PRIMARY KEY | UNIQUE } 
-            [ CLUSTERED | NONCLUSTERED ] 
-            [ WITH FILLFACTOR = fillfactor ] 
-            [ON {filegroup | DEFAULT} ] ] 
-        ] 
-        | [ [ FOREIGN KEY ] 
-            REFERENCES ref_table [ ( ref_column ) ] 
-            [ ON DELETE { CASCADE | NO ACTION } ] 
-            [ ON UPDATE { CASCADE | NO ACTION } ] 
-            [ NOT FOR REPLICATION ] 
-        ] 
-        | CHECK [ NOT FOR REPLICATION ] 
-        ( logical_expression ) 
-    } 
-
-< table_constraint > ::= [ CONSTRAINT constraint_name ] 
-    { [ { PRIMARY KEY | UNIQUE } 
-        [ CLUSTERED | NONCLUSTERED ] 
-        { ( column [ ASC | DESC ] [ ,...n ] ) } 
-        [ WITH FILLFACTOR = fillfactor ] 
-        [ ON { filegroup | DEFAULT } ] 
-    ] 
-    | FOREIGN KEY 
-        [ ( column [ ,...n ] ) ] 
-        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
-        [ ON DELETE { CASCADE | NO ACTION } ] 
-        [ ON UPDATE { CASCADE | NO ACTION } ] 
-        [ NOT FOR REPLICATION ] 
-    | CHECK [ NOT FOR REPLICATION ] 
-        ( search_conditions ) 
-    } 
-
-
-	*/
-	
-	/*
-	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
-    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
-		[ WITH < index_option > [ ,...n] ] 
-		[ ON filegroup ]
-		< index_option > :: = 
-		    { PAD_INDEX | 
-		        FILLFACTOR = fillfactor | 
-		        IGNORE_DUP_KEY | 
-		        DROP_EXISTING | 
-		    STATISTICS_NORECOMPUTE | 
-		    SORT_IN_TEMPDB  
-		}
-*/
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	
-	function _GetSize($ftype, $ty, $fsize, $fprec)
-	{
-		switch ($ftype) {
-		case 'INT':
-		case 'SMALLINT':
-		case 'TINYINT':
-		case 'BIGINT':
-			return $ftype;
-		}
-    	if ($ty == 'T') return $ftype;
-    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
-
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-access.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-access.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-access.inc.php	(working copy)
@@ -1,95 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_access extends ADODB_DataDict {
-	
-	var $databaseType = 'access';
-	var $seqField = false;
-	
- 	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'TEXT';
-		case 'XL':
-		case 'X': return 'MEMO'; 
-		
-		case 'C2': return 'TEXT'; // up to 32K
-		case 'X2': return 'MEMO';
-		
-		case 'B': return 'BINARY';
-			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		
-		case 'L': return 'BYTE';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'BYTE';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'INTEGER';
-		
-		case 'F': return 'DOUBLE';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{
-		if ($fautoinc) {
-			$ftype = 'COUNTER';
-			return '';
-		}
-		if (substr($ftype,0,7) == 'DECIMAL') $ftype = 'DECIMAL';
-		$suffix = '';
-		if (strlen($fdefault)) {
-			//$suffix .= " DEFAULT $fdefault";
-			if ($this->debug) ADOConnection::outp("Warning: Access does not supported DEFAULT values (field $fname)");
-		}
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	function CreateDatabase($dbname,$options=false)
-	{
-		return array();
-	}
-	
-	
-	function SetSchema($schema)
-	{
-	}
-
-	function AlterColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-oci8.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-oci8.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-oci8.inc.php	(working copy)
@@ -1,290 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_oci8 extends ADODB_DataDict {
-	
-	var $databaseType = 'oci8';
-	var $seqField = false;
-	var $seqPrefix = 'SEQ_';
-	var $dropTable = "DROP TABLE %s CASCADE CONSTRAINTS";
-	var $trigPrefix = 'TRIG_';
-	var $alterCol = ' MODIFY ';
-	var $typeX = 'VARCHAR(4000)';
-	var $typeXL = 'CLOB';
-	
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-	 	case 'VARCHAR':
-	 	case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-			if (isset($this) && $len <= $this->blobSize) return 'C';
-			return 'X';
-		
-		case 'NCHAR':
-		case 'NVARCHAR2':
-		case 'NVARCHAR':
-			if (isset($this) && $len <= $this->blobSize) return 'C2';
-			return 'X2';
-			
-		case 'NCLOB':
-		case 'CLOB':
-			return 'XL';
-		
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-			return 'B';
-		
-		case 'DATE': 
-			return 'T';
-		
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': 
-			return 'I';
-			
-		default:
-			return 'N';
-		}
-	}
-	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'X': return $this->typeX;
-		case 'XL': return $this->typeXL;
-		
-		case 'C2': return 'NVARCHAR2';
-		case 'X2': return 'NVARCHAR2(4000)';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': 
-		case 'T': return 'DATE';
-		case 'L': return 'DECIMAL(1)';
-		case 'I1': return 'DECIMAL(3)';
-		case 'I2': return 'DECIMAL(5)';
-		case 'I':
-		case 'I4': return 'DECIMAL(10)';
-		
-		case 'I8': return 'DECIMAL(20)';
-		case 'F': return 'DECIMAL';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}	
-	}
-	
-	function CreateDatabase($dbname, $options=false)
-	{
-		$options = $this->_Options($options);
-		$password = isset($options['PASSWORD']) ? $options['PASSWORD'] : 'tiger';
-		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
-		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
-		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
-		
-		return $sql;
-	}
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname ADD (";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		
-		$s .= implode(', ',$f).')';
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function AlterColumnSQL($tabname, $flds)
-	{
-		$f = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$s = "ALTER TABLE $tabname MODIFY(";
-		foreach($lines as $v) {
-			$f[] = "\n $v";
-		}
-		$s .= implode(', ',$f).')';
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
-		
-		$sql = array();
-		$s = "ALTER TABLE $tabname DROP(";
-		$s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	function _DropAutoIncrement($t)
-	{
-		if (strpos($t,'.') !== false) {
-			$tarr = explode('.',$t);
-			return "drop sequence ".$tarr[0].".seq_".$tarr[1];
-		}
-		return "drop sequence seq_".$t;
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{
-		$suffix = '';
-		
-		if ($fdefault == "''" && $fnotnull) {// this is null in oracle
-			$fnotnull = false;
-			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
-		}
-		
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		
-		if ($fautoinc) $this->seqField = $fname;
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		
-		return $suffix;
-	}
-	
-/*
-CREATE or replace TRIGGER jaddress_insert
-before insert on jaddress
-for each row
-begin
-select seqaddress.nextval into :new.A_ID from dual;
-end;
-*/
-	function _Triggers($tabname,$tableoptions)
-	{
-		if (!$this->seqField) return array();
-		
-		if ($this->schema) {
-			$t = strpos($tabname,'.');
-			if ($t !== false) $tab = substr($tabname,$t+1);
-			else $tab = $tabname;
-			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
-			$trigname = $this->schema.'.'.$this->trigPrefix.$this->seqPrefix.$tab;
-		} else {
-			$seqname = $this->seqPrefix.$tabname;
-			$trigname = $this->trigPrefix.$seqname;
-		}
-		
-		if (strlen($seqname) > 30) {
-			$seqname = $this->seqPrefix.uniqid('');
-		} // end if
-		if (strlen($trigname) > 30) {
-			$trigname = $this->trigPrefix.uniqid('');
-		} // end if
-
-		if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE $seqname";
-		$seqCache = '';
-		if (isset($tableoptions['SEQUENCE_CACHE'])){$seqCache = $tableoptions['SEQUENCE_CACHE'];}
-		$seqIncr = '';
-		if (isset($tableoptions['SEQUENCE_INCREMENT'])){$seqIncr = ' INCREMENT BY '.$tableoptions['SEQUENCE_INCREMENT'];}
-		$seqStart = '';
-		if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START WITH '.$tableoptions['SEQUENCE_START'];}
-		$sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr $seqCache";
-		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
-		
-		$this->seqField = false;
-		return $sql;
-	}
-	
-	/*
-	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
-		[table_options] [select_statement]
-		create_definition:
-		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
-		[PRIMARY KEY] [reference_definition]
-		or PRIMARY KEY (index_col_name,...)
-		or KEY [index_name] (index_col_name,...)
-		or INDEX [index_name] (index_col_name,...)
-		or UNIQUE [INDEX] [index_name] (index_col_name,...)
-		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
-		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
-		[reference_definition]
-		or CHECK (expr)
-	*/
-	
-
-	
-	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		if (isset($idxoptions['BITMAP'])) {
-			$unique = ' BITMAP'; 
-		} elseif (isset($idxoptions['UNIQUE'])) {
-			$unique = ' UNIQUE';
-		} else {
-			$unique = '';
-		}
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if (isset($idxoptions['oci8']))
-			$s .= $idxoptions['oci8'];
-		
-
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function GetCommentSQL($table,$col)
-	{
-		$table = $this->connection->qstr($table);
-		$col = $this->connection->qstr($col);	
-		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
-	}
-	
-	function SetCommentSQL($table,$col,$cmt)
-	{
-		$cmt = $this->connection->qstr($cmt);
-		return  "COMMENT ON COLUMN $table.$col IS $cmt";
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-ibase.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-ibase.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-ibase.inc.php	(working copy)
@@ -1,67 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_ibase extends ADODB_DataDict {
-	
-	var $databaseType = 'ibase';
-	var $seqField = false;
-	
- 	
- 	function ActualType($meta)
-	{
-		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'VARCHAR(4000)'; 
-		
-		case 'C2': return 'VARCHAR'; // up to 32K
-		case 'X2': return 'VARCHAR(4000)';
-		
-		case 'B': return 'BLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
-		
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'INTEGER';
-		
-		case 'F': return 'DOUBLE PRECISION';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
-		}
-	}
-
-	function AlterColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
-		return array();
-	}
-	
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
-		return array();
-	}
-	
-}
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/datadict/datadict-mysql.inc.php
===================================================================
--- admin/include/lib/adodb/datadict/datadict-mysql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/datadict/datadict-mysql.inc.php	(working copy)
@@ -1,181 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_mysql extends ADODB_DataDict {
-	var $databaseType = 'mysql';
-	var $alterCol = ' MODIFY COLUMN';
-	var $alterTableAddIndex = true;
-	var $dropTable = 'DROP TABLE IF EXISTS %s'; // requires mysql 3.22 or later
-	
-	var $dropIndex = 'DROP INDEX %s ON %s';
-	var $renameColumn = 'ALTER TABLE %s CHANGE COLUMN %s %s %s';	// needs column-definition!
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'STRING': 
-		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET':
-			if ($len <= $this->blobSize) return 'C';
-			
-		case 'TEXT':
-		case 'LONGTEXT': 
-		case 'MEDIUMTEXT':
-			return 'X';
-			
-		// php_mysql extension always returns 'blob' even if 'text'
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
-		case 'YEAR':
-		case 'DATE': return 'D';
-		
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP': return 'T';
-		
-		case 'FLOAT':
-		case 'DOUBLE':
-			return 'F';
-			
-		case 'INT': 
-		case 'INTEGER': return $is_serial ? 'R' : 'I';
-		case 'TINYINT': return $is_serial ? 'R' : 'I1';
-		case 'SMALLINT': return $is_serial ? 'R' : 'I2';
-		case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
-		case 'BIGINT':  return $is_serial ? 'R' : 'I8';
-		default: return 'N';
-		}
-	}
-
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR';
-		case 'XL':return 'LONGTEXT';
-		case 'X': return 'TEXT';
-		
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'LONGTEXT';
-		
-		case 'B': return 'LONGBLOB';
-			
-		case 'D': return 'DATE';
-		case 'T': return 'DATETIME';
-		case 'L': return 'TINYINT';
-		
-		case 'R':
-		case 'I4':
-		case 'I': return 'INTEGER';
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I8': return 'BIGINT';
-		
-		case 'F': return 'DOUBLE';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
-		}
-	}
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
-	{	
-		$suffix = '';
-		if ($funsigned) $suffix .= ' UNSIGNED';
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fautoinc) $suffix .= ' AUTO_INCREMENT';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	/*
-	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
-		[table_options] [select_statement]
-		create_definition:
-		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
-		[PRIMARY KEY] [reference_definition]
-		or PRIMARY KEY (index_col_name,...)
-		or KEY [index_name] (index_col_name,...)
-		or INDEX [index_name] (index_col_name,...)
-		or UNIQUE [INDEX] [index_name] (index_col_name,...)
-		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
-		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
-		[reference_definition]
-		or CHECK (expr)
-	*/
-	
-	/*
-	CREATE [UNIQUE|FULLTEXT] INDEX index_name
-		ON tbl_name (col_name[(length)],... )
-	*/
-	
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
-			else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
-
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		if (isset($idxoptions['FULLTEXT'])) {
-			$unique = ' FULLTEXT';
-		} elseif (isset($idxoptions['UNIQUE'])) {
-			$unique = ' UNIQUE';
-		} else {
-			$unique = '';
-		}
-		
-		if ( is_array($flds) ) $flds = implode(', ',$flds);
-		
-		if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
-		else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
-		
-		$s .= ' (' . $flds . ')';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		$sql[] = $s;
-		
-		return $sql;
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-pl.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-pl.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-pl.inc.php	(working copy)
@@ -1,36 +0,0 @@
-<?php
-
-// Contributed by Grzegorz Pacan <gp#dione.cc>
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'pl',
-            DB_ERROR                    => 'niezidentyfikowany b��d',
-            DB_ERROR_ALREADY_EXISTS     => 'ju� istniej�',
-            DB_ERROR_CANNOT_CREATE      => 'nie mo�na stworzy�',
-            DB_ERROR_CANNOT_DELETE      => 'nie mo�na usun��',
-            DB_ERROR_CANNOT_DROP        => 'nie mo�na porzuci�',
-            DB_ERROR_CONSTRAINT         => 'pogwa�cenie uprawnie�',
-            DB_ERROR_DIVZERO            => 'dzielenie przez zero',
-            DB_ERROR_INVALID            => 'b��dny',
-            DB_ERROR_INVALID_DATE       => 'b��dna godzina lub data',
-            DB_ERROR_INVALID_NUMBER     => 'b��dny numer',
-            DB_ERROR_MISMATCH           => 'niedopasowanie',
-            DB_ERROR_NODBSELECTED       => 'baza danych nie zosta�a wybrana',
-            DB_ERROR_NOSUCHFIELD        => 'nie znaleziono pola',
-            DB_ERROR_NOSUCHTABLE        => 'nie znaleziono tabeli',
-            DB_ERROR_NOT_CAPABLE        => 'nie zdolny',
-            DB_ERROR_NOT_FOUND          => 'nie znaleziono',
-            DB_ERROR_NOT_LOCKED         => 'nie zakmni�ty',
-            DB_ERROR_SYNTAX             => 'b��d sk�adni',
-            DB_ERROR_UNSUPPORTED        => 'nie obs�uguje',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'warto�� liczona w szeregu',
-            DB_ERROR_INVALID_DSN        => 'b��dny DSN',
-            DB_ERROR_CONNECT_FAILED     => 'po��czenie nie zosta�o zrealizowane',
-            0	                       => 'brak b��d�w', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilo�� informacji',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'nie znaleziono rozszerzenia',
-            DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
-            DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'
-);
-?>
-		
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-cz.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-cz.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-cz.inc.php	(working copy)
@@ -1,40 +0,0 @@
-<?php
-
-# Czech language, encoding by ISO 8859-2 charset (Iso Latin-2)
-# For convert to MS Windows use shell command:
-#    iconv -f ISO_8859-2 -t CP1250 < adodb-cz.inc.php
-# For convert to ASCII use shell command:
-#    unaccent ISO_8859-2 < adodb-cz.inc.php
-# v1.0, 19.06.2003 Kamil Jakubovic <jake@host.sk>
-
-$ADODB_LANG_ARRAY = array (
-            'LANG'                      => 'cz',
-            DB_ERROR                    => 'nezn�m� chyba',
-            DB_ERROR_ALREADY_EXISTS     => 'ji? existuje',
-            DB_ERROR_CANNOT_CREATE      => 'nelze vytvo?it',
-            DB_ERROR_CANNOT_DELETE      => 'nelze smazat',
-            DB_ERROR_CANNOT_DROP        => 'nelze odstranit',
-            DB_ERROR_CONSTRAINT         => 'poru?en� omezuj�c� podm�nky',
-            DB_ERROR_DIVZERO            => 'd?len� nulou',
-            DB_ERROR_INVALID            => 'neplatn�',
-            DB_ERROR_INVALID_DATE       => 'neplatn� datum nebo ?as',
-            DB_ERROR_INVALID_NUMBER     => 'neplatn� ?�slo',
-            DB_ERROR_MISMATCH           => 'nesouhlas�',
-            DB_ERROR_NODBSELECTED       => '?�dn� datab�ze nen� vybr�na',
-            DB_ERROR_NOSUCHFIELD        => 'pole nenalezeno',
-            DB_ERROR_NOSUCHTABLE        => 'tabulka nenalezena',
-            DB_ERROR_NOT_CAPABLE        => 'nepodporov�no',
-            DB_ERROR_NOT_FOUND          => 'nenalezeno',
-            DB_ERROR_NOT_LOCKED         => 'nezam?eno',
-            DB_ERROR_SYNTAX             => 'syntaktick� chyba',
-            DB_ERROR_UNSUPPORTED        => 'nepodporov�no',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '',
-            DB_ERROR_INVALID_DSN        => 'neplatn� DSN',
-            DB_ERROR_CONNECT_FAILED     => 'p?ipojen� selhalo',
-            0	                        => 'bez chyb', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'm�lo zdrojov�ch dat',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'roz?�?en� nenalezeno',
-            DB_ERROR_NOSUCHDB           => 'datab�ze neexistuje',
-            DB_ERROR_ACCESS_VIOLATION   => 'nedostate?n� pr�va'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-hu.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-hu.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-hu.inc.php	(working copy)
@@ -1,34 +0,0 @@
-<?php
-# Hungarian language, encoding by ISO 8859-2 charset (Iso Latin-2)
-# Hal�szv�ri G�bor <g.halaszvari#portmax.hu>
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'hu',
-            DB_ERROR                    => 'ismeretlen hiba',
-            DB_ERROR_ALREADY_EXISTS     => 'm�r l�tezik',
-            DB_ERROR_CANNOT_CREATE      => 'nem siker�lt l�trehozni',
-            DB_ERROR_CANNOT_DELETE      => 'nem siker�lt t�r�lni',
-            DB_ERROR_CANNOT_DROP        => 'nem siker�lt eldobni',
-            DB_ERROR_CONSTRAINT         => 'szab�lyok megszeg�se',
-            DB_ERROR_DIVZERO            => 'oszt�s null�val',
-            DB_ERROR_INVALID            => '�rv�nytelen',
-            DB_ERROR_INVALID_DATE       => '�rv�nytelen d�tum vagy id�',
-            DB_ERROR_INVALID_NUMBER     => '�rv�nytelen sz�m',
-            DB_ERROR_MISMATCH           => 'nem megfelel�',
-            DB_ERROR_NODBSELECTED       => 'nincs kiv�lasztott adatb�zis',
-            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mez�',
-            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen t�bla',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend nem t�mogatja',
-            DB_ERROR_NOT_FOUND          => 'nem tal�lhat�',
-            DB_ERROR_NOT_LOCKED         => 'nincs lez�rva',
-            DB_ERROR_SYNTAX             => 'szintaktikai hiba',
-            DB_ERROR_UNSUPPORTED        => 'nem t�mogatott',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron v�gzett �rt�k sz�ml�l�s',
-            DB_ERROR_INVALID_DSN        => 'hib�s DSN',
-            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakoz�s',
-            0	                       => 'nincs hiba', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 't�l kev�s az adat',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'b�v�tm�ny nem tal�lhat�',
-            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatb�zis',
-            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosults�g'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-it.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-it.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-it.inc.php	(working copy)
@@ -1,34 +0,0 @@
-<?php
-// Italian language file contributed by Tiraboschi Massimiliano aka TiMax  
-// www.maxdev.com  timax@maxdev.com
-$ADODB_LANG_ARRAY = array (
-            'LANG'                      => 'it',
-            DB_ERROR                    => 'errore sconosciuto',
-            DB_ERROR_ALREADY_EXISTS     => 'esiste gi&agrave;',
-            DB_ERROR_CANNOT_CREATE      => 'non posso creare',
-            DB_ERROR_CANNOT_DELETE      => 'non posso cancellare',
-            DB_ERROR_CANNOT_DROP        => 'non posso eliminare',
-            DB_ERROR_CONSTRAINT         => 'violazione constraint',
-            DB_ERROR_DIVZERO            => 'divisione per zero',
-            DB_ERROR_INVALID            => 'non valido',
-            DB_ERROR_INVALID_DATE       => 'data od ora non valida',
-            DB_ERROR_INVALID_NUMBER     => 'numero non valido',
-            DB_ERROR_MISMATCH           => 'diversi',
-            DB_ERROR_NODBSELECTED       => 'nessun database selezionato',
-            DB_ERROR_NOSUCHFIELD        => 'nessun campo trovato',
-            DB_ERROR_NOSUCHTABLE        => 'nessuna tabella trovata',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend non abilitato',
-            DB_ERROR_NOT_FOUND          => 'non trovato',
-            DB_ERROR_NOT_LOCKED         => 'non bloccato',
-            DB_ERROR_SYNTAX             => 'errore di sintassi',
-            DB_ERROR_UNSUPPORTED        => 'non supportato',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'valore inserito troppo grande per una colonna',
-            DB_ERROR_INVALID_DSN        => 'DSN non valido',
-            DB_ERROR_CONNECT_FAILED     => 'connessione fallita',
-            0                           => 'nessun errore', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'dati inseriti insufficienti',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'estensione non trovata',
-            DB_ERROR_NOSUCHDB           => 'database non trovato',
-            DB_ERROR_ACCESS_VIOLATION   => 'permessi insufficienti'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-ro.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-ro.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-ro.inc.php	(working copy)
@@ -1,36 +0,0 @@
-<?php
-
-/* Romanian - by "bogdan stefan" <sbogdan#rsb.ro> */
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'ro',
-            DB_ERROR                    => 'eroare necunoscuta',
-            DB_ERROR_ALREADY_EXISTS     => 'deja exista',
-            DB_ERROR_CANNOT_CREATE      => 'nu se poate creea',
-            DB_ERROR_CANNOT_DELETE      => 'nu se poate sterge',
-            DB_ERROR_CANNOT_DROP        => 'nu se poate executa drop',
-            DB_ERROR_CONSTRAINT         => 'violare de constrain',
-            DB_ERROR_DIVZERO            => 'se divide la zero',
-            DB_ERROR_INVALID            => 'invalid',
-            DB_ERROR_INVALID_DATE       => 'data sau timp invalide',
-            DB_ERROR_INVALID_NUMBER     => 'numar invalid',
-            DB_ERROR_MISMATCH           => 'nepotrivire-mismatch',
-            DB_ERROR_NODBSELECTED       => 'nu exista baza de date selectata',
-            DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
-            DB_ERROR_NOSUCHTABLE        => 'tabela inexistenta',
-            DB_ERROR_NOT_CAPABLE        => 'functie optionala neinstalata',
-            DB_ERROR_NOT_FOUND          => 'negasit',
-            DB_ERROR_NOT_LOCKED         => 'neblocat',
-            DB_ERROR_SYNTAX             => 'eroare de sintaxa',
-            DB_ERROR_UNSUPPORTED        => 'nu e suportat',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'valoare prea mare pentru coloana',
-            DB_ERROR_INVALID_DSN        => 'DSN invalid',
-            DB_ERROR_CONNECT_FAILED     => 'conectare esuata',
-            0	                       => 'fara eroare', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'data introduse insuficiente',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie negasita',
-            DB_ERROR_NOSUCHDB           => 'nu exista baza de date',
-            DB_ERROR_ACCESS_VIOLATION   => 'permisiuni insuficiente'
-);
-?>
-
Index: admin/include/lib/adodb/lang/adodb-ca.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-ca.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-ca.inc.php	(working copy)
@@ -1,35 +0,0 @@
-<?php
-// Catalan language
-// contributed by "Josep Lladonosa" jlladono#pie.xtec.es
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'ca',
-            DB_ERROR                    => 'error desconegut',
-            DB_ERROR_ALREADY_EXISTS     => 'ja existeix',
-            DB_ERROR_CANNOT_CREATE      => 'no es pot crear',
-            DB_ERROR_CANNOT_DELETE      => 'no es pot esborrar',
-            DB_ERROR_CANNOT_DROP        => 'no es pot eliminar',
-            DB_ERROR_CONSTRAINT         => 'violaci� de constraint',
-            DB_ERROR_DIVZERO            => 'divisi� per zero',
-            DB_ERROR_INVALID            => 'no �s v�lid',
-            DB_ERROR_INVALID_DATE       => 'la data o l\'hora no s�n v�lides',
-            DB_ERROR_INVALID_NUMBER     => 'el nombre no �s v�lid',
-            DB_ERROR_MISMATCH           => 'no hi ha coincid�ncia',
-            DB_ERROR_NODBSELECTED       => 'cap base de dades seleccionada',
-            DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
-            DB_ERROR_NOSUCHTABLE        => 'taula inexistent',
-            DB_ERROR_NOT_CAPABLE        => 'l\'execuci� secund�ria de DB no pot',
-            DB_ERROR_NOT_FOUND          => 'no trobat',
-            DB_ERROR_NOT_LOCKED         => 'no blocat',
-            DB_ERROR_SYNTAX             => 'error de sintaxi',
-            DB_ERROR_UNSUPPORTED        => 'no suportat',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'el nombre de columnes no coincideix amb el nombre de valors en la fila',
-            DB_ERROR_INVALID_DSN        => 'el DSN no �s v�lid',
-            DB_ERROR_CONNECT_FAILED     => 'connexi� fallida',
-            0	                       => 'cap error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'les dades subministrades s�n insuficients',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensi� no trobada',
-            DB_ERROR_NOSUCHDB           => 'base de dades inexistent',
-            DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficients'
-);
-?>
-		
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-pt-br.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-pt-br.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-pt-br.inc.php	(working copy)
@@ -1,35 +0,0 @@
-<?php
-// contributed by "Levi Fukumori" levi _AT_ fukumori _DOT_ com _DOT_ br
-// portugese (brazilian)
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'pt-br',
-            DB_ERROR                    => 'erro desconhecido',
-            DB_ERROR_ALREADY_EXISTS     => 'j� existe',
-            DB_ERROR_CANNOT_CREATE      => 'imposs�vel criar',
-            DB_ERROR_CANNOT_DELETE      => 'imposs�vel exclu�r',
-            DB_ERROR_CANNOT_DROP        => 'imposs�vel remover',
-            DB_ERROR_CONSTRAINT         => 'viola��o do confinamente',
-            DB_ERROR_DIVZERO            => 'divis�o por zero',
-            DB_ERROR_INVALID            => 'inv�lido',
-            DB_ERROR_INVALID_DATE       => 'data ou hora inv�lida',
-            DB_ERROR_INVALID_NUMBER     => 'n�mero inv�lido',
-            DB_ERROR_MISMATCH           => 'erro',
-            DB_ERROR_NODBSELECTED       => 'nenhum banco de dados selecionado',
-            DB_ERROR_NOSUCHFIELD        => 'campo inv�lido',
-            DB_ERROR_NOSUCHTABLE        => 'tabela inexistente',
-            DB_ERROR_NOT_CAPABLE        => 'capacidade inv�lida para este BD',
-            DB_ERROR_NOT_FOUND          => 'n�o encontrado',
-            DB_ERROR_NOT_LOCKED         => 'n�o bloqueado',
-            DB_ERROR_SYNTAX             => 'erro de sintaxe',
-            DB_ERROR_UNSUPPORTED        => 
-'n�o suportado',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'a quantidade de colunas n�o corresponde ao de valores',
-            DB_ERROR_INVALID_DSN        => 'DSN inv�lido',
-            DB_ERROR_CONNECT_FAILED     => 'falha na conex�o',
-            0				=> 'sem erro', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'dados insuficientes',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extens�o n�o encontrada',
-            DB_ERROR_NOSUCHDB           => 'banco de dados n�o encontrado',
-            DB_ERROR_ACCESS_VIOLATION   => 'permiss�o insuficiente'
-);
-?>
Index: admin/include/lib/adodb/lang/adodb-da.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-da.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-da.inc.php	(working copy)
@@ -1,33 +0,0 @@
-<?php
-// Arne Eckmann bananstat#users.sourceforge.net
-$ADODB_LANG_ARRAY = array (
-  	    'LANG'                      => 'da',
-            DB_ERROR                    => 'ukendt fejl',
-            DB_ERROR_ALREADY_EXISTS     => 'eksisterer allerede',
-            DB_ERROR_CANNOT_CREATE      => 'kan ikke oprette',
-            DB_ERROR_CANNOT_DELETE      => 'kan ikke slette',
-            DB_ERROR_CANNOT_DROP        => 'kan ikke droppe',
-            DB_ERROR_CONSTRAINT         => 'begr&aelig;nsning kr&aelig;nket',
-            DB_ERROR_DIVZERO            => 'division med nul',
-            DB_ERROR_INVALID            => 'ugyldig',
-            DB_ERROR_INVALID_DATE       => 'ugyldig dato eller klokkeslet',
-            DB_ERROR_INVALID_NUMBER     => 'ugyldigt tal',
-            DB_ERROR_MISMATCH           => 'mismatch',
-            DB_ERROR_NODBSELECTED       => 'ingen database valgt',
-            DB_ERROR_NOSUCHFIELD        => 'felt findes ikke',
-            DB_ERROR_NOSUCHTABLE        => 'tabel findes ikke',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend opgav',
-            DB_ERROR_NOT_FOUND          => 'ikke fundet',
-            DB_ERROR_NOT_LOCKED         => 'ikke l&aring;st',
-            DB_ERROR_SYNTAX             => 'syntaksfejl',
-            DB_ERROR_UNSUPPORTED        => 'ikke underst&oslash;ttet',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'resulterende antal felter svarer ikke til foresp&oslash;rgslens antal felter',
-            DB_ERROR_INVALID_DSN        => 'ugyldig DSN',
-            DB_ERROR_CONNECT_FAILED     => 'tilslutning mislykkedes',
-            0	                        => 'ingen fejl', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'utilstr&aelig;kkelige data angivet',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'udvidelse ikke fundet',
-            DB_ERROR_NOSUCHDB           => 'database ikke fundet',
-            DB_ERROR_ACCESS_VIOLATION   => 'utilstr&aelig;kkelige rettigheder'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-uk1251.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-uk1251.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-uk1251.inc.php	(working copy)
@@ -1,35 +0,0 @@
-<?php
-
-// Ukrainian language file contributed by  Alex Rootoff rootoff{AT}pisem.net.
-
-$ADODB_LANG_ARRAY = array (
-             'LANG'                      => 'uk1251',
-            DB_ERROR                    => '������� �������',
-            DB_ERROR_ALREADY_EXISTS     => '��� ����',
-            DB_ERROR_CANNOT_CREATE      => '��������� ��������',
-            DB_ERROR_CANNOT_DELETE      => '��������� ��������',
-            DB_ERROR_CANNOT_DROP        => '��������� ������� (drop)',
-            DB_ERROR_CONSTRAINT         => '��������� ���� ��������',
-            DB_ERROR_DIVZERO            => '������ �� 0',
-            DB_ERROR_INVALID            => '�����������',
-            DB_ERROR_INVALID_DATE       => '����������� ���� �� ���',
-            DB_ERROR_INVALID_NUMBER     => '����������� �����',
-            DB_ERROR_MISMATCH           => '�������',
-            DB_ERROR_NODBSELECTED       => '�� ������� ��',
-            DB_ERROR_NOSUCHFIELD        => '�� ���� ����',
-            DB_ERROR_NOSUCHTABLE        => '�� ���� �������',
-            DB_ERROR_NOT_CAPABLE        => '���� �� � �����',
-            DB_ERROR_NOT_FOUND          => '�� ��������',
-            DB_ERROR_NOT_LOCKED         => '�� �����������',
-            DB_ERROR_SYNTAX             => '����������� �������',
-            DB_ERROR_UNSUPPORTED        => '�� �����������',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '�������� ������� � ������',
-            DB_ERROR_INVALID_DSN        => '����������� DSN',
-            DB_ERROR_CONNECT_FAILED     => '�\'������� ��������',
-            0                               => '��� ������', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => '������ ����������� �����',
-            DB_ERROR_EXTENSION_NOT_FOUND=> '���������� �� ��������',
-            DB_ERROR_NOSUCHDB           => '�� ���� ��',
-            DB_ERROR_ACCESS_VIOLATION   => '����������� ���� �������'
-);
-?>
Index: admin/include/lib/adodb/lang/adodb-sv.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-sv.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-sv.inc.php	(working copy)
@@ -1,33 +0,0 @@
-<?php
-// Christian Tiberg" christian@commsoft.nu
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'en',
-            DB_ERROR                    => 'Ok�nt fel',
-            DB_ERROR_ALREADY_EXISTS     => 'finns redan',
-            DB_ERROR_CANNOT_CREATE      => 'kan inte skapa',
-            DB_ERROR_CANNOT_DELETE      => 'kan inte ta bort',
-            DB_ERROR_CANNOT_DROP        => 'kan inte sl�ppa',
-            DB_ERROR_CONSTRAINT         => 'begr�nsning kr�nkt',
-            DB_ERROR_DIVZERO            => 'division med noll',
-            DB_ERROR_INVALID            => 'ogiltig',
-            DB_ERROR_INVALID_DATE       => 'ogiltigt datum eller tid',
-            DB_ERROR_INVALID_NUMBER     => 'ogiltigt tal',
-            DB_ERROR_MISMATCH           => 'felaktig matchning',
-            DB_ERROR_NODBSELECTED       => 'ingen databas vald',
-            DB_ERROR_NOSUCHFIELD        => 'inget s�dant f�lt',
-            DB_ERROR_NOSUCHTABLE        => 'ingen s�dan tabell',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend klarar det inte',
-            DB_ERROR_NOT_FOUND          => 'finns inte',
-            DB_ERROR_NOT_LOCKED         => 'inte l�st',
-            DB_ERROR_SYNTAX             => 'syntaxfel',
-            DB_ERROR_UNSUPPORTED        => 'st�ds ej',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'v�rde r�knat p� rad',
-            DB_ERROR_INVALID_DSN        => 'ogiltig DSN',
-            DB_ERROR_CONNECT_FAILED     => 'anslutning misslyckades',
-            0	                       => 'inget fel', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'otillr�ckligt med data angivet',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'ut�kning hittades ej',
-            DB_ERROR_NOSUCHDB           => 'ingen s�dan databas',
-            DB_ERROR_ACCESS_VIOLATION   => 'otillr�ckliga r�ttigheter'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-bg.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-bg.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-bg.inc.php	(working copy)
@@ -1,38 +0,0 @@
-<?php
-/*
-	Bulgarian language, v1.0, 25.03.2004, encoding by Windows-1251 charset
-	contributed by Valentin Sheiretsky <valio#valio.eu.org>
-*/
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'bg',
-            DB_ERROR                    => '���������� ������',
-            DB_ERROR_ALREADY_EXISTS     => '���� ����������',
-            DB_ERROR_CANNOT_CREATE      => '�� ���� �� ���� ���������',
-            DB_ERROR_CANNOT_DELETE      => '�� ���� �� ���� �������',
-            DB_ERROR_CANNOT_DROP        => '�� ���� �� ���� ���������',
-            DB_ERROR_CONSTRAINT         => '�������� �������',
-            DB_ERROR_DIVZERO            => '������� �� ����',
-            DB_ERROR_INVALID            => '����������',
-            DB_ERROR_INVALID_DATE       => '���������� ���� ��� ���',
-            DB_ERROR_INVALID_NUMBER     => '��������� �����',
-            DB_ERROR_MISMATCH           => '�������� ��������',
-            DB_ERROR_NODBSELECTED       => '�� � ������� ���� �����',
-            DB_ERROR_NOSUCHFIELD        => '�������������� ����',
-            DB_ERROR_NOSUCHTABLE        => '�������������� �������',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => '�� � ��������',
-            DB_ERROR_NOT_LOCKED         => '�� � ���������',
-            DB_ERROR_SYNTAX             => '������ ���������',
-            DB_ERROR_UNSUPPORTED        => '�� �� ��������',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '���������� ���� ������ � ����',
-            DB_ERROR_INVALID_DSN        => '��������� DSN',
-            DB_ERROR_CONNECT_FAILED     => '�������� �� ���� �� ���� �����������',
-            0	                        => '���� ������', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => '�������������� ����� �� ������������',
-            DB_ERROR_EXTENSION_NOT_FOUND=> '������������ �� � ��������',
-            DB_ERROR_NOSUCHDB           => '�������������� ���� �����',
-            DB_ERROR_ACCESS_VIOLATION   => '������ ���������� �����'
-);
-?>
-		
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-de.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-de.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-de.inc.php	(working copy)
@@ -1,33 +0,0 @@
-<?php
-// contributed by "Heinz Hombergs" <opn@hhombergs.de>
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'de',
-			DB_ERROR                    => 'Unbekannter Fehler',
-            DB_ERROR_ALREADY_EXISTS     => 'existiert bereits',
-            DB_ERROR_CANNOT_CREATE      => 'kann nicht erstellen',
-            DB_ERROR_CANNOT_DELETE      => 'kann nicht l&ouml;schen',
-            DB_ERROR_CANNOT_DROP        => 'Tabelle oder Index konnte nicht gel&ouml;scht werden',
-            DB_ERROR_CONSTRAINT         => 'Constraint Verletzung',
-            DB_ERROR_DIVZERO            => 'Division durch Null',
-            DB_ERROR_INVALID            => 'ung&uml;ltig',
-            DB_ERROR_INVALID_DATE       => 'ung&uml;ltiges Datum oder Zeit',
-            DB_ERROR_INVALID_NUMBER     => 'ung&uml;ltige Zahl',
-            DB_ERROR_MISMATCH           => 'Unvertr&auml;glichkeit',
-            DB_ERROR_NODBSELECTED       => 'keine Dantebank ausgew&auml;hlt',
-            DB_ERROR_NOSUCHFIELD        => 'Feld nicht vorhanden',
-            DB_ERROR_NOSUCHTABLE        => 'Tabelle nicht vorhanden',
-            DB_ERROR_NOT_CAPABLE        => 'Funktion nicht installiert',
-            DB_ERROR_NOT_FOUND          => 'nicht gefunden',
-            DB_ERROR_NOT_LOCKED         => 'nicht gesperrt',
-            DB_ERROR_SYNTAX             => 'Syntaxfehler',
-            DB_ERROR_UNSUPPORTED        => 'nicht Unterst&uml;tzt',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'Anzahl der zur&uml;ckgelieferten Felder entspricht nicht der Anzahl der Felder in der Abfrage',
-            DB_ERROR_INVALID_DSN        => 'ung&uml;ltiger DSN',
-            DB_ERROR_CONNECT_FAILED     => 'Verbindung konnte nicht hergestellt werden',
-            0	                       => 'kein Fehler', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'Nicht gen&uml;gend Daten geliefert',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'erweiterung nicht gefunden',
-            DB_ERROR_NOSUCHDB           => 'keine Datenbank',
-            DB_ERROR_ACCESS_VIOLATION   => 'ungen&uml;gende Rechte'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb_th.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb_th.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb_th.inc.php	(working copy)
@@ -1,34 +0,0 @@
-<?php
-// by Trirat Petchsingh <rosskouk#gmail.com>
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'th',
-            DB_ERROR                    => 'error ไม่รู้สาเหตุ',
-            DB_ERROR_ALREADY_EXISTS     => 'มี�?ล้ว',
-            DB_ERROR_CANNOT_CREATE      => 'สร้างไม่ได้',
-            DB_ERROR_CANNOT_DELETE      => 'ลบไม่ได้',
-            DB_ERROR_CANNOT_DROP        => 'drop ไม่ได้',
-            DB_ERROR_CONSTRAINT         => 'constraint violation',
-            DB_ERROR_DIVZERO            => 'หา�?ด้วยสู�?',
-            DB_ERROR_INVALID            => 'ไม่ valid',
-            DB_ERROR_INVALID_DATE       => 'วันที่ เวลา ไม่ valid',
-            DB_ERROR_INVALID_NUMBER     => 'เลขไม่ valid',
-            DB_ERROR_MISMATCH           => 'mismatch',
-            DB_ERROR_NODBSELECTED       => 'ไม่ได้เลือ�?�?านข้อมูล',
-            DB_ERROR_NOSUCHFIELD        => 'ไม่มีฟีลด์นี้',
-            DB_ERROR_NOSUCHTABLE        => 'ไม่มีตารางนี้',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'ไม่พบ',
-            DB_ERROR_NOT_LOCKED         => 'ไม่ได้ล๊อ�?',
-            DB_ERROR_SYNTAX             => 'ผิด syntax',
-            DB_ERROR_UNSUPPORTED        => 'ไม่ support',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
-            DB_ERROR_INVALID_DSN        => 'invalid DSN',
-            DB_ERROR_CONNECT_FAILED     => 'ไม่สามารถ connect',
-            0	                        => 'no error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ข้อมูลไม่เพียงพอ',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'ไม่พบ extension',
-            DB_ERROR_NOSUCHDB           => 'ไม่มีข้อมูลนี้',
-            DB_ERROR_ACCESS_VIOLATION   => 'permissions ไม่พอ'
-);
-?>
-
Index: admin/include/lib/adodb/lang/adodb-ru1251.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-ru1251.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-ru1251.inc.php	(working copy)
@@ -1,35 +0,0 @@
-<?php
-
-// Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
-
-$ADODB_LANG_ARRAY = array (
-             'LANG'                      => 'ru1251',
-            DB_ERROR                    => '����������� ������',
-            DB_ERROR_ALREADY_EXISTS     => '��� ����������',
-            DB_ERROR_CANNOT_CREATE      => '���������� �������',
-            DB_ERROR_CANNOT_DELETE      => '���������� �������',
-            DB_ERROR_CANNOT_DROP        => '���������� ������� (drop)',
-            DB_ERROR_CONSTRAINT         => '��������� ������� ��������',
-            DB_ERROR_DIVZERO            => '������� �� 0',
-            DB_ERROR_INVALID            => '�����������',
-            DB_ERROR_INVALID_DATE       => '������������ ���� ��� �����',
-            DB_ERROR_INVALID_NUMBER     => '������������ �����',
-            DB_ERROR_MISMATCH           => '������',
-            DB_ERROR_NODBSELECTED       => '�� �� �������',
-            DB_ERROR_NOSUCHFIELD        => '�� ���������� ����',
-            DB_ERROR_NOSUCHTABLE        => '�� ���������� �������',
-            DB_ERROR_NOT_CAPABLE        => '���� �� � ���������',
-            DB_ERROR_NOT_FOUND          => '�� �������',
-            DB_ERROR_NOT_LOCKED         => '�� �������������',
-            DB_ERROR_SYNTAX             => '�������������� ������',
-            DB_ERROR_UNSUPPORTED        => '�� ��������������',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '������� �������� � ������',
-            DB_ERROR_INVALID_DSN        => '������������ DSN',
-            DB_ERROR_CONNECT_FAILED     => '���������� ���������',
-            0                               => '��� ������', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => '������������� ������������ ������',
-            DB_ERROR_EXTENSION_NOT_FOUND=> '���������� �� �������',
-            DB_ERROR_NOSUCHDB           => '�� ���������� ��',
-            DB_ERROR_ACCESS_VIOLATION   => '������������ ���� �������'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-bgutf8.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-bgutf8.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-bgutf8.inc.php	(working copy)
@@ -1,38 +0,0 @@
-﻿<?php
-/*
-	Bulgarian language, v1.0, 25.03.2004, encoding by UTF-8 charset
-	contributed by Valentin Sheiretsky <valio#valio.eu.org>
-*/
-
-$ADODB_LANG_ARRAY = array (
-            'LANG'                      => 'bgutf8',
-            DB_ERROR                    => 'неизвестна грешка',
-            DB_ERROR_ALREADY_EXISTS     => 'вече съществува',
-            DB_ERROR_CANNOT_CREATE      => 'не може да бъде създадена',
-            DB_ERROR_CANNOT_DELETE      => 'не може да бъде изтрита',
-            DB_ERROR_CANNOT_DROP        => 'не може да бъде унищожена',
-            DB_ERROR_CONSTRAINT         => 'нарушено условие',
-            DB_ERROR_DIVZERO            => 'деление на нула',
-            DB_ERROR_INVALID            => 'неправилно',
-            DB_ERROR_INVALID_DATE       => 'некоректна дата или час',
-            DB_ERROR_INVALID_NUMBER     => 'невалиден номер',
-            DB_ERROR_MISMATCH           => 'погрешна употреба',
-            DB_ERROR_NODBSELECTED       => 'не е избрана база данни',
-            DB_ERROR_NOSUCHFIELD        => 'несъществуващо поле',
-            DB_ERROR_NOSUCHTABLE        => 'несъществуваща таблица',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'не е намерена',
-            DB_ERROR_NOT_LOCKED         => 'не е заключена',
-            DB_ERROR_SYNTAX             => 'грешен синтаксис',
-            DB_ERROR_UNSUPPORTED        => 'не се поддържа',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'некоректен брой колони в реда',
-            DB_ERROR_INVALID_DSN        => 'невалиден DSN',
-            DB_ERROR_CONNECT_FAILED     => 'връзката не може да бъде осъществена',
-            0	                        => 'няма грешки', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'предоставените данни са недостатъчни',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'разширението не е намерено',
-            DB_ERROR_NOSUCHDB           => 'несъществуваща база данни',
-            DB_ERROR_ACCESS_VIOLATION   => 'нямате достатъчно права'
-);
-?>
-		
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-esperanto.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-esperanto.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-esperanto.inc.php	(working copy)
@@ -1,35 +0,0 @@
-<?php
-// Vivu Esperanto cxiam! 
-// Traduko fare de Antono Vasiljev (anders[#]brainactive.org)
-
-$ADODB_LANG_ARRAY = array (
-             'LANG'                      => 'eo',
-            DB_ERROR                    => 'nekonata eraro',
-            DB_ERROR_ALREADY_EXISTS     => 'jam ekzistas',
-            DB_ERROR_CANNOT_CREATE      => 'maleblas krei',
-            DB_ERROR_CANNOT_DELETE      => 'maleblas elimini',
-            DB_ERROR_CANNOT_DROP        => 'maleblas elimini (drop)',
-            DB_ERROR_CONSTRAINT         => 'rompo de kondicxoj de provo',
-            DB_ERROR_DIVZERO            => 'divido per 0 (nul)',
-            DB_ERROR_INVALID            => 'malregule',
-            DB_ERROR_INVALID_DATE       => 'malregula dato kaj tempo',
-            DB_ERROR_INVALID_NUMBER     => 'malregula nombro',
-            DB_ERROR_MISMATCH           => 'eraro',
-            DB_ERROR_NODBSELECTED       => 'datumbazo ne elektita',
-            DB_ERROR_NOSUCHFIELD        => 'ne ekzistas kampo',
-            DB_ERROR_NOSUCHTABLE        => 'ne ekzistas tabelo',
-            DB_ERROR_NOT_CAPABLE        => 'DBMS ne povas',
-            DB_ERROR_NOT_FOUND          => 'ne trovita',
-            DB_ERROR_NOT_LOCKED         => 'ne blokita',
-            DB_ERROR_SYNTAX             => 'sintaksa eraro',
-            DB_ERROR_UNSUPPORTED        => 'ne apogata',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'nombrilo de valoroj en linio',
-            DB_ERROR_INVALID_DSN        => 'malregula DSN-o',
-            DB_ERROR_CONNECT_FAILED     => 'konekto malsukcesa',
-            0                               => 'cxio bone', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ne suficxe da datumo',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'etendo ne trovita',
-            DB_ERROR_NOSUCHDB           => 'datumbazo ne ekzistas',
-            DB_ERROR_ACCESS_VIOLATION   => 'ne suficxe da rajto por atingo'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-cn.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-cn.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-cn.inc.php	(working copy)
@@ -1,35 +0,0 @@
-<?php
-// Chinese language file contributed by "Cuiyan (cysoft)" cysoft#php.net.
-// Encode by GB2312
-// Simplified Chinese
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'cn',
-            DB_ERROR                    => 'δ֪����',
-            DB_ERROR_ALREADY_EXISTS     => '�Ѿ�����',
-            DB_ERROR_CANNOT_CREATE      => '���ܴ���',
-            DB_ERROR_CANNOT_DELETE      => '����ɾ��',
-            DB_ERROR_CANNOT_DROP        => '���ܶ���',
-            DB_ERROR_CONSTRAINT         => 'Լ������',
-            DB_ERROR_DIVZERO            => '��0��',
-            DB_ERROR_INVALID            => '��Ч',
-            DB_ERROR_INVALID_DATE       => '��Ч�����ڻ���ʱ��',
-            DB_ERROR_INVALID_NUMBER     => '��Ч������',
-            DB_ERROR_MISMATCH           => '��ƥ��',
-            DB_ERROR_NODBSELECTED       => 'û�����ݿⱻѡ��',
-            DB_ERROR_NOSUCHFIELD        => 'û����Ӧ���ֶ�',
-            DB_ERROR_NOSUCHTABLE        => 'û����Ӧ�ı�',
-            DB_ERROR_NOT_CAPABLE        => '���ݿ��̨������',
-            DB_ERROR_NOT_FOUND          => 'û�з���',
-            DB_ERROR_NOT_LOCKED         => 'û�б�����',
-            DB_ERROR_SYNTAX             => '�﷨����',
-            DB_ERROR_UNSUPPORTED        => '��֧��',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '�������ۼ�ֵ',
-            DB_ERROR_INVALID_DSN        => '��Ч������Դ (DSN)',
-            DB_ERROR_CONNECT_FAILED     => '����ʧ��',
-            0	                       => 'û�д���', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => '�ṩ�����ݲ��ܷ���Ҫ��',
-            DB_ERROR_EXTENSION_NOT_FOUND=> '��չû�б�����',
-            DB_ERROR_NOSUCHDB           => 'û����Ӧ�����ݿ�',
-            DB_ERROR_ACCESS_VIOLATION   => 'û�к��ʵ�Ȩ��'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-en.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-en.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-en.inc.php	(working copy)
@@ -1,34 +0,0 @@
-<?php
-
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'en',
-            DB_ERROR                    => 'unknown error',
-            DB_ERROR_ALREADY_EXISTS     => 'already exists',
-            DB_ERROR_CANNOT_CREATE      => 'can not create',
-            DB_ERROR_CANNOT_DELETE      => 'can not delete',
-            DB_ERROR_CANNOT_DROP        => 'can not drop',
-            DB_ERROR_CONSTRAINT         => 'constraint violation',
-            DB_ERROR_DIVZERO            => 'division by zero',
-            DB_ERROR_INVALID            => 'invalid',
-            DB_ERROR_INVALID_DATE       => 'invalid date or time',
-            DB_ERROR_INVALID_NUMBER     => 'invalid number',
-            DB_ERROR_MISMATCH           => 'mismatch',
-            DB_ERROR_NODBSELECTED       => 'no database selected',
-            DB_ERROR_NOSUCHFIELD        => 'no such field',
-            DB_ERROR_NOSUCHTABLE        => 'no such table',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'not found',
-            DB_ERROR_NOT_LOCKED         => 'not locked',
-            DB_ERROR_SYNTAX             => 'syntax error',
-            DB_ERROR_UNSUPPORTED        => 'not supported',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
-            DB_ERROR_INVALID_DSN        => 'invalid DSN',
-            DB_ERROR_CONNECT_FAILED     => 'connect failed',
-            0	                       => 'no error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
-            DB_ERROR_NOSUCHDB           => 'no such database',
-            DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions'
-);
-?>
-		
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-ar.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-ar.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-ar.inc.php	(working copy)
@@ -1,34 +0,0 @@
-<?php
-// by "El-Shamaa, Khaled" <k.el-shamaa#cgiar.org>
-$ADODB_LANG_ARRAY = array (
-			'LANG'			    => 'ar',
-	    DB_ERROR			=> '��� ��� ����',
-	    DB_ERROR_ALREADY_EXISTS	=> '����� �����',
-	    DB_ERROR_CANNOT_CREATE	=> '�� ���� �����',
-	    DB_ERROR_CANNOT_DELETE	=> '�� ���� ���',
-	    DB_ERROR_CANNOT_DROP	=> '�� ���� ���',
-	    DB_ERROR_CONSTRAINT 	=> '����� ����� ������',
-	    DB_ERROR_DIVZERO		=> '����� ������� ��� ���',
-	    DB_ERROR_INVALID		=> '��� ����',
-	    DB_ERROR_INVALID_DATE	=> '���� ��� �� ����� ��� �����',
-	    DB_ERROR_INVALID_NUMBER	=> '���� ��� ��� �����',
-	    DB_ERROR_MISMATCH		=> '��� ������',
-	    DB_ERROR_NODBSELECTED	=> '�� ��� ������ ����� �������� ���',
-	    DB_ERROR_NOSUCHFIELD	=> '��� ����� ��� ���� �����',
-	    DB_ERROR_NOSUCHTABLE	=> '��� ����� ���� ���� �����',
-	    DB_ERROR_NOT_CAPABLE	=> '����� �������� ������� ��� ��� �����',
-	    DB_ERROR_NOT_FOUND		=> '�� ��� ������',
-	    DB_ERROR_NOT_LOCKED 	=> '��� �����',
-	    DB_ERROR_SYNTAX		=> '��� �� ������',
-	    DB_ERROR_UNSUPPORTED	=> '��� �����',
-	    DB_ERROR_VALUE_COUNT_ON_ROW => '��� ����� �� �����',
-	    DB_ERROR_INVALID_DSN	=> 'DSN ��� ����',
-	    DB_ERROR_CONNECT_FAILED	=> '��� ����� �������',
-	    0			       => '��� ����� �����', // DB_OK
-	    DB_ERROR_NEED_MORE_DATA	=> '�������� ������� ��� �����',
-	    DB_ERROR_EXTENSION_NOT_FOUND=> '�� ��� ����� ������� ��������',
-	    DB_ERROR_NOSUCHDB		=> '��� ����� ����� ������ ���� �����',
-	    DB_ERROR_ACCESS_VIOLATION	=> '������� ��� �����'
-);
-?>
-		
Index: admin/include/lib/adodb/lang/adodb-fr.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-fr.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-fr.inc.php	(working copy)
@@ -1,33 +0,0 @@
-<?php
-
-$ADODB_LANG_ARRAY = array (
-	'LANG'                      => 'fr',
-	DB_ERROR                    => 'erreur inconnue',
-	DB_ERROR_ALREADY_EXISTS     => 'existe d&eacute;j&agrave;',
-	DB_ERROR_CANNOT_CREATE      => 'cr&eacute;tion impossible',
-	DB_ERROR_CANNOT_DELETE      => 'effacement impossible',
-	DB_ERROR_CANNOT_DROP        => 'suppression impossible',
-	DB_ERROR_CONSTRAINT         => 'violation de contrainte',
-	DB_ERROR_DIVZERO            => 'division par z&eacute;ro',
-	DB_ERROR_INVALID            => 'invalide',
-	DB_ERROR_INVALID_DATE       => 'date ou heure invalide',
-	DB_ERROR_INVALID_NUMBER     => 'nombre invalide',
-	DB_ERROR_MISMATCH           => 'erreur de concordance',
-	DB_ERROR_NODBSELECTED       => 'pas de base de donn&eacute;ess&eacute;lectionn&eacute;e',
-	DB_ERROR_NOSUCHFIELD        => 'nom de colonne invalide',
-	DB_ERROR_NOSUCHTABLE        => 'table ou vue inexistante',
-	DB_ERROR_NOT_CAPABLE        => 'fonction optionnelle non install&eacute;e',
-	DB_ERROR_NOT_FOUND          => 'pas trouv&eacute;',
-	DB_ERROR_NOT_LOCKED         => 'non verrouill&eacute;',
-	DB_ERROR_SYNTAX             => 'erreur de syntaxe',
-	DB_ERROR_UNSUPPORTED        => 'non support&eacute;',
-	DB_ERROR_VALUE_COUNT_ON_ROW => 'valeur ins&eacute;r&eacute;e trop grande pour colonne',
-	DB_ERROR_INVALID_DSN        => 'DSN invalide',
-	DB_ERROR_CONNECT_FAILED     => '&eacute;chec &agrave; la connexion',
-	0                        => "pas d'erreur", // DB_OK
-	DB_ERROR_NEED_MORE_DATA     => 'donn&eacute;es fournies insuffisantes',
-	DB_ERROR_EXTENSION_NOT_FOUND=> 'extension non trouv&eacute;e',
-	DB_ERROR_NOSUCHDB           => 'base de donn&eacute;es inconnue',
-	DB_ERROR_ACCESS_VIOLATION   => 'droits insuffisants'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-es.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-es.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-es.inc.php	(working copy)
@@ -1,33 +0,0 @@
-<?php
-// contributed by "Horacio Degiorgi" <horaciod@codigophp.com>
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'es',
-            DB_ERROR                    => 'error desconocido',
-            DB_ERROR_ALREADY_EXISTS     => 'ya existe',
-            DB_ERROR_CANNOT_CREATE      => 'imposible crear',
-            DB_ERROR_CANNOT_DELETE      => 'imposible borrar',
-            DB_ERROR_CANNOT_DROP        => 'imposible hacer drop',
-            DB_ERROR_CONSTRAINT         => 'violacion de constraint',
-            DB_ERROR_DIVZERO            => 'division por cero',
-            DB_ERROR_INVALID            => 'invalido',
-            DB_ERROR_INVALID_DATE       => 'fecha u hora invalida',
-            DB_ERROR_INVALID_NUMBER     => 'numero invalido',
-            DB_ERROR_MISMATCH           => 'error',
-            DB_ERROR_NODBSELECTED       => 'no hay base de datos seleccionada',
-            DB_ERROR_NOSUCHFIELD        => 'campo invalido',
-            DB_ERROR_NOSUCHTABLE        => 'tabla no existe',
-            DB_ERROR_NOT_CAPABLE        => 'capacidad invalida para esta DB',
-            DB_ERROR_NOT_FOUND          => 'no encontrado',
-            DB_ERROR_NOT_LOCKED         => 'no bloqueado',
-            DB_ERROR_SYNTAX             => 'error de sintaxis',
-            DB_ERROR_UNSUPPORTED        => 'no soportado',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'la cantidad de columnas no corresponden a la cantidad de valores',
-            DB_ERROR_INVALID_DSN        => 'DSN invalido',
-            DB_ERROR_CONNECT_FAILED     => 'fallo la conexion',
-            0	                       => 'sin error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'insuficientes datos',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension no encontrada',
-            DB_ERROR_NOSUCHDB           => 'base de datos no encontrada',
-            DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficientes'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/lang/adodb-nl.inc.php
===================================================================
--- admin/include/lib/adodb/lang/adodb-nl.inc.php	(revision 6370)
+++ admin/include/lib/adodb/lang/adodb-nl.inc.php	(working copy)
@@ -1,33 +0,0 @@
-<?php
-// Translated by Pim Koeman (pim#wittenborg-university.com)
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'nl',
-            DB_ERROR                    => 'onbekende fout',
-            DB_ERROR_ALREADY_EXISTS     => 'bestaat al',
-            DB_ERROR_CANNOT_CREATE      => 'kan niet aanmaken',
-            DB_ERROR_CANNOT_DELETE      => 'kan niet wissen',
-            DB_ERROR_CANNOT_DROP        => 'kan niet verwijderen',
-            DB_ERROR_CONSTRAINT         => 'constraint overtreding',
-            DB_ERROR_DIVZERO            => 'poging tot delen door nul',
-            DB_ERROR_INVALID            => 'ongeldig',
-            DB_ERROR_INVALID_DATE       => 'ongeldige datum of tijd',
-            DB_ERROR_INVALID_NUMBER     => 'ongeldig nummer',
-            DB_ERROR_MISMATCH           => 'is incorrect',
-            DB_ERROR_NODBSELECTED       => 'geen database geselecteerd',
-            DB_ERROR_NOSUCHFIELD        => 'onbekend veld',
-            DB_ERROR_NOSUCHTABLE        => 'onbekende tabel',
-            DB_ERROR_NOT_CAPABLE        => 'database systeem is niet tot uitvoer in staat',
-            DB_ERROR_NOT_FOUND          => 'niet gevonden',
-            DB_ERROR_NOT_LOCKED         => 'niet vergrendeld',
-            DB_ERROR_SYNTAX             => 'syntaxis fout',
-            DB_ERROR_UNSUPPORTED        => 'niet ondersteund',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'waarde telling op rij',
-            DB_ERROR_INVALID_DSN        => 'ongeldige DSN',
-            DB_ERROR_CONNECT_FAILED     => 'connectie mislukt',
-            0	                       => 'geen fout', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'onvoldoende data gegeven',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie niet gevonden',
-            DB_ERROR_NOSUCHDB           => 'onbekende database',
-            DB_ERROR_ACCESS_VIOLATION   => 'onvoldoende rechten'
-);
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-datadict.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-datadict.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-datadict.inc.php	(working copy)
@@ -1,997 +0,0 @@
-<?php
-
-/**
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
- 	DOCUMENTATION:
-	
-		See adodb/tests/test-datadict.php for docs and examples.
-*/
-
-/*
-	Test script for parser
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-function Lens_ParseTest()
-{
-$str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
-print "<p>$str</p>";
-$a= Lens_ParseArgs($str);
-print "<pre>";
-print_r($a);
-print "</pre>";
-}
-
-
-if (!function_exists('ctype_alnum')) {
-	function ctype_alnum($text) {
-		return preg_match('/^[a-z0-9]*$/i', $text);
-	}
-}
-
-//Lens_ParseTest();
-
-/**
-	Parse arguments, treat "text" (text) and 'text' as quotation marks.
-	To escape, use "" or '' or ))
-	
-	Will read in "abc def" sans quotes, as: abc def
-	Same with 'abc def'.
-	However if `abc def`, then will read in as `abc def`
-	
-	@param endstmtchar    Character that indicates end of statement
-	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9 
-	@returns 2 dimensional array containing parsed tokens.
-*/
-function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
-{
-	$pos = 0;
-	$intoken = false;
-	$stmtno = 0;
-	$endquote = false;
-	$tokens = array();
-	$tokens[$stmtno] = array();
-	$max = strlen($args);
-	$quoted = false;
-	$tokarr = array();
-	
-	while ($pos < $max) {
-		$ch = substr($args,$pos,1);
-		switch($ch) {
-		case ' ':
-		case "\t":
-		case "\n":
-		case "\r":
-			if (!$quoted) {
-				if ($intoken) {
-					$intoken = false;
-					$tokens[$stmtno][] = implode('',$tokarr);
-				}
-				break;
-			}
-			
-			$tokarr[] = $ch;
-			break;
-		
-		case '`':
-			if ($intoken) $tokarr[] = $ch;
-		case '(':
-		case ')':	
-		case '"':
-		case "'":
-			
-			if ($intoken) {
-				if (empty($endquote)) {
-					$tokens[$stmtno][] = implode('',$tokarr);
-					if ($ch == '(') $endquote = ')';
-					else $endquote = $ch;
-					$quoted = true;
-					$intoken = true;
-					$tokarr = array();
-				} else if ($endquote == $ch) {
-					$ch2 = substr($args,$pos+1,1);
-					if ($ch2 == $endquote) {
-						$pos += 1;
-						$tokarr[] = $ch2;
-					} else {
-						$quoted = false;
-						$intoken = false;
-						$tokens[$stmtno][] = implode('',$tokarr);
-						$endquote = '';
-					}
-				} else
-					$tokarr[] = $ch;
-					
-			}else {
-			
-				if ($ch == '(') $endquote = ')';
-				else $endquote = $ch;
-				$quoted = true;
-				$intoken = true;
-				$tokarr = array();
-				if ($ch == '`') $tokarr[] = '`';
-			}
-			break;
-			
-		default:
-			
-			if (!$intoken) {
-				if ($ch == $endstmtchar) {
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
-					break;
-				}
-			
-				$intoken = true;
-				$quoted = false;
-				$endquote = false;
-				$tokarr = array();
-	
-			}
-			
-			if ($quoted) $tokarr[] = $ch;
-			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
-			else {
-				if ($ch == $endstmtchar) {			
-					$tokens[$stmtno][] = implode('',$tokarr);
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
-					$intoken = false;
-					$tokarr = array();
-					break;
-				}
-				$tokens[$stmtno][] = implode('',$tokarr);
-				$tokens[$stmtno][] = $ch;
-				$intoken = false;
-			}
-		}
-		$pos += 1;
-	}
-	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
-	
-	return $tokens;
-}
-
-
-class ADODB_DataDict {
-	var $connection;
-	var $debug = false;
-	var $dropTable = 'DROP TABLE %s';
-	var $renameTable = 'RENAME TABLE %s TO %s'; 
-	var $dropIndex = 'DROP INDEX %s';
-	var $addCol = ' ADD';
-	var $alterCol = ' ALTER COLUMN';
-	var $dropCol = ' DROP COLUMN';
-	var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';	// table, old-column, new-column, column-definitions (not used by default)
-	var $nameRegex = '\w';
-	var $nameRegexBrackets = 'a-zA-Z0-9_\(\)';
-	var $schema = false;
-	var $serverInfo = array();
-	var $autoIncrement = false;
-	var $dataProvider;
-	var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql
-	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
-							/// in other words, we use a text area for editting.
-	
-	function GetCommentSQL($table,$col)
-	{
-		return false;
-	}
-	
-	function SetCommentSQL($table,$col,$cmt)
-	{
-		return false;
-	}
-	
-	function MetaTables()
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaTables();
-	}
-	
-	function MetaColumns($tab, $upper=true, $schema=false)
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
-	}
-	
-	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
-	}
-	
-	function MetaIndexes($table, $primary = false, $owner = false)
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
-	}
-	
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{		
-		static $typeMap = array(
-		'VARCHAR' => 'C',
-		'VARCHAR2' => 'C',
-		'CHAR' => 'C',
-		'C' => 'C',
-		'STRING' => 'C',
-		'NCHAR' => 'C',
-		'NVARCHAR' => 'C',
-		'VARYING' => 'C',
-		'BPCHAR' => 'C',
-		'CHARACTER' => 'C',
-		'INTERVAL' => 'C',  # Postgres
-		'MACADDR' => 'C', # postgres
-		##
-		'LONGCHAR' => 'X',
-		'TEXT' => 'X',
-		'NTEXT' => 'X',
-		'M' => 'X',
-		'X' => 'X',
-		'CLOB' => 'X',
-		'NCLOB' => 'X',
-		'LVARCHAR' => 'X',
-		##
-		'BLOB' => 'B',
-		'IMAGE' => 'B',
-		'BINARY' => 'B',
-		'VARBINARY' => 'B',
-		'LONGBINARY' => 'B',
-		'B' => 'B',
-		##
-		'YEAR' => 'D', // mysql
-		'DATE' => 'D',
-		'D' => 'D',
-		##
-		'UNIQUEIDENTIFIER' => 'C', # MS SQL Server
-		##
-		'TIME' => 'T',
-		'TIMESTAMP' => 'T',
-		'DATETIME' => 'T',
-		'TIMESTAMPTZ' => 'T',
-		'T' => 'T',
-		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
-		##
-		'BOOL' => 'L',
-		'BOOLEAN' => 'L', 
-		'BIT' => 'L',
-		'L' => 'L',
-		##
-		'COUNTER' => 'R',
-		'R' => 'R',
-		'SERIAL' => 'R', // ifx
-		'INT IDENTITY' => 'R',
-		##
-		'INT' => 'I',
-		'INT2' => 'I',
-		'INT4' => 'I',
-		'INT8' => 'I',
-		'INTEGER' => 'I',
-		'INTEGER UNSIGNED' => 'I',
-		'SHORT' => 'I',
-		'TINYINT' => 'I',
-		'SMALLINT' => 'I',
-		'I' => 'I',
-		##
-		'LONG' => 'N', // interbase is numeric, oci8 is blob
-		'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
-		'DECIMAL' => 'N',
-		'DEC' => 'N',
-		'REAL' => 'N',
-		'DOUBLE' => 'N',
-		'DOUBLE PRECISION' => 'N',
-		'SMALLFLOAT' => 'N',
-		'FLOAT' => 'N',
-		'NUMBER' => 'N',
-		'NUM' => 'N',
-		'NUMERIC' => 'N',
-		'MONEY' => 'N',
-		
-		## informix 9.2
-		'SQLINT' => 'I', 
-		'SQLSERIAL' => 'I', 
-		'SQLSMINT' => 'I', 
-		'SQLSMFLOAT' => 'N', 
-		'SQLFLOAT' => 'N', 
-		'SQLMONEY' => 'N', 
-		'SQLDECIMAL' => 'N', 
-		'SQLDATE' => 'D', 
-		'SQLVCHAR' => 'C', 
-		'SQLCHAR' => 'C', 
-		'SQLDTIME' => 'T', 
-		'SQLINTERVAL' => 'N', 
-		'SQLBYTES' => 'B', 
-		'SQLTEXT' => 'X',
-		 ## informix 10
-		"SQLINT8" => 'I8',
-		"SQLSERIAL8" => 'I8',
-		"SQLNCHAR" => 'C',
-		"SQLNVCHAR" => 'C',
-		"SQLLVARCHAR" => 'X',
-		"SQLBOOL" => 'L'
-		);
-		
-		if (!$this->connection->IsConnected()) {
-			$t = strtoupper($t);
-			if (isset($typeMap[$t])) return $typeMap[$t];
-			return 'N';
-		}
-		return $this->connection->MetaType($t,$len,$fieldobj);
-	}
-	
-	function NameQuote($name = NULL,$allowBrackets=false)
-	{
-		if (!is_string($name)) {
-			return FALSE;
-		}
-		
-		$name = trim($name);
-		
-		if ( !is_object($this->connection) ) {
-			return $name;
-		}
-		
-		$quote = $this->connection->nameQuote;
-		
-		// if name is of the form `name`, quote it
-		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
-			return $quote . $matches[1] . $quote;
-		}
-		
-		// if name contains special characters, quote it
-		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
-		
-		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
-			return $quote . $name . $quote;
-		}
-		
-		return $name;
-	}
-	
-	function TableName($name)
-	{
-		if ( $this->schema ) {
-			return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name);
-		}
-		return $this->NameQuote($name);
-	}
-	
-	// Executes the sql array returned by GetTableSQL and GetIndexSQL
-	function ExecuteSQLArray($sql, $continueOnError = true)
-	{
-		$rez = 2;
-		$conn = &$this->connection;
-		$saved = $conn->debug;
-		foreach($sql as $line) {
-			
-			if ($this->debug) $conn->debug = true;
-			$ok = $conn->Execute($line);
-			$conn->debug = $saved;
-			if (!$ok) {
-				if ($this->debug) ADOConnection::outp($conn->ErrorMsg());
-				if (!$continueOnError) return 0;
-				$rez = 1;
-			}
-		}
-		return $rez;
-	}
-	
-	/**
-	 	Returns the actual type given a character code.
-		
-		C:  varchar
-		X:  CLOB (character large object) or largest varchar size if CLOB is not supported
-		C2: Multibyte varchar
-		X2: Multibyte CLOB
-		
-		B:  BLOB (binary large object)
-		
-		D:  Date
-		T:  Date-time 
-		L:  Integer field suitable for storing booleans (0 or 1)
-		I:  Integer
-		F:  Floating point number
-		N:  Numeric or decimal number
-	*/
-	
-	function ActualType($meta)
-	{
-		return $meta;
-	}
-	
-	function CreateDatabase($dbname,$options=false)
-	{
-		$options = $this->_Options($options);
-		$sql = array();
-		
-		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
-		if (isset($options[$this->upperName]))
-			$s .= ' '.$options[$this->upperName];
-		
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	/*
-	 Generates the SQL to create index. Returns an array of sql strings.
-	*/
-	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
-	{
-		if (!is_array($flds)) {
-			$flds = explode(',',$flds);
-		}
-		
-		foreach($flds as $key => $fld) {
-			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
-			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
-		}
-		
-		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
-	}
-	
-	function DropIndexSQL ($idxname, $tabname = NULL)
-	{
-		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
-	}
-	
-	function SetSchema($schema)
-	{
-		$this->schema = $schema;
-	}
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey,$idxs) = $this->_GenFields($flds);
-		// genfields can return FALSE at times
-		if ($lines  == null) $lines = array();
-		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
-			$sql[] = $alter . $v;
-		}
-		if (is_array($idxs)) {
-			foreach($idxs as $idx => $idxdef) {
-				$sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']);
-				$sql = array_merge($sql, $sql_idxs);
-			}
-		}
-		return $sql;
-	}
-	
-	/**
-	 * Change the definition of one column
-	 *
-	 * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey,$idxs) = $this->_GenFields($flds);
-		// genfields can return FALSE at times
-		if ($lines == null) $lines = array();
-		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-		foreach($lines as $v) {
-			$sql[] = $alter . $v;
-		}
-		if (is_array($idxs)) {
-			foreach($idxs as $idx => $idxdef) {
-				$sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']);
-				$sql = array_merge($sql, $sql_idxs);
-			}
-
-		}
-		return $sql;
-	}
-	
-	/**
-	 * Rename one column
-	 *
-	 * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql)
-	 * @param string $tabname table-name
-	 * @param string $oldcolumn column-name to be renamed
-	 * @param string $newcolumn new column-name
-	 * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default=''
-	 * @return array with SQL strings
-	 */
-	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
-	{
-		$tabname = $this->TableName ($tabname);
-		if ($flds) {
-			list($lines,$pkey,$idxs) = $this->_GenFields($flds);
-			// genfields can return FALSE at times
-			if ($lines == null) $lines = array();
-			list(,$first) = each($lines);
-			list(,$column_def) = split("[\t ]+",$first,2);
-		}
-		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
-	}
-		
-	/**
-	 * Drop one column
-	 *
-	 * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		$sql = array();
-		$alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
-		foreach($flds as $v) {
-			$sql[] = $alter . $this->NameQuote($v);
-		}
-		return $sql;
-	}
-	
-	function DropTableSQL($tabname)
-	{
-		return array (sprintf($this->dropTable, $this->TableName($tabname)));
-	}
-	
-	function RenameTableSQL($tabname,$newname)
-	{
-		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
-	}	
-	
-	/**
-	 Generate the SQL to create table. Returns an array of sql strings.
-	*/
-	function CreateTableSQL($tabname, $flds, $tableoptions=array())
-	{
-		list($lines,$pkey,$idxs) = $this->_GenFields($flds, true);
-		// genfields can return FALSE at times
-		if ($lines == null) $lines = array();
-		
-		$taboptions = $this->_Options($tableoptions);
-		$tabname = $this->TableName ($tabname);
-		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
-		
-		// ggiunta - 2006/10/12 - KLUDGE:
-        // if we are on autoincrement, and table options includes REPLACE, the
-        // autoincrement sequence has already been dropped on table creation sql, so
-        // we avoid passing REPLACE to trigger creation code. This prevents
-        // creating sql that double-drops the sequence
-        if ($this->autoIncrement && isset($taboptions['REPLACE']))
-        	unset($taboptions['REPLACE']);
-		$tsql = $this->_Triggers($tabname,$taboptions);
-		foreach($tsql as $s) $sql[] = $s;
-		
-		if (is_array($idxs)) {
-			foreach($idxs as $idx => $idxdef) {
-				$sql_idxs = $this->CreateIndexSql($idx, $tabname,  $idxdef['cols'], $idxdef['opts']);
-				$sql = array_merge($sql, $sql_idxs);
-			}
-		}
-
-		return $sql;
-	}
-	
-	function _GenFields($flds,$widespacing=false)
-	{
-		if (is_string($flds)) {
-			$padding = '     ';
-			$txt = $flds.$padding;
-			$flds = array();
-			$flds0 = Lens_ParseArgs($txt,',');
-			$hasparam = false;
-			foreach($flds0 as $f0) {
-				$f1 = array();
-				foreach($f0 as $token) {
-					switch (strtoupper($token)) {
-					case 'INDEX':
-						$f1['INDEX'] = '';
-						// fall through intentionally
-					case 'CONSTRAINT':
-					case 'DEFAULT': 
-						$hasparam = $token;
-						break;
-					default:
-						if ($hasparam) $f1[$hasparam] = $token;
-						else $f1[] = $token;
-						$hasparam = false;
-						break;
-					}
-				}
-				// 'index' token without a name means single column index: name it after column
-				if (array_key_exists('INDEX', $f1) && $f1['INDEX'] == '') {
-					$f1['INDEX'] = isset($f0['NAME']) ? $f0['NAME'] : $f0[0];
-					// check if column name used to create an index name was quoted
-					if (($f1['INDEX'][0] == '"' || $f1['INDEX'][0] == "'" || $f1['INDEX'][0] == "`") &&
-						($f1['INDEX'][0] == substr($f1['INDEX'], -1))) {
-						$f1['INDEX'] = $f1['INDEX'][0].'idx_'.substr($f1['INDEX'], 1, -1).$f1['INDEX'][0];
-					}
-					else
-						$f1['INDEX'] = 'idx_'.$f1['INDEX'];
-				}
-				// reset it, so we don't get next field 1st token as INDEX...
-				$hasparam = false;
-
-				$flds[] = $f1;
-				
-			}
-		}
-		$this->autoIncrement = false;
-		$lines = array();
-		$pkey = array();
-		$idxs = array();
-		foreach($flds as $fld) {
-			$fld = _array_change_key_case($fld);
-			
-			$fname = false;
-			$fdefault = false;
-			$fautoinc = false;
-			$ftype = false;
-			$fsize = false;
-			$fprec = false;
-			$fprimary = false;
-			$fnoquote = false;
-			$fdefts = false;
-			$fdefdate = false;
-			$fconstraint = false;
-			$fnotnull = false;
-			$funsigned = false;
-			$findex = '';
-			$funiqueindex = false;
-			
-			//-----------------
-			// Parse attributes
-			foreach($fld as $attr => $v) {
-				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
-				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
-				
-				switch($attr) {
-				case '0':
-				case 'NAME': 	$fname = $v; break;
-				case '1':
-				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
-				
-				case 'SIZE': 	
-								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
-								if ($dotat === false) $fsize = $v;
-								else {
-									$fsize = substr($v,0,$dotat);
-									$fprec = substr($v,$dotat+1);
-								}
-								break;
-				case 'UNSIGNED': $funsigned = true; break;
-				case 'AUTOINCREMENT':
-				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
-				case 'KEY':
-                // a primary key col can be non unique in itself (if key spans many cols...)
-				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; /*$funiqueindex = true;*/ break;
-				case 'DEF':
-				case 'DEFAULT': $fdefault = $v; break;
-				case 'NOTNULL': $fnotnull = $v; break;
-				case 'NOQUOTE': $fnoquote = $v; break;
-				case 'DEFDATE': $fdefdate = $v; break;
-				case 'DEFTIMESTAMP': $fdefts = $v; break;
-				case 'CONSTRAINT': $fconstraint = $v; break;
-				// let INDEX keyword create a 'very standard' index on column
-				case 'INDEX': $findex = $v; break;
-				case 'UNIQUE': $funiqueindex = true; break;
-				} //switch
-			} // foreach $fld
-			
-			//--------------------
-			// VALIDATE FIELD INFO
-			if (!strlen($fname)) {
-				if ($this->debug) ADOConnection::outp("Undefined NAME");
-				return false;
-			}
-			
-			$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));
-			$fname = $this->NameQuote($fname);
-			
-			if (!strlen($ftype)) {
-				if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");
-				return false;
-			} else {
-				$ftype = strtoupper($ftype);
-			}
-			
-			$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
-			
-			if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls
-			
-			if ($fprimary) $pkey[] = $fname;
-			
-			// some databases do not allow blobs to have defaults
-			if ($ty == 'X') $fdefault = false;
-			
-			// build list of indexes
-			if ($findex != '') {
-				if (array_key_exists($findex, $idxs)) {
-					$idxs[$findex]['cols'][] = ($fname);
-					if (in_array('UNIQUE', $idxs[$findex]['opts']) != $funiqueindex) {
-						if ($this->debug) ADOConnection::outp("Index $findex defined once UNIQUE and once not");
-					}
-					if ($funiqueindex && !in_array('UNIQUE', $idxs[$findex]['opts']))
-						$idxs[$findex]['opts'][] = 'UNIQUE';
-				}
-				else
-				{
-					$idxs[$findex] = array();
-					$idxs[$findex]['cols'] = array($fname);
-					if ($funiqueindex)
-						$idxs[$findex]['opts'] = array('UNIQUE');
-					else
-						$idxs[$findex]['opts'] = array();
-				}
-			}
-
-			//--------------------
-			// CONSTRUCT FIELD SQL
-			if ($fdefts) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
-					$ftype = 'TIMESTAMP';
-				} else {
-					$fdefault = $this->connection->sysTimeStamp;
-				}
-			} else if ($fdefdate) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
-					$ftype = 'TIMESTAMP';
-				} else {
-					$fdefault = $this->connection->sysDate;
-				}
-			} else if ($fdefault !== false && !$fnoquote) {
-				if ($ty == 'C' or $ty == 'X' or 
-					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) {
-
-					if (($ty == 'D' || $ty == 'T') && strtolower($fdefault) != 'null') {
-						// convert default date into database-aware code
-						if ($ty == 'T')
-						{
-							$fdefault = $this->connection->DBTimeStamp($fdefault);
-						}
-						else
-						{
-							$fdefault = $this->connection->DBDate($fdefault);
-						}
-					}
-					else
-					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
-						$fdefault = trim($fdefault);
-					else if (strtolower($fdefault) != 'null')
-						$fdefault = $this->connection->qstr($fdefault);
-				}
-			}
-			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
-			
-			// add index creation
-			if ($widespacing) $fname = str_pad($fname,24);
-			
-			 // check for field names appearing twice
-            if (array_key_exists($fid, $lines)) {
-            	 ADOConnection::outp("Field '$fname' defined twice");
-            }
-			
-			$lines[$fid] = $fname.' '.$ftype.$suffix;
-			
-			if ($fautoinc) $this->autoIncrement = true;
-		} // foreach $flds
-		
-		return array($lines,$pkey,$idxs);
-	}
-
-	/**
-		 GENERATE THE SIZE PART OF THE DATATYPE
-			$ftype is the actual type
-			$ty is the type defined originally in the DDL
-	*/
-	function _GetSize($ftype, $ty, $fsize, $fprec)
-	{
-		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {
-			$ftype .= "(".$fsize;
-			if (strlen($fprec)) $ftype .= ",".$fprec;
-			$ftype .= ')';
-		}
-		return $ftype;
-	}
-	
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-	
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s .= '(' . $flds . ')';
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function _DropAutoIncrement($tabname)
-	{
-		return false;
-	}
-	
-	function _TableSQL($tabname,$lines,$pkey,$tableoptions)
-	{
-		$sql = array();
-		
-		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
-			$sql[] = sprintf($this->dropTable,$tabname);
-			if ($this->autoIncrement) {
-				$sInc = $this->_DropAutoIncrement($tabname);
-				if ($sInc) $sql[] = $sInc;
-			}
-			if ( isset ($tableoptions['DROP']) ) {
-				return $sql;
-			}
-		}
-		$s = "CREATE TABLE $tabname (\n";
-		$s .= implode(",\n", $lines);
-		if (sizeof($pkey)>0) {
-			$s .= ",\n                 PRIMARY KEY (";
-			$s .= implode(", ",$pkey).")";
-		}
-		if (isset($tableoptions['CONSTRAINTS'])) 
-			$s .= "\n".$tableoptions['CONSTRAINTS'];
-		
-		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
-			$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
-		
-		$s .= "\n)";
-		if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	/**
-		GENERATE TRIGGERS IF NEEDED
-		used when table has auto-incrementing field that is emulated using triggers
-	*/
-	function _Triggers($tabname,$taboptions)
-	{
-		return array();
-	}
-	
-	/**
-		Sanitize options, so that array elements with no keys are promoted to keys
-	*/
-	function _Options($opts)
-	{
-		if (!is_array($opts)) return array();
-		$newopts = array();
-		foreach($opts as $k => $v) {
-			if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
-			else $newopts[strtoupper($k)] = $v;
-		}
-		return $newopts;
-	}
-	
-	/**
-	"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
-	
-	This function changes/adds new fields to your table. You don't
-	have to know if the col is new or not. It will check on its own.
-	*/
-	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
-		
-		// check table exists
-		$save_handler = $this->connection->raiseErrorFn;
-		$this->connection->raiseErrorFn = '';
-		$cols = $this->MetaColumns($tablename);
-		$this->connection->raiseErrorFn = $save_handler;
-		
-		if (isset($savem)) $this->connection->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ( empty($cols)) { 
-			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
-		}
-		
-		if (is_array($flds)) {
-		// Cycle through the update fields, comparing
-		// existing fields to fields to update.
-		// if the Metatype and size is exactly the
-		// same, ignore - by Mark Newham
-			$holdflds = array();
-			foreach($flds as $k=>$v) {
-				if ( isset($cols[$k]) && is_object($cols[$k]) ) {
-					// If already not allowing nulls, then don't change
-					$obj = $cols[$k];
-					if (isset($obj->not_null) && $obj->not_null)
-						$v = str_replace('NOT NULL','',$v);
-
-					$c = $cols[$k];
-					$ml = $c->max_length;
-					$mt = $this->MetaType($c->type,$ml);
-					if ($ml == -1) $ml = '';
-					if ($mt == 'X') $ml = $v['SIZE'];
-					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {
-						$holdflds[$k] = $v;
-					}
-				} else {
-					$holdflds[$k] = $v;
-				}		
-			}
-			$flds = $holdflds;
-		}
-	
-
-		// already exists, alter table instead
-		list($lines,$pkey,$idxs) = $this->_GenFields($flds);
-		// genfields can return FALSE at times
-		if ($lines == null) $lines = array();
-		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
-		$sql = array();
-
-		foreach ( $lines as $id => $v ) {
-			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
-			
-				$flds = Lens_ParseArgs($v,',');
-				
-				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
-				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) {
-					echo "<h3>$this->alterCol cannot be changed to $flds currently</h3>";
-					continue;	 
-	 			}
-				$sql[] = $alter . $this->alterCol . ' ' . $v;
-			} else {
-				$sql[] = $alter . $this->addCol . ' ' . $v;
-			}
-		}
-		
-		return $sql;
-	}
-} // class
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/adodb-session-clob2.php
===================================================================
--- admin/include/lib/adodb/session/adodb-session-clob2.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-session-clob2.php	(working copy)
@@ -1,24 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
-
-if (!defined('ADODB_SESSION')) {
-	require_once dirname(__FILE__) . '/adodb-session2.php';
-}
-ADODB_Session::clob('CLOB');
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/adodb-sessions.mysql.sql
===================================================================
--- admin/include/lib/adodb/session/adodb-sessions.mysql.sql	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-sessions.mysql.sql	(working copy)
@@ -1,16 +0,0 @@
--- $CVSHeader$
-
-CREATE DATABASE /*! IF NOT EXISTS */ adodb_sessions;
-
-USE adodb_sessions;
-
-DROP TABLE /*! IF EXISTS */ sessions;
-
-CREATE TABLE /*! IF NOT EXISTS */ sessions (
-	sesskey		CHAR(32)	/*! BINARY */ NOT NULL DEFAULT '',
-	expiry		INT(11)		/*! UNSIGNED */ NOT NULL DEFAULT 0,
-	expireref	VARCHAR(64)	DEFAULT '',
-	data		LONGTEXT	DEFAULT '',
-	PRIMARY KEY	(sesskey),
-	INDEX expiry (expiry)
-);
Index: admin/include/lib/adodb/session/adodb-sessions.oracle.sql
===================================================================
--- admin/include/lib/adodb/session/adodb-sessions.oracle.sql	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-sessions.oracle.sql	(working copy)
@@ -1,16 +0,0 @@
--- $CVSHeader$
-
-DROP TABLE adodb_sessions;
-
-CREATE TABLE sessions (
-	sesskey		CHAR(32)	DEFAULT '' NOT NULL,
-	expiry		INT		DEFAULT 0 NOT NULL,
-	expireref	VARCHAR(64)	DEFAULT '',
-	data		VARCHAR(4000)	DEFAULT '',
-	PRIMARY KEY	(sesskey),
-	INDEX expiry (expiry)
-);
-
-CREATE INDEX ix_expiry ON sessions (expiry);
-
-QUIT;
Index: admin/include/lib/adodb/session/adodb-session.php
===================================================================
--- admin/include/lib/adodb/session/adodb-session.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-session.php	(working copy)
@@ -1,934 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-	You may want to rename the 'data' field to 'session_data' as
-	'data' appears to be a reserved word for one or more of the following:
-		ANSI SQL
-		IBM DB2
-		MS SQL Server
-		Postgres
-		SAP
-
-	If you do, then execute:
-
-		ADODB_Session::dataFieldName('session_data');
-
-*/
-
-if (!defined('_ADODB_LAYER')) {
-	require realpath(dirname(__FILE__) . '/../adodb.inc.php');
-}
-
-if (defined('ADODB_SESSION')) return 1;
-
-define('ADODB_SESSION', dirname(__FILE__));
-
-
-/* 
-	Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821 
-	
-	From Kerr Schere, to unserialize session data stored via ADOdb. 
-	1. Pull the session data from the db and loop through it. 
-	2. Inside the loop, you will need to urldecode the data column. 
-	3. After urldecode, run the serialized string through this function:
-
-*/
-function adodb_unserialize( $serialized_string ) 
-{
-	$variables = array( );
-	$a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
-	for( $i = 0; $i < count( $a ); $i = $i+2 ) {
-		$variables[$a[$i]] = unserialize( $a[$i+1] );
-	}
-	return( $variables );
-}
-
-/*
-	Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
-	Since adodb 4.61.
-*/
-function adodb_session_regenerate_id() 
-{
-	$conn =& ADODB_Session::_conn();
-	if (!$conn) return false;
-
-	$old_id = session_id();
-	if (function_exists('session_regenerate_id')) {
-		session_regenerate_id();
-	} else {
-		session_id(md5(uniqid(rand(), true)));
-		$ck = session_get_cookie_params();
-		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
-		//@session_start();
-	}
-	$new_id = session_id();
-	$ok =& $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
-	
-	/* it is possible that the update statement fails due to a collision */
-	if (!$ok) {
-		session_id($old_id);
-		if (empty($ck)) $ck = session_get_cookie_params();
-		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
-		return false;
-	}
-	
-	return true;
-}
-
-/*
-    Generate database table for session data
-    @see http://phplens.com/lens/lensforum/msgs.php?id=12280
-    @return 0 if failure, 1 if errors, 2 if successful.
-	@author Markus Staab http://www.public-4u.de
-*/
-function adodb_session_create_table($schemaFile=null,$conn = null)
-{
-    // set default values
-    if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema.xml';
-    if ($conn===null) $conn =& ADODB_Session::_conn();
-
-	if (!$conn) return 0;
-
-    $schema = new adoSchema($conn);
-    $schema->ParseSchema($schemaFile);
-    return $schema->ExecuteSchema();
-}
-
-/*!
-	\static
-*/
-class ADODB_Session {
-	/////////////////////
-	// getter/setter methods
-	/////////////////////
-	
-	/*
-	
-	function Lock($lock=null)
-	{
-	static $_lock = false;
-	
-		if (!is_null($lock)) $_lock = $lock;
-		return $lock;
-	}
-	*/
-	/*!
-	*/
-	function driver($driver = null) {
-		static $_driver = 'mysql';
-		static $set = false;
-
-		if (!is_null($driver)) {
-			$_driver = trim($driver);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_DRIVER'])) {
-				return $GLOBALS['ADODB_SESSION_DRIVER'];
-			}
-		}
-
-		return $_driver;
-	}
-
-	/*!
-	*/
-	function host($host = null) {
-		static $_host = 'localhost';
-		static $set = false;
-
-		if (!is_null($host)) {
-			$_host = trim($host);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_CONNECT'])) {
-				return $GLOBALS['ADODB_SESSION_CONNECT'];
-			}
-		}
-
-		return $_host;
-	}
-
-	/*!
-	*/
-	function user($user = null) {
-		static $_user = 'root';
-		static $set = false;
-
-		if (!is_null($user)) {
-			$_user = trim($user);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_USER'])) {
-				return $GLOBALS['ADODB_SESSION_USER'];
-			}
-		}
-
-		return $_user;
-	}
-
-	/*!
-	*/
-	function password($password = null) {
-		static $_password = '';
-		static $set = false;
-
-		if (!is_null($password)) {
-			$_password = $password;
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_PWD'])) {
-				return $GLOBALS['ADODB_SESSION_PWD'];
-			}
-		}
-
-		return $_password;
-	}
-
-	/*!
-	*/
-	function database($database = null) {
-		static $_database = 'xphplens_2';
-		static $set = false;
-
-		if (!is_null($database)) {
-			$_database = trim($database);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_DB'])) {
-				return $GLOBALS['ADODB_SESSION_DB'];
-			}
-		}
-
-		return $_database;
-	}
-
-	/*!
-	*/
-	function persist($persist = null) 
-	{
-		static $_persist = true;
-
-		if (!is_null($persist)) {
-			$_persist = trim($persist);
-		}
-
-		return $_persist;
-	}
-
-	/*!
-	*/
-	function lifetime($lifetime = null) {
-		static $_lifetime;
-		static $set = false;
-
-		if (!is_null($lifetime)) {
-			$_lifetime = (int) $lifetime;
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESS_LIFE'])) {
-				return $GLOBALS['ADODB_SESS_LIFE'];
-			}
-		}
-		if (!$_lifetime) {
-			$_lifetime = ini_get('session.gc_maxlifetime');
-			if ($_lifetime <= 1) {
-				// bug in PHP 4.0.3 pl 1  -- how about other versions?
-				//print "<h3>Session Error: PHP.INI setting <i>session.gc_maxlifetime</i>not set: $lifetime</h3>";
-				$_lifetime = 1440;
-			}
-		}
-
-		return $_lifetime;
-	}
-
-	/*!
-	*/
-	function debug($debug = null) {
-		static $_debug = false;
-		static $set = false;
-
-		if (!is_null($debug)) {
-			$_debug = (bool) $debug;
-
-			$conn = ADODB_Session::_conn();
-			if ($conn) {
-				$conn->debug = $_debug;
-			}
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESS_DEBUG'])) {
-				return $GLOBALS['ADODB_SESS_DEBUG'];
-			}
-		}
-
-		return $_debug;
-	}
-
-	/*!
-	*/
-	function expireNotify($expire_notify = null) {
-		static $_expire_notify;
-		static $set = false;
-
-		if (!is_null($expire_notify)) {
-			$_expire_notify = $expire_notify;
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'])) {
-				return $GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'];
-			}
-		}
-
-		return $_expire_notify;
-	}
-
-	/*!
-	*/
-	function table($table = null) {
-		static $_table = 'sessions';
-		static $set = false;
-
-		if (!is_null($table)) {
-			$_table = trim($table);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_TBL'])) {
-				return $GLOBALS['ADODB_SESSION_TBL'];
-			}
-		}
-
-		return $_table;
-	}
-
-	/*!
-	*/
-	function optimize($optimize = null) {
-		static $_optimize = false;
-		static $set = false;
-
-		if (!is_null($optimize)) {
-			$_optimize = (bool) $optimize;
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (defined('ADODB_SESSION_OPTIMIZE')) {
-				return true;
-			}
-		}
-
-		return $_optimize;
-	}
-
-	/*!
-	*/
-	function syncSeconds($sync_seconds = null) {
-		static $_sync_seconds = 60;
-		static $set = false;
-
-		if (!is_null($sync_seconds)) {
-			$_sync_seconds = (int) $sync_seconds;
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (defined('ADODB_SESSION_SYNCH_SECS')) {
-				return ADODB_SESSION_SYNCH_SECS;
-			}
-		}
-
-		return $_sync_seconds;
-	}
-
-	/*!
-	*/
-	function clob($clob = null) {
-		static $_clob = false;
-		static $set = false;
-
-		if (!is_null($clob)) {
-			$_clob = strtolower(trim($clob));
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_USE_LOBS'])) {
-				return $GLOBALS['ADODB_SESSION_USE_LOBS'];
-			}
-		}
-
-		return $_clob;
-	}
-
-	/*!
-	*/
-	function dataFieldName($data_field_name = null) {
-		static $_data_field_name = 'data';
-
-		if (!is_null($data_field_name)) {
-			$_data_field_name = trim($data_field_name);
-		}
-
-		return $_data_field_name;
-	}
-
-	/*!
-	*/
-	function filter($filter = null) {
-		static $_filter = array();
-
-		if (!is_null($filter)) {
-			if (!is_array($filter)) {
-				$filter = array($filter);
-			}
-			$_filter = $filter;
-		}
-
-		return $_filter;
-	}
-
-	/*!
-	*/
-	function encryptionKey($encryption_key = null) {
-		static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
-
-		if (!is_null($encryption_key)) {
-			$_encryption_key = $encryption_key;
-		}
-
-		return $_encryption_key;
-	}
-
-	/////////////////////
-	// private methods
-	/////////////////////
-
-	/*!
-	*/
-	function &_conn($conn=null) {
-		return $GLOBALS['ADODB_SESS_CONN'];
-	}
-
-	/*!
-	*/
-	function _crc($crc = null) {
-		static $_crc = false;
-
-		if (!is_null($crc)) {
-			$_crc = $crc;
-		}
-
-		return $_crc;
-	}
-
-	/*!
-	*/
-	function _init() {
-		session_module_name('user');
-		session_set_save_handler(
-			array('ADODB_Session', 'open'),
-			array('ADODB_Session', 'close'),
-			array('ADODB_Session', 'read'),
-			array('ADODB_Session', 'write'),
-			array('ADODB_Session', 'destroy'),
-			array('ADODB_Session', 'gc')
-		);
-	}
-
-
-	/*!
-	*/
-	function _sessionKey() {
-		// use this function to create the encryption key for crypted sessions
-		// crypt the used key, ADODB_Session::encryptionKey() as key and session_id() as salt
-		return crypt(ADODB_Session::encryptionKey(), session_id());
-	}
-
-	/*!
-	*/
-	function _dumprs($rs) {
-		$conn	=& ADODB_Session::_conn();
-		$debug	= ADODB_Session::debug();
-
-		if (!$conn) {
-			return;
-		}
-
-		if (!$debug) {
-			return;
-		}
-
-		if (!$rs) {
-			echo "<br />\$rs is null or false<br />\n";
-			return;
-		}
-
-		//echo "<br />\nAffected_Rows=",$conn->Affected_Rows(),"<br />\n";
-
-		if (!is_object($rs)) {
-			return;
-		}
-
-		require_once ADODB_SESSION.'/../tohtml.inc.php';
-		rs2html($rs);
-	}
-
-	/////////////////////
-	// public methods
-	/////////////////////
-	
-	function config($driver, $host, $user, $password, $database=false,$options=false)
-	{
-		ADODB_Session::driver($driver);
-		ADODB_Session::host($host);
-		ADODB_Session::user($user);
-		ADODB_Session::password($password);
-		ADODB_Session::database($database);
-		
-		if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] = 'CLOB';
-		
-		if (isset($options['table'])) ADODB_Session::table($options['table']);
-		if (isset($options['lob'])) ADODB_Session::clob($options['lob']);
-		if (isset($options['debug'])) ADODB_Session::debug($options['debug']);
-	}
-
-	/*!
-		Create the connection to the database.
-
-		If $conn already exists, reuse that connection
-	*/
-	function open($save_path, $session_name, $persist = null) 
-	{
-		$conn =& ADODB_Session::_conn();
-
-		if ($conn) {
-			return true;
-		}
-
-		$database	= ADODB_Session::database();
-		$debug		= ADODB_Session::debug();
-		$driver		= ADODB_Session::driver();
-		$host		= ADODB_Session::host();
-		$password	= ADODB_Session::password();
-		$user		= ADODB_Session::user();
-
-		if (!is_null($persist)) {
-			ADODB_Session::persist($persist);
-		} else {
-			$persist = ADODB_Session::persist();
-		}
-
-# these can all be defaulted to in php.ini
-#		assert('$database');
-#		assert('$driver');
-#		assert('$host');
-
-		$conn =& ADONewConnection($driver);
-
-		if ($debug) {
-			$conn->debug = true;
-//			ADOConnection::outp( " driver=$driver user=$user pwd=$password db=$database ");
-		}
-
-		if ($persist) {
-			switch($persist) {
-			default:
-			case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
-			case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
-			case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
-			}
-		} else {
-			$ok = $conn->Connect($host, $user, $password, $database);
-		}
-
-		if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
-		else
-			ADOConnection::outp('<p>Session: connection failed</p>', false);
-		
-
-		return $ok;
-	}
-
-	/*!
-		Close the connection
-	*/
-	function close() 
-	{
-/*
-		$conn =& ADODB_Session::_conn();
-		if ($conn) $conn->Close();
-*/
-		return true;
-	}
-
-	/*
-		Slurp in the session variables and return the serialized string
-	*/
-	function read($key) 
-	{
-		$conn	=& ADODB_Session::_conn();
-		$data	= ADODB_Session::dataFieldName();
-		$filter	= ADODB_Session::filter();
-		$table	= ADODB_Session::table();
-
-		if (!$conn) {
-			return '';
-		}
-
-		//assert('$table');
-
-		$qkey = $conn->quote($key);
-		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-	
-		$sql = "SELECT $data FROM $table WHERE sesskey = $binary $qkey AND expiry >= " . time();
-		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if 
-		  developer has commited elsewhere... :(
-		 */
-		#if (ADODB_Session::Lock())
-		#	$rs =& $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
-		#else
-		
-			$rs =& $conn->Execute($sql);
-		//ADODB_Session::_dumprs($rs);
-		if ($rs) {
-			if ($rs->EOF) {
-				$v = '';
-			} else {
-				$v = reset($rs->fields);
-				$filter = array_reverse($filter);
-				foreach ($filter as $f) {
-					if (is_object($f)) {
-						$v = $f->read($v, ADODB_Session::_sessionKey());
-					}
-				}
-				$v = rawurldecode($v);
-			}
-
-			$rs->Close();
-
-			ADODB_Session::_crc(strlen($v) . crc32($v));
-			return $v;
-		}
-
-		return '';
-	}
-
-	/*!
-		Write the serialized data to a database.
-
-		If the data has not been modified since the last read(), we do not write.
-	*/
-	function write($key, $val) 
-	{
-	global $ADODB_SESSION_READONLY;
-	
-		if (!empty($ADODB_SESSION_READONLY)) return;
-		
-		$clob			= ADODB_Session::clob();
-		$conn			=& ADODB_Session::_conn();
-		$crc			= ADODB_Session::_crc();
-		$data			= ADODB_Session::dataFieldName();
-		$debug			= ADODB_Session::debug();
-		$driver			= ADODB_Session::driver();
-		$expire_notify	= ADODB_Session::expireNotify();
-		$filter			= ADODB_Session::filter();
-		$lifetime		= ADODB_Session::lifetime();
-		$table			= ADODB_Session::table();
-	
-		if (!$conn) {
-			return false;
-		}
-		$qkey = $conn->qstr($key);
-	
-		//assert('$table');
-
-		$expiry = time() + $lifetime;
-
-		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-
-		// crc32 optimization since adodb 2.1
-		// now we only update expiry date, thx to sebastian thom in adodb 2.32
-		if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
-			if ($debug) {
-				echo '<p>Session: Only updating date - crc32 not changed</p>';
-			}
-			
-			$expirevar = '';
-			if ($expire_notify) {
-				$var = reset($expire_notify);
-				global $$var;
-				if (isset($$var)) {
-					$expirevar = $$var;
-				}
-			}
-			
-			
-			$sql = "UPDATE $table SET expiry = ".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey = ".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
-			$rs =& $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
-			return true;
-		}
-		$val = rawurlencode($val);
-		foreach ($filter as $f) {
-			if (is_object($f)) {
-				$val = $f->write($val, ADODB_Session::_sessionKey());
-			}
-		}
-
-		$arr = array('sesskey' => $key, 'expiry' => $expiry, $data => $val, 'expireref' => '');
-		if ($expire_notify) {
-			$var = reset($expire_notify);
-			global $$var;
-			if (isset($$var)) {
-				$arr['expireref'] = $$var;
-			}
-		}
-
-		if (!$clob) {	// no lobs, simply use replace()
-			$arr[$data] = $conn->qstr($val);
-			$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
-			
-		} else {
-			// what value shall we insert/update for lob row?
-			switch ($driver) {
-				// empty_clob or empty_lob for oracle dbs
-				case 'oracle':
-				case 'oci8':
-				case 'oci8po':
-				case 'oci805':
-					$lob_value = sprintf('empty_%s()', strtolower($clob));
-					break;
-
-				// null for all other
-				default:
-					$lob_value = 'null';
-					break;
-			}
-			
-			$conn->StartTrans();
-			$expiryref = $conn->qstr($arr['expireref']);
-			// do we insert or update? => as for sesskey
-			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
-			if ($rs && reset($rs->fields) > 0) {
-				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value, expireref=$expiryref WHERE  sesskey = $qkey";
-			} else {
-				$sql = "INSERT INTO $table (expiry, $data, sesskey,expireref) VALUES ($expiry, $lob_value, $qkey,$expiryref)";
-			}
-			if ($rs)$rs->Close();
-			
-
-			$err = '';
-			$rs1 =& $conn->Execute($sql);
-			if (!$rs1) $err = $conn->ErrorMsg()."\n";
-			
-			$rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
-			if (!$rs2) $err .= $conn->ErrorMsg()."\n";
-			
-			$rs = ($rs && $rs2) ? true : false;
-			$conn->CompleteTrans();
-		}
-
-		if (!$rs) {
-			ADOConnection::outp('<p>Session Replace: ' . $conn->ErrorMsg() . '</p>', false);
-			return false;
-		}  else {
-			// bug in access driver (could be odbc?) means that info is not committed
-			// properly unless select statement executed in Win2000
-			if ($conn->databaseType == 'access') {
-				$sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
-				$rs =& $conn->Execute($sql);
-				ADODB_Session::_dumprs($rs);
-				if ($rs) {
-					$rs->Close();
-				}
-			}
-		}/*
-		if (ADODB_Session::Lock()) {
-			$conn->CommitTrans();
-		}*/
-		return $rs ? true : false;
-	}
-
-	/*!
-	*/
-	function destroy($key) {
-		$conn			=& ADODB_Session::_conn();
-		$table			= ADODB_Session::table();
-		$expire_notify	= ADODB_Session::expireNotify();
-
-		if (!$conn) {
-			return false;
-		}
-
-		//assert('$table');
-
-		$qkey = $conn->quote($key);
-		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-
-		if ($expire_notify) {
-			reset($expire_notify);
-			$fn = next($expire_notify);
-			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
-			$sql = "SELECT expireref, sesskey FROM $table WHERE $binary sesskey = $qkey";
-			$rs =& $conn->Execute($sql);
-			ADODB_Session::_dumprs($rs);
-			$conn->SetFetchMode($savem);
-			if (!$rs) {
-				return false;
-			}
-			if (!$rs->EOF) {
-				$ref = $rs->fields[0];
-				$key = $rs->fields[1];
-				//assert('$ref');
-				//assert('$key');
-				$fn($ref, $key);
-			}
-			$rs->Close();
-		}
-
-		$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
-		$rs =& $conn->Execute($sql);
-		ADODB_Session::_dumprs($rs);
-
-		return $rs ? true : false;
-	}
-
-	/*!
-	*/
-	function gc($maxlifetime) 
-	{
-		$conn			=& ADODB_Session::_conn();
-		$debug			= ADODB_Session::debug();
-		$expire_notify	= ADODB_Session::expireNotify();
-		$optimize		= ADODB_Session::optimize();
-		$sync_seconds	= ADODB_Session::syncSeconds();
-		$table			= ADODB_Session::table();
-
-		if (!$conn) {
-			return false;
-		}
-
-
-		$time			= time();
-		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-
-		if ($expire_notify) {
-			reset($expire_notify);
-			$fn = next($expire_notify);
-			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
-			$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time";
-			$rs =& $conn->Execute($sql);
-			ADODB_Session::_dumprs($rs);
-			$conn->SetFetchMode($savem);
-			if ($rs) {
-				$conn->StartTrans();
-				$keys = array();
-				while (!$rs->EOF) {
-					$ref = $rs->fields[0];
-					$key = $rs->fields[1];
-					$fn($ref, $key);
-					$del = $conn->Execute("DELETE FROM $table WHERE sesskey=".$conn->Param('0'),array($key));
-					$rs->MoveNext();
-				}
-				$rs->Close();
-				
-				$conn->CompleteTrans();
-			}
-		} else {
-		
-			if (1) {
-				$sql = "SELECT sesskey FROM $table WHERE expiry < $time";
-				$arr =& $conn->GetAll($sql);
-				foreach ($arr as $row) {
-					$sql2 = "DELETE FROM $table WHERE sesskey=".$conn->Param('0');
-					$conn->Execute($sql2,array($row[0]));
-				}
-			} else {
-				$sql = "DELETE FROM $table WHERE expiry < $time";
-				$rs =& $conn->Execute($sql);
-				ADODB_Session::_dumprs($rs);
-				if ($rs) $rs->Close();
-			}
-			if ($debug) {
-				ADOConnection::outp("<p><b>Garbage Collection</b>: $sql</p>");
-			}
-		}
-
-		// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
-		if ($optimize) {
-			$driver = ADODB_Session::driver();
-
-			if (preg_match('/mysql/i', $driver)) {
-				$sql = "OPTIMIZE TABLE $table";
-			}
-			if (preg_match('/postgres/i', $driver)) {
-				$sql = "VACUUM $table";
-			}
-			if (!empty($sql)) {
-				$conn->Execute($sql);
-			}
-		}
-
-		if ($sync_seconds) {
-			$sql = 'SELECT ';
-			if ($conn->dataProvider === 'oci8') {
-				$sql .= "TO_CHAR({$conn->sysTimeStamp}, 'RRRR-MM-DD HH24:MI:SS')";
-			} else {
-				$sql .= $conn->sysTimeStamp;
-			}
-			$sql .= " FROM $table";
-
-			$rs =& $conn->SelectLimit($sql, 1);
-			if ($rs && !$rs->EOF) {
-				$dbts = reset($rs->fields);
-				$rs->Close();
-				$dbt = $conn->UnixTimeStamp($dbts);
-				$t = time();
-
-				if (abs($dbt - $t) >= $sync_seconds) {
-					$msg = __FILE__ .
-						": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: " .
-						" database=$dbt ($dbts), webserver=$t (diff=". (abs($dbt - $t) / 60) . ' minutes)';
-					error_log($msg);
-					if ($debug) {
-						ADOConnection::outp("<p>$msg</p>");
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-}
-
-ADODB_Session::_init();
-if (empty($ADODB_SESSION_READONLY))
-	register_shutdown_function('session_write_close');
-
-// for backwards compatability only
-function adodb_sess_open($save_path, $session_name, $persist = true) {
-	return ADODB_Session::open($save_path, $session_name, $persist);
-}
-
-// for backwards compatability only
-function adodb_sess_gc($t)
-{	
-	return ADODB_Session::gc($t);
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/session_schema2.xml
===================================================================
--- admin/include/lib/adodb/session/session_schema2.xml	(revision 6370)
+++ admin/include/lib/adodb/session/session_schema2.xml	(working copy)
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<schema version="0.3">
-  <table name="sessions2">
-    <desc>table for ADOdb session-management</desc>
-
-    <field name="SESSKEY" type="C" size="64">
-      <descr>session key</descr>
-      <KEY/>
-      <NOTNULL/>
-    </field>
- 
-
-	
-    <field name="EXPIRY" type="T">
-      <descr></descr>
-      <NOTNULL/>
-    </field>
-	
-	 	<field name="CREATED" type="T">
-	     <descr></descr>
-      <NOTNULL/>
-    </field>
-	
-	 	<field name="MODIFIED" type="T">
-	     <descr></descr>
-      <NOTNULL/>
-    </field>
-
-    <field name="EXPIREREF" type="C" size="250">
-      <descr></descr>
-    </field>
-
-    <field name="SESSDATA" type="XL">
-      <descr></descr>
-      <NOTNULL/>
-    </field>
-  </table>
-</schema>
Index: admin/include/lib/adodb/session/adodb-cryptsession2.php
===================================================================
--- admin/include/lib/adodb/session/adodb-cryptsession2.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-cryptsession2.php	(working copy)
@@ -1,27 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
-
-if (!defined('ADODB_SESSION')) {
-	require_once dirname(__FILE__) . '/adodb-session2.php';
-}
-
-require_once  ADODB_SESSION . '/adodb-encrypt-md5.php';
-
-ADODB_Session::filter(new ADODB_Encrypt_MD5());
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/adodb-encrypt-mcrypt.php
===================================================================
--- admin/include/lib/adodb/session/adodb-encrypt-mcrypt.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-encrypt-mcrypt.php	(working copy)
@@ -1,109 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
-
-if (!function_exists('mcrypt_encrypt')) {
-	trigger_error('Mcrypt functions are not available', E_USER_ERROR);
-	return 0;
-}
-
-/**
- */
-class ADODB_Encrypt_MCrypt {
-	/**
-	 */
-	var $_cipher;
-
-	/**
-	 */
-	var $_mode;
-
-	/**
-	 */
-	var $_source;
-
-	/**
-	 */
-	function getCipher() {
-		return $this->_cipher;
-	}
-
-	/**
-	 */
-	function setCipher($cipher) {
-		$this->_cipher = $cipher;
-	}
-
-	/**
-	 */
-	function getMode() {
-		return $this->_mode;
-	}
-
-	/**
-	 */
-	function setMode($mode) {
-		$this->_mode = $mode;
-	}
-
-	/**
-	 */
-	function getSource() {
-		return $this->_source;
-	}
-
-	/**
-	 */
-	function setSource($source) {
-		$this->_source = $source;
-	}
-
-	/**
-	 */
-	function ADODB_Encrypt_MCrypt($cipher = null, $mode = null, $source = null) {
-		if (!$cipher) {
-			$cipher = MCRYPT_RIJNDAEL_256;
-		}
-		if (!$mode) {
-			$mode = MCRYPT_MODE_ECB;
-		}
-		if (!$source) {
-			$source = MCRYPT_RAND;
-		}
-
-		$this->_cipher = $cipher;
-		$this->_mode = $mode;
-		$this->_source = $source;
-	}
-
-	/**
-	 */
-	function write($data, $key) {
-		$iv_size = mcrypt_get_iv_size($this->_cipher, $this->_mode);
-		$iv = mcrypt_create_iv($iv_size, $this->_source);
-		return mcrypt_encrypt($this->_cipher, $key, $data, $this->_mode, $iv);
-	}
-
-	/**
-	 */
-	function read($data, $key) {
-		$iv_size = mcrypt_get_iv_size($this->_cipher, $this->_mode);
-		$iv = mcrypt_create_iv($iv_size, $this->_source);
-		$rv = mcrypt_decrypt($this->_cipher, $key, $data, $this->_mode, $iv);
-		return rtrim($rv, "\0");
-	}
-
-}
-
-return 1;
-
-?>
Index: admin/include/lib/adodb/session/adodb-session-clob.php
===================================================================
--- admin/include/lib/adodb/session/adodb-session-clob.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-session-clob.php	(working copy)
@@ -1,24 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
-
-if (!defined('ADODB_SESSION')) {
-	require_once dirname(__FILE__) . '/adodb-session.php';
-}
-ADODB_Session::clob('CLOB');
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/adodb-sessions.oracle.clob.sql
===================================================================
--- admin/include/lib/adodb/session/adodb-sessions.oracle.clob.sql	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-sessions.oracle.clob.sql	(working copy)
@@ -1,15 +0,0 @@
--- $CVSHeader$
-
-DROP TABLE adodb_sessions;
-
-CREATE TABLE sessions (
-	sesskey		CHAR(32)	DEFAULT '' NOT NULL,
-	expiry		INT		DEFAULT 0 NOT NULL,
-	expireref	VARCHAR(64)	DEFAULT '',
-	data		CLOB		DEFAULT '',
-	PRIMARY KEY	(sesskey)
-);
-
-CREATE INDEX ix_expiry ON sessions (expiry);
-
-QUIT;
Index: admin/include/lib/adodb/session/crypt.inc.php
===================================================================
--- admin/include/lib/adodb/session/crypt.inc.php	(revision 6370)
+++ admin/include/lib/adodb/session/crypt.inc.php	(working copy)
@@ -1,161 +0,0 @@
-<?php
-//	 Session Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
-class MD5Crypt{
-		function keyED($txt,$encrypt_key)
-		{
-				$encrypt_key = md5($encrypt_key);
-				$ctr=0;
-				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++){
-						if ($ctr==strlen($encrypt_key)) $ctr=0;
-						$tmp.= substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1);
-						$ctr++;
-				}
-				return $tmp;
-		}
-
-		function Encrypt($txt,$key)
-		{
-				srand((double)microtime()*1000000);
-				$encrypt_key = md5(rand(0,32000));
-				$ctr=0;
-				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++)
-				{
-				if ($ctr==strlen($encrypt_key)) $ctr=0;
-				$tmp.= substr($encrypt_key,$ctr,1) .
-				(substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
-				$ctr++;
-				}
-				return base64_encode($this->keyED($tmp,$key));
-		}
-
-		function Decrypt($txt,$key)
-		{
-				$txt = $this->keyED(base64_decode($txt),$key);
-				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++){
-						$md5 = substr($txt,$i,1);
-						$i++;
-						$tmp.= (substr($txt,$i,1) ^ $md5);
-				}
-				return $tmp;
-		}
-
-		function RandPass()
-		{
-				$randomPassword = "";
-				srand((double)microtime()*1000000);
-				for($i=0;$i<8;$i++)
-				{
-						$randnumber = rand(48,120);
-
-						while (($randnumber >= 58 && $randnumber <= 64) || ($randnumber >= 91 && $randnumber <= 96))
-						{
-								$randnumber = rand(48,120);
-						}
-
-						$randomPassword .= chr($randnumber);
-				}
-				return $randomPassword;
-		}
-
-}
-
-
-class SHA1Crypt{
-
-		function keyED($txt,$encrypt_key)
-		{
-
-				$encrypt_key = sha1($encrypt_key);
-				$ctr=0;
-				$tmp = "";
-
-				for ($i=0;$i<strlen($txt);$i++){
-						if ($ctr==strlen($encrypt_key)) $ctr=0;
-						$tmp.= substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1);
-						$ctr++;
-				}
-				return $tmp;
-
-		}
-
-
-
-		function Encrypt($txt,$key)
-		{
-
-				srand((double)microtime()*1000000);
-				$encrypt_key = sha1(rand(0,32000));
-				$ctr=0;
-				$tmp = "";
-
-				for ($i=0;$i<strlen($txt);$i++)
-
-				{
-
-				if ($ctr==strlen($encrypt_key)) $ctr=0;
-
-				$tmp.= substr($encrypt_key,$ctr,1) .
-
-				(substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
-
-				$ctr++;
-
-				}
-
-				return base64_encode($this->keyED($tmp,$key));
-
-		}
-
-
-
-		function Decrypt($txt,$key)
-		{
-
-				$txt = $this->keyED(base64_decode($txt),$key);
-
-				$tmp = "";
-
-				for ($i=0;$i<strlen($txt);$i++){
-
-						$sha1 = substr($txt,$i,1);
-
-						$i++;
-
-						$tmp.= (substr($txt,$i,1) ^ $sha1);
-
-				}
-
-				return $tmp;
-		}
-
-
-
-		function RandPass()
-		{
-				$randomPassword = "";
-				srand((double)microtime()*1000000);
-
-				for($i=0;$i<8;$i++)
-				{
-
-						$randnumber = rand(48,120);
-
-						while (($randnumber >= 58 && $randnumber <= 64) || ($randnumber >= 91 && $randnumber <= 96))
-						{
-								$randnumber = rand(48,120);
-						}
-
-						$randomPassword .= chr($randnumber);
-				}
-
-				return $randomPassword;
-
-		}
-
-
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/adodb-compress-gzip.php
===================================================================
--- admin/include/lib/adodb/session/adodb-compress-gzip.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-compress-gzip.php	(working copy)
@@ -1,93 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
-
-if (!function_exists('gzcompress')) {
-	trigger_error('gzip functions are not available', E_USER_ERROR);
-	return 0;
-}
-
-/*
-*/
-class ADODB_Compress_Gzip {
-	/**
-	 */
-	var $_level = null;
-
-	/**
-	 */
-	var $_min_length = 1;
-
-	/**
-	 */
-	function getLevel() {
-		return $this->_level;
-	}
-
-	/**
-	 */
-	function setLevel($level) {
-		assert('$level >= 0');
-		assert('$level <= 9');
-		$this->_level = (int) $level;
-	}
-
-	/**
-	 */
-	function getMinLength() {
-		return $this->_min_length;
-	}
-
-	/**
-	 */
-	function setMinLength($min_length) {
-		assert('$min_length >= 0');
-		$this->_min_length = (int) $min_length;
-	}
-
-	/**
-	 */
-	function ADODB_Compress_Gzip($level = null, $min_length = null) {
-		if (!is_null($level)) {
-			$this->setLevel($level);
-		}
-
-		if (!is_null($min_length)) {
-			$this->setMinLength($min_length);
-		}
-	}
-
-	/**
-	 */
-	function write($data, $key) {
-		if (strlen($data) < $this->_min_length) {
-			return $data;
-		}
-
-		if (!is_null($this->_level)) {
-			return gzcompress($data, $this->_level);
-		} else {
-			return gzcompress($data);
-		}
-	}
-
-	/**
-	 */
-	function read($data, $key) {
-		return $data ? gzuncompress($data) : $data;
-	}
-
-}
-
-return 1;
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/adodb-cryptsession.php
===================================================================
--- admin/include/lib/adodb/session/adodb-cryptsession.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-cryptsession.php	(working copy)
@@ -1,27 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
-
-if (!defined('ADODB_SESSION')) {
-	require_once dirname(__FILE__) . '/adodb-session.php';
-}
-
-require_once  ADODB_SESSION . '/adodb-encrypt-md5.php';
-
-ADODB_Session::filter(new ADODB_Encrypt_MD5());
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/adodb-sess.txt
===================================================================
--- admin/include/lib/adodb/session/adodb-sess.txt	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-sess.txt	(working copy)
@@ -1,131 +0,0 @@
-John,
-
-I have been an extremely satisfied ADODB user for several years now.
-
-To give you something back for all your hard work, I've spent the last 3
-days rewriting the adodb-session.php code.
-
-----------
-What's New
-----------
-
-Here's a list of the new code's benefits:
-
-* Combines the functionality of the three files:
-
-adodb-session.php
-adodb-session-clob.php
-adodb-cryptsession.php
-
-each with very similar functionality, into a single file adodb-session.php.
-This will ease maintenance and support issues.
-
-* Supports multiple encryption and compression schemes.
-  Currently, we support:
-
-  MD5Crypt (crypt.inc.php)
-  MCrypt
-  Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
-  GZip
-  BZip2
-
-These can be stacked, so if you want to compress and then encrypt your
-session data, it's easy.
-Also, the built-in MCrypt functions will be *much* faster, and more secure,
-than the MD5Crypt code.
-
-* adodb-session.php contains a single class ADODB_Session that encapsulates
-all functionality.
-  This eliminates the use of global vars and defines (though they are
-supported for backwards compatibility).
-
-* All user defined parameters are now static functions in the ADODB_Session
-class.
-
-New parameters include:
-
-* encryptionKey(): Define the encryption key used to encrypt the session.
-Originally, it was a hard coded string.
-
-* persist(): Define if the database will be opened in persistent mode.
-Originally, the user had to call adodb_sess_open().
-
-* dataFieldName(): Define the field name used to store the session data, as
-'DATA' appears to be a reserved word in the following cases:
-	ANSI SQL
-	IBM DB2
-	MS SQL Server
-	Postgres
-	SAP
-
-* filter(): Used to support multiple, simulataneous encryption/compression
-schemes.
-
-* Debug support is improved thru _rsdump() function, which is called after
-every database call.
-
-------------
-What's Fixed
-------------
-
-The new code includes several bug fixes and enhancements:
-
-* sesskey is compared in BINARY mode for MySQL, to avoid problems with
-session keys that differ only by case.
-  Of course, the user should define the sesskey field as BINARY, to
-correctly fix this problem, otherwise performance will suffer.
-
-* In ADODB_Session::gc(), if $expire_notify is true, the multiple DELETES in
-the original code have been optimized to a single DELETE.
-
-* In ADODB_Session::destroy(), since "SELECT expireref, sesskey FROM $table
-WHERE sesskey = $qkey" will only return a single value, we don't loop on the
-result, we simply process the row, if any.
-
-* We close $rs after every use.
-
----------------
-What's the Same
----------------
-
-I know backwards compatibility is *very* important to you.  Therefore, the
-new code is 100% backwards compatible.
-
-If you like my code, but don't "trust" it's backwards compatible, maybe we
-offer it as beta code, in a new directory for a release or two?
-
-------------
-What's To Do
-------------
-
-I've vascillated over whether to use a single function to get/set
-parameters:
-
-$user = ADODB_Session::user(); 	// get
-ADODB_Session::user($user);		// set
-
-or to use separate functions (which is the PEAR/Java way):
-
-$user = ADODB_Session::getUser();
-ADODB_Session::setUser($user);
-
-I've chosen the former as it's makes for a simpler API, and reduces the
-amount of code, but I'd be happy to change it to the latter.
-
-Also, do you think the class should be a singleton class, versus a static
-class?
-
-Let me know if you find this code useful, and will be including it in the
-next release of ADODB.
-
-If so, I will modify the current documentation to detail the new
-functionality.  To that end, what file(s) contain the documentation?  Please
-send them to me if they are not publically available.
-
-Also, if there is *anything* in the code that you like to see changed, let
-me know.
-
-Thanks,
-
-Ross
-
Index: admin/include/lib/adodb/session/adodb-session2.php
===================================================================
--- admin/include/lib/adodb/session/adodb-session2.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-session2.php	(working copy)
@@ -1,947 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-	  
-
-*/
-
-/*
-
-CREATE Table SCripts
-
-Oracle
-======
-
-CREATE TABLE SESSIONS2
-(
-  SESSKEY    VARCHAR2(48 BYTE)                  NOT NULL,
-  EXPIRY     DATE                               NOT NULL,
-  EXPIREREF  VARCHAR2(200 BYTE),
-  CREATED    DATE                               NOT NULL,
-  MODIFIED   DATE                               NOT NULL,
-  SESSDATA   CLOB,
-  PRIMARY KEY(SESSKEY)
-);
-
-
-CREATE INDEX SESS2_EXPIRY ON SESSIONS2(EXPIRY);
-CREATE UNIQUE INDEX SESS2_PK ON SESSIONS2(SESSKEY);
-CREATE INDEX SESS2_EXP_REF ON SESSIONS2(EXPIREREF);
-
-
- 
- MySQL
- =====
- 
-CREATE TABLE sessions2(
-	sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
-	expiry TIMESTAMP NOT NULL ,
-	expireref VARCHAR( 250 ) DEFAULT '',
-	created TIMESTAMP NOT NULL ,
-	modified TIMESTAMP NOT NULL ,
-	sessdata LONGTEXT DEFAULT '',
-	PRIMARY KEY ( sesskey ) ,
-	INDEX sess2_expiry( expiry ),
-	INDEX sess2_expireref( expireref )
-)
-
-
-*/
-
-if (!defined('_ADODB_LAYER')) {
-	require realpath(dirname(__FILE__) . '/../adodb.inc.php');
-}
-
-if (defined('ADODB_SESSION')) return 1;
-
-define('ADODB_SESSION', dirname(__FILE__));
-define('ADODB_SESSION2', ADODB_SESSION);
-
-/* 
-	Unserialize session data manually. See http://phplens.com/lens/lensforum/msgs.php?id=9821 
-	
-	From Kerr Schere, to unserialize session data stored via ADOdb. 
-	1. Pull the session data from the db and loop through it. 
-	2. Inside the loop, you will need to urldecode the data column. 
-	3. After urldecode, run the serialized string through this function:
-
-*/
-function adodb_unserialize( $serialized_string ) 
-{
-	$variables = array( );
-	$a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
-	for( $i = 0; $i < count( $a ); $i = $i+2 ) {
-		$variables[$a[$i]] = unserialize( $a[$i+1] );
-	}
-	return( $variables );
-}
-
-/*
-	Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
-	Since adodb 4.61.
-*/
-function adodb_session_regenerate_id() 
-{
-	$conn =& ADODB_Session::_conn();
-	if (!$conn) return false;
-
-	$old_id = session_id();
-	if (function_exists('session_regenerate_id')) {
-		session_regenerate_id();
-	} else {
-		session_id(md5(uniqid(rand(), true)));
-		$ck = session_get_cookie_params();
-		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
-		//@session_start();
-	}
-	$new_id = session_id();
-	$ok =& $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
-	
-	/* it is possible that the update statement fails due to a collision */
-	if (!$ok) {
-		session_id($old_id);
-		if (empty($ck)) $ck = session_get_cookie_params();
-		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
-		return false;
-	}
-	
-	return true;
-}
-
-/*
-    Generate database table for session data
-    @see http://phplens.com/lens/lensforum/msgs.php?id=12280
-    @return 0 if failure, 1 if errors, 2 if successful.
-	@author Markus Staab http://www.public-4u.de
-*/
-function adodb_session_create_table($schemaFile=null,$conn = null)
-{
-    // set default values
-    if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema2.xml';
-    if ($conn===null) $conn =& ADODB_Session::_conn();
-
-	if (!$conn) return 0;
-
-    $schema = new adoSchema($conn);
-    $schema->ParseSchema($schemaFile);
-    return $schema->ExecuteSchema();
-}
-
-/*!
-	\static
-*/
-class ADODB_Session {
-	/////////////////////
-	// getter/setter methods
-	/////////////////////
-	
-	/*
-	
-	function Lock($lock=null)
-	{
-	static $_lock = false;
-	
-		if (!is_null($lock)) $_lock = $lock;
-		return $lock;
-	}
-	*/
-	/*!
-	*/
-	function driver($driver = null) 
-	{
-		static $_driver = 'mysql';
-		static $set = false;
-
-		if (!is_null($driver)) {
-			$_driver = trim($driver);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_DRIVER'])) {
-				return $GLOBALS['ADODB_SESSION_DRIVER'];
-			}
-		}
-
-		return $_driver;
-	}
-
-	/*!
-	*/
-	function host($host = null) {
-		static $_host = 'localhost';
-		static $set = false;
-
-		if (!is_null($host)) {
-			$_host = trim($host);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_CONNECT'])) {
-				return $GLOBALS['ADODB_SESSION_CONNECT'];
-			}
-		}
-
-		return $_host;
-	}
-
-	/*!
-	*/
-	function user($user = null) 
-	{
-		static $_user = 'root';
-		static $set = false;
-
-		if (!is_null($user)) {
-			$_user = trim($user);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_USER'])) {
-				return $GLOBALS['ADODB_SESSION_USER'];
-			}
-		}
-
-		return $_user;
-	}
-
-	/*!
-	*/
-	function password($password = null) 
-	{
-		static $_password = '';
-		static $set = false;
-
-		if (!is_null($password)) {
-			$_password = $password;
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_PWD'])) {
-				return $GLOBALS['ADODB_SESSION_PWD'];
-			}
-		}
-
-		return $_password;
-	}
-
-	/*!
-	*/
-	function database($database = null) 
-	{
-		static $_database = '';
-		static $set = false;
-		
-		if (!is_null($database)) {
-			$_database = trim($database);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_DB'])) {
-				return $GLOBALS['ADODB_SESSION_DB'];
-			}
-		}
-		return $_database;
-	}
-
-	/*!
-	*/
-	function persist($persist = null) 
-	{
-		static $_persist = true;
-
-		if (!is_null($persist)) {
-			$_persist = trim($persist);
-		}
-
-		return $_persist;
-	}
-
-	/*!
-	*/
-	function lifetime($lifetime = null) 
-	{
-		static $_lifetime;
-		static $set = false;
-
-		if (!is_null($lifetime)) {
-			$_lifetime = (int) $lifetime;
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESS_LIFE'])) {
-				return $GLOBALS['ADODB_SESS_LIFE'];
-			}
-		}
-		if (!$_lifetime) {
-			$_lifetime = ini_get('session.gc_maxlifetime');
-			if ($_lifetime <= 1) {
-				// bug in PHP 4.0.3 pl 1  -- how about other versions?
-				//print "<h3>Session Error: PHP.INI setting <i>session.gc_maxlifetime</i>not set: $lifetime</h3>";
-				$_lifetime = 1440;
-			}
-		}
-
-		return $_lifetime;
-	}
-
-	/*!
-	*/
-	function debug($debug = null) 
-	{
-		static $_debug = false;
-		static $set = false;
-
-		if (!is_null($debug)) {
-			$_debug = (bool) $debug;
-
-			$conn = ADODB_Session::_conn();
-			if ($conn) {
-				$conn->debug = $_debug;
-			}
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESS_DEBUG'])) {
-				return $GLOBALS['ADODB_SESS_DEBUG'];
-			}
-		}
-
-		return $_debug;
-	}
-
-	/*!
-	*/
-	function expireNotify($expire_notify = null) 
-	{
-		static $_expire_notify;
-		static $set = false;
-
-		if (!is_null($expire_notify)) {
-			$_expire_notify = $expire_notify;
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'])) {
-				return $GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'];
-			}
-		}
-
-		return $_expire_notify;
-	}
-
-	/*!
-	*/
-	function table($table = null) 
-	{
-		static $_table = 'sessions2';
-		static $set = false;
-
-		if (!is_null($table)) {
-			$_table = trim($table);
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_TBL'])) {
-				return $GLOBALS['ADODB_SESSION_TBL'];
-			}
-		}
-
-		return $_table;
-	}
-
-	/*!
-	*/
-	function optimize($optimize = null) 
-	{
-		static $_optimize = false;
-		static $set = false;
-
-		if (!is_null($optimize)) {
-			$_optimize = (bool) $optimize;
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (defined('ADODB_SESSION_OPTIMIZE')) {
-				return true;
-			}
-		}
-
-		return $_optimize;
-	}
-
-	/*!
-	*/
-	function syncSeconds($sync_seconds = null) {
-		//echo ("<p>WARNING: ADODB_SESSION::syncSeconds is longer used, please remove this function for your code</p>");
-		
-		return 0;
-	}
-
-	/*!
-	*/
-	function clob($clob = null) {
-		static $_clob = false;
-		static $set = false;
-
-		if (!is_null($clob)) {
-			$_clob = strtolower(trim($clob));
-			$set = true;
-		} elseif (!$set) {
-			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_USE_LOBS'])) {
-				return $GLOBALS['ADODB_SESSION_USE_LOBS'];
-			}
-		}
-
-		return $_clob;
-	}
-
-	/*!
-	*/
-	function dataFieldName($data_field_name = null) {
-		//echo ("<p>WARNING: ADODB_SESSION::dataFieldName() is longer used, please remove this function for your code</p>");
-		return '';
-	}
-
-	/*!
-	*/
-	function filter($filter = null) {
-		static $_filter = array();
-
-		if (!is_null($filter)) {
-			if (!is_array($filter)) {
-				$filter = array($filter);
-			}
-			$_filter = $filter;
-		}
-
-		return $_filter;
-	}
-
-	/*!
-	*/
-	function encryptionKey($encryption_key = null) {
-		static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
-
-		if (!is_null($encryption_key)) {
-			$_encryption_key = $encryption_key;
-		}
-
-		return $_encryption_key;
-	}
-
-	/////////////////////
-	// private methods
-	/////////////////////
-
-	/*!
-	*/
-	function &_conn($conn=null) 
-	{
-		if (isset($GLOBALS['ADODB_SESS_CONN'])) {
-			$conn =& $GLOBALS['ADODB_SESS_CONN'];
-			return $conn;
-		}
-		$false = false;
-		return $false;
-	}
-
-	/*!
-	*/
-	function _crc($crc = null) {
-		static $_crc = false;
-
-		if (!is_null($crc)) {
-			$_crc = $crc;
-		}
-
-		return $_crc;
-	}
-
-	/*!
-	*/
-	function _init() {
-		session_module_name('user');
-		session_set_save_handler(
-			array('ADODB_Session', 'open'),
-			array('ADODB_Session', 'close'),
-			array('ADODB_Session', 'read'),
-			array('ADODB_Session', 'write'),
-			array('ADODB_Session', 'destroy'),
-			array('ADODB_Session', 'gc')
-		);
-	}
-
-
-	/*!
-	*/
-	function _sessionKey() {
-		// use this function to create the encryption key for crypted sessions
-		// crypt the used key, ADODB_Session::encryptionKey() as key and session_id() as salt
-		return crypt(ADODB_Session::encryptionKey(), session_id());
-	}
-
-	/*!
-	*/
-	function _dumprs($rs) {
-		$conn	=& ADODB_Session::_conn();
-		$debug	= ADODB_Session::debug();
-
-		if (!$conn) {
-			return;
-		}
-
-		if (!$debug) {
-			return;
-		}
-
-		if (!$rs) {
-			echo "<br />\$rs is null or false<br />\n";
-			return;
-		}
-
-		//echo "<br />\nAffected_Rows=",$conn->Affected_Rows(),"<br />\n";
-
-		if (!is_object($rs)) {
-			return;
-		}
-
-		require_once ADODB_SESSION.'/../tohtml.inc.php';
-		rs2html($rs);
-	}
-
-	/////////////////////
-	// public methods
-	/////////////////////
-	
-	function config($driver, $host, $user, $password, $database=false,$options=false)
-	{
-		ADODB_Session::driver($driver);
-		ADODB_Session::host($host);
-		ADODB_Session::user($user);
-		ADODB_Session::password($password);
-		ADODB_Session::database($database);
-		
-		if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] = 'CLOB';
-		
-		if (isset($options['table'])) ADODB_Session::table($options['table']);
-		if (isset($options['lob'])) ADODB_Session::clob($options['lob']);
-		if (isset($options['debug'])) ADODB_Session::debug($options['debug']);
-	}
-
-	/*!
-		Create the connection to the database.
-
-		If $conn already exists, reuse that connection
-	*/
-	function open($save_path, $session_name, $persist = null) 
-	{
-		$conn =& ADODB_Session::_conn();
-
-		if ($conn) {
-			return true;
-		}
-
-		$database	= ADODB_Session::database();
-		$debug		= ADODB_Session::debug();
-		$driver		= ADODB_Session::driver();
-		$host		= ADODB_Session::host();
-		$password	= ADODB_Session::password();
-		$user		= ADODB_Session::user();
-
-		if (!is_null($persist)) {
-			ADODB_Session::persist($persist);
-		} else {
-			$persist = ADODB_Session::persist();
-		}
-
-# these can all be defaulted to in php.ini
-#		assert('$database');
-#		assert('$driver');
-#		assert('$host');
-
-		$conn =& ADONewConnection($driver);
-
-		if ($debug) {
-			$conn->debug = true;		
-			ADOConnection::outp( " driver=$driver user=$user db=$database ");
-		}
-		
-		if ($persist) {
-			switch($persist) {
-			default:
-			case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
-			case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
-			case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
-			}
-		} else {
-			$ok = $conn->Connect($host, $user, $password, $database);
-		}
-
-		if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
-		else
-			ADOConnection::outp('<p>Session: connection failed</p>', false);
-		
-
-		return $ok;
-	}
-
-	/*!
-		Close the connection
-	*/
-	function close() 
-	{
-/*
-		$conn =& ADODB_Session::_conn();
-		if ($conn) $conn->Close();
-*/
-		return true;
-	}
-
-	/*
-		Slurp in the session variables and return the serialized string
-	*/
-	function read($key) 
-	{
-		$conn	=& ADODB_Session::_conn();
-		$filter	= ADODB_Session::filter();
-		$table	= ADODB_Session::table();
-
-		if (!$conn) {
-			return '';
-		}
-
-		//assert('$table');
-
-		$qkey = $conn->quote($key);
-		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-	
-		$sql = "SELECT sessdata FROM $table WHERE sesskey = $binary $qkey AND expiry >= " . $conn->sysTimeStamp;
-		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if 
-		  developer has commited elsewhere... :(
-		 */
-		#if (ADODB_Session::Lock())
-		#	$rs =& $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), sessdata);
-		#else
-		
-			$rs =& $conn->Execute($sql);
-		//ADODB_Session::_dumprs($rs);
-		if ($rs) {
-			if ($rs->EOF) {
-				$v = '';
-			} else {
-				$v = reset($rs->fields);
-				$filter = array_reverse($filter);
-				foreach ($filter as $f) {
-					if (is_object($f)) {
-						$v = $f->read($v, ADODB_Session::_sessionKey());
-					}
-				}
-				$v = rawurldecode($v);
-			}
-
-			$rs->Close();
-
-			ADODB_Session::_crc(strlen($v) . crc32($v));
-			return $v;
-		}
-
-		return '';
-	}
-
-	/*!
-		Write the serialized data to a database.
-
-		If the data has not been modified since the last read(), we do not write.
-	*/
-	function write($key, $val) 
-	{
-	global $ADODB_SESSION_READONLY;
-	
-		if (!empty($ADODB_SESSION_READONLY)) return;
-		
-		$clob			= ADODB_Session::clob();
-		$conn			=& ADODB_Session::_conn();
-		$crc			= ADODB_Session::_crc();
-		$debug			= ADODB_Session::debug();
-		$driver			= ADODB_Session::driver();
-		$expire_notify	= ADODB_Session::expireNotify();
-		$filter			= ADODB_Session::filter();
-		$lifetime		= ADODB_Session::lifetime();
-		$table			= ADODB_Session::table();
-	
-		if (!$conn) {
-			return false;
-		}
-	
-		$sysTimeStamp = $conn->sysTimeStamp;
-		
-		//assert('$table');
-
-		$expiry = $conn->OffsetDate($lifetime/(24*3600),$sysTimeStamp);
-
-		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-
-		// crc32 optimization since adodb 2.1
-		// now we only update expiry date, thx to sebastian thom in adodb 2.32
-		if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
-			if ($debug) {
-				echo '<p>Session: Only updating date - crc32 not changed</p>';
-			}
-			
-			$expirevar = '';
-			if ($expire_notify) {
-				$var = reset($expire_notify);
-				global $$var;
-				if (isset($$var)) {
-					$expirevar = $$var;
-				}
-			}
-			
-			
-			$sql = "UPDATE $table SET expiry = $expiry ,expireref=".$conn->Param('0').", modified = $sysTimeStamp WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= $sysTimeStamp";
-			$rs =& $conn->Execute($sql,array($expirevar,$key));
-			return true;
-		}
-		$val = rawurlencode($val);
-		foreach ($filter as $f) {
-			if (is_object($f)) {
-				$val = $f->write($val, ADODB_Session::_sessionKey());
-			}
-		}
-
-		$expireref = '';
-		if ($expire_notify) {
-			$var = reset($expire_notify);
-			global $$var;
-			if (isset($$var)) {
-				$expireref = $$var;
-			}
-		} 
-
-		if (!$clob) {	// no lobs, simply use replace()
-			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
-			if ($rs) $rs->Close();
-					
-			if ($rs && reset($rs->fields) > 0) {
-				$sql = "UPDATE $table SET expiry=$expiry, sessdata=".$conn->Param(0).", expireref= ".$conn->Param(1).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param('2');
-				
-			} else {
-				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified) 
-					VALUES ($expiry,".$conn->Param('0').", ". $conn->Param('1').", ".$conn->Param('2').", $sysTimeStamp, $sysTimeStamp)";
-			}
-			
-	
-			$rs =& $conn->Execute($sql,array($val,$expireref,$key));
-			
-		} else {
-			// what value shall we insert/update for lob row?
-			switch ($driver) {
-				// empty_clob or empty_lob for oracle dbs
-				case 'oracle':
-				case 'oci8':
-				case 'oci8po':
-				case 'oci805':
-					$lob_value = sprintf('empty_%s()', strtolower($clob));
-					break;
-
-				// null for all other
-				default:
-					$lob_value = 'null';
-					break;
-			}
-			
-			$conn->StartTrans();
-			
-			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
-			if ($rs) $rs->Close();
-					
-			if ($rs && reset($rs->fields) > 0) {
-				$sql = "UPDATE $table SET expiry=$expiry, sessdata=$lob_value, expireref= ".$conn->Param(0).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param('1');
-				
-			} else {
-				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified) 
-					VALUES ($expiry,$lob_value, ". $conn->Param('0').", ".$conn->Param('1').", $sysTimeStamp, $sysTimeStamp)";
-			}
-			
-			$rs =& $conn->Execute($sql,array($expireref,$key));
-			
-			$qkey = $conn->qstr($key);
-			$rs2 = $conn->UpdateBlob($table, 'sessdata', $val, " sesskey=$qkey", strtoupper($clob));
-			$rs = @$conn->CompleteTrans();
-			
-			
-		}
-
-		if (!$rs) {
-			ADOConnection::outp('<p>Session Replace: ' . $conn->ErrorMsg() . '</p>', false);
-			return false;
-		}  else {
-			// bug in access driver (could be odbc?) means that info is not committed
-			// properly unless select statement executed in Win2000
-			if ($conn->databaseType == 'access') {
-				$sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
-				$rs =& $conn->Execute($sql);
-				ADODB_Session::_dumprs($rs);
-				if ($rs) {
-					$rs->Close();
-				}
-			}
-		}/*
-		if (ADODB_Session::Lock()) {
-			$conn->CommitTrans();
-		}*/
-		return $rs ? true : false;
-	}
-
-	/*!
-	*/
-	function destroy($key) {
-		$conn			=& ADODB_Session::_conn();
-		$table			= ADODB_Session::table();
-		$expire_notify	= ADODB_Session::expireNotify();
-
-		if (!$conn) {
-			return false;
-		}
-
-		//assert('$table');
-
-		$qkey = $conn->quote($key);
-		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-
-		if ($expire_notify) {
-			reset($expire_notify);
-			$fn = next($expire_notify);
-			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
-			$sql = "SELECT expireref, sesskey FROM $table WHERE $binary sesskey = $qkey";
-			$rs =& $conn->Execute($sql);
-			ADODB_Session::_dumprs($rs);
-			$conn->SetFetchMode($savem);
-			if (!$rs) {
-				return false;
-			}
-			if (!$rs->EOF) {
-				$ref = $rs->fields[0];
-				$key = $rs->fields[1];
-				//assert('$ref');
-				//assert('$key');
-				$fn($ref, $key);
-			}
-			$rs->Close();
-		}
-
-		$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
-		$rs =& $conn->Execute($sql);
-		ADODB_Session::_dumprs($rs);
-		if ($rs) {
-			$rs->Close();
-		}
-
-		return $rs ? true : false;
-	}
-
-	/*!
-	*/
-	function gc($maxlifetime) 
-	{
-		$conn			=& ADODB_Session::_conn();
-		$debug			= ADODB_Session::debug();
-		$expire_notify	= ADODB_Session::expireNotify();
-		$optimize		= ADODB_Session::optimize();
-		$table			= ADODB_Session::table();
-
-		if (!$conn) {
-			return false;
-		}
-
-		//assert('$table');
-
-		$time = $conn->sysTimeStamp;
-		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
-
-		if ($expire_notify) {
-			reset($expire_notify);
-			$fn = next($expire_notify);
-			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
-			$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time";
-			$rs =& $conn->Execute($sql);
-			ADODB_Session::_dumprs($rs);
-			$conn->SetFetchMode($savem);
-			if ($rs) {
-				$conn->StartTrans();
-				$keys = array();
-				while (!$rs->EOF) {
-					$ref = $rs->fields[0];
-					$key = $rs->fields[1];
-					$fn($ref, $key);
-					$del = $conn->Execute("DELETE FROM $table WHERE sesskey=".$conn->Param('0'),array($key));
-					$rs->MoveNext();
-				}
-				$rs->Close();
-				
-				$conn->CompleteTrans();
-			}
-		} else {
-		
-			if (0) {
-				$sql = "SELECT sesskey FROM $table WHERE expiry < $time";
-				$arr =& $conn->GetAll($sql);
-				foreach ($arr as $row) {
-					$sql2 = "DELETE FROM $table WHERE sesskey=".$conn->Param('0');
-					$conn->Execute($sql2,array($row[0]));
-				}
-			} else {
-				$sql = "DELETE FROM $table WHERE expiry < $time";
-				$rs =& $conn->Execute($sql);
-				ADODB_Session::_dumprs($rs);
-				if ($rs) $rs->Close();
-			}
-			if ($debug) {
-				ADOConnection::outp("<p><b>Garbage Collection</b>: $sql</p>");
-			}
-		}
-
-		// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
-		if ($optimize) {
-			$driver = ADODB_Session::driver();
-
-			if (preg_match('/mysql/i', $driver)) {
-				$sql = "OPTIMIZE TABLE $table";
-			}
-			if (preg_match('/postgres/i', $driver)) {
-				$sql = "VACUUM $table";
-			}
-			if (!empty($sql)) {
-				$conn->Execute($sql);
-			}
-		}
-
-		
-		return true;
-	}
-}
-
-ADODB_Session::_init();
-if (empty($ADODB_SESSION_READONLY))
-	register_shutdown_function('session_write_close');
-
-// for backwards compatability only
-function adodb_sess_open($save_path, $session_name, $persist = true) {
-	return ADODB_Session::open($save_path, $session_name, $persist);
-}
-
-// for backwards compatability only
-function adodb_sess_gc($t)
-{	
-	return ADODB_Session::gc($t);
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/session_schema.xml
===================================================================
--- admin/include/lib/adodb/session/session_schema.xml	(revision 6370)
+++ admin/include/lib/adodb/session/session_schema.xml	(working copy)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<schema version="0.2">
-  <table name="sessions">
-    <desc>table for ADOdb session-management</desc>
-
-    <field name="SESSKEY" type="C" size="32">
-      <descr>session key</descr>
-      <KEY/>
-      <NOTNULL/>
-    </field>
- 
-    <field name="EXPIRY" type="I" size="11">
-      <descr></descr>
-      <NOTNULL/>
-    </field>
-
-    <field name="EXPIREREF" type="C" size="64">
-      <descr></descr>
-    </field>
-
-    <field name="DATA" type="XL">
-      <descr></descr>
-      <NOTNULL/>
-    </field>
-  </table>
-</schema>
Index: admin/include/lib/adodb/session/adodb-encrypt-secret.php
===================================================================
--- admin/include/lib/adodb/session/adodb-encrypt-secret.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-encrypt-secret.php	(working copy)
@@ -1,48 +0,0 @@
-<?php
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
-
-@define('HORDE_BASE', dirname(dirname(dirname(__FILE__))) . '/horde');
-
-if (!is_dir(HORDE_BASE)) {
-	trigger_error(sprintf('Directory not found: \'%s\'', HORDE_BASE), E_USER_ERROR);
-	return 0;
-}
-
-include_once HORDE_BASE . '/lib/Horde.php';
-include_once HORDE_BASE . '/lib/Secret.php';
-
-/**
-
-NOTE: On Windows 2000 SP4 with PHP 4.3.1, MCrypt 2.4.x, and Apache 1.3.28,
-the session didn't work properly.
-
-This may be resolved with 4.3.3.
-
- */
-class ADODB_Encrypt_Secret {
-	/**
-	 */
-	function write($data, $key) {
-		return Secret::write($key, $data);
-	}
-
-	/**
-	 */
-	function read($data, $key) {
-		return Secret::read($key, $data);
-	}
-
-}
-
-return 1;
-
-?>
Index: admin/include/lib/adodb/session/adodb-encrypt-md5.php
===================================================================
--- admin/include/lib/adodb/session/adodb-encrypt-md5.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-encrypt-md5.php	(working copy)
@@ -1,39 +0,0 @@
-<?php
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_SESSION')) die();
-
-include_once ADODB_SESSION . '/crypt.inc.php';
-
-/**
- */
-class ADODB_Encrypt_MD5 {
-	/**
-	 */
-	function write($data, $key) {
-		$md5crypt =& new MD5Crypt();
-		return $md5crypt->encrypt($data, $key);
-	}
-
-	/**
-	 */
-	function read($data, $key) {
-		$md5crypt =& new MD5Crypt();
-		return $md5crypt->decrypt($data, $key);
-	}
-
-}
-
-return 1;
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/adodb-encrypt-sha1.php
===================================================================
--- admin/include/lib/adodb/session/adodb-encrypt-sha1.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-encrypt-sha1.php	(working copy)
@@ -1,32 +0,0 @@
-<?php
-if (!defined('ADODB_SESSION')) die();
-
-include_once ADODB_SESSION . '/crypt.inc.php';
-
-
-/**
-
- */
-
-class ADODB_Encrypt_SHA1 {
-
-	function write($data, $key) 
-	{
-		$sha1crypt =& new SHA1Crypt();
-		return $sha1crypt->encrypt($data, $key);
-
-	}
-
-
-	function read($data, $key) 
-	{
-		$sha1crypt =& new SHA1Crypt();
-		return $sha1crypt->decrypt($data, $key);
-
-	}
-}
-
-
-
-return 1;
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/adodb-compress-bzip2.php
===================================================================
--- admin/include/lib/adodb/session/adodb-compress-bzip2.php	(revision 6370)
+++ admin/include/lib/adodb/session/adodb-compress-bzip2.php	(working copy)
@@ -1,118 +0,0 @@
-<?php
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-         Contributed by Ross Smith (adodb@netebb.com). 
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
-
-if (!function_exists('bzcompress')) {
-	trigger_error('bzip2 functions are not available', E_USER_ERROR);
-	return 0;
-}
-
-/*
-*/
-class ADODB_Compress_Bzip2 {
-	/**
-	 */
-	var $_block_size = null;
-
-	/**
-	 */
-	var $_work_level = null;
-
-	/**
-	 */
-	var $_min_length = 1;
-
-	/**
-	 */
-	function getBlockSize() {
-		return $this->_block_size;
-	}
-
-	/**
-	 */
-	function setBlockSize($block_size) {
-		assert('$block_size >= 1');
-		assert('$block_size <= 9');
-		$this->_block_size = (int) $block_size;
-	}
-
-	/**
-	 */
-	function getWorkLevel() {
-		return $this->_work_level;
-	}
-
-	/**
-	 */
-	function setWorkLevel($work_level) {
-		assert('$work_level >= 0');
-		assert('$work_level <= 250');
-		$this->_work_level = (int) $work_level;
-	}
-
-	/**
-	 */
-	function getMinLength() {
-		return $this->_min_length;
-	}
-
-	/**
-	 */
-	function setMinLength($min_length) {
-		assert('$min_length >= 0');
-		$this->_min_length = (int) $min_length;
-	}
-
-	/**
-	 */
-	function ADODB_Compress_Bzip2($block_size = null, $work_level = null, $min_length = null) {
-		if (!is_null($block_size)) {
-			$this->setBlockSize($block_size);
-		}
-
-		if (!is_null($work_level)) {
-			$this->setWorkLevel($work_level);
-		}
-
-		if (!is_null($min_length)) {
-			$this->setMinLength($min_length);
-		}
-	}
-
-	/**
-	 */
-	function write($data, $key) {
-		if (strlen($data) < $this->_min_length) {
-			return $data;
-		}
-
-		if (!is_null($this->_block_size)) {
-			if (!is_null($this->_work_level)) {
-				return bzcompress($data, $this->_block_size, $this->_work_level);
-			} else {
-				return bzcompress($data, $this->_block_size);
-			}
-		}
-
-		return bzcompress($data);
-	}
-
-	/**
-	 */
-	function read($data, $key) {
-		return $data ? bzdecompress($data) : $data;
-	}
-
-}
-
-return 1;
-
-?>
Index: admin/include/lib/adodb/session/old/crypt.inc.php
===================================================================
--- admin/include/lib/adodb/session/old/crypt.inc.php	(revision 6370)
+++ admin/include/lib/adodb/session/old/crypt.inc.php	(working copy)
@@ -1,64 +0,0 @@
-<?php
-//	 Session Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
-class MD5Crypt{
-		function keyED($txt,$encrypt_key)
-		{
-				$encrypt_key = md5($encrypt_key);
-				$ctr=0;
-				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++){
-						if ($ctr==strlen($encrypt_key)) $ctr=0;
-						$tmp.= substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1);
-						$ctr++;
-				}
-				return $tmp;
-		}
-
-		function Encrypt($txt,$key)
-		{
-				srand((double)microtime()*1000000);
-				$encrypt_key = md5(rand(0,32000));
-				$ctr=0;
-				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++)
-				{
-				if ($ctr==strlen($encrypt_key)) $ctr=0;
-				$tmp.= substr($encrypt_key,$ctr,1) .
-				(substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
-				$ctr++;
-				}
-				return base64_encode($this->keyED($tmp,$key));
-		}
-
-		function Decrypt($txt,$key)
-		{
-				$txt = $this->keyED(base64_decode($txt),$key);
-				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++){
-						$md5 = substr($txt,$i,1);
-						$i++;
-						$tmp.= (substr($txt,$i,1) ^ $md5);
-				}
-				return $tmp;
-		}
-
-		function RandPass()
-		{
-				$randomPassword = "";
-				srand((double)microtime()*1000000);
-				for($i=0;$i<8;$i++)
-				{
-						$randnumber = rand(48,120);
-
-						while (($randnumber >= 58 && $randnumber <= 64) || ($randnumber >= 91 && $randnumber <= 96))
-						{
-								$randnumber = rand(48,120);
-						}
-
-						$randomPassword .= chr($randnumber);
-				}
-				return $randomPassword;
-		}
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/old/adodb-session.php
===================================================================
--- admin/include/lib/adodb/session/old/adodb-session.php	(revision 6370)
+++ admin/include/lib/adodb/session/old/adodb-session.php	(working copy)
@@ -1,439 +0,0 @@
-<?php
-/*
-V4.93 10 Oct 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-  
-  Latest version of ADODB is available at http://php.weblogs.com/adodb
-  ======================================================================
-  
- This file provides PHP4 session management using the ADODB database
-wrapper library.
- 
- Example
- =======
- 
-	include('adodb.inc.php');
-	include('adodb-session.php');
-	session_start();
-	session_register('AVAR');
-	$_SESSION['AVAR'] += 1;
-	print "
--- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-	
-To force non-persistent connections, call adodb_session_open first before session_start():
-
-	include('adodb.inc.php');
-	include('adodb-session.php');
-	adodb_sess_open(false,false,false);
-	session_start();
-	session_register('AVAR');
-	$_SESSION['AVAR'] += 1;
-	print "
--- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-
- 
- Installation
- ============
- 1. Create this table in your database (syntax might vary depending on your db):
- 
-  create table sessions (
-	   SESSKEY char(32) not null,
-	   EXPIRY int(11) unsigned not null,
-	   EXPIREREF varchar(64),
-	   DATA text not null,
-	  primary key (sesskey)
-  );
-  
-  For oracle:
-    create table sessions (
-	   SESSKEY char(32) not null,
-	   EXPIRY DECIMAL(16)  not null,
-	   EXPIREREF varchar(64),
-	   DATA varchar(4000) not null,
-	  primary key (sesskey)
-  );
-
-
-  2. Then define the following parameters. You can either modify
-     this file, or define them before this file is included:
-	 
-  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
-	$ADODB_SESSION_CONNECT='server to connect to';
-	$ADODB_SESSION_USER ='user';
-	$ADODB_SESSION_PWD ='password';
-	$ADODB_SESSION_DB ='database';
-	$ADODB_SESSION_TBL = 'sessions'
-	
-  3. Recommended is PHP 4.1.0 or later. There are documented
-	 session bugs in earlier versions of PHP.
-
-  4. If you want to receive notifications when a session expires, then
-  	 you can tag a session with an EXPIREREF, and before the session
-	 record is deleted, we can call a function that will pass the EXPIREREF
-	 as the first parameter, and the session key as the second parameter.
-	 
-	 To do this, define a notification function, say NotifyFn:
-	 
-	 	function NotifyFn($expireref, $sesskey)
-	 	{
-	 	}
-	 
-	 Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
-	 This is an array with 2 elements, the first being the name of the variable
-	 you would like to store in the EXPIREREF field, and the 2nd is the 
-	 notification function's name.
-	 
-	 In this example, we want to be notified when a user's session 
-	 has expired, so we store the user id in the global variable $USERID, 
-	 store this value in the EXPIREREF field:
-	 
-	 	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-		
-	Then when the NotifyFn is called, we are passed the $USERID as the first
-	parameter, eg. NotifyFn($userid, $sesskey).
-*/
-
-if (!defined('_ADODB_LAYER')) {
-	include (dirname(__FILE__).'/adodb.inc.php');
-}
-
-if (!defined('ADODB_SESSION')) {
-
- define('ADODB_SESSION',1);
- 
- /* if database time and system time is difference is greater than this, then give warning */
- define('ADODB_SESSION_SYNCH_SECS',60); 
-
- /*
-	Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
-*/
-function adodb_session_regenerate_id() 
-{
-	$conn =& ADODB_Session::_conn();
-	if (!$conn) return false;
-
-	$old_id = session_id();
-	if (function_exists('session_regenerate_id')) {
-		session_regenerate_id();
-	} else {
-		session_id(md5(uniqid(rand(), true)));
-		$ck = session_get_cookie_params();
-		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
-		//@session_start();
-	}
-	$new_id = session_id();
-	$ok =& $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
-	
-	/* it is possible that the update statement fails due to a collision */
-	if (!$ok) {
-		session_id($old_id);
-		if (empty($ck)) $ck = session_get_cookie_params();
-		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
-		return false;
-	}
-	
-	return true;
-}
-
-/****************************************************************************************\
-	Global definitions
-\****************************************************************************************/
-GLOBAL 	$ADODB_SESSION_CONNECT, 
-	$ADODB_SESSION_DRIVER,
-	$ADODB_SESSION_USER,
-	$ADODB_SESSION_PWD,
-	$ADODB_SESSION_DB,
-	$ADODB_SESS_CONN,
-	$ADODB_SESS_LIFE,
-	$ADODB_SESS_DEBUG,
-	$ADODB_SESSION_EXPIRE_NOTIFY,
-	$ADODB_SESSION_CRC,
-	$ADODB_SESSION_TBL;
-	
-	
-	$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
-	if ($ADODB_SESS_LIFE <= 1) {
-	 // bug in PHP 4.0.3 pl 1  -- how about other versions?
-	 //print "<h3>Session Error: PHP.INI setting <i>session.gc_maxlifetime</i>not set: $ADODB_SESS_LIFE</h3>";
-	 	$ADODB_SESS_LIFE=1440;
-	}
-	$ADODB_SESSION_CRC = false;
-	//$ADODB_SESS_DEBUG = true;
-	
-	//////////////////////////////////
-	/* SET THE FOLLOWING PARAMETERS */
-	//////////////////////////////////
-	
-	if (empty($ADODB_SESSION_DRIVER)) {
-		$ADODB_SESSION_DRIVER='mysql';
-		$ADODB_SESSION_CONNECT='localhost';
-		$ADODB_SESSION_USER ='root';
-		$ADODB_SESSION_PWD ='';
-		$ADODB_SESSION_DB ='xphplens_2';
-	}
-	
-	if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
-		$ADODB_SESSION_EXPIRE_NOTIFY = false;
-	}
-	//  Made table name configurable - by David Johnson djohnson@inpro.net
-	if (empty($ADODB_SESSION_TBL)){
-		$ADODB_SESSION_TBL = 'sessions';
-	}
-	
-	/*
-	$ADODB_SESS['driver'] = $ADODB_SESSION_DRIVER;
-	$ADODB_SESS['connect'] = $ADODB_SESSION_CONNECT;
-	$ADODB_SESS['user'] = $ADODB_SESSION_USER;
-	$ADODB_SESS['pwd'] = $ADODB_SESSION_PWD;
-	$ADODB_SESS['db'] = $ADODB_SESSION_DB;
-	$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
-	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
-	
-	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
-	$ADODB_SESS['table'] = $ADODB_SESS_TBL;
-	*/
-	
-/****************************************************************************************\
-	Create the connection to the database. 
-	
-	If $ADODB_SESS_CONN already exists, reuse that connection
-\****************************************************************************************/
-function adodb_sess_open($save_path, $session_name,$persist=true) 
-{
-GLOBAL $ADODB_SESS_CONN;
-	if (isset($ADODB_SESS_CONN)) return true;
-	
-GLOBAL 	$ADODB_SESSION_CONNECT, 
-	$ADODB_SESSION_DRIVER,
-	$ADODB_SESSION_USER,
-	$ADODB_SESSION_PWD,
-	$ADODB_SESSION_DB,
-	$ADODB_SESS_DEBUG;
-	
-	// cannot use & below - do not know why...
-	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
-	if (!empty($ADODB_SESS_DEBUG)) {
-		$ADODB_SESS_CONN->debug = true;
-		ADOConnection::outp( " conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ");
-	}
-	if ($persist) $ok = $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
-			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-	else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
-			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-	
-	if (!$ok) ADOConnection::outp( "
--- Session: connection failed</p>",false);
-}
-
-/****************************************************************************************\
-	Close the connection
-\****************************************************************************************/
-function adodb_sess_close() 
-{
-global $ADODB_SESS_CONN;
-
-	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
-	return true;
-}
-
-/****************************************************************************************\
-	Slurp in the session variables and return the serialized string
-\****************************************************************************************/
-function adodb_sess_read($key) 
-{
-global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
-
-	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
-	if ($rs) {
-		if ($rs->EOF) {
-			$v = '';
-		} else 
-			$v = rawurldecode(reset($rs->fields));
-			
-		$rs->Close();
-		
-		// new optimization adodb 2.1
-		$ADODB_SESSION_CRC = strlen($v).crc32($v);
-		
-		return $v;
-	}
-	
-	return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
-}
-
-/****************************************************************************************\
-	Write the serialized data to a database.
-	
-	If the data has not been modified since adodb_sess_read(), we do not write.
-\****************************************************************************************/
-function adodb_sess_write($key, $val) 
-{
-	global
-		$ADODB_SESS_CONN, 
-		$ADODB_SESS_LIFE, 
-		$ADODB_SESSION_TBL,
-		$ADODB_SESS_DEBUG, 
-		$ADODB_SESSION_CRC,
-		$ADODB_SESSION_EXPIRE_NOTIFY;
-
-	$expiry = time() + $ADODB_SESS_LIFE;
-	
-	// crc32 optimization since adodb 2.1
-	// now we only update expiry date, thx to sebastian thom in adodb 2.32
-	if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
-		if ($ADODB_SESS_DEBUG) echo "
--- Session: Only updating date - crc32 not changed</p>";
-		$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
-		$rs = $ADODB_SESS_CONN->Execute($qry);	
-		return true;
-	}
-	$val = rawurlencode($val);
-	
-	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
-	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
-		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
-		global $$var;
-		$arr['expireref'] = $$var;
-	}
-	$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr,
-    	'sesskey',$autoQuote = true);
-	
-	if (!$rs) {
-		ADOConnection::outp( '
--- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'</p>',false);
-	}  else {
-		// bug in access driver (could be odbc?) means that info is not commited
-		// properly unless select statement executed in Win2000
-		if ($ADODB_SESS_CONN->databaseType == 'access') 
-			$rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
-	}
-	return !empty($rs);
-}
-
-function adodb_sess_destroy($key) 
-{
-	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
-	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
-		reset($ADODB_SESSION_EXPIRE_NOTIFY);
-		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
-		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
-		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
-		$ADODB_SESS_CONN->SetFetchMode($savem);
-		if ($rs) {
-			$ADODB_SESS_CONN->BeginTrans();
-			while (!$rs->EOF) {
-				$ref = $rs->fields[0];
-				$key = $rs->fields[1];
-				$fn($ref,$key);
-				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
-				$rs->MoveNext();
-			}
-			$ADODB_SESS_CONN->CommitTrans();
-		}
-	} else {
-		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
-		$rs = $ADODB_SESS_CONN->Execute($qry);
-	}
-	return $rs ? true : false;
-}
-
-function adodb_sess_gc($maxlifetime) 
-{
-	global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
-	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
-		reset($ADODB_SESSION_EXPIRE_NOTIFY);
-		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
-		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
-		$t = time();
-		$rs =& $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE expiry < $t");
-		$ADODB_SESS_CONN->SetFetchMode($savem);
-		if ($rs) {
-			$ADODB_SESS_CONN->BeginTrans();
-			while (!$rs->EOF) {
-				$ref = $rs->fields[0];
-				$key = $rs->fields[1];
-				$fn($ref,$key);
-				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			
-			$ADODB_SESS_CONN->CommitTrans();
-			
-		}
-	} else {
-		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
-		$ADODB_SESS_CONN->Execute($qry);
-	
-		if ($ADODB_SESS_DEBUG) ADOConnection::outp("
--- <b>Garbage Collection</b>: $qry</p>");
-	}
-	// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
-	if (defined('ADODB_SESSION_OPTIMIZE')) {
-	global $ADODB_SESSION_DRIVER;
-	
-		switch( $ADODB_SESSION_DRIVER ) {
-			case 'mysql':
-			case 'mysqlt':
-				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
-				break;
-			case 'postgresql':
-			case 'postgresql7':
-				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
-				break;
-		}
-		if (!empty($opt_qry)) {
-			$ADODB_SESS_CONN->Execute($opt_qry);
-		}
-	}
-	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
-	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
-	
-	$rs =& $ADODB_SESS_CONN->SelectLimit($sql,1);
-	if ($rs && !$rs->EOF) {
-	
-		$dbts = reset($rs->fields);
-		$rs->Close();
-		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
-		$t = time();
-	
-		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
-		
-			$msg = 
-			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
-			error_log($msg);
-			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
--- $msg</p>");
-		}
-	}
-	
-	return true;
-}
-
-session_module_name('user'); 
-session_set_save_handler(
-	"adodb_sess_open",
-	"adodb_sess_close",
-	"adodb_sess_read",
-	"adodb_sess_write",
-	"adodb_sess_destroy",
-	"adodb_sess_gc");
-}
-
-/*  TEST SCRIPT -- UNCOMMENT */
-
-if (0) {
-
-	session_start();
-	session_register('AVAR');
-	$_SESSION['AVAR'] += 1;
-	ADOConnection::outp( "
--- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>",false);
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/session/old/adodb-cryptsession.php
===================================================================
--- admin/include/lib/adodb/session/old/adodb-cryptsession.php	(revision 6370)
+++ admin/include/lib/adodb/session/old/adodb-cryptsession.php	(working copy)
@@ -1,324 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	Made table name configurable - by David Johnson djohnson@inpro.net
-	Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
-	
-  Set tabs to 4 for best viewing.
-  
-  Latest version of ADODB is available at http://php.weblogs.com/adodb
-  ======================================================================
-  
- This file provides PHP4 session management using the ADODB database
-wrapper library.
- 
- Example
- =======
- 
-	include('adodb.inc.php');
-	#---------------------------------#
-	include('adodb-cryptsession.php'); 
-	#---------------------------------#
-	session_start();
-	session_register('AVAR');
-	$_SESSION['AVAR'] += 1;
-	print "
--- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-
- 
- Installation
- ============
- 1. Create a new database in MySQL or Access "sessions" like
-so:
- 
-  create table sessions (
-	   SESSKEY char(32) not null,
-	   EXPIRY int(11) unsigned not null,
-	   EXPIREREF varchar(64),
-	   DATA CLOB,
-	  primary key (sesskey)
-  );
-  
-  2. Then define the following parameters. You can either modify
-     this file, or define them before this file is included:
-	 
-  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
-	$ADODB_SESSION_CONNECT='server to connect to';
-	$ADODB_SESSION_USER ='user';
-	$ADODB_SESSION_PWD ='password';
-	$ADODB_SESSION_DB ='database';
-	$ADODB_SESSION_TBL = 'sessions'
-	
-  3. Recommended is PHP 4.0.2 or later. There are documented
-session bugs in earlier versions of PHP.
-
-*/
-
-
-include_once('crypt.inc.php');
-
-if (!defined('_ADODB_LAYER')) {
-	include (dirname(__FILE__).'/adodb.inc.php');
-}
-
- /* if database time and system time is difference is greater than this, then give warning */
- define('ADODB_SESSION_SYNCH_SECS',60); 
-
-if (!defined('ADODB_SESSION')) {
-
- define('ADODB_SESSION',1);
- 
-GLOBAL 	$ADODB_SESSION_CONNECT, 
-	$ADODB_SESSION_DRIVER,
-	$ADODB_SESSION_USER,
-	$ADODB_SESSION_PWD,
-	$ADODB_SESSION_DB,
-	$ADODB_SESS_CONN,
-	$ADODB_SESS_LIFE,
-	$ADODB_SESS_DEBUG,
-	$ADODB_SESS_INSERT,
-	$ADODB_SESSION_EXPIRE_NOTIFY,
-	$ADODB_SESSION_TBL; 
-
-	//$ADODB_SESS_DEBUG = true;
-	
-	/* SET THE FOLLOWING PARAMETERS */
-if (empty($ADODB_SESSION_DRIVER)) {
-	$ADODB_SESSION_DRIVER='mysql';
-	$ADODB_SESSION_CONNECT='localhost';
-	$ADODB_SESSION_USER ='root';
-	$ADODB_SESSION_PWD ='';
-	$ADODB_SESSION_DB ='xphplens_2';
-}
-
-if (empty($ADODB_SESSION_TBL)){
-	$ADODB_SESSION_TBL = 'sessions';
-}
-
-if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
-	$ADODB_SESSION_EXPIRE_NOTIFY = false;
-}
-
-function ADODB_Session_Key() 
-{
-$ADODB_CRYPT_KEY = 'CRYPTED ADODB SESSIONS ROCK!';
-
-	/* USE THIS FUNCTION TO CREATE THE ENCRYPTION KEY FOR CRYPTED SESSIONS	*/
-	/* Crypt the used key, $ADODB_CRYPT_KEY as key and session_ID as SALT	*/
-	return crypt($ADODB_CRYPT_KEY, session_ID());
-}
-
-$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
-if ($ADODB_SESS_LIFE <= 1) {
-	// bug in PHP 4.0.3 pl 1  -- how about other versions?
-	//print "<h3>Session Error: PHP.INI setting <i>session.gc_maxlifetime</i>not set: $ADODB_SESS_LIFE</h3>";
-	$ADODB_SESS_LIFE=1440;
-}
-
-function adodb_sess_open($save_path, $session_name) 
-{
-GLOBAL 	$ADODB_SESSION_CONNECT, 
-	$ADODB_SESSION_DRIVER,
-	$ADODB_SESSION_USER,
-	$ADODB_SESSION_PWD,
-	$ADODB_SESSION_DB,
-	$ADODB_SESS_CONN,
-	$ADODB_SESS_DEBUG;
-	
-	$ADODB_SESS_INSERT = false;
-	
-	if (isset($ADODB_SESS_CONN)) return true;
-	
-	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
-	if (!empty($ADODB_SESS_DEBUG)) {
-		$ADODB_SESS_CONN->debug = true;
-		print" conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ";
-	}
-	return $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
-			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-	
-}
-
-function adodb_sess_close() 
-{
-global $ADODB_SESS_CONN;
-
-	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
-	return true;
-}
-
-function adodb_sess_read($key) 
-{
-$Crypt = new MD5Crypt;
-global $ADODB_SESS_CONN,$ADODB_SESS_INSERT,$ADODB_SESSION_TBL;
-	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
-	if ($rs) {
-		if ($rs->EOF) {
-			$ADODB_SESS_INSERT = true;
-			$v = '';
-		} else {
-			// Decrypt session data
-			$v = rawurldecode($Crypt->Decrypt(reset($rs->fields), ADODB_Session_Key()));
-		}
-		$rs->Close();
-		return $v;
-	}
-	else $ADODB_SESS_INSERT = true;
-	
-	return '';
-}
-
-function adodb_sess_write($key, $val) 
-{
-$Crypt = new MD5Crypt;
-	global $ADODB_SESS_INSERT,$ADODB_SESS_CONN, $ADODB_SESS_LIFE, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-
-	$expiry = time() + $ADODB_SESS_LIFE;
-
-	// encrypt session data..	
-	$val = $Crypt->Encrypt(rawurlencode($val), ADODB_Session_Key());
-	
-	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
-	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
-		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
-		global $$var;
-		$arr['expireref'] = $$var;
-	}
-	$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,
-	    $arr,
-    	'sesskey',$autoQuote = true);
-
-	if (!$rs) {
-		ADOConnection::outp( '
--- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'</p>',false);
-	} else {
-		// bug in access driver (could be odbc?) means that info is not commited
-		// properly unless select statement executed in Win2000
-	
-	if ($ADODB_SESS_CONN->databaseType == 'access') $rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
-	}
-	return isset($rs);
-}
-
-function adodb_sess_destroy($key) 
-{
-	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
-	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
-		reset($ADODB_SESSION_EXPIRE_NOTIFY);
-		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
-		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
-		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
-		$ADODB_SESS_CONN->SetFetchMode($savem);
-		if ($rs) {
-			$ADODB_SESS_CONN->BeginTrans();
-			while (!$rs->EOF) {
-				$ref = $rs->fields[0];
-				$key = $rs->fields[1];
-				$fn($ref,$key);
-				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
-				$rs->MoveNext();
-			}
-			$ADODB_SESS_CONN->CommitTrans();
-		}
-	} else {
-		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
-		$rs = $ADODB_SESS_CONN->Execute($qry);
-	}
-	return $rs ? true : false;
-}
-
-
-function adodb_sess_gc($maxlifetime) {
-	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY,$ADODB_SESS_DEBUG;
-
-	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
-		reset($ADODB_SESSION_EXPIRE_NOTIFY);
-		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
-		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
-		$t = time();
-		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE expiry < $t");
-		$ADODB_SESS_CONN->SetFetchMode($savem);
-		if ($rs) {
-			$ADODB_SESS_CONN->BeginTrans();
-			while (!$rs->EOF) {
-				$ref = $rs->fields[0];
-				$key = $rs->fields[1];
-				$fn($ref,$key);
-				//$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			
-			$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
-			$ADODB_SESS_CONN->CommitTrans();
-		}
-	} else {
-		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
-		$ADODB_SESS_CONN->Execute($qry);
-	}
-	
-	// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
-	if (defined('ADODB_SESSION_OPTIMIZE'))
-	{
-	global $ADODB_SESSION_DRIVER;
-	
-		switch( $ADODB_SESSION_DRIVER ) {
-			case 'mysql':
-			case 'mysqlt':
-				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
-				break;
-			case 'postgresql':
-			case 'postgresql7':
-				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
-				break;
-		}
-	}
-	
-	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
-	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
-	
-	$rs =& $ADODB_SESS_CONN->SelectLimit($sql,1);
-	if ($rs && !$rs->EOF) {
-	
-		$dbts = reset($rs->fields);
-		$rs->Close();
-		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
-		$t = time();
-		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
-			$msg = 
-			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
-			error_log($msg);
-			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
--- $msg</p>");
-		}
-	}
-	
-	return true;
-}
-
-session_module_name('user'); 
-session_set_save_handler(
-	"adodb_sess_open",
-	"adodb_sess_close",
-	"adodb_sess_read",
-	"adodb_sess_write",
-	"adodb_sess_destroy",
-	"adodb_sess_gc");
-}
-
-/*  TEST SCRIPT -- UNCOMMENT */
-/*
-if (0) {
-
-	session_start();
-	session_register('AVAR');
-	$_SESSION['AVAR'] += 1;
-	print "
--- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-}
-*/
-?>
Index: admin/include/lib/adodb/session/old/adodb-session-clob.php
===================================================================
--- admin/include/lib/adodb/session/old/adodb-session-clob.php	(revision 6370)
+++ admin/include/lib/adodb/session/old/adodb-session-clob.php	(working copy)
@@ -1,448 +0,0 @@
-<?php
-/*
-  V4.93 10 Oct 2006  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-  
-  Latest version of ADODB is available at http://php.weblogs.com/adodb
-  ======================================================================
-  
- This file provides PHP4 session management using the ADODB database
- wrapper library, using Oracle CLOB's to store data. Contributed by achim.gosse@ddd.de.
-
- Example
- =======
- 
-	include('adodb.inc.php');
-	include('adodb-session.php');
-	session_start();
-	session_register('AVAR');
-	$_SESSION['AVAR'] += 1;
-	print "
--- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-	
-To force non-persistent connections, call adodb_session_open first before session_start():
-
-	include('adodb.inc.php');
-	include('adodb-session.php');
-	adodb_session_open(false,false,false);
-	session_start();
-	session_register('AVAR');
-	$_SESSION['AVAR'] += 1;
-	print "
--- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
-
- 
- Installation
- ============
- 1. Create this table in your database (syntax might vary depending on your db):
- 
-  create table sessions (
-	   SESSKEY char(32) not null,
-	   EXPIRY int(11) unsigned not null,
-	   EXPIREREF varchar(64),
-	   DATA CLOB,
-	  primary key (sesskey)
-  );
-
-
-  2. Then define the following parameters in this file:
-  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
-	$ADODB_SESSION_CONNECT='server to connect to';
-	$ADODB_SESSION_USER ='user';
-	$ADODB_SESSION_PWD ='password';
-	$ADODB_SESSION_DB ='database';
-	$ADODB_SESSION_TBL = 'sessions'
-	$ADODB_SESSION_USE_LOBS = false; (or, if you wanna use CLOBS (= 'CLOB') or ( = 'BLOB')
-	
-  3. Recommended is PHP 4.1.0 or later. There are documented
-	 session bugs in earlier versions of PHP.
-
-  4. If you want to receive notifications when a session expires, then
-  	 you can tag a session with an EXPIREREF, and before the session
-	 record is deleted, we can call a function that will pass the EXPIREREF
-	 as the first parameter, and the session key as the second parameter.
-	 
-	 To do this, define a notification function, say NotifyFn:
-	 
-	 	function NotifyFn($expireref, $sesskey)
-	 	{
-	 	}
-	 
-	 Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
-	 This is an array with 2 elements, the first being the name of the variable
-	 you would like to store in the EXPIREREF field, and the 2nd is the 
-	 notification function's name.
-	 
-	 In this example, we want to be notified when a user's session 
-	 has expired, so we store the user id in the global variable $USERID, 
-	 store this value in the EXPIREREF field:
-	 
-	 	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
-		
-	Then when the NotifyFn is called, we are passed the $USERID as the first
-	parameter, eg. NotifyFn($userid, $sesskey).
-*/
-
-if (!defined('_ADODB_LAYER')) {
-	include (dirname(__FILE__).'/adodb.inc.php');
-}
-
-if (!defined('ADODB_SESSION')) {
-
- define('ADODB_SESSION',1);
- 
- /* if database time and system time is difference is greater than this, then give warning */
- define('ADODB_SESSION_SYNCH_SECS',60); 
-
-/****************************************************************************************\
-	Global definitions
-\****************************************************************************************/
-GLOBAL 	$ADODB_SESSION_CONNECT, 
-	$ADODB_SESSION_DRIVER,
-	$ADODB_SESSION_USER,
-	$ADODB_SESSION_PWD,
-	$ADODB_SESSION_DB,
-	$ADODB_SESS_CONN,
-	$ADODB_SESS_LIFE,
-	$ADODB_SESS_DEBUG,
-	$ADODB_SESSION_EXPIRE_NOTIFY,
-	$ADODB_SESSION_CRC,
-	$ADODB_SESSION_USE_LOBS,
-	$ADODB_SESSION_TBL;
-	
-	if (!isset($ADODB_SESSION_USE_LOBS)) $ADODB_SESSION_USE_LOBS = 'CLOB';
-	
-	$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
-	if ($ADODB_SESS_LIFE <= 1) {
-	 // bug in PHP 4.0.3 pl 1  -- how about other versions?
-	 //print "<h3>Session Error: PHP.INI setting <i>session.gc_maxlifetime</i>not set: $ADODB_SESS_LIFE</h3>";
-	 	$ADODB_SESS_LIFE=1440;
-	}
-	$ADODB_SESSION_CRC = false;
-	//$ADODB_SESS_DEBUG = true;
-	
-	//////////////////////////////////
-	/* SET THE FOLLOWING PARAMETERS */
-	//////////////////////////////////
-	
-	if (empty($ADODB_SESSION_DRIVER)) {
-		$ADODB_SESSION_DRIVER='mysql';
-		$ADODB_SESSION_CONNECT='localhost';
-		$ADODB_SESSION_USER ='root';
-		$ADODB_SESSION_PWD ='';
-		$ADODB_SESSION_DB ='xphplens_2';
-	}
-	
-	if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
-		$ADODB_SESSION_EXPIRE_NOTIFY = false;
-	}
-	//  Made table name configurable - by David Johnson djohnson@inpro.net
-	if (empty($ADODB_SESSION_TBL)){
-		$ADODB_SESSION_TBL = 'sessions';
-	}
-	
-
-	// defaulting $ADODB_SESSION_USE_LOBS
-	if (!isset($ADODB_SESSION_USE_LOBS) || empty($ADODB_SESSION_USE_LOBS)) {
-		$ADODB_SESSION_USE_LOBS = false;
-	}
-
-	/*
-	$ADODB_SESS['driver'] = $ADODB_SESSION_DRIVER;
-	$ADODB_SESS['connect'] = $ADODB_SESSION_CONNECT;
-	$ADODB_SESS['user'] = $ADODB_SESSION_USER;
-	$ADODB_SESS['pwd'] = $ADODB_SESSION_PWD;
-	$ADODB_SESS['db'] = $ADODB_SESSION_DB;
-	$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
-	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
-	
-	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
-	$ADODB_SESS['table'] = $ADODB_SESS_TBL;
-	*/
-	
-/****************************************************************************************\
-	Create the connection to the database. 
-	
-	If $ADODB_SESS_CONN already exists, reuse that connection
-\****************************************************************************************/
-function adodb_sess_open($save_path, $session_name,$persist=true) 
-{
-GLOBAL $ADODB_SESS_CONN;
-	if (isset($ADODB_SESS_CONN)) return true;
-	
-GLOBAL 	$ADODB_SESSION_CONNECT, 
-	$ADODB_SESSION_DRIVER,
-	$ADODB_SESSION_USER,
-	$ADODB_SESSION_PWD,
-	$ADODB_SESSION_DB,
-	$ADODB_SESS_DEBUG;
-	
-	// cannot use & below - do not know why...
-	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
-	if (!empty($ADODB_SESS_DEBUG)) {
-		$ADODB_SESS_CONN->debug = true;
-		ADOConnection::outp( " conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ");
-	}
-	if ($persist) $ok = $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
-			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-	else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
-			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
-	
-	if (!$ok) ADOConnection::outp( "
--- Session: connection failed</p>",false);
-}
-
-/****************************************************************************************\
-	Close the connection
-\****************************************************************************************/
-function adodb_sess_close() 
-{
-global $ADODB_SESS_CONN;
-
-	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
-	return true;
-}
-
-/****************************************************************************************\
-	Slurp in the session variables and return the serialized string
-\****************************************************************************************/
-function adodb_sess_read($key) 
-{
-global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
-
-	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
-	if ($rs) {
-		if ($rs->EOF) {
-			$v = '';
-		} else 
-			$v = rawurldecode(reset($rs->fields));
-			
-		$rs->Close();
-		
-		// new optimization adodb 2.1
-		$ADODB_SESSION_CRC = strlen($v).crc32($v);
-		
-		return $v;
-	}
-	
-	return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
-}
-
-/****************************************************************************************\
-	Write the serialized data to a database.
-	
-	If the data has not been modified since adodb_sess_read(), we do not write.
-\****************************************************************************************/
-function adodb_sess_write($key, $val) 
-{
-	global
-		$ADODB_SESS_CONN, 
-		$ADODB_SESS_LIFE, 
-		$ADODB_SESSION_TBL,
-		$ADODB_SESS_DEBUG, 
-		$ADODB_SESSION_CRC,
-		$ADODB_SESSION_EXPIRE_NOTIFY,
-		$ADODB_SESSION_DRIVER,			// added
-		$ADODB_SESSION_USE_LOBS;		// added
-
-	$expiry = time() + $ADODB_SESS_LIFE;
-	
-	// crc32 optimization since adodb 2.1
-	// now we only update expiry date, thx to sebastian thom in adodb 2.32
-	if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
-		if ($ADODB_SESS_DEBUG) echo "
--- Session: Only updating date - crc32 not changed</p>";
-		$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
-		$rs = $ADODB_SESS_CONN->Execute($qry);	
-		return true;
-	}
-	$val = rawurlencode($val);
-	
-	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
-	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
-		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
-		global $$var;
-		$arr['expireref'] = $$var;
-	}
-
-	
-	if ($ADODB_SESSION_USE_LOBS === false) {	// no lobs, simply use replace()
-		$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr, 'sesskey',$autoQuote = true);
-		if (!$rs) {
-			$err = $ADODB_SESS_CONN->ErrorMsg();
-		}
-	} else {
-		// what value shall we insert/update for lob row?
-		switch ($ADODB_SESSION_DRIVER) {
-			// empty_clob or empty_lob for oracle dbs
-			case "oracle":
-			case "oci8":
-			case "oci8po":
-			case "oci805":
-				$lob_value = sprintf("empty_%s()", strtolower($ADODB_SESSION_USE_LOBS));
-				break;
-
-			// null for all other
-			default:
-				$lob_value = "null";
-				break;
-		}
-
-		// do we insert or update? => as for sesskey
-		$res = $ADODB_SESS_CONN->Execute("select count(*) as cnt from $ADODB_SESSION_TBL where sesskey = '$key'");
-		if ($res && reset($res->fields) > 0) {
-			$qry = sprintf("update %s set expiry = %d, data = %s where sesskey = '%s'", $ADODB_SESSION_TBL, $expiry, $lob_value, $key);
-		} else {
-			// insert
-			$qry = sprintf("insert into %s (sesskey, expiry, data) values ('%s', %d, %s)", $ADODB_SESSION_TBL, $key, $expiry, $lob_value);
-		}
-
-		$err = "";
-		$rs1 = $ADODB_SESS_CONN->Execute($qry);
-		if (!$rs1) {
-			$err .= $ADODB_SESS_CONN->ErrorMsg()."\n";
-		}
-		$rs2 = $ADODB_SESS_CONN->UpdateBlob($ADODB_SESSION_TBL, 'data', $val, "sesskey='$key'", strtoupper($ADODB_SESSION_USE_LOBS));
-		if (!$rs2) {
-			$err .= $ADODB_SESS_CONN->ErrorMsg()."\n";
-		}
-		$rs = ($rs1 && $rs2) ? true : false;
-	}
-
-	if (!$rs) {
-		ADOConnection::outp( '
--- Session Replace: '.nl2br($err).'</p>',false);
-	}  else {
-		// bug in access driver (could be odbc?) means that info is not commited
-		// properly unless select statement executed in Win2000
-		if ($ADODB_SESS_CONN->databaseType == 'access') 
-			$rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
-	}
-	return !empty($rs);
-}
-
-function adodb_sess_destroy($key) 
-{
-	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
-	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
-		reset($ADODB_SESSION_EXPIRE_NOTIFY);
-		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
-		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
-		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
-		$ADODB_SESS_CONN->SetFetchMode($savem);
-		if ($rs) {
-			$ADODB_SESS_CONN->BeginTrans();
-			while (!$rs->EOF) {
-				$ref = $rs->fields[0];
-				$key = $rs->fields[1];
-				$fn($ref,$key);
-				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
-				$rs->MoveNext();
-			}
-			$ADODB_SESS_CONN->CommitTrans();
-		}
-	} else {
-		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
-		$rs = $ADODB_SESS_CONN->Execute($qry);
-	}
-	return $rs ? true : false;
-}
-
-function adodb_sess_gc($maxlifetime) 
-{
-	global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
-	
-	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
-		reset($ADODB_SESSION_EXPIRE_NOTIFY);
-		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
-		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
-		$t = time();
-		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE expiry < $t");
-		$ADODB_SESS_CONN->SetFetchMode($savem);
-		if ($rs) {
-			$ADODB_SESS_CONN->BeginTrans();
-			while (!$rs->EOF) {
-				$ref = $rs->fields[0];
-				$key = $rs->fields[1];
-				$fn($ref,$key);
-				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			
-			//$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
-			$ADODB_SESS_CONN->CommitTrans();
-			
-		}
-	} else {
-		$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time());
-	
-		if ($ADODB_SESS_DEBUG) ADOConnection::outp("
--- <b>Garbage Collection</b>: $qry</p>");
-	}
-	// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
-	if (defined('ADODB_SESSION_OPTIMIZE')) {
-	global $ADODB_SESSION_DRIVER;
-	
-		switch( $ADODB_SESSION_DRIVER ) {
-			case 'mysql':
-			case 'mysqlt':
-				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
-				break;
-			case 'postgresql':
-			case 'postgresql7':
-				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
-				break;
-		}
-		if (!empty($opt_qry)) {
-			$ADODB_SESS_CONN->Execute($opt_qry);
-		}
-	}
-	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
-	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
-	
-	$rs =& $ADODB_SESS_CONN->SelectLimit($sql,1);
-	if ($rs && !$rs->EOF) {
-	
-		$dbts = reset($rs->fields);
-		$rs->Close();
-		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
-		$t = time();
-		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
-			$msg = 
-			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
-			error_log($msg);
-			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
--- $msg</p>");
-		}
-	}
-	
-	return true;
-}
-
-session_module_name('user'); 
-session_set_save_handler(
-	"adodb_sess_open",
-	"adodb_sess_close",
-	"adodb_sess_read",
-	"adodb_sess_write",
-	"adodb_sess_destroy",
-	"adodb_sess_gc");
-}
-
-/*  TEST SCRIPT -- UNCOMMENT */
-
-if (0) {
-
-	session_start();
-	session_register('AVAR');
-	$_SESSION['AVAR'] += 1;
-	ADOConnection::outp( "
--- \$_SESSION['AVAR']={$_SESSION['AVAR']}</p>",false);
-}
-
-?>
Index: admin/include/lib/adodb/cute_icons_for_site/adodb2.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: admin/include/lib/adodb/cute_icons_for_site/adodb.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: admin/include/lib/adodb/adodb-exceptions.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-exceptions.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-exceptions.inc.php	(working copy)
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * @version V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
- *
- * Set tabs to 4 for best viewing.
- *
- * Latest version is available at http://php.weblogs.com
- *
- * Exception-handling code using PHP5 exceptions (try-catch-throw).
- */
-
-
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
-define('ADODB_ERROR_HANDLER','adodb_throw');
-
-class ADODB_Exception extends Exception {
-var $dbms;
-var $fn;
-var $sql = '';
-var $params = '';
-var $host = '';
-var $database = '';
-	
-	function __construct($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
-	{
-		switch($fn) {
-		case 'EXECUTE':
-			$this->sql = $p1;
-			$this->params = $p2;
-			$s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n";
-			break;
-	
-		case 'PCONNECT':
-		case 'CONNECT':
-			$user = $thisConnection->user;
-			$s = "$dbms error: [$errno: $errmsg] in $fn($p1, '$user', '****', $p2)\n";
-			break;
-		default:
-			$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
-			break;
-		}
-	
-		$this->dbms = $dbms;
-		if ($thisConnection) {
-			$this->host = $thisConnection->host;
-			$this->database = $thisConnection->database;
-		}
-		$this->fn = $fn;
-		$this->msg = $errmsg;
-				
-		if (!is_numeric($errno)) $errno = -1;
-		parent::__construct($s,$errno);
-	}
-}
-
-/**
-* Default Error Handler. This will be called with the following params
-*
-* @param $dbms		the RDBMS you are connecting to
-* @param $fn		the name of the calling function (in uppercase)
-* @param $errno		the native error number from the database
-* @param $errmsg	the native error msg from the database
-* @param $p1		$fn specific parameter - see below
-* @param $P2		$fn specific parameter - see below
-*/
-
-function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection)
-{
-global $ADODB_EXCEPTION;
-	
-	if (error_reporting() == 0) return; // obey @ protocol
-	if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION;
-	else $errfn = 'ADODB_EXCEPTION';
-	throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection);
-}
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/rsfilter.inc.php
===================================================================
--- admin/include/lib/adodb/rsfilter.inc.php	(revision 6370)
+++ admin/include/lib/adodb/rsfilter.inc.php	(working copy)
@@ -1,61 +0,0 @@
-<?php
-/** 
- * @version V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
- * Latest version is available at http://php.weblogs.com
- *
- * Requires PHP4.01pl2 or later because it uses include_once
-*/
-
-/*
-	Filter all fields and all rows in a recordset and returns the 
-	processed recordset. We scroll to the beginning of the new recordset
-	after processing.
-	
-	We pass a recordset and function name to RSFilter($rs,'rowfunc');
-	and the function will be called multiple times, once
-	for each row in the recordset. The function will be passed
-	an array containing one row repeatedly.
-	
-	Example: 
- 	
-	// ucwords() every element in the recordset
-	function do_ucwords(&$arr,$rs)
-	{
-		foreach($arr as $k => $v) {
-			$arr[$k] = ucwords($v);
-		}
-	}
-	$rs = RSFilter($rs,'do_ucwords');
- */
-function &RSFilter($rs,$fn)
-{
-	if ($rs->databaseType != 'array') {
-		if (!$rs->connection) return false;
-		
-		$rs = &$rs->connection->_rs2rs($rs);
-	}
-	$rows = $rs->RecordCount();
-	for ($i=0; $i < $rows; $i++) {
-		if (is_array ($fn)) {
-        	$obj = $fn[0];
-        	$method = $fn[1];
-        	$obj->$method ($rs->_array[$i],$rs);
-      } else {
-			$fn($rs->_array[$i],$rs);
-      }
-	  
-	}
-	if (!$rs->EOF) {
-		$rs->_currentRow = 0;
-		$rs->fields = $rs->_array[0];
-	}
-	
-	return $rs;
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-xmlschema03.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-xmlschema03.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-xmlschema03.inc.php	(working copy)
@@ -1,2403 +0,0 @@
-<?php
-// Copyright (c) 2004-2005 ars Cognita Inc., all rights reserved
-/* ******************************************************************************
-    Released under both BSD license and Lesser GPL library license. 
- 	Whenever there is any discrepancy between the two licenses, 
- 	the BSD license will take precedence. 
-*******************************************************************************/
-/**
- * xmlschema is a class that allows the user to quickly and easily
- * build a database on any ADOdb-supported platform using a simple
- * XML schema.
- *
- * Last Editor: $Author: liedekef $
- * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.1 $
- *
- * @package axmls
- * @tutorial getting_started.pkg
- */
- 
-function _file_get_contents($file) 
-{
- 	if (function_exists('file_get_contents')) return file_get_contents($file);
-	
-	$f = fopen($file,'r');
-	if (!$f) return '';
-	$t = '';
-	
-	while ($s = fread($f,100000)) $t .= $s;
-	fclose($f);
-	return $t;
-}
-
-
-/**
-* Debug on or off
-*/
-if( !defined( 'XMLS_DEBUG' ) ) {
-	define( 'XMLS_DEBUG', FALSE );
-}
-
-/**
-* Default prefix key
-*/
-if( !defined( 'XMLS_PREFIX' ) ) {
-	define( 'XMLS_PREFIX', '%%P' );
-}
-
-/**
-* Maximum length allowed for object prefix
-*/
-if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
-	define( 'XMLS_PREFIX_MAXLEN', 10 );
-}
-
-/**
-* Execute SQL inline as it is generated
-*/
-if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
-	define( 'XMLS_EXECUTE_INLINE', FALSE );
-}
-
-/**
-* Continue SQL Execution if an error occurs?
-*/
-if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
-	define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
-}
-
-/**
-* Current Schema Version
-*/
-if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_SCHEMA_VERSION', '0.3' );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
-}
-
-/**
-* How to handle data rows that already exist in a database during and upgrade.
-* Options are INSERT (attempts to insert duplicate rows), UPDATE (updates existing
-* rows) and IGNORE (ignores existing rows).
-*/
-if( !defined( 'XMLS_MODE_INSERT' ) ) {
-	define( 'XMLS_MODE_INSERT', 0 );
-}
-if( !defined( 'XMLS_MODE_UPDATE' ) ) {
-	define( 'XMLS_MODE_UPDATE', 1 );
-}
-if( !defined( 'XMLS_MODE_IGNORE' ) ) {
-	define( 'XMLS_MODE_IGNORE', 2 );
-}
-if( !defined( 'XMLS_EXISTING_DATA' ) ) {
-	define( 'XMLS_EXISTING_DATA', XMLS_MODE_INSERT );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
-	define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
-}
-
-/**
-* Include the main ADODB library
-*/
-if( !defined( '_ADODB_LAYER' ) ) {
-	require( 'adodb.inc.php' );
-	require( 'adodb-datadict.inc.php' );
-}
-
-/**
-* Abstract DB Object. This class provides basic methods for database objects, such
-* as tables and indexes.
-*
-* @package axmls
-* @access private
-*/
-class dbObject {
-	
-	/**
-	* var object Parent
-	*/
-	var $parent;
-	
-	/**
-	* var string current element
-	*/
-	var $currentElement;
-	
-	/**
-	* NOP
-	*/
-	function dbObject( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	function create() {
-		return array();
-	}
-	
-	/**
-	* Destroys the object
-	*/
-	function destroy() {
-		unset( $this );
-	}
-	
-	/**
-	* Checks whether the specified RDBMS is supported by the current
-	* database object or its ranking ancestor.
-	*
-	* @param string $platform RDBMS platform name (from ADODB platform list).
-	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
-	}
-	
-	/**
-	* Returns the prefix set by the ranking ancestor of the database object.
-	*
-	* @param string $name Prefix string.
-	* @return string Prefix.
-	*/
-	function prefix( $name = '' ) {
-		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
-	}
-	
-	/**
-	* Extracts a field ID from the specified field.
-	*
-	* @param string $field Field.
-	* @return string Field ID.
-	*/
-	function FieldID( $field ) {
-		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
-	}
-}
-
-/**
-* Creates a table object in ADOdb's datadict format
-*
-* This class stores information about a database table. As charactaristics
-* of the table are loaded from the external source, methods and properties
-* of this class are used to build up the table description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbTable extends dbObject {
-	
-	/**
-	* @var string Table name
-	*/
-	var $name;
-	
-	/**
-	* @var array Field specifier: Meta-information about each field
-	*/
-	var $fields = array();
-	
-	/**
-	* @var array List of table indexes.
-	*/
-	var $indexes = array();
-	
-	/**
-	* @var array Table options: Table-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var string Field index: Keeps track of which field is currently being processed
-	*/
-	var $current_field;
-	
-	/**
-	* @var boolean Mark table for destruction
-	* @access private
-	*/
-	var $drop_table;
-	
-	/**
-	* @var boolean Mark field for destruction (not yet implemented)
-	* @access private
-	*/
-	var $drop_field = array();
-	
-	/**
-	* @var array Platform-specific options
-	* @access private
-	*/
-	var $currentPlatform = true;
-	
-	
-	/**
-	* Iniitializes a new table object.
-	*
-	* @param string $prefix DB Object prefix
-	* @param array $attributes Array of table attributes.
-	*/
-	function dbTable( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		$this->name = $this->prefix($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'INDEX':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addIndex( $attributes ) );
-				}
-				break;
-			case 'DATA':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addData( $attributes ) );
-				}
-				break;
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'FIELD':
-				// Add a field
-				$fieldName = $attributes['NAME'];
-				$fieldType = $attributes['TYPE'];
-				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
-				$fieldOpts = !empty( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
-				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
-				break;
-			case 'KEY':
-			case 'NOTNULL':
-			case 'AUTOINCREMENT':
-			case 'DEFDATE':
-			case 'DEFTIMESTAMP':
-			case 'UNSIGNED':
-				// Add a field option
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			case 'DEFAULT':
-				// Add a field option to the table object
-				
-				// Work around ADOdb datadict issue that misinterprets empty strings.
-				if( $attributes['VALUE'] == '' ) {
-					$attributes['VALUE'] = " '' ";
-				}
-				
-				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
-				break;
-			case 'OPT':
-			case 'CONSTRAINT':
-				// Accept platform-specific options
-				$this->currentPlatform = ( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Table/field constraint
-			case 'CONSTRAINT':
-				if( isset( $this->current_field ) ) {
-					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
-				} else {
-					$this->addTableOpt( $cdata );
-				}
-				break;
-			// Table/field option
-			case 'OPT':
-				if( isset( $this->current_field ) ) {
-					$this->addFieldOpt( $this->current_field, $cdata );
-				} else {
-				$this->addTableOpt( $cdata );
-				}
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			case 'FIELD':
-				unset($this->current_field);
-				break;
-			case 'OPT':
-			case 'CONSTRAINT':
-				$this->currentPlatform = true;
-				break;
-			default:
-
-		}
-	}
-	
-	/**
-	* Adds an index to a table object
-	*
-	* @param array $attributes Index attributes
-	* @return object dbIndex object
-	*/
-	function &addIndex( $attributes ) {
-		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] =& new dbIndex( $this, $attributes );
-		return $this->indexes[$name];
-	}
-	
-	/**
-	* Adds data to a table object
-	*
-	* @param array $attributes Data attributes
-	* @return object dbData object
-	*/
-	function &addData( $attributes ) {
-		if( !isset( $this->data ) ) {
-			$this->data =& new dbData( $this, $attributes );
-		}
-		return $this->data;
-	}
-	
-	/**
-	* Adds a field to a table object
-	*
-	* $name is the name of the table to which the field should be added. 
-	* $type is an ADODB datadict field type. The following field types
-	* are supported as of ADODB 3.40:
-	* 	- C:  varchar
-	*	- X:  CLOB (character large object) or largest varchar size
-	*	   if CLOB is not supported
-	*	- C2: Multibyte varchar
-	*	- X2: Multibyte CLOB
-	*	- B:  BLOB (binary large object)
-	*	- D:  Date (some databases do not support this, and we return a datetime type)
-	*	- T:  Datetime or Timestamp
-	*	- L:  Integer field suitable for storing booleans (0 or 1)
-	*	- I:  Integer (mapped to I4)
-	*	- I1: 1-byte integer
-	*	- I2: 2-byte integer
-	*	- I4: 4-byte integer
-	*	- I8: 8-byte integer
-	*	- F:  Floating point number
-	*	- N:  Numeric or decimal number
-	*
-	* @param string $name Name of the table to which the field will be added.
-	* @param string $type	ADODB datadict field type.
-	* @param string $size	Field size
-	* @param array $opts	Field options array
-	* @return array Field specifier array
-	*/
-	function addField( $name, $type, $size = NULL, $opts = NULL ) {
-		$field_id = $this->FieldID( $name );
-		
-		// Set the field index so we know where we are
-		$this->current_field = $field_id;
-		
-		// Set the field name (required)
-		$this->fields[$field_id]['NAME'] = $name;
-		
-		// Set the field type (required)
-		$this->fields[$field_id]['TYPE'] = $type;
-		
-		// Set the field size (optional)
-		if( isset( $size ) ) {
-			$this->fields[$field_id]['SIZE'] = $size;
-		}
-		
-		// Set the field options
-		if( isset( $opts ) ) {
-			$this->fields[$field_id]['OPTS'] = array($opts);
-		} else {
-			$this->fields[$field_id]['OPTS'] = array();
-		}
-	}
-	
-	/**
-	* Adds a field option to the current field specifier
-	*
-	* This method adds a field option allowed by the ADOdb datadict 
-	* and appends it to the given field.
-	*
-	* @param string $field	Field name
-	* @param string $opt ADOdb field option
-	* @param mixed $value Field option value
-	* @return array Field specifier array
-	*/
-	function addFieldOpt( $field, $opt, $value = NULL ) {
-		if( $this->currentPlatform ) {
-		if( !isset( $value ) ) {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
-		// Add the option and value
-		} else {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
-		}
-	}
-	}
-	
-	/**
-	* Adds an option to the table
-	*
-	* This method takes a comma-separated list of table-level options
-	* and appends them to the table object.
-	*
-	* @param string $opt Table option
-	* @return array Options
-	*/
-	function addTableOpt( $opt ) {
-		if( $this->currentPlatform ) {
-		$this->opts[] = $opt;
-		}
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the table in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing table creation SQL
-	*/
-	function create( &$xmls ) {
-		$sql = array();
-		
-		// drop any existing indexes
-		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
-			foreach( $legacy_indexes as $index => $index_details ) {
-				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
-			}
-		}
-		
-		// remove fields to be dropped from table object
-		foreach( $this->drop_field as $field ) {
-			unset( $this->fields[$field] );
-		}
-		
-		// if table exists
-		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
-			// drop table
-			if( $this->drop_table ) {
-				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
-				return $sql;
-			}
-			
-			// drop any existing fields not in schema
-			foreach( $legacy_fields as $field_id => $field ) {
-				if( !isset( $this->fields[$field_id] ) ) {
-					$sql[] = $xmls->dict->DropColumnSQL( $this->name, $field->name );
-				}
-			}
-		// if table doesn't exist
-		} else {
-			if( $this->drop_table ) {
-				return $sql;
-			}
-			
-			$legacy_fields = array();
-		}
-		
-		// Loop through the field specifier array, building the associative array for the field options
-		$fldarray = array();
-		
-		foreach( $this->fields as $field_id => $finfo ) {
-			// Set an empty size if it isn't supplied
-			if( !isset( $finfo['SIZE'] ) ) {
-				$finfo['SIZE'] = '';
-			}
-			
-			// Initialize the field array with the type and size
-			$fldarray[$field_id] = array(
-				'NAME' => $finfo['NAME'],
-				'TYPE' => $finfo['TYPE'],
-				'SIZE' => $finfo['SIZE']
-			);
-			
-			// Loop through the options array and add the field options. 
-			if( isset( $finfo['OPTS'] ) ) {
-				foreach( $finfo['OPTS'] as $opt ) {
-					// Option has an argument.
-					if( is_array( $opt ) ) {
-						$key = key( $opt );
-						$value = $opt[key( $opt )];
-						@$fldarray[$field_id][$key] .= $value;
-					// Option doesn't have arguments
-					} else {
-						$fldarray[$field_id][$opt] = $opt;
-					}
-				}
-			}
-		}
-		
-		if( empty( $legacy_fields ) ) {
-			// Create the new table
-			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-			logMsg( end( $sql ), 'Generated CreateTableSQL' );
-		} else {
-			// Upgrade an existing table
-			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
-			switch( $xmls->upgrade ) {
-				// Use ChangeTableSQL
-				case 'ALTER':
-					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
-					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				case 'REPLACE':
-					logMsg( 'Doing upgrade REPLACE (testing)' );
-					$sql[] = $xmls->dict->DropTableSQL( $this->name );
-					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				// ignore table
-				default:
-					return array();
-			}
-		}
-		
-		foreach( $this->indexes as $index ) {
-			$sql[] = $index->create( $xmls );
-		}
-		
-		if( isset( $this->data ) ) {
-			$sql[] = $this->data->create( $xmls );
-		}
-		
-		return $sql;
-	}
-	
-	/**
-	* Marks a field or table for destruction
-	*/
-	function drop() {
-		if( isset( $this->current_field ) ) {
-			// Drop the current field
-			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
-			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
-			$this->drop_field[$this->current_field] = $this->current_field;
-		} else {
-			// Drop the current table
-			logMsg( "Dropping table '{$this->name}'" );
-			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
-			$this->drop_table = TRUE;
-		}
-	}
-}
-
-/**
-* Creates an index object in ADOdb's datadict format
-*
-* This class stores information about a database index. As charactaristics
-* of the index are loaded from the external source, methods and properties
-* of this class are used to build up the index description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbIndex extends dbObject {
-	
-	/**
-	* @var string	Index name
-	*/
-	var $name;
-	
-	/**
-	* @var array	Index options: Index-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var array	Indexed fields: Table columns included in this index
-	*/
-	var $columns = array();
-	
-	/**
-	* @var boolean Mark index for destruction
-	* @access private
-	*/
-	var $drop = FALSE;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		
-		$this->name = $this->prefix ($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'CLUSTERED':
-			case 'BITMAP':
-			case 'UNIQUE':
-			case 'FULLTEXT':
-			case 'HASH':
-				// Add index Option
-				$this->addIndexOpt( $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'COL':
-				$this->addField( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'INDEX':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $name ) {
-		$this->columns[$this->FieldID( $name )] = $name;
-		
-		// Return the field list
-		return $this->columns;
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addIndexOpt( $opt ) {
-		$this->opts[] = $opt;
-		
-		// Return the options list
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		if( $this->drop ) {
-			return NULL;
-		}
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->columns as $id => $col ) {
-			if( !isset( $this->parent->fields[$id] ) ) {
-				unset( $this->columns[$id] );
-			}
-		}
-		
-		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
-	}
-	
-	/**
-	* Marks an index for destruction
-	*/
-	function drop() {
-		$this->drop = TRUE;
-	}
-}
-
-/**
-* Creates a data object in ADOdb's datadict format
-*
-* This class stores information about table data, and is called
-* when we need to load field data into a table.
-*
-* @package axmls
-* @access private
-*/
-class dbData extends dbObject {
-	
-	var $data = array();
-	
-	var $row;
-	
-	/**
-	* Initializes the new dbData object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbData( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: ROW and F (field). 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'ROW':
-				$this->row = count( $this->data );
-				$this->data[$this->row] = array();
-				break;
-			case 'F':
-				$this->addField($attributes);
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'F':
-				$this->addData( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'DATA':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the insert
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $attributes ) {
-		// check we're in a valid row
-		if( !isset( $this->row ) || !isset( $this->data[$this->row] ) ) {
-			return;
-		}
-		
-		// Set the field index so we know where we are
-		if( isset( $attributes['NAME'] ) ) {
-			$this->current_field = $this->FieldID( $attributes['NAME'] );
-		} else {
-			$this->current_field = count( $this->data[$this->row] );
-		}
-		
-		// initialise data
-		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
-			$this->data[$this->row][$this->current_field] = '';
-		}
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addData( $cdata ) {
-		// check we're in a valid field
-		if ( isset( $this->data[$this->row][$this->current_field] ) ) {
-			// add data to field
-			$this->data[$this->row][$this->current_field] .= $cdata;
-		}
-	}
-	
-	/**
-	* Generates the SQL that will add/update the data in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		$table = $xmls->dict->TableName($this->parent->name);
-		$table_field_count = count($this->parent->fields);
-		$tables = $xmls->db->MetaTables(); 
-		$sql = array();
-		
-		$ukeys = $xmls->db->MetaPrimaryKeys( $table );
-		if( !empty( $this->parent->indexes ) and !empty( $ukeys ) ) {
-			foreach( $this->parent->indexes as $indexObj ) {
-				if( !in_array( $indexObj->name, $ukeys ) ) $ukeys[] = $indexObj->name;
-			}
-		}
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->data as $row ) {
-			$table_fields = $this->parent->fields;
-			$fields = array();
-			$rawfields = array(); // Need to keep some of the unprocessed data on hand.
-			
-			foreach( $row as $field_id => $field_data ) {
-				if( !array_key_exists( $field_id, $table_fields ) ) {
-					if( is_numeric( $field_id ) ) {
-						$field_id = reset( array_keys( $table_fields ) );
-					} else {
-						continue;
-					}
-				}
-				
-				$name = $table_fields[$field_id]['NAME'];
-				
-				switch( $table_fields[$field_id]['TYPE'] ) {
-					case 'I':
-					case 'I1':
-					case 'I2':
-					case 'I4':
-					case 'I8':
-						$fields[$name] = intval($field_data);
-						break;
-					case 'C':
-					case 'C2':
-					case 'X':
-					case 'X2':
-					default:
-						$fields[$name] = $xmls->db->qstr( $field_data );
-						$rawfields[$name] = $field_data;
-				}
-				
-				unset($table_fields[$field_id]);
-				
-			}
-			
-			// check that at least 1 column is specified
-			if( empty( $fields ) ) {
-				continue;
-			}
-			
-			// check that no required columns are missing
-			if( count( $fields ) < $table_field_count ) {
-				foreach( $table_fields as $field ) {
-					if( isset( $field['OPTS'] ) and ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
-							continue(2);
-						}
-				}
-			}
-			
-			// The rest of this method deals with updating existing data records.
-			
-			if( !in_array( $table, $tables ) or ( $mode = $xmls->existingData() ) == XMLS_MODE_INSERT ) {
-				// Table doesn't yet exist, so it's safe to insert.
-				logMsg( "$table doesn't exist, inserting or mode is INSERT" );
-			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
-				continue;
-		}
-		
-			// Prepare to test for potential violations. Get primary keys and unique indexes
-			$mfields = array_merge( $fields, $rawfields );
-			$keyFields = array_intersect( $ukeys, array_keys( $mfields ) );
-			
-			if( empty( $ukeys ) or count( $keyFields ) == 0 ) {
-				// No unique keys in schema, so safe to insert
-				logMsg( "Either schema or data has no unique keys, so safe to insert" );
-				$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
-				continue;
-			}
-			
-			// Select record containing matching unique keys.
-			$where = '';
-			foreach( $ukeys as $key ) {
-				if( isset( $mfields[$key] ) and $mfields[$key] ) {
-					if( $where ) $where .= ' AND ';
-					$where .= $key . ' = ' . $xmls->db->qstr( $mfields[$key] );
-				}
-			}
-			$records = $xmls->db->Execute( 'SELECT * FROM ' . $table . ' WHERE ' . $where );
-			switch( $records->RecordCount() ) {
-				case 0:
-					// No matching record, so safe to insert.
-					logMsg( "No matching records. Inserting new row with unique data" );
-					$sql[] = $xmls->db->GetInsertSQL( $records, $mfields );
-					break;
-				case 1:
-					// Exactly one matching record, so we can update if the mode permits.
-					logMsg( "One matching record..." );
-					if( $mode == XMLS_MODE_UPDATE ) {
-						logMsg( "...Updating existing row from unique data" );
-						$sql[] = $xmls->db->GetUpdateSQL( $records, $mfields );
-					}
-					break;
-				default:
-					// More than one matching record; the result is ambiguous, so we must ignore the row.
-					logMsg( "More than one matching record. Ignoring row." );
-			}
-		}
-		return $sql;
-	}
-}
-
-/**
-* Creates the SQL to execute a list of provided SQL queries
-*
-* @package axmls
-* @access private
-*/
-class dbQuerySet extends dbObject {
-	
-	/**
-	* @var array	List of SQL queries
-	*/
-	var $queries = array();
-	
-	/**
-	* @var string	String used to build of a query line by line
-	*/
-	var $query;
-	
-	/**
-	* @var string	Query prefix key
-	*/
-	var $prefixKey = '';
-	
-	/**
-	* @var boolean	Auto prefix enable (TRUE)
-	*/
-	var $prefixMethod = 'AUTO';
-	
-	/**
-	* Initializes the query set.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-			
-		// Overrides the manual prefix key
-		if( isset( $attributes['KEY'] ) ) {
-			$this->prefixKey = $attributes['KEY'];
-		}
-		
-		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
-		// Enables or disables automatic prefix prepending
-		switch( $prefixMethod ) {
-			case 'AUTO':
-				$this->prefixMethod = 'AUTO';
-				break;
-			case 'MANUAL':
-				$this->prefixMethod = 'MANUAL';
-				break;
-			case 'NONE':
-				$this->prefixMethod = 'NONE';
-				break;
-		}
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'QUERY':
-				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
-				// current connection platform.
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->newQuery();
-				} else {
-					$this->discardQuery();
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Line of queryset SQL data
-			case 'QUERY':
-				$this->buildQuery( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'QUERY':
-				// Add the finished query to the open query set.
-				$this->addQuery();
-				break;
-			case 'SQL':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* Re-initializes the query.
-	*
-	* @return boolean TRUE
-	*/
-	function newQuery() {
-		$this->query = '';
-		
-		return TRUE;
-	}
-	
-	/**
-	* Discards the existing query.
-	*
-	* @return boolean TRUE
-	*/
-	function discardQuery() {
-		unset( $this->query );
-		
-		return TRUE;
-	}
-	
-	/** 
-	* Appends a line to a query that is being built line by line
-	*
-	* @param string $data Line of SQL data or NULL to initialize a new query
-	* @return string SQL query string.
-	*/
-	function buildQuery( $sql = NULL ) {
-		if( !isset( $this->query ) OR empty( $sql ) ) {
-			return FALSE;
-		}
-		
-		$this->query .= $sql;
-		
-		return $this->query;
-	}
-	
-	/**
-	* Adds a completed query to the query list
-	*
-	* @return string	SQL of added query
-	*/
-	function addQuery() {
-		if( !isset( $this->query ) ) {
-			return FALSE;
-		}
-		
-		$this->queries[] = $return = trim($this->query);
-		
-		unset( $this->query );
-		
-		return $return;
-	}
-	
-	/**
-	* Creates and returns the current query set
-	*
-	* @param object $xmls adoSchema object
-	* @return array Query set
-	*/
-	function create( &$xmls ) {
-		foreach( $this->queries as $id => $query ) {
-			switch( $this->prefixMethod ) {
-				case 'AUTO':
-					// Enable auto prefix replacement
-					
-					// Process object prefix.
-					// Evaluate SQL statements to prepend prefix to objects
-					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
-					// SELECT statements aren't working yet
-					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
-				case 'MANUAL':
-					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
-					// If prefixKey is not set, we use the default constant XMLS_PREFIX
-					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
-						// Enable prefix override
-						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
-					} else {
-						// Use default replacement
-						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
-					}
-			}
-			
-			$this->queries[$id] = trim( $query );
-		}
-		
-		// Return the query set array
-		return $this->queries;
-	}
-	
-	/**
-	* Rebuilds the query with the prefix attached to any objects
-	*
-	* @param string $regex Regex used to add prefix
-	* @param string $query SQL query string
-	* @param string $prefix Prefix to be appended to tables, indices, etc.
-	* @return string Prefixed SQL query string.
-	*/
-	function prefixQuery( $regex, $query, $prefix = NULL ) {
-		if( !isset( $prefix ) ) {
-			return $query;
-		}
-		
-		if( preg_match( $regex, $query, $match ) ) {
-			$preamble = $match[1];
-			$postamble = $match[5];
-			$objectList = explode( ',', $match[3] );
-			// $prefix = $prefix . '_';
-			
-			$prefixedList = '';
-			
-			foreach( $objectList as $object ) {
-				if( $prefixedList !== '' ) {
-					$prefixedList .= ', ';
-				}
-				
-				$prefixedList .= $prefix . trim( $object );
-			}
-			
-			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
-		}
-		
-		return $query;
-	}
-}
-
-/**
-* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
-* This class is used to load and parse the XML file, to create an array of SQL statements
-* that can be used to build a database, and to build the database using the SQL array.
-*
-* @tutorial getting_started.pkg
-*
-* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.1 $
-*
-* @package axmls
-*/
-class adoSchema {
-	
-	/**
-	* @var array	Array containing SQL queries to generate all objects
-	* @access private
-	*/
-	var $sqlArray;
-	
-	/**
-	* @var object	ADOdb connection object
-	* @access private
-	*/
-	var $db;
-	
-	/**
-	* @var object	ADOdb Data Dictionary
-	* @access private
-	*/
-	var $dict;
-	
-	/**
-	* @var string Current XML element
-	* @access private
-	*/
-	var $currentElement = '';
-	
-	/**
-	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
-	* @access private
-	*/
-	var $upgrade = '';
-	
-	/**
-	* @var string Optional object prefix
-	* @access private
-	*/
-	var $objectPrefix = '';
-	
-	/**
-	* @var long	Original Magic Quotes Runtime value
-	* @access private
-	*/
-	var $mgq;
-	
-	/**
-	* @var long	System debug
-	* @access private
-	*/
-	var $debug;
-	
-	/**
-	* @var string Regular expression to find schema version
-	* @access private
-	*/
-	var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
-	
-	/**
-	* @var string Current schema version
-	* @access private
-	*/
-	var $schemaVersion;
-	
-	/**
-	* @var int	Success of last Schema execution
-	*/
-	var $success;
-	
-	/**
-	* @var bool	Execute SQL inline as it is generated
-	*/
-	var $executeInline;
-	
-	/**
-	* @var bool	Continue SQL execution if errors occur
-	*/
-	var $continueOnError;
-	
-	/**
-	* @var int	How to handle existing data rows (insert, update, or ignore)
-	*/
-	var $existingData;
-	
-	/**
-	* Creates an adoSchema object
-	*
-	* Creating an adoSchema object is the first step in processing an XML schema.
-	* The only parameter is an ADOdb database connection object, which must already
-	* have been created.
-	*
-	* @param object $db ADOdb database connection object.
-	*/
-	function adoSchema( &$db ) {
-		// Initialize the environment
-		$this->mgq = get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);
-		
-		$this->db =& $db;
-		$this->debug = $this->db->debug;
-		$this->dict = NewDataDictionary( $this->db );
-		$this->sqlArray = array();
-		$this->schemaVersion = XMLS_SCHEMA_VERSION;
-		$this->executeInline( XMLS_EXECUTE_INLINE );
-		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
-		$this->existingData( XMLS_EXISTING_DATA );
-		$this->setUpgradeMethod();
-	}
-	
-	/**
-	* Sets the method to be used for upgrading an existing database
-	*
-	* Use this method to specify how existing database objects should be upgraded.
-	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
-	* alter each database object directly, REPLACE attempts to rebuild each object
-	* from scratch, BEST attempts to determine the best upgrade method for each
-	* object, and NONE disables upgrading.
-	*
-	* This method is not yet used by AXMLS, but exists for backward compatibility.
-	* The ALTER method is automatically assumed when the adoSchema object is
-	* instantiated; other upgrade methods are not currently supported.
-	*
-	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
-	* @returns string Upgrade method used
-	*/
-	function SetUpgradeMethod( $method = '' ) {
-		if( !is_string( $method ) ) {
-			return FALSE;
-		}
-		
-		$method = strtoupper( $method );
-		
-		// Handle the upgrade methods
-		switch( $method ) {
-			case 'ALTER':
-				$this->upgrade = $method;
-				break;
-			case 'REPLACE':
-				$this->upgrade = $method;
-				break;
-			case 'BEST':
-				$this->upgrade = 'ALTER';
-				break;
-			case 'NONE':
-				$this->upgrade = 'NONE';
-				break;
-			default:
-				// Use default if no legitimate method is passed.
-				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
-		}
-		
-		return $this->upgrade;
-	}
-	
-	/**
-	* Specifies how to handle existing data row when there is a unique key conflict.
-	*
-	* The existingData setting specifies how the parser should handle existing rows
-	* when a unique key violation occurs during the insert. This can happen when inserting
-	* data into an existing table with one or more primary keys or unique indexes.
-	* The existingData method takes one of three options: XMLS_MODE_INSERT attempts
-	* to always insert the data as a new row. In the event of a unique key violation,
-	* the database will generate an error.  XMLS_MODE_UPDATE attempts to update the 
-	* any existing rows with the new data based upon primary or unique key fields in
-	* the schema. If the data row in the schema specifies no unique fields, the row
-	* data will be inserted as a new row. XMLS_MODE_IGNORE specifies that any data rows
-	* that would result in a unique key violation be ignored; no inserts or updates will
-	* take place. For backward compatibility, the default setting is XMLS_MODE_INSERT,
-	* but XMLS_MODE_UPDATE will generally be the most appropriate setting.
-	*
-	* @param int $mode XMLS_MODE_INSERT, XMLS_MODE_UPDATE, or XMLS_MODE_IGNORE
-	* @return int current mode
-	*/
-	function ExistingData( $mode = NULL ) {
-		if( is_int( $mode ) ) {
-			switch( $mode ) {
-				case XMLS_MODE_UPDATE:
-					$mode = XMLS_MODE_UPDATE;
-					break;
-				case XMLS_MODE_IGNORE:
-					$mode = XMLS_MODE_IGNORE;
-					break;
-				case XMLS_MODE_INSERT:
-					$mode = XMLS_MODE_INSERT;
-					break;
-				default:
-					$mode = XMLS_EXISITNG_DATA;
-					break;
-			}
-			$this->existingData = $mode;
-		}
-		
-		return $this->existingData;
-	}
-	
-	/**
-	* Enables/disables inline SQL execution.
-	*
-	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
-	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
-	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
-	* to apply the schema to the database.
-	*
-	* @param bool $mode execute
-	* @return bool current execution mode
-	*
-	* @see ParseSchema(), ExecuteSchema()
-	*/
-	function ExecuteInline( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->executeInline = $mode;
-		}
-		
-		return $this->executeInline;
-	}
-	
-	/**
-	* Enables/disables SQL continue on error.
-	*
-	* Call this method to enable or disable continuation of SQL execution if an error occurs.
-	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
-	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
-	* of the schema will continue.
-	*
-	* @param bool $mode execute
-	* @return bool current continueOnError mode
-	*
-	* @see addSQL(), ExecuteSchema()
-	*/
-	function ContinueOnError( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->continueOnError = $mode;
-		}
-		
-		return $this->continueOnError;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database
-	* described. This method automatically converts the schema to the latest
-	* axmls schema version.
-	* @see ParseSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function ParseSchema( $filename, $returnSchema = FALSE ) {
-		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema directly from a file (see
-	* the DTD for the proper format) and generate the SQL necessary to create
-	* the database described by the schema. Use this method when you are dealing
-	* with large schema files. Otherwise, ParseSchema() is faster.
-	* This method does not automatically convert the schema to the latest axmls
-	* schema version. You must convert the schema manually using either the
-	* ConvertSchemaFile() or ConvertSchemaString() method.
-	* @see ParseSchema()
-	* @see ConvertSchemaFile()
-	* @see ConvertSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*
-	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
-	* @see ParseSchema(), ParseSchemaString()
-	*/
-	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			logMsg( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
-			logMsg( 'Invalid Schema Version' );
-			return FALSE;
-		}
-		
-		if( $returnSchema ) {
-			$xmlstring = '';
-			while( $data = fread( $fp, 4096 ) ) {
-				$xmlstring .= $data . "\n";
-			}
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
-				die( sprintf(
-					"XML error: %s at line %d",
-					xml_error_string( xml_get_error_code( $xmlParser) ),
-					xml_get_current_line_number( $xmlParser)
-				) );
-			}
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Converts an XML schema string to SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
-	* @see ParseSchema()
-	*
-	* @param string $xmlstring XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			logMsg( 'Empty or Invalid Schema' );
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
-			logMsg( 'Invalid Schema Version' );
-			return FALSE;
-		}
-		
-		if( $returnSchema ) {
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
-			die( sprintf(
-				"XML error: %s at line %d",
-				xml_error_string( xml_get_error_code( $xmlParser) ),
-				xml_get_current_line_number( $xmlParser)
-			) );
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to uninstallation SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to remove the database described.
-	* @see RemoveSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function RemoveSchema( $filename, $returnSchema = FALSE ) {
-		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Converts an XML schema string to uninstallation SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
-	* @see RemoveSchema()
-	*
-	* @param string $schema XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
-	}
-	
-	/**
-	* Applies the current XML schema to the database (post execution).
-	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
-	* and executing other SQL specified in the schema) after parsing.
-	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
-	*
-	* @param array $sqlArray Array of SQL statements that will be applied rather than
-	*		the current schema.
-	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
-	* @returns integer 0 if failure, 1 if errors, 2 if successful.
-	*/
-	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
-		if( !is_bool( $continueOnErr ) ) {
-			$continueOnErr = $this->ContinueOnError();
-		}
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			$this->success = 0;
-		} else {
-			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
-		}
-		
-		return $this->success;
-	}
-	
-	/**
-	* Returns the current SQL array. 
-	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
-	*
-	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
-	* @return array Array of SQL statements or FALSE if an error occurs
-	*/
-	function PrintSQL( $format = 'NONE' ) {
-		$sqlArray = null;
-		return $this->getSQL( $format, $sqlArray );
-	}
-	
-	/**
-	* Saves the current SQL array to the local filesystem as a list of SQL queries.
-	*
-	* Call this method to save the array of SQL queries (generally resulting from a
-	* parsed XML schema) to the filesystem.
-	*
-	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
-	*/
-	function SaveSQL( $filename = './schema.sql' ) {
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		if( !isset( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		$fp = fopen( $filename, "w" );
-		
-		foreach( $sqlArray as $key => $query ) {
-			fwrite( $fp, $query . ";\n" );
-		}
-		fclose( $fp );
-	}
-	
-	/**
-	* Create an xml parser
-	*
-	* @return object PHP XML parser object
-	*
-	* @access private
-	*/
-	function &create_parser() {
-		// Create the parser
-		$xmlParser = xml_parser_create();
-		xml_set_object( $xmlParser, $this );
-		
-		// Initialize the XML callback functions
-		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
-		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
-		return $xmlParser;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-				$this->obj = new dbTable( $this, $attributes );
-				xml_set_object( $parser, $this->obj );
-				}
-				break;
-			case 'SQL':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->obj = new dbQuerySet( $this, $attributes );
-					xml_set_object( $parser, $this->obj );
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	* @internal
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	/**
-	* Converts an XML schema string to the specified DTD version.
-	*
-	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaFile()
-	*
-	* @param string $schema String containing XML schema that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = $schema;
-		} else {
-			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-
-	/*
-	// compat for pre-4.3 - jlim
-	function _file_get_contents($path)
-	{
-		if (function_exists('file_get_contents')) return file_get_contents($path);
-		return join('',file($path));
-	}*/
-	
-	/**
-	* Converts an XML schema file to the specified DTD version.
-	*
-	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaString()
-	*
-	* @param string $filename Name of XML schema file that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = _file_get_contents( $filename );
-			
-			// remove unicode BOM if present
-			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
-				$result = substr( $result, 3 );
-			}
-		} else {
-			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	function TransformSchema( $schema, $xsl, $schematype='string' )
-	{
-		// Fail if XSLT extension is not available
-		if( ! function_exists( 'xslt_create' ) ) {
-			return FALSE;
-		}
-		
-		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
-		// look for xsl
-		if( !is_readable( $xsl_file ) ) {
-			return FALSE;
-		}
-		
-		switch( $schematype )
-		{
-			case 'file':
-				if( !is_readable( $schema ) ) {
-					return FALSE;
-				}
-				
-				$schema = _file_get_contents( $schema );
-				break;
-			case 'string':
-			default:
-				if( !is_string( $schema ) ) {
-					return FALSE;
-				}
-		}
-		
-		$arguments = array (
-			'/_xml' => $schema,
-			'/_xsl' => _file_get_contents( $xsl_file )
-		);
-		
-		// create an XSLT processor
-		$xh = xslt_create ();
-		
-		// set error handler
-		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
-		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
-		xslt_free ($xh);
-		
-		return $result;
-	}
-	
-	/**
-	* Processes XSLT transformation errors
-	*
-	* @param object $parser XML parser object
-	* @param integer $errno Error number
-	* @param integer $level Error level
-	* @param array $fields Error information fields
-	*
-	* @access private
-	*/
-	function xslt_error_handler( $parser, $errno, $level, $fields ) {
-		if( is_array( $fields ) ) {
-			$msg = array(
-				'Message Type' => ucfirst( $fields['msgtype'] ),
-				'Message Code' => $fields['code'],
-				'Message' => $fields['msg'],
-				'Error Number' => $errno,
-				'Level' => $level
-			);
-			
-			switch( $fields['URI'] ) {
-				case 'arg:/_xml':
-					$msg['Input'] = 'XML';
-					break;
-				case 'arg:/_xsl':
-					$msg['Input'] = 'XSL';
-					break;
-				default:
-					$msg['Input'] = $fields['URI'];
-			}
-			
-			$msg['Line'] = $fields['line'];
-		} else {
-			$msg = array(
-				'Message Type' => 'Error',
-				'Error Number' => $errno,
-				'Level' => $level,
-				'Fields' => var_export( $fields, TRUE )
-			);
-		}
-		
-		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
-					   . '<table>' . "\n";
-		
-		foreach( $msg as $label => $details ) {
-			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
-		}
-		
-		$error_details .= '</table>';
-		
-		trigger_error( $error_details, E_USER_ERROR );
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the requested XML schema file.
-	*
-	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
-	* @see SchemaStringVersion()
-	*
-	* @param string $filename AXMLS schema file
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaFileVersion( $filename ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( preg_match( $this->versionRegex, $data, $matches ) ) {
-				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-			}
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the provided XML schema string.
-	*
-	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
-	* @see SchemaFileVersion()
-	*
-	* @param string $xmlstring XML schema string
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaStringVersion( $xmlstring ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
-			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Extracts an XML schema from an existing database.
-	*
-	* Call this method to create an XML schema string from an existing database.
-	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
-	*
-	* @param boolean $data Include data in schema dump
-	* @indent string indentation to use
-	* @prefix string extract only tables with given prefix
-	* @stripprefix strip prefix string when storing in XML schema
-	* @return string Generated XML schema
-	*/
-	function ExtractSchema( $data = FALSE, $indent = '  ', $prefix = '' , $stripprefix=false) {
-		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
-		$schema = '<?xml version="1.0"?>' . "\n"
-				. '<schema version="' . $this->schemaVersion . '">' . "\n";
-		
-		if( is_array( $tables = $this->db->MetaTables( 'TABLES' , ($prefix) ? $prefix.'%' : '') ) ) {
-			foreach( $tables as $table ) {
-				if ($stripprefix) $table = str_replace(str_replace('\\_', '_', $pfx ), '', $table);
-				$schema .= $indent . '<table name="' . htmlentities( $table ) . '">' . "\n";
-				
-				// grab details from database
-				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE -1' );
-				$fields = $this->db->MetaColumns( $table );
-				$indexes = $this->db->MetaIndexes( $table );
-				
-				if( is_array( $fields ) ) {
-					foreach( $fields as $details ) {
-						$extra = '';
-						$content = array();
-						
-						if( isset($details->max_length) && $details->max_length > 0 ) {
-							$extra .= ' size="' . $details->max_length . '"';
-						}
-						
-						if( isset($details->primary_key) && $details->primary_key ) {
-							$content[] = '<KEY/>';
-						} elseif( isset($details->not_null) && $details->not_null ) {
-							$content[] = '<NOTNULL/>';
-						}
-						
-						if( isset($details->has_default) && $details->has_default ) {
-							$content[] = '<DEFAULT value="' . htmlentities( $details->default_value ) . '"/>';
-						}
-						
-						if( isset($details->auto_increment) && $details->auto_increment ) {
-							$content[] = '<AUTOINCREMENT/>';
-						}
-						
-						if( isset($details->unsigned) && $details->unsigned ) {
-							$content[] = '<UNSIGNED/>';
-						}
-						
-						// this stops the creation of 'R' columns,
-						// AUTOINCREMENT is used to create auto columns
-						$details->primary_key = 0;
-						$type = $rs->MetaType( $details );
-						
-						$schema .= str_repeat( $indent, 2 ) . '<field name="' . htmlentities( $details->name ) . '" type="' . $type . '"' . $extra;
-						
-						if( !empty( $content ) ) {
-							$schema .= ">\n" . str_repeat( $indent, 3 )
-									 . implode( "\n" . str_repeat( $indent, 3 ), $content ) . "\n"
-									 . str_repeat( $indent, 2 ) . '</field>' . "\n";
-						} else {
-							$schema .= "/>\n";
-						}
-					}
-				}
-				
-				if( is_array( $indexes ) ) {
-					foreach( $indexes as $index => $details ) {
-						$schema .= str_repeat( $indent, 2 ) . '<index name="' . $index . '">' . "\n";
-						
-						if( $details['unique'] ) {
-							$schema .= str_repeat( $indent, 3 ) . '<UNIQUE/>' . "\n";
-						}
-						
-						foreach( $details['columns'] as $column ) {
-							$schema .= str_repeat( $indent, 3 ) . '<col>' . htmlentities( $column ) . '</col>' . "\n";
-						}
-						
-						$schema .= str_repeat( $indent, 2 ) . '</index>' . "\n";
-					}
-				}
-				
-				if( $data ) {
-					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
-					if( is_object( $rs ) && !$rs->EOF ) {
-						$schema .= str_repeat( $indent, 2 ) . "<data>\n";
-						
-						while( $row = $rs->FetchRow() ) {
-							foreach( $row as $key => $val ) {
-								if ( $val != htmlentities( $val ) ) {
-									$row[$key] = '<![CDATA[' . $val . ']]>';
-								}
-							}
-							
-							$schema .= str_repeat( $indent, 3 ) . '<row><f>' . implode( '</f><f>', $row ) . "</f></row>\n";
-						}
-						
-						$schema .= str_repeat( $indent, 2 ) . "</data>\n";
-					}
-				}
-				
-				$schema .= $indent . "</table>\n";
-			}
-		}
-		
-		$this->db->SetFetchMode( $old_mode );
-		
-		$schema .= '</schema>';
-		return $schema;
-	}
-	
-	/**
-	* Sets a prefix for database objects
-	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
-	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
-	*
-	* @param string $prefix Prefix that will be prepended.
-	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
-	* @return boolean TRUE if successful, else FALSE
-	*/
-	function SetPrefix( $prefix = '', $underscore = TRUE ) {
-		switch( TRUE ) {
-			// clear prefix
-			case empty( $prefix ):
-				logMsg( 'Cleared prefix' );
-				$this->objectPrefix = '';
-				return TRUE;
-			// prefix too long
-			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
-			// prefix contains invalid characters
-			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
-				logMsg( 'Invalid prefix: ' . $prefix );
-				return FALSE;
-		}
-		
-		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
-			$prefix .= '_';
-		}
-		
-		// prefix valid
-		logMsg( 'Set prefix: ' . $prefix );
-		$this->objectPrefix = $prefix;
-		return TRUE;
-	}
-	
-	/**
-	* Returns an object name with the current prefix prepended.
-	*
-	* @param string	$name Name
-	* @return string	Prefixed name
-	*
-	* @access private
-	*/
-	function prefix( $name = '' ) {
-		// if prefix is set
-		if( !empty( $this->objectPrefix ) ) {
-			// Prepend the object prefix to the table name
-			// prepend after quote if used
-			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
-		}
-		
-		// No prefix set. Use name provided.
-		return $name;
-	}
-	
-	/**
-	* Checks if element references a specific platform
-	*
-	* @param string $platform Requested platform
-	* @returns boolean TRUE if platform check succeeds
-	*
-	* @access private
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		if( !empty( $platform ) ) {
-			$regex = '/(^|\|)' . $this->db->databaseType . '(\||$)/i';
-		
-			if( preg_match( '/^- /', $platform ) ) {
-				if (preg_match ( $regex, substr( $platform, 2 ) ) ) {
-					logMsg( 'Platform ' . $platform . ' is NOT supported' );
-					return FALSE;
-				}
-		} else {
-				if( !preg_match ( $regex, $platform ) ) {
-					logMsg( 'Platform ' . $platform . ' is NOT supported' );
-			return FALSE;
-		}
-	}
-		}
-		
-		logMsg( 'Platform ' . $platform . ' is supported' );
-		return TRUE;
-	}
-	
-	/**
-	* Clears the array of generated SQL.
-	*
-	* @access private
-	*/
-	function clearSQL() {
-		$this->sqlArray = array();
-	}
-	
-	/**
-	* Adds SQL into the SQL array.
-	*
-	* @param mixed $sql SQL to Add
-	* @return boolean TRUE if successful, else FALSE.
-	*
-	* @access private
-	*/	
-	function addSQL( $sql = NULL ) {
-		if( is_array( $sql ) ) {
-			foreach( $sql as $line ) {
-				$this->addSQL( $line );
-			}
-			
-			return TRUE;
-		}
-		
-		if( is_string( $sql ) ) {
-			$this->sqlArray[] = $sql;
-			
-			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
-			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
-				$saved = $this->db->debug;
-				$this->db->debug = $this->debug;
-				$ok = $this->db->Execute( $sql );
-				$this->db->debug = $saved;
-				
-				if( !$ok ) {
-					if( $this->debug ) {
-						ADOConnection::outp( $this->db->ErrorMsg() );
-					}
-					
-					$this->success = 1;
-				}
-			}
-			
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Gets the SQL array in the specified format.
-	*
-	* @param string $format Format
-	* @return mixed SQL
-	*	
-	* @access private
-	*/
-	function getSQL( $format = NULL, $sqlArray = NULL ) {
-		if( !is_array( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		switch( strtolower( $format ) ) {
-			case 'string':
-			case 'text':
-				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
-			case'html':
-				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
-		}
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Destroys an adoSchema object.
-	*
-	* Call this method to clean up after an adoSchema object that is no longer in use.
-	* @deprecated adoSchema now cleans up automatically.
-	*/
-	function Destroy() {
-		set_magic_quotes_runtime( $this->mgq );
-		unset( $this );
-	}
-}
-
-/**
-* Message logging function
-*
-* @access private
-*/
-function logMsg( $msg, $title = NULL, $force = FALSE ) {
-	if( XMLS_DEBUG or $force ) {
-		echo '<pre>';
-		
-		if( isset( $title ) ) {
-			echo '<h3>' . htmlentities( $title ) . '</h3>';
-		}
-		
-		if( @is_object( $this ) ) {
-			echo '[' . get_class( $this ) . '] ';
-		}
-		
-		print_r( $msg );
-		
-		echo '</pre>';
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-errorhandler.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-errorhandler.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-errorhandler.inc.php	(working copy)
@@ -1,79 +0,0 @@
-<?php
-/**
- * @version V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
- *
- * Set tabs to 4 for best viewing.
- *
- * Latest version is available at http://php.weblogs.com
- *
-*/
-
-
-// added Claudio Bustos  clbustos#entelchile.net
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR); 
-
-if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_Handler');
-
-/**
-* Default Error Handler. This will be called with the following params
-*
-* @param $dbms		the RDBMS you are connecting to
-* @param $fn		the name of the calling function (in uppercase)
-* @param $errno		the native error number from the database
-* @param $errmsg	the native error msg from the database
-* @param $p1		$fn specific parameter - see below
-* @param $p2		$fn specific parameter - see below
-* @param $thisConn	$current connection object - can be false if no connection object created
-*/
-function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
-{
-	if (error_reporting() == 0) return; // obey @ protocol
-	switch($fn) {
-	case 'EXECUTE':
-		$sql = $p1;
-		$inputparams = $p2;
-
-		$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n";
-		break;
-
-	case 'PCONNECT':
-	case 'CONNECT':
-		$host = $p1;
-		$database = $p2;
-
-		$s = "$dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n";
-		break;
-	default:
-		$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
-		break;
-	}
-	/*
-	* Log connection error somewhere
-	*	0 message is sent to PHP's system logger, using the Operating System's system
-	*		logging mechanism or a file, depending on what the error_log configuration
-	*		directive is set to.
-	*	1 message is sent by email to the address in the destination parameter.
-	*		This is the only message type where the fourth parameter, extra_headers is used.
-	*		This message type uses the same internal function as mail() does.
-	*	2 message is sent through the PHP debugging connection.
-	*		This option is only available if remote debugging has been enabled.
-	*		In this case, the destination parameter specifies the host name or IP address
-	*		and optionally, port number, of the socket receiving the debug information.
-	*	3 message is appended to the file destination
-	*/
-	if (defined('ADODB_ERROR_LOG_TYPE')) {
-		$t = date('Y-m-d H:i:s');
-		if (defined('ADODB_ERROR_LOG_DEST'))
-			error_log("($t) $s", ADODB_ERROR_LOG_TYPE, ADODB_ERROR_LOG_DEST);
-		else
-			error_log("($t) $s", ADODB_ERROR_LOG_TYPE);
-	}
-
-
-	//print "<p>$s</p>";
-	trigger_error($s,ADODB_ERROR_HANDLER_TYPE); 
-}
-?>
Index: admin/include/lib/adodb/perf/perf-db2.inc.php
===================================================================
--- admin/include/lib/adodb/perf/perf-db2.inc.php	(revision 6370)
+++ admin/include/lib/adodb/perf/perf-db2.inc.php	(working copy)
@@ -1,102 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-// Simple guide to configuring db2: so-so http://www.devx.com/gethelpon/10MinuteSolution/16575
-
-// SELECT * FROM TABLE(SNAPSHOT_APPL('SAMPLE', -1)) as t
-class perf_db2 extends adodb_perf{
-	var $createTableSQL = "CREATE TABLE adodb_logsql (
-		  created TIMESTAMP NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 varchar(4000) NOT NULL,
-		  params varchar(3000) NOT NULL,
-		  tracer varchar(500) NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)";
-		
-	var $settings = array(
-	'Ratios',
-		'data cache hit ratio' => array('RATIO',
-			"SELECT 
-				case when sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0 
-				else 100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)) end 
-				FROM TABLE(SNAPSHOT_APPL('',-2)) as t",
-			'=WarnCacheRatio'),
-			
-	'Data Cache',
-		'data cache buffers' => array('DATAC',
-		'select sum(npages) from SYSCAT.BUFFERPOOLS',
-			'See <a href=http://www7b.boulder.ibm.com/dmdd/library/techarticle/anshum/0107anshum.html#bufferpoolsize>tuning reference</a>.' ),
-		'cache blocksize' => array('DATAC',
-		'select avg(pagesize) from SYSCAT.BUFFERPOOLS',
-			'' ),
-		'data cache size' => array('DATAC',
-		'select sum(npages*pagesize) from SYSCAT.BUFFERPOOLS',
-			'' ),
-	'Connections',
-		'current connections' => array('SESS',
-			"SELECT count(*) FROM TABLE(SNAPSHOT_APPL_INFO('',-2)) as t",
-			''),
-
-		false
-	);
-
-
-	function perf_db2(&$conn)
-	{
-		$this->conn =& $conn;
-	}
-	
-	function Explain($sql,$partial=false)
-	{
-		$save = $this->conn->LogSQL(false);
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		$qno = rand();
-		$ok = $this->conn->Execute("EXPLAIN PLAN SET QUERYNO=$qno FOR $sql");
-		ob_start();
-		if (!$ok) echo "<p>Have EXPLAIN tables been created?</p>";
-		else {
-			$rs = $this->conn->Execute("select * from explain_statement where queryno=$qno");
-			if ($rs) rs2html($rs);
-		}
-		$s = ob_get_contents();
-		ob_end_clean();
-		$this->conn->LogSQL($save);
-		
-		$s .= $this->Tracer($sql);
-		return $s;
-	}
-	
-	
-	function Tables()
-	{
-		$rs = $this->conn->Execute("select tabschema,tabname,card as rows,
-			npages pages_used,fpages pages_allocated, tbspace tablespace  
-			from syscat.tables where tabschema not in ('SYSCAT','SYSIBM','SYSSTAT') order by 1,2");
-		return rs2html($rs,false,false,false,false);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/perf/perf-informix.inc.php
===================================================================
--- admin/include/lib/adodb/perf/perf-informix.inc.php	(revision 6370)
+++ admin/include/lib/adodb/perf/perf-informix.inc.php	(working copy)
@@ -1,70 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-//
-// Thx to  Fernando Ortiz, mailto:fortiz#lacorona.com.mx
-// With info taken from http://www.oninit.com/oninit/sysmaster/index.html
-//
-class perf_informix extends adodb_perf{
-
-	// Maximum size on varchar upto 9.30 255 chars
-	// better truncate varchar to 255 than char(4000) ?
-	var $createTableSQL = "CREATE TABLE adodb_logsql (
-		created datetime year to second NOT NULL,
-		sql0 varchar(250) NOT NULL,
-		sql1 varchar(255) NOT NULL,
-		params varchar(255) NOT NULL,
-		tracer varchar(255) NOT NULL,
-		timer decimal(16,6) NOT NULL
-	)";
-	
-	var $tablesSQL = "select a.tabname tablename, ti_nptotal*2 size_in_k, ti_nextns extents, ti_nrows records from systables c, sysmaster:systabnames a, sysmaster:systabinfo b where c.tabname not matches 'sys*' and c.partnum = a.partnum and c.partnum = b.ti_partnum";
-	
-	var $settings = array(
-	'Ratios',
-		'data cache hit ratio' => array('RATIOH',
-		"select round((1-(wt.value / (rd.value + wr.value)))*100,2)
-		from sysmaster:sysprofile wr, sysmaster:sysprofile rd, sysmaster:sysprofile wt
-		where rd.name = 'pagreads' and
-		wr.name = 'pagwrites' and
-		wt.name = 'buffwts'",
-		'=WarnCacheRatio'),
-	'IO',
-		'data reads' => array('IO',
-		"select value from sysmaster:sysprofile where name='pagreads'",
-		'Page reads'),
-		
-		'data writes' => array('IO',
-		"select value from sysmaster:sysprofile where name='pagwrites'",
-		'Page writes'),
-	
-	'Connections',
-		'current connections' => array('SESS',
-		'select count(*) from sysmaster:syssessions',
-		'Number of sessions'),
-	
-	false
-	
-	);
-	
-	function perf_informix(&$conn)
-	{
-		$this->conn =& $conn;
-	}
-
-}
-?>
Index: admin/include/lib/adodb/perf/perf-mssql.inc.php
===================================================================
--- admin/include/lib/adodb/perf/perf-mssql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/perf/perf-mssql.inc.php	(working copy)
@@ -1,164 +0,0 @@
-<?php
-
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-	MSSQL has moved most performance info to Performance Monitor
-*/
-class perf_mssql extends adodb_perf{
-	var $sql1 = 'cast(sql1 as text)';
-	var $createTableSQL = "CREATE TABLE adodb_logsql (
-		  created datetime NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 varchar(4000) NOT NULL,
-		  params varchar(3000) NOT NULL,
-		  tracer varchar(500) NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)";
-		
-	var $settings = array(
-	'Ratios',
-		'data cache hit ratio' => array('RATIO',
-			"select round((a.cntr_value*100.0)/b.cntr_value,2) from master.dbo.sysperfinfo a, master.dbo.sysperfinfo b where a.counter_name = 'Buffer cache hit ratio' and b.counter_name='Buffer cache hit ratio base'",
-			'=WarnCacheRatio'),
-		'prepared sql hit ratio' => array('RATIO',
-			array('dbcc cachestats','Prepared',1,100),
-			''),
-		'adhoc sql hit ratio' => array('RATIO',
-			array('dbcc cachestats','Adhoc',1,100),
-			''),
-	'IO',
-		'data reads' => array('IO',
-		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page reads/sec'"),
-		'data writes' => array('IO',
-		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page writes/sec'"),
-			
-	'Data Cache',
-		'data cache size' => array('DATAC',
-		"select cntr_value*8192 from master.dbo.sysperfinfo where counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
-			'' ),
-		'data cache blocksize' => array('DATAC',
-			"select 8192",'page size'),
-	'Connections',
-		'current connections' => array('SESS',
-			'=sp_who',
-			''),
-		'max connections' => array('SESS',
-			"SELECT @@MAX_CONNECTIONS",
-			''),
-
-		false
-	);
-	
-	
-	function perf_mssql(&$conn)
-	{
-		if ($conn->dataProvider == 'odbc') {
-			$this->sql1 = 'sql1';
-			//$this->explain = false;
-		}
-		$this->conn =& $conn;
-	}
-	
-	function Explain($sql,$partial=false)
-	{
-		
-		$save = $this->conn->LogSQL(false);
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		
-		$s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
-		$this->conn->Execute("SET SHOWPLAN_ALL ON;");
-		$sql = str_replace('?',"''",$sql);
-		global $ADODB_FETCH_MODE;
-		
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$rs =& $this->conn->Execute($sql);
-		//adodb_printr($rs);
-		$ADODB_FETCH_MODE = $save;
-		if ($rs) {
-			$rs->MoveNext();
-			$s .= '<table bgcolor=white border=0 cellpadding="1" callspacing=0><tr><td nowrap align=center> Rows<td nowrap align=center> IO<td nowrap align=center> CPU<td align=left> &nbsp; &nbsp; Plan</tr>';
-			while (!$rs->EOF) {
-				$s .= '<tr><td>'.round($rs->fields[8],1).'<td>'.round($rs->fields[9],3).'<td align=right>'.round($rs->fields[10],3).'<td nowrap><pre>'.htmlspecialchars($rs->fields[0])."</td></pre></tr>\n"; ## NOTE CORRUPT </td></pre> tag is intentional!!!!
-				$rs->MoveNext();
-			}
-			$s .= '</table>';
-			
-			$rs->NextRecordSet();
-		}
-		
-		$this->conn->Execute("SET SHOWPLAN_ALL OFF;");
-		$this->conn->LogSQL($save);
-		$s .= $this->Tracer($sql);
-		return $s;
-	}
-	
-	function Tables()
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		//$this->conn->debug=1;
-		$s = '<table border=1 bgcolor=white><tr><td><b>tablename</b></td><td><b>size_in_k</b></td><td><b>index size</b></td><td><b>reserved size</b></td></tr>';
-		$rs1 = $this->conn->Execute("select distinct name from sysobjects where xtype='U'");
-		if ($rs1) {
-			while (!$rs1->EOF) {
-				$tab = $rs1->fields[0];
-				$tabq = $this->conn->qstr($tab);
-				$rs2 = $this->conn->Execute("sp_spaceused $tabq");
-				if ($rs2) {
-					$s .= '<tr><td>'.$tab.'</td><td align=right>'.$rs2->fields[3].'</td><td align=right>'.$rs2->fields[4].'</td><td align=right>'.$rs2->fields[2].'</td></tr>';
-					$rs2->Close();
-				}
-				$rs1->MoveNext();
-			}
-			$rs1->Close();
-		}
-		$ADODB_FETCH_MODE = $save;
-		return $s.'</table>';
-	}
-	
-	function sp_who()
-	{
-		$arr = $this->conn->GetArray('sp_who');
-		return sizeof($arr);
-	}
-	
-	function HealthCheck($cli=false)
-	{
-		
-		$this->conn->Execute('dbcc traceon(3604)');
-		$html =  adodb_perf::HealthCheck($cli);
-		$this->conn->Execute('dbcc traceoff(3604)');
-		return $html;
-	}
-	
-	
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/perf/perf-oci8.inc.php
===================================================================
--- admin/include/lib/adodb/perf/perf-oci8.inc.php	(revision 6370)
+++ admin/include/lib/adodb/perf/perf-oci8.inc.php	(working copy)
@@ -1,509 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class perf_oci8 extends ADODB_perf{
-	
-	var $tablesSQL = "select segment_name as \"tablename\", sum(bytes)/1024 as \"size_in_k\",tablespace_name as \"tablespace\",count(*) \"extents\" from sys.user_extents 
-	   group by segment_name,tablespace_name";
-	 
-	var $version;
-	var $createTableSQL = "CREATE TABLE adodb_logsql (
-		  created date NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 varchar(4000) NOT NULL,
-		  params varchar(4000),
-		  tracer varchar(4000),
-		  timer decimal(16,6) NOT NULL
-		)";
-	
-	var $settings = array(
-	'Ratios',
-		'data cache hit ratio' => array('RATIOH',
-			"select round((1-(phy.value / (cur.value + con.value)))*100,2) 
-			from v\$sysstat cur, v\$sysstat con, v\$sysstat phy
-			where cur.name = 'db block gets' and
-			      con.name = 'consistent gets' and
-			      phy.name = 'physical reads'",
-			'=WarnCacheRatio'),
-		
-		'sql cache hit ratio' => array( 'RATIOH',
-			'select round(100*(sum(pins)-sum(reloads))/sum(pins),2)  from v$librarycache',
-			'increase <i>shared_pool_size</i> if too ratio low'),
-			
-		'datadict cache hit ratio' => array('RATIOH',
-		"select      
-           round((1 - (sum(getmisses) / (sum(gets) +          
-   		 sum(getmisses))))*100,2)
-		from  v\$rowcache",
-		'increase <i>shared_pool_size</i> if too ratio low'),
-		
-		'memory sort ratio' => array('RATIOH',
-		"SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE), 
-       0,1,(a.VALUE + b.VALUE)),2)
-FROM   v\$sysstat a, 
-       v\$sysstat b
-WHERE  a.name = 'sorts (disk)'
-AND    b.name = 'sorts (memory)'",
-	"% of memory sorts compared to disk sorts - should be over 95%"),
-
-	'IO',
-		'data reads' => array('IO',
-		"select value from v\$sysstat where name='physical reads'"),
-	
-	'data writes' => array('IO',
-		"select value from v\$sysstat where name='physical writes'"),
-	
-	'Data Cache',
-		'data cache buffers' => array( 'DATAC',
-		"select a.value/b.value  from v\$parameter a, v\$parameter b 
-			where a.name = 'db_cache_size' and b.name= 'db_block_size'",
-			'Number of cache buffers. Tune <i>db_cache_size</i> if the <i>data cache hit ratio</i> is too low.'),
-		'data cache blocksize' => array('DATAC',
-			"select value from v\$parameter where name='db_block_size'",
-			'' ),			
-	'Memory Pools',
-		'data cache size' => array('DATAC',
-			"select value from v\$parameter where name = 'db_cache_size'",
-			'db_cache_size' ),
-		'shared pool size' => array('DATAC',
-			"select value from v\$parameter where name = 'shared_pool_size'",
-			'shared_pool_size, which holds shared sql, stored procedures, dict cache and similar shared structs' ),
-		'java pool size' => array('DATAJ',
-			"select value from v\$parameter where name = 'java_pool_size'",
-			'java_pool_size' ),
-		'large pool buffer size' => array('CACHE',
-			"select value from v\$parameter where name='large_pool_size'",
-			'this pool is for large mem allocations (not because it is larger than shared pool), for MTS sessions, parallel queries, io buffers (large_pool_size) ' ),
-
-		'pga buffer size' => array('CACHE',			
-			"select value from v\$parameter where name='pga_aggregate_target'",
-			'program global area is private memory for sorting, and hash and bitmap merges - since oracle 9i (pga_aggregate_target)' ),
-
-		
-		'Connections',
-		'current connections' => array('SESS',
-			'select count(*) from sys.v_$session where username is not null',
-			''),
-		'max connections' => array( 'SESS',
-			"select value from v\$parameter where name='sessions'",
-			''),
-
-	'Memory Utilization',		
-		'data cache utilization ratio' => array('RATIOU',
-			"select round((1-bytes/sgasize)*100, 2)
-			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
-			where name = 'free memory' and pool = 'shared pool'",
-		'Percentage of data cache actually in use - should be over 85%'),
-		
-				'shared pool utilization ratio' => array('RATIOU', 
-		'select round((sga.bytes/case when p.value=0 then sga.bytes else to_number(p.value) end)*100,2)
-		from v$sgastat sga, v$parameter p
-		where sga.name = \'free memory\' and sga.pool = \'shared pool\'
-		and p.name = \'shared_pool_size\'',
-		'Percentage of shared pool actually used - too low is bad, too high is worse'),
-		
-		'large pool utilization ratio' => array('RATIOU',
-			"select round((1-bytes/sgasize)*100, 2)
-			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
-			where name = 'free memory' and pool = 'large pool'",
-		'Percentage of large_pool actually in use - too low is bad, too high is worse'),
-		'sort buffer size' => array('CACHE',
-			"select value from v\$parameter where name='sort_area_size'",
-			'max in-mem sort_area_size (per query), uses memory in pga' ),
-
-		'pga usage at peak' => array('RATIOU',
-		'=PGA','Mb utilization at peak transactions (requires Oracle 9i+)'),
-	'Transactions',
-		'rollback segments' => array('ROLLBACK',
-			"select count(*) from sys.v_\$rollstat",
-			''),
-	
-		'peak transactions' => array('ROLLBACK',
-			"select max_utilization  tx_hwm
-    		from sys.v_\$resource_limit
-    		where resource_name = 'transactions'",
-			'Taken from high-water-mark'),
-		'max transactions' => array('ROLLBACK',
-			"select value from v\$parameter where name = 'transactions'",
-			'max transactions / rollback segments < 3.5 (or transactions_per_rollback_segment)'),
-	'Parameters',	
-		'cursor sharing' => array('CURSOR',
-			"select value from v\$parameter where name = 'cursor_sharing'",
-			'Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR (9i+). See <a href=http://www.praetoriate.com/oracle_tips_cursor_sharing.htm>cursor_sharing</a>.'),
-		/*
-		'cursor reuse' => array('CURSOR',
-			"select count(*) from (select sql_text_wo_constants, count(*)
-  from t1
- group by sql_text_wo_constants
-having count(*) > 100)",'These are sql statements that should be using bind variables'),*/
-		'index cache cost' => array('COST',
-			"select value from v\$parameter where name = 'optimizer_index_caching'",
-			'=WarnIndexCost'),
-		'random page cost' => array('COST',
-			"select value from v\$parameter where name = 'optimizer_index_cost_adj'",
-			'=WarnPageCost'),
-		
-		false
-		
-	);
-	
-	
-	function perf_oci8(&$conn)
-	{
-		$savelog = $conn->LogSQL(false);	
-		$this->version = $conn->ServerInfo();
-		$conn->LogSQL($savelog);	
-		$this->conn =& $conn;
-	}
-	
-	function WarnPageCost($val)
-	{
-		if ($val == 100) $s = '<font color=red><b>Too High</b>. </font>';
-		else $s = '';
-		
-		return $s.'Recommended is 20-50 for TP, and 50 for data warehouses. Default is 100. See <a href=http://www.dba-oracle.com/oracle_tips_cost_adj.htm>optimizer_index_cost_adj</a>. ';
-	}
-	
-	function WarnIndexCost($val)
-	{
-		if ($val == 0) $s = '<font color=red><b>Too Low</b>. </font>';
-		else $s = '';
-		
-		return $s.'Percentage of indexed data blocks expected in the cache.
-			Recommended is 20 (fast disk array) to 50 (slower hard disks). Default is 0.
-			 See <a href=http://www.dba-oracle.com/oracle_tips_cbo_part1.htm>optimizer_index_caching</a>.';
-		}
-	
-	function PGA()
-	{
-		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
-		
-		$rs = $this->conn->Execute("select a.mb,a.targ as pga_size_pct,a.pct from 
-	   (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
-	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
-	   	   from v\$pga_target_advice) a left join
-	   (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
-	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
-	   	   from v\$pga_target_advice) b on 
-	  a.r = b.r+1 where 
-  		b.pct < 100");
-		if (!$rs) return "Only in 9i or later";
-		$rs->Close();
-		if ($rs->EOF) return "PGA could be too big";
-		
-		return reset($rs->fields);
-	}
-	
-	function Explain($sql,$partial=false) 
-	{
-		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
-		if (!$rs) {
-			echo "<p><b>Missing PLAN_TABLE</b></p>
-<pre>
-CREATE TABLE PLAN_TABLE (
-  STATEMENT_ID                    VARCHAR2(30),
-  TIMESTAMP                       DATE,
-  REMARKS                         VARCHAR2(80),
-  OPERATION                       VARCHAR2(30),
-  OPTIONS                         VARCHAR2(30),
-  OBJECT_NODE                     VARCHAR2(128),
-  OBJECT_OWNER                    VARCHAR2(30),
-  OBJECT_NAME                     VARCHAR2(30),
-  OBJECT_INSTANCE                 NUMBER(38),
-  OBJECT_TYPE                     VARCHAR2(30),
-  OPTIMIZER                       VARCHAR2(255),
-  SEARCH_COLUMNS                  NUMBER,
-  ID                              NUMBER(38),
-  PARENT_ID                       NUMBER(38),
-  POSITION                        NUMBER(38),
-  COST                            NUMBER(38),
-  CARDINALITY                     NUMBER(38),
-  BYTES                           NUMBER(38),
-  OTHER_TAG                       VARCHAR2(255),
-  PARTITION_START                 VARCHAR2(255),
-  PARTITION_STOP                  VARCHAR2(255),
-  PARTITION_ID                    NUMBER(38),
-  OTHER                           LONG,
-  DISTRIBUTION                    VARCHAR2(30)
-);
-</pre>";
-			return false;
-		}
-		
-		$rs->Close();
-	//	$this->conn->debug=1;
-	
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		
-		$s = "<p><b>Explain</b>: ".htmlspecialchars($sql)."</p>";	
-		
-		$this->conn->BeginTrans();
-		$id = "ADODB ".microtime();
-
-		$rs =& $this->conn->Execute("EXPLAIN PLAN SET STATEMENT_ID='$id' FOR $sql");
-		$m = $this->conn->ErrorMsg();
-		if ($m) {
-			$this->conn->RollbackTrans();
-			$this->conn->LogSQL($savelog);
-			$s .= "<p>$m</p>";
-			return $s;
-		}
-		$rs =& $this->conn->Execute("
-		select 
-  '<pre>'||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'</pre>'  as Operation, 
-  object_name,COST,CARDINALITY,bytes
-		FROM plan_table 
-START WITH id = 0  and STATEMENT_ID='$id'  
-CONNECT BY prior id=parent_id and statement_id='$id'");
-		
-		$s .= rs2html($rs,false,false,false,false);
-		$this->conn->RollbackTrans();
-		$this->conn->LogSQL($savelog);
-		$s .= $this->Tracer($sql,$partial);
-		return $s;
-	}
-	
-	
-	function CheckMemory()
-	{
-		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
-		
-		 $rs =& $this->conn->Execute("
-select  a.size_for_estimate as cache_mb_estimate,
-	case when a.size_factor=1 then 
-   		'&lt;&lt;= current'
-	 when a.estd_physical_read_factor-b.estd_physical_read_factor > 0 and a.estd_physical_read_factor<1 then
-		'- BETTER - '
-	else ' ' end as currsize, 
-   a.estd_physical_read_factor-b.estd_physical_read_factor as best_when_0
-   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum  r from v\$db_cache_advice) a , 
-   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r from v\$db_cache_advice) b where a.r = b.r-1");
-		if (!$rs) return false;
-		
-		/*
-		The v$db_cache_advice utility show the marginal changes in physical data block reads for different sizes of db_cache_size
-		*/
-		$s = "<h3>Data Cache Estimate</h3>";
-		if ($rs->EOF) {
-			$s .= "<p>Cache that is 50% of current size is still too big</p>";
-		} else {
-			$s .= "Ideal size of Data Cache is when \"best_when_0\" changes from a positive number and becomes zero.";
-			$s .= rs2html($rs,false,false,false,false);
-		}
-		return $s;
-	}
-	
-	/*
-		Generate html for suspicious/expensive sql
-	*/
-	function tohtml(&$rs,$type)
-	{
-		$o1 = $rs->FetchField(0);
-		$o2 = $rs->FetchField(1);
-		$o3 = $rs->FetchField(2);
-		if ($rs->EOF) return '<p>None found</p>';
-		$check = '';
-		$sql = '';
-		$s = "\n\n<table border=1 bgcolor=white><tr><td><b>".$o1->name.'</b></td><td><b>'.$o2->name.'</b></td><td><b>'.$o3->name.'</b></td></tr>';
-		while (!$rs->EOF) {
-			if ($check != $rs->fields[0].'::'.$rs->fields[1]) {
-				if ($check) {
-					$carr = explode('::',$check);
-					$prefix = "<a href=\"?$type=1&sql=".rawurlencode($sql).'&x#explain">';
-					$suffix = '</a>';
-					if (strlen($prefix)>2000) {
-						$prefix = '';
-						$suffix = '';
-					}
-					
-					$s .=  "\n<tr><td align=right>".$carr[0].'</td><td align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
-				}
-				$sql = $rs->fields[2];
-				$check = $rs->fields[0].'::'.$rs->fields[1];			
-			} else
-				$sql .= $rs->fields[2];
-			if (substr($sql,strlen($sql)-1) == "\0") $sql = substr($sql,0,strlen($sql)-1);
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		
-		$carr = explode('::',$check);
-		$prefix = "<a target=".rand()." href=\"?&hidem=1&$type=1&sql=".rawurlencode($sql).'&x#explain">';
-		$suffix = '</a>';
-		if (strlen($prefix)>2000) {
-			$prefix = '';
-			$suffix = '';
-		}
-		$s .=  "\n<tr><td align=right>".$carr[0].'</td><td align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
-					
-		return $s."</table>\n\n";
-	}
-	
-	// code thanks to Ixora. 
-	// http://www.ixora.com.au/scripts/query_opt.htm
-	// requires oracle 8.1.7 or later
-	function SuspiciousSQL($numsql=10)
-	{
-		$sql = "
-select
-  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
-  s.executions  executes,
-  p.sql_text
-from
-  ( 
-    select
-      address,
-      buffer_gets,
-      executions,
-      pct,
-      rank() over (order by buffer_gets desc)  ranking
-    from
-      ( 
-	select
-	  address,
-	  buffer_gets,
-	  executions,
-	  100 * ratio_to_report(buffer_gets) over ()  pct
-	from
-	  sys.v_\$sql
-	where
-	  command_type != 47 and module != 'T.O.A.D.'
-      )
-    where
-      buffer_gets > 50 * executions
-  )  s,
-  sys.v_\$sqltext  p
-where
-  s.ranking <= $numsql and
-  p.address = s.address
-order by
-  1 desc, s.address, p.piece";
-
-  		global $ADODB_CACHE_MODE;
-  		if (isset($_GET['expsixora']) && isset($_GET['sql'])) {
-				$partial = empty($_GET['part']);
-				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
-		}
-
-		if (isset($_GET['sql'])) return $this->_SuspiciousSQL($numsql);
-		
-		$s = '';
-		$s .= $this->_SuspiciousSQL($numsql);
-		$s .= '<p>';
-		
-		$save = $ADODB_CACHE_MODE;
-		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
-		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->SelectLimit($sql);
-		$this->conn->LogSQL($savelog);
-		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
-		$ADODB_CACHE_MODE = $save;
-		if ($rs) {
-			$s .= "\n<h3>Ixora Suspicious SQL</h3>";
-			$s .= $this->tohtml($rs,'expsixora');
-		}
-		
-		return $s;
-	}
-	
-	// code thanks to Ixora. 
-	// http://www.ixora.com.au/scripts/query_opt.htm
-	// requires oracle 8.1.7 or later
-	function ExpensiveSQL($numsql = 10)
-	{
-		$sql = "
-select
-  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
-  s.executions  executes,
-  p.sql_text
-from
-  ( 
-    select
-      address,
-      disk_reads,
-      executions,
-      pct,
-      rank() over (order by disk_reads desc)  ranking
-    from
-      (
-	select
-	  address,
-	  disk_reads,
-	  executions,
-	  100 * ratio_to_report(disk_reads) over ()  pct
-	from
-	  sys.v_\$sql
-	where
-	  command_type != 47 and module != 'T.O.A.D.'
-      )
-    where
-      disk_reads > 50 * executions
-  )  s,
-  sys.v_\$sqltext  p
-where
-  s.ranking <= $numsql and
-  p.address = s.address
-order by
-  1 desc, s.address, p.piece
-";
-		global $ADODB_CACHE_MODE;
-  		if (isset($_GET['expeixora']) && isset($_GET['sql'])) {
-			$partial = empty($_GET['part']);	
-			echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
-		}
-		if (isset($_GET['sql'])) {
-			 $var = $this->_ExpensiveSQL($numsql);
-			 return $var;
-		}
-		
-		$s = '';		
-		$s .= $this->_ExpensiveSQL($numsql);
-		$s .= '<p>';
-		$save = $ADODB_CACHE_MODE;
-		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
-		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->Execute($sql);
-		$this->conn->LogSQL($savelog);
-		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
-		$ADODB_CACHE_MODE = $save;
-		
-		if ($rs) {
-			$s .= "\n<h3>Ixora Expensive SQL</h3>";
-			$s .= $this->tohtml($rs,'expeixora');
-		}
-	
-		return $s;
-	}
-	
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/perf/perf-mysql.inc.php
===================================================================
--- admin/include/lib/adodb/perf/perf-mysql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/perf/perf-mysql.inc.php	(working copy)
@@ -1,315 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class perf_mysql extends adodb_perf{
-	
-	var $tablesSQL = 'show table status';
-	
-	var $createTableSQL = "CREATE TABLE adodb_logsql (
-		  created datetime NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 text NOT NULL,
-		  params text NOT NULL,
-		  tracer text NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)";
-		
-	var $settings = array(
-	'Ratios',
-		'MyISAM cache hit ratio' => array('RATIO',
-			'=GetKeyHitRatio',
-			'=WarnCacheRatio'),
-		'InnoDB cache hit ratio' => array('RATIO',
-			'=GetInnoDBHitRatio',
-			'=WarnCacheRatio'),
-		'data cache hit ratio' => array('HIDE', # only if called
-			'=FindDBHitRatio',
-			'=WarnCacheRatio'),
-		'sql cache hit ratio' => array('RATIO',
-			'=GetQHitRatio',
-			''),
-	'IO',
-		'data reads' => array('IO',
-			'=GetReads',
-			'Number of selects (Key_reads is not accurate)'),
-		'data writes' => array('IO',
-			'=GetWrites',
-			'Number of inserts/updates/deletes * coef (Key_writes is not accurate)'),
-		
-	'Data Cache',
-		'MyISAM data cache size' => array('DATAC',
-			array("show variables", 'key_buffer_size'),
-			'' ),
-		'BDB data cache size' => array('DATAC',
-			array("show variables", 'bdb_cache_size'),
-			'' ),
-		'InnoDB data cache size' => array('DATAC',
-			array("show variables", 'innodb_buffer_pool_size'),
-			'' ),
-	'Memory Usage',
-		'read buffer size' => array('CACHE',
-			array("show variables", 'read_buffer_size'),
-			'(per session)'),
-		'sort buffer size' => array('CACHE',
-			array("show variables", 'sort_buffer_size'),
-			'Size of sort buffer (per session)' ),
-		'table cache' => array('CACHE',
-			array("show variables", 'table_cache'),
-			'Number of tables to keep open'),
-	'Connections',	
-		'current connections' => array('SESS',
-			array('show status','Threads_connected'),
-			''),
-		'max connections' => array( 'SESS',
-			array("show variables",'max_connections'),
-			''),
-	
-		false
-	);
-	
-	function perf_mysql(&$conn)
-	{
-		$this->conn =& $conn;
-	}
-	
-	function Explain($sql,$partial=false)
-	{
-		
-		if (strtoupper(substr(trim($sql),0,6)) !== 'SELECT') return '<p>Unable to EXPLAIN non-select statement</p>';
-		$save = $this->conn->LogSQL(false);
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		$sql = str_replace('?',"''",$sql);
-		
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$sql = $this->conn->GetOne("select sql1 from adodb_logsql where sql1 like $sqlq");
-		}
-		
-		$s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
-		$rs = $this->conn->Execute('EXPLAIN '.$sql);
-		$s .= rs2html($rs,false,false,false,false);
-		$this->conn->LogSQL($save);
-		$s .= $this->Tracer($sql);
-		return $s;
-	}
-	
-	function Tables()
-	{
-		if (!$this->tablesSQL) return false;
-		
-		$rs = $this->conn->Execute($this->tablesSQL);
-		if (!$rs) return false;
-		
-		$html = rs2html($rs,false,false,false,false);
-		return $html;
-	}
-	
-	function GetReads()
-	{
-	global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
-		$rs = $this->conn->Execute('show status');
-		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if (!$rs) return 0;
-		$val = 0;
-		while (!$rs->EOF) {
-			switch($rs->fields[0]) {
-			case 'Com_select': 
-				$val = $rs->fields[1];
-				$rs->Close();
-				return $val;
-			}
-			$rs->MoveNext();
-		} 
-		
-		$rs->Close();
-		
-		return $val;
-	}
-	
-	function GetWrites()
-	{
-	global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
-		$rs = $this->conn->Execute('show status');
-		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if (!$rs) return 0;
-		$val = 0.0;
-		while (!$rs->EOF) {
-			switch($rs->fields[0]) {
-			case 'Com_insert': 
-				$val += $rs->fields[1]; break;
-			case 'Com_delete': 
-				$val += $rs->fields[1]; break;
-			case 'Com_update': 
-				$val += $rs->fields[1]/2;
-				$rs->Close();
-				return $val;
-			}
-			$rs->MoveNext();
-		} 
-		
-		$rs->Close();
-		
-		return $val;
-	}
-	
-	function FindDBHitRatio()
-	{
-		// first find out type of table
-		//$this->conn->debug=1;
-		
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
-		$rs = $this->conn->Execute('show table status');
-		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if (!$rs) return '';
-		$type = strtoupper($rs->fields[1]);
-		$rs->Close();
-		switch($type){
-		case 'MYISAM':
-		case 'ISAM':
-			return $this->DBParameter('MyISAM cache hit ratio').' (MyISAM)';
-		case 'INNODB':
-			return $this->DBParameter('InnoDB cache hit ratio').' (InnoDB)';
-		default:
-			return $type.' not supported';
-		}
-		
-	}
-	
-	function GetQHitRatio()
-	{
-		//Total number of queries = Qcache_inserts + Qcache_hits + Qcache_not_cached
-		$hits = $this->_DBParameter(array("show status","Qcache_hits"));
-		$total = $this->_DBParameter(array("show status","Qcache_inserts"));
-		$total += $this->_DBParameter(array("show status","Qcache_not_cached"));
-		
-		$total += $hits;
-		if ($total) return round(($hits*100)/$total,2);
-		return 0;
-	}
-	
-	/*
-		Use session variable to store Hit percentage, because MySQL
-		does not remember last value of SHOW INNODB STATUS hit ratio
-		
-		# 1st query to SHOW INNODB STATUS
-		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
-		Buffer pool hit rate 1000 / 1000
-		
-		# 2nd query to SHOW INNODB STATUS
-		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
-		No buffer pool activity since the last printout
-	*/
-	function GetInnoDBHitRatio()
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-		
-		$rs = $this->conn->Execute('show innodb status');
-		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if (!$rs || $rs->EOF) return 0;
-		$stat = $rs->fields[0];
-		$rs->Close();
-		$at = strpos($stat,'Buffer pool hit rate');
-		$stat = substr($stat,$at,200);
-		if (preg_match('!Buffer pool hit rate\s*([0-9]*) / ([0-9]*)!',$stat,$arr)) {
-			$val = 100*$arr[1]/$arr[2];
-			$_SESSION['INNODB_HIT_PCT'] = $val;
-			return round($val,2);
-		} else {
-			if (isset($_SESSION['INNODB_HIT_PCT'])) return $_SESSION['INNODB_HIT_PCT'];
-			return 0;
-		}
-		return 0;
-	}
-	
-	function GetKeyHitRatio()
-	{
-		$hits = $this->_DBParameter(array("show status","Key_read_requests"));
-		$reqs = $this->_DBParameter(array("show status","Key_reads"));
-		if ($reqs == 0) return 0;
-		
-		return round(($hits/($reqs+$hits))*100,2);
-	}
-	
-    // start hack 
-    var $optimizeTableLow = 'CHECK TABLE %s FAST QUICK';
-    var $optimizeTableHigh = 'OPTIMIZE TABLE %s';
-    
-    /** 
-     * @see adodb_perf#optimizeTable
-     */
-     function optimizeTable( $table, $mode = ADODB_OPT_LOW) 
-     {
-        if ( !is_string( $table)) return false;
-        
-        $conn = $this->conn;
-        if ( !$conn) return false;
-        
-        $sql = '';
-        switch( $mode) {
-            case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break;
-            case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break;
-            default : 
-            {
-                // May dont use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0)
-                ADOConnection::outp( sprintf( "<p>%s: '%s' using of undefined mode '%s'</p>", __CLASS__, __FUNCTION__, $mode));
-                return false;
-            }
-        }
-        $sql = sprintf( $sql, $table);
-        
-        return $conn->Execute( $sql) !== false;
-     }
-    // end hack 
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/perf/perf-postgres.inc.php
===================================================================
--- admin/include/lib/adodb/perf/perf-postgres.inc.php	(revision 6370)
+++ admin/include/lib/adodb/perf/perf-postgres.inc.php	(working copy)
@@ -1,124 +0,0 @@
-<?php
-
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning 
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-	Notice that PostgreSQL has no sql query cache
-*/
-class perf_postgres extends adodb_perf{
-	
-	var $tablesSQL = 
-	"select a.relname as tablename,(a.relpages+CASE WHEN b.relpages is null THEN 0 ELSE b.relpages END+CASE WHEN c.relpages is null THEN 0 ELSE c.relpages END)*8 as size_in_K,a.relfilenode as \"OID\"  from pg_class a left join pg_class b
-		on b.relname = 'pg_toast_'||trim(a.relfilenode) 
-		left join pg_class c on c.relname = 'pg_toast_'||trim(a.relfilenode)||'_index'
-		where a.relname in (select tablename from pg_tables where tablename not like 'pg_%')";
-	
-	var $createTableSQL = "CREATE TABLE adodb_logsql (
-		  created timestamp NOT NULL,
-		  sql0 varchar(250) NOT NULL,
-		  sql1 text NOT NULL,
-		  params text NOT NULL,
-		  tracer text NOT NULL,
-		  timer decimal(16,6) NOT NULL
-		)";	
-	
-	var $settings = array(
-	'Ratios',
-		'statistics collector' => array('RATIO',
-			"select case when count(*)=3 then 'TRUE' else 'FALSE' end from pg_settings where (name='stats_block_level' or name='stats_row_level' or name='stats_start_collector') and setting='on' ",
-			'Value must be TRUE to enable hit ratio statistics (<i>stats_start_collector</i>,<i>stats_row_level</i> and <i>stats_block_level</i> must be set to true in postgresql.conf)'),
-		'data cache hit ratio' => array('RATIO',
-			"select case when blks_hit=0 then 0 else round( ((1-blks_read::float/blks_hit)*100)::numeric, 2) end from pg_stat_database where datname='\$DATABASE'",
-			'=WarnCacheRatio'),
-	'IO',
-		'data reads' => array('IO',
-		'select sum(heap_blks_read+toast_blks_read) from pg_statio_user_tables',
-		),
-		'data writes' => array('IO',
-		'select round((sum(n_tup_ins/4.0+n_tup_upd/8.0+n_tup_del/4.0)/16)::numeric,2) from pg_stat_user_tables',
-		'Count of inserts/updates/deletes * coef'),
-
-	'Data Cache',
-		'data cache buffers' => array('DATAC',
-			"select setting from pg_settings where name='shared_buffers'",
-			'Number of cache buffers. <a href=http://www.varlena.com/GeneralBits/Tidbits/perf.html#basic>Tuning</a>'),
-		'cache blocksize' => array('DATAC',
-			'select 8192',
-			'(estimate)' ),
-		'data cache size' => array( 'DATAC',
-		"select setting::integer*8192 from pg_settings where name='shared_buffers'",
-			'' ),
-		'operating system cache size' => array( 'DATA',
-		"select setting::integer*8192 from pg_settings where name='effective_cache_size'",
-			'(effective cache size)' ),
-	'Memory Usage',
-	# Postgres 7.5 changelog: Rename server parameters SortMem and VacuumMem to work_mem and maintenance_work_mem;
-		'sort/work buffer size' => array('CACHE',
-			"select setting::integer*1024 from pg_settings where name='sort_mem' or name = 'work_mem' order by name",
-			'Size of sort buffer (per query)' ),
-	'Connections',
-		'current connections' => array('SESS',
-			'select count(*) from pg_stat_activity',
-			''),
-		'max connections' => array('SESS',
-			"select setting from pg_settings where name='max_connections'",
-			''),
-	'Parameters',
-		'rollback buffers' => array('COST',
-			"select setting from pg_settings where name='wal_buffers'",
-			'WAL buffers'),
-		'random page cost' => array('COST',
-			"select setting from pg_settings where name='random_page_cost'",
-			'Cost of doing a seek (default=4). See <a href=http://www.varlena.com/GeneralBits/Tidbits/perf.html#less>random_page_cost</a>'),
-		false
-	);
-	
-	function perf_postgres(&$conn)
-	{
-		$this->conn =& $conn;
-	}
-	
-	function Explain($sql,$partial=false)
-	{
-		$save = $this->conn->LogSQL(false);
-		
-		if ($partial) {
-			$sqlq = $this->conn->qstr($sql.'%');
-			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
-					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
-				}
-			}
-		}
-		$sql = str_replace('?',"''",$sql);
-		$s = '<p><b>Explain</b>: '.htmlspecialchars($sql).'</p>';
-		$rs = $this->conn->Execute('EXPLAIN '.$sql);
-		$this->conn->LogSQL($save);
-		$s .= '<pre>';
-		if ($rs)
-			while (!$rs->EOF) {
-				$s .= reset($rs->fields)."\n";
-				$rs->MoveNext();
-			}
-		$s .= '</pre>';
-		$s .= $this->Tracer($sql,$partial);
-		return $s;
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-error.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-error.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-error.inc.php	(working copy)
@@ -1,258 +0,0 @@
-<?php
-/** 
- * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
- * The following code is adapted from the PEAR DB error handling code.
- * Portions (c)1997-2002 The PHP Group.
- */
-
-
-if (!defined("DB_ERROR")) define("DB_ERROR",-1);
-
-if (!defined("DB_ERROR_SYNTAX")) {
-	define("DB_ERROR_SYNTAX",              -2);
-	define("DB_ERROR_CONSTRAINT",          -3);
-	define("DB_ERROR_NOT_FOUND",           -4);
-	define("DB_ERROR_ALREADY_EXISTS",      -5);
-	define("DB_ERROR_UNSUPPORTED",         -6);
-	define("DB_ERROR_MISMATCH",            -7);
-	define("DB_ERROR_INVALID",             -8);
-	define("DB_ERROR_NOT_CAPABLE",         -9);
-	define("DB_ERROR_TRUNCATED",          -10);
-	define("DB_ERROR_INVALID_NUMBER",     -11);
-	define("DB_ERROR_INVALID_DATE",       -12);
-	define("DB_ERROR_DIVZERO",            -13);
-	define("DB_ERROR_NODBSELECTED",       -14);
-	define("DB_ERROR_CANNOT_CREATE",      -15);
-	define("DB_ERROR_CANNOT_DELETE",      -16);
-	define("DB_ERROR_CANNOT_DROP",        -17);
-	define("DB_ERROR_NOSUCHTABLE",        -18);
-	define("DB_ERROR_NOSUCHFIELD",        -19);
-	define("DB_ERROR_NEED_MORE_DATA",     -20);
-	define("DB_ERROR_NOT_LOCKED",         -21);
-	define("DB_ERROR_VALUE_COUNT_ON_ROW", -22);
-	define("DB_ERROR_INVALID_DSN",        -23);
-	define("DB_ERROR_CONNECT_FAILED",     -24);
-	define("DB_ERROR_EXTENSION_NOT_FOUND",-25);
-	define("DB_ERROR_NOSUCHDB",           -25);
-	define("DB_ERROR_ACCESS_VIOLATION",   -26);
-}
-
-function adodb_errormsg($value)
-{
-global $ADODB_LANG,$ADODB_LANG_ARRAY;
-
-	if (empty($ADODB_LANG)) $ADODB_LANG = 'en';
-	if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == $ADODB_LANG) ;
-	else {
-		include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");
-    }
-	return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : $ADODB_LANG_ARRAY[DB_ERROR];
-}
-
-function adodb_error($provider,$dbType,$errno)
-{
-	//var_dump($errno);
-	if (is_numeric($errno) && $errno == 0) return 0;
-	switch($provider) { 
-	case 'mysql': $map = adodb_error_mysql(); break;
-	
-	case 'oracle':
-	case 'oci8': $map = adodb_error_oci8(); break;
-	
-	case 'ibase': $map = adodb_error_ibase(); break;
-	
-	case 'odbc': $map = adodb_error_odbc(); break;
-	
-	case 'mssql':
-	case 'sybase': $map = adodb_error_mssql(); break;
-	
-	case 'informix': $map = adodb_error_ifx(); break;
-	
-	case 'postgres': return adodb_error_pg($errno); break;
-	
-	case 'sqlite': return $map = adodb_error_sqlite(); break;
-	default:
-		return DB_ERROR;
-	}	
-	//print_r($map);
-	//var_dump($errno);
-	if (isset($map[$errno])) return $map[$errno];
-	return DB_ERROR;
-}
-
-//**************************************************************************************
-
-function adodb_error_pg($errormsg)
-{
-	if (is_numeric($errormsg)) return (integer) $errormsg;
-    static $error_regexps = array(
-            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
-            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
-            '/divide by zero$/'                     => DB_ERROR_DIVZERO,
-            '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,
-            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,
-            '/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,
-            '/referential integrity violation/'     => DB_ERROR_CONSTRAINT,
-			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/'     
-			 	 => DB_ERROR_ALREADY_EXISTS
-        );
-	reset($error_regexps);
-    while (list($regexp,$code) = each($error_regexps)) {
-        if (preg_match($regexp, $errormsg)) {
-            return $code;
-        }
-    }
-    // Fall back to DB_ERROR if there was no mapping.
-    return DB_ERROR;
-}
-	
-function adodb_error_odbc()
-{
-static $MAP = array(
-            '01004' => DB_ERROR_TRUNCATED,
-            '07001' => DB_ERROR_MISMATCH,
-            '21S01' => DB_ERROR_MISMATCH,
-            '21S02' => DB_ERROR_MISMATCH,
-            '22003' => DB_ERROR_INVALID_NUMBER,
-            '22008' => DB_ERROR_INVALID_DATE,
-            '22012' => DB_ERROR_DIVZERO,
-            '23000' => DB_ERROR_CONSTRAINT,
-            '24000' => DB_ERROR_INVALID,
-            '34000' => DB_ERROR_INVALID,
-            '37000' => DB_ERROR_SYNTAX,
-            '42000' => DB_ERROR_SYNTAX,
-            'IM001' => DB_ERROR_UNSUPPORTED,
-            'S0000' => DB_ERROR_NOSUCHTABLE,
-            'S0001' => DB_ERROR_NOT_FOUND,
-            'S0002' => DB_ERROR_NOSUCHTABLE,
-            'S0011' => DB_ERROR_ALREADY_EXISTS,
-            'S0012' => DB_ERROR_NOT_FOUND,
-            'S0021' => DB_ERROR_ALREADY_EXISTS,
-            'S0022' => DB_ERROR_NOT_FOUND,
-			'S1000' => DB_ERROR_NOSUCHTABLE,
-            'S1009' => DB_ERROR_INVALID,
-            'S1090' => DB_ERROR_INVALID,
-            'S1C00' => DB_ERROR_NOT_CAPABLE
-        );
-		return $MAP;
-}
-
-function adodb_error_ibase()
-{
-static $MAP = array(
-            -104 => DB_ERROR_SYNTAX,
-            -150 => DB_ERROR_ACCESS_VIOLATION,
-            -151 => DB_ERROR_ACCESS_VIOLATION,
-            -155 => DB_ERROR_NOSUCHTABLE,
-            -157 => DB_ERROR_NOSUCHFIELD,
-            -158 => DB_ERROR_VALUE_COUNT_ON_ROW,
-            -170 => DB_ERROR_MISMATCH,
-            -171 => DB_ERROR_MISMATCH,
-            -172 => DB_ERROR_INVALID,
-            -204 => DB_ERROR_INVALID,
-            -205 => DB_ERROR_NOSUCHFIELD,
-            -206 => DB_ERROR_NOSUCHFIELD,
-            -208 => DB_ERROR_INVALID,
-            -219 => DB_ERROR_NOSUCHTABLE,
-            -297 => DB_ERROR_CONSTRAINT,
-            -530 => DB_ERROR_CONSTRAINT,
-            -803 => DB_ERROR_CONSTRAINT,
-            -551 => DB_ERROR_ACCESS_VIOLATION,
-            -552 => DB_ERROR_ACCESS_VIOLATION,
-            -922 => DB_ERROR_NOSUCHDB,
-            -923 => DB_ERROR_CONNECT_FAILED,
-            -924 => DB_ERROR_CONNECT_FAILED
-        );
-		
-		return $MAP;
-}
-
-function adodb_error_ifx()
-{
-static $MAP = array(
-            '-201'    => DB_ERROR_SYNTAX,
-            '-206'    => DB_ERROR_NOSUCHTABLE,
-            '-217'    => DB_ERROR_NOSUCHFIELD,
-            '-329'    => DB_ERROR_NODBSELECTED,
-            '-1204'   => DB_ERROR_INVALID_DATE,
-            '-1205'   => DB_ERROR_INVALID_DATE,
-            '-1206'   => DB_ERROR_INVALID_DATE,
-            '-1209'   => DB_ERROR_INVALID_DATE,
-            '-1210'   => DB_ERROR_INVALID_DATE,
-            '-1212'   => DB_ERROR_INVALID_DATE
-       );
-	   
-	   return $MAP;
-}
-
-function adodb_error_oci8()
-{
-static $MAP = array(
-			 1 => DB_ERROR_ALREADY_EXISTS,
-            900 => DB_ERROR_SYNTAX,
-            904 => DB_ERROR_NOSUCHFIELD,
-            923 => DB_ERROR_SYNTAX,
-            942 => DB_ERROR_NOSUCHTABLE,
-            955 => DB_ERROR_ALREADY_EXISTS,
-            1476 => DB_ERROR_DIVZERO,
-            1722 => DB_ERROR_INVALID_NUMBER,
-            2289 => DB_ERROR_NOSUCHTABLE,
-            2291 => DB_ERROR_CONSTRAINT,
-            2449 => DB_ERROR_CONSTRAINT
-        );
-	   
-	return $MAP;
-}
-
-function adodb_error_mssql()
-{
-static $MAP = array(
-		  208 => DB_ERROR_NOSUCHTABLE,
-          2601 => DB_ERROR_ALREADY_EXISTS
-       );
-	   
-	return $MAP;
-}
-
-function adodb_error_sqlite()
-{
-static $MAP = array(
-		  1 => DB_ERROR_SYNTAX
-       );
-	   
-	return $MAP;
-}
-
-function adodb_error_mysql()
-{
-static $MAP = array(
-           1004 => DB_ERROR_CANNOT_CREATE,
-           1005 => DB_ERROR_CANNOT_CREATE,
-           1006 => DB_ERROR_CANNOT_CREATE,
-           1007 => DB_ERROR_ALREADY_EXISTS,
-           1008 => DB_ERROR_CANNOT_DROP,
-		   1045 => DB_ERROR_ACCESS_VIOLATION,
-           1046 => DB_ERROR_NODBSELECTED,
-		   1049 => DB_ERROR_NOSUCHDB,
-           1050 => DB_ERROR_ALREADY_EXISTS,
-           1051 => DB_ERROR_NOSUCHTABLE,
-           1054 => DB_ERROR_NOSUCHFIELD,
-           1062 => DB_ERROR_ALREADY_EXISTS,
-           1064 => DB_ERROR_SYNTAX,
-           1100 => DB_ERROR_NOT_LOCKED,
-           1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
-           1146 => DB_ERROR_NOSUCHTABLE,
-           1048 => DB_ERROR_CONSTRAINT,
-		    2002 => DB_ERROR_CONNECT_FAILED,
-			2005 => DB_ERROR_CONNECT_FAILED
-       );
-	   
-	return $MAP;
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-iterator.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-iterator.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-iterator.inc.php	(working copy)
@@ -1,85 +0,0 @@
-<?php
-
-/*
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Set tabs to 4.
-  
-  Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with 
-  the ADODB_Iterator class.
-  
-  		$rs = $db->Execute("select * from adoxyz");
-		foreach($rs as $k => $v) {
-			echo $k; print_r($v); echo "<br>";
-		}
-		
-		
-	Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
- */
- 
-
- class ADODB_Iterator implements Iterator {
-
-    private $rs;
-
-    function __construct($rs) 
-	{
-        $this->rs = $rs;
-    }
-    function rewind() 
-	{
-        $this->rs->MoveFirst();
-    }
-
-	function valid() 
-	{
-        return !$this->rs->EOF;
-    }
-	
-    function key() 
-	{
-        return $this->rs->_currentRow;
-    }
-	
-    function current() 
-	{
-        return $this->rs->fields;
-    }
-	
-    function next() 
-	{
-        $this->rs->MoveNext();
-    }
-	
-	function __call($func, $params)
-	{
-		return call_user_func_array(array($this->rs, $func), $params);
-	}
-
-	
-	function hasMore()
-	{
-		return !$this->rs->EOF;
-	}
-
-}
-
-
-class ADODB_BASE_RS implements IteratorAggregate {
-    function getIterator() {
-        return new ADODB_Iterator($this);
-    }
-	
-	/* this is experimental - i don't really know what to return... */
-	function __toString()
-	{
-		include_once(ADODB_DIR.'/toexport.inc.php');
-		return _adodb_export($this,',',',',false,true);
-	}
-} 
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/xmlschema03.dtd
===================================================================
--- admin/include/lib/adodb/xmlschema03.dtd	(revision 6370)
+++ admin/include/lib/adodb/xmlschema03.dtd	(working copy)
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE adodb_schema [
-<!ELEMENT schema (table*, sql*)>
-<!ATTLIST schema version CDATA #REQUIRED>
-<!ELEMENT table (descr?, (field+|DROP), constraint*, opt*, index*, data*)>
-<!ATTLIST table name CDATA #REQUIRED platform CDATA #IMPLIED version CDATA #IMPLIED>
-<!ELEMENT field (descr?, (NOTNULL|KEY|PRIMARY)?, (AUTO|AUTOINCREMENT)?, (DEFAULT|DEFDATE|DEFTIMESTAMP)?, NOQUOTE?, UNSIGNED?, constraint*, opt*)>
-<!ATTLIST field name CDATA #REQUIRED type (C|C2|X|X2|B|D|T|L|I|F|N) #REQUIRED size CDATA #IMPLIED opts CDATA #IMPLIED>
-<!ELEMENT data (descr?, row+)>
-<!ATTLIST data platform CDATA #IMPLIED>
-<!ELEMENT row (f+)>
-<!ELEMENT f (#CDATA)>
-<!ATTLIST f name CDATA #IMPLIED>
-<!ELEMENT descr (#CDATA)>
-<!ELEMENT NOTNULL EMPTY>
-<!ELEMENT KEY EMPTY>
-<!ELEMENT PRIMARY EMPTY>
-<!ELEMENT AUTO EMPTY>
-<!ELEMENT AUTOINCREMENT EMPTY>
-<!ELEMENT DEFAULT EMPTY>
-<!ATTLIST DEFAULT value CDATA #REQUIRED>
-<!ELEMENT DEFDATE EMPTY>
-<!ELEMENT DEFTIMESTAMP EMPTY>
-<!ELEMENT NOQUOTE EMPTY>
-<!ELEMENT UNSIGNED EMPTY>
-<!ELEMENT DROP EMPTY>
-<!ELEMENT constraint (#CDATA)>
-<!ATTLIST constraint platform CDATA #IMPLIED>
-<!ELEMENT opt (#CDATA)>
-<!ATTLIST opt platform CDATA #IMPLIED>
-<!ELEMENT index ((col+|DROP), CLUSTERED?, BITMAP?, UNIQUE?, FULLTEXT?, HASH?, descr?)>
-<!ATTLIST index name CDATA #REQUIRED platform CDATA #IMPLIED>
-<!ELEMENT col (#CDATA)>
-<!ELEMENT CLUSTERED EMPTY>
-<!ELEMENT BITMAP EMPTY>
-<!ELEMENT UNIQUE EMPTY>
-<!ELEMENT FULLTEXT EMPTY>
-<!ELEMENT HASH EMPTY>
-<!ELEMENT sql (query+, descr?)>
-<!ATTLIST sql name CDATA #IMPLIED platform CDATA #IMPLIED, key CDATA, prefixmethod (AUTO|MANUAL|NONE)>
-<!ELEMENT query (#CDATA)>
-<!ATTLIST query platform CDATA #IMPLIED>
-]>
\ No newline at end of file
Index: admin/include/lib/adodb/contrib/toxmlrpc.inc.php
===================================================================
--- admin/include/lib/adodb/contrib/toxmlrpc.inc.php	(revision 6370)
+++ admin/include/lib/adodb/contrib/toxmlrpc.inc.php	(working copy)
@@ -1,183 +0,0 @@
-<?php
-    /**
-    * Helper functions to convert between ADODB recordset objects and XMLRPC values.
-    * Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
-    * 
-    * @author Daniele Baroncelli
-    * @author Gaetano Giunta
-    * @copyright (c) 2003-2004 Giunta/Baroncelli. All rights reserved.
-    * 
-    * @todo some more error checking here and there
-    * @todo document the xmlrpc-struct used to encode recordset info
-    * @todo verify if using xmlrpc_encode($rs->GetArray()) would work with:
-    *       - ADODB_FETCH_BOTH
-    *       - null values
-    */
-
-    /**
-    * Include the main libraries
-    */    
-    require_once('xmlrpc.inc');
-    if (!defined('ADODB_DIR')) require_once('adodb.inc.php');
-            
-    /**
-    * Builds an xmlrpc struct value out of an AdoDB recordset
-    */
-    function rs2xmlrpcval(&$adodbrs) {
-
-        $header =& rs2xmlrpcval_header($adodbrs);
-        $body =& rs2xmlrpcval_body($adodbrs);
-
-        // put it all together and build final xmlrpc struct
-        $xmlrpcrs =& new xmlrpcval ( array(
-                "header" => $header,
-                "body" => $body,
-                ), "struct");
-
-        return $xmlrpcrs;
-
-    }
-
-    /**
-    * Builds an xmlrpc struct value describing an AdoDB recordset
-    */
-    function rs2xmlrpcval_header($adodbrs)
-    {
-        $numfields = $adodbrs->FieldCount();
-        $numrecords = $adodbrs->RecordCount();
-
-        // build structure holding recordset information
-        $fieldstruct = array();
-        for ($i = 0; $i < $numfields; $i++) {
-            $fld = $adodbrs->FetchField($i);
-            $fieldarray = array();
-            if (isset($fld->name))
-                $fieldarray["name"] =& new xmlrpcval ($fld->name);
-            if (isset($fld->type))
-                $fieldarray["type"] =& new xmlrpcval ($fld->type);
-            if (isset($fld->max_length))
-                $fieldarray["max_length"] =& new xmlrpcval ($fld->max_length, "int");
-            if (isset($fld->not_null))
-                $fieldarray["not_null"] =& new xmlrpcval ($fld->not_null, "boolean");
-            if (isset($fld->has_default))
-                $fieldarray["has_default"] =& new xmlrpcval ($fld->has_default, "boolean");
-            if (isset($fld->default_value))
-                $fieldarray["default_value"] =& new xmlrpcval ($fld->default_value);
-            $fieldstruct[$i] =& new xmlrpcval ($fieldarray, "struct");
-        }
-        $fieldcount =& new xmlrpcval ($numfields, "int");
-        $recordcount =& new xmlrpcval ($numrecords, "int");
-        $sql =& new xmlrpcval ($adodbrs->sql);
-        $fieldinfo =& new xmlrpcval ($fieldstruct, "array");
-
-        $header =& new xmlrpcval ( array(
-                "fieldcount" => $fieldcount,
-                "recordcount" => $recordcount,
-                "sql" => $sql,
-                "fieldinfo" => $fieldinfo
-                ), "struct");
-
-        return $header;
-    }
-
-    /**
-    * Builds an xmlrpc struct value out of an AdoDB recordset
-    * (data values only, no data definition)
-    */
-    function rs2xmlrpcval_body($adodbrs)
-    {
-        $numfields = $adodbrs->FieldCount();
-
-        // build structure containing recordset data
-        $adodbrs->MoveFirst();
-        $rows = array();
-        while (!$adodbrs->EOF) {
-            $columns = array();
-            // This should work on all cases of fetch mode: assoc, num, both or default
-            if ($adodbrs->fetchMode == 'ADODB_FETCH_BOTH' || count($adodbrs->fields) == 2 * $adodbrs->FieldCount())
-                for ($i = 0; $i < $numfields; $i++)
-                    if ($adodbrs->fields[$i] === null)
-                        $columns[$i] =& new xmlrpcval ('');
-                    else
-                        $columns[$i] =& xmlrpc_encode ($adodbrs->fields[$i]);
-            else
-                foreach ($adodbrs->fields as $val)
-                    if ($val === null)
-                        $columns[] =& new xmlrpcval ('');
-                    else
-                        $columns[] =& xmlrpc_encode ($val);
-
-            $rows[] =& new xmlrpcval ($columns, "array");
-
-            $adodbrs->MoveNext();
-        }
-        $body =& new xmlrpcval ($rows, "array");
-
-        return $body;    
-    }
-    
-    /**
-    * Returns an xmlrpc struct value as string out of an AdoDB recordset
-    */    
-    function rs2xmlrpcstring (&$adodbrs) {
-        $xmlrpc = rs2xmlrpcval ($adodbrs);
-        if ($xmlrpc)
-          return $xmlrpc->serialize();
-        else
-          return null;
-    }
-
-    /**
-    * Given a well-formed xmlrpc struct object returns an AdoDB object
-    * 
-    * @todo add some error checking on the input value
-    */
-    function xmlrpcval2rs (&$xmlrpcval) {
-
-        $fields_array = array();
-        $data_array = array();
- 
-        // rebuild column information  
-        $header =& $xmlrpcval->structmem('header');
-        
-        $numfields = $header->structmem('fieldcount');
-        $numfields = $numfields->scalarval();
-        $numrecords = $header->structmem('recordcount');
-        $numrecords = $numrecords->scalarval();
-        $sqlstring = $header->structmem('sql');
-        $sqlstring = $sqlstring->scalarval();
-        
-        $fieldinfo =& $header->structmem('fieldinfo');
-        for ($i = 0; $i < $numfields; $i++) {
-            $temp =& $fieldinfo->arraymem($i);
-            $fld =& new ADOFieldObject();
-            while (list($key,$value) = $temp->structeach()) {
-                if ($key == "name") $fld->name = $value->scalarval();
-                if ($key == "type") $fld->type = $value->scalarval();
-                if ($key == "max_length") $fld->max_length = $value->scalarval();
-                if ($key == "not_null") $fld->not_null = $value->scalarval();
-                if ($key == "has_default") $fld->has_default = $value->scalarval();
-                if ($key == "default_value") $fld->default_value = $value->scalarval();
-            } // while
-            $fields_array[] = $fld;
-        } // for
-
-        // fetch recordset information into php array
-        $body =& $xmlrpcval->structmem('body');
-        for ($i = 0; $i < $numrecords; $i++) {
-            $data_array[$i]= array();
-            $xmlrpcrs_row =& $body->arraymem($i);
-            for ($j = 0; $j < $numfields; $j++) {
-                $temp =& $xmlrpcrs_row->arraymem($j);
-                $data_array[$i][$j] = $temp->scalarval();
-            } // for j
-        } // for i
-
-        // finally build in-memory recordset object and return it
-        $rs =& new ADORecordSet_array();
-        $rs->InitArrayFields($data_array,$fields_array);
-        return $rs;
-
-    }
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-perf.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-perf.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-perf.inc.php	(working copy)
@@ -1,1068 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Library for basic performance monitoring and tuning.
-  
-  My apologies if you see code mixed with presentation. The presentation suits
-  my needs. If you want to separate code from presentation, be my guest. Patches
-  are welcome.
-  
-*/
-
-if (!defined('ADODB_DIR')) include_once(dirname(__FILE__).'/adodb.inc.php');
-include_once(ADODB_DIR.'/tohtml.inc.php');
-
-define( 'ADODB_OPT_HIGH', 2);
-define( 'ADODB_OPT_LOW', 1);
-
-// returns in K the memory of current process, or 0 if not known
-function adodb_getmem()
-{
-	if (function_exists('memory_get_usage'))
-		return (integer) ((memory_get_usage()+512)/1024);
-	
-	$pid = getmypid();
-	
-	if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) {
-		$output = array();
-	
-		exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output); 
-		return substr($output[5], strpos($output[5], ':') + 1);
-	} 
-	
-	/* Hopefully UNIX */
-	exec("ps --pid $pid --no-headers -o%mem,size", $output);
-	if (sizeof($output) == 0) return 0;
-	
-	$memarr = explode(' ',$output[0]);
-	if (sizeof($memarr)>=2) return (integer) $memarr[1];
-	
-	return 0;
-}
-
-// avoids localization problems where , is used instead of .
-function adodb_round($n,$prec)
-{
-	return number_format($n, $prec, '.', '');
-}
-
-/* return microtime value as a float */
-function adodb_microtime()
-{
-	$t = microtime();
-	$t = explode(' ',$t);
-	return (float)$t[1]+ (float)$t[0];
-}
-
-/* sql code timing */
-function& adodb_log_sql(&$connx,$sql,$inputarr)
-{
-    $perf_table = adodb_perf::table();
-	$connx->fnExecute = false;
-	$t0 = microtime();
-	$rs =& $connx->Execute($sql,$inputarr);
-	$t1 = microtime();
-
-	if (!empty($connx->_logsql) && (empty($connx->_logsqlErrors) || !$rs)) {
-	global $ADODB_LOG_CONN;
-	
-		if (!empty($ADODB_LOG_CONN)) {
-			$conn = &$ADODB_LOG_CONN;
-			if ($conn->databaseType != $connx->databaseType)
-				$prefix = '/*dbx='.$connx->databaseType .'*/ ';
-			else
-				$prefix = '';
-		} else {
-			$conn =& $connx;
-			$prefix = '';
-		}
-		
-		$conn->_logsql = false; // disable logsql error simulation
-		$dbT = $conn->databaseType;
-		
-		$a0 = split(' ',$t0);
-		$a0 = (float)$a0[1]+(float)$a0[0];
-		
-		$a1 = split(' ',$t1);
-		$a1 = (float)$a1[1]+(float)$a1[0];
-		
-		$time = $a1 - $a0;
-	
-		if (!$rs) {
-			$errM = $connx->ErrorMsg();
-			$errN = $connx->ErrorNo();
-			$conn->lastInsID = 0;
-			$tracer = substr('ERROR: '.htmlspecialchars($errM),0,250);
-		} else {
-			$tracer = '';
-			$errM = '';
-			$errN = 0;
-			$dbg = $conn->debug;
-			$conn->debug = false;
-			if (!is_object($rs) || $rs->dataProvider == 'empty') 
-				$conn->_affected = $conn->affected_rows(true);
-			$conn->lastInsID = @$conn->Insert_ID();
-			$conn->debug = $dbg;
-		}
-		if (isset($_SERVER['HTTP_HOST'])) {
-			$tracer .= '<br>'.$_SERVER['HTTP_HOST'];
-			if (isset($_SERVER['PHP_SELF'])) $tracer .= $_SERVER['PHP_SELF'];
-		} else 
-			if (isset($_SERVER['PHP_SELF'])) $tracer .= '<br>'.$_SERVER['PHP_SELF'];
-		//$tracer .= (string) adodb_backtrace(false);
-		
-		$tracer = (string) substr($tracer,0,500);
-		
-		if (is_array($inputarr)) {
-			if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr);
-			else {
-				// Quote string parameters so we can see them in the
-				// performance stats. This helps spot disabled indexes.
-				$xar_params = $inputarr;
-				foreach ($xar_params as $xar_param_key => $xar_param) {
-					if (gettype($xar_param) == 'string')
-					$xar_params[$xar_param_key] = '"' . $xar_param . '"';
-				}
-				$params = implode(', ', $xar_params);
-				if (strlen($params) >= 3000) $params = substr($params, 0, 3000);
-			}
-		} else {
-			$params = '';
-		}
-		
-		if (is_array($sql)) $sql = $sql[0];
-		if ($prefix) $sql = $prefix.$sql;
-		$arr = array('b'=>strlen($sql).'.'.crc32($sql),
-					'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6));
-		//var_dump($arr);
-		$saved = $conn->debug;
-		$conn->debug = 0;
-		
-		$d = $conn->sysTimeStamp;
-		if (empty($d)) $d = date("'Y-m-d H:i:s'");
-		if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
-			$isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)";
-		} else if ($dbT == 'odbc_mssql' || $dbT == 'informix' || strncmp($dbT,'odbtp',4)==0) {
-			$timer = $arr['f'];
-			if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
-
-			$sql1 = $conn->qstr($arr['b']);
-			$sql2 = $conn->qstr($arr['c']);
-			$params = $conn->qstr($arr['d']);
-			$tracer = $conn->qstr($arr['e']);
-			
-			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)";
-			if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql);
-			$arr = false;
-		} else {
-			if ($dbT == 'db2') $arr['f'] = (float) $arr['f'];
-			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";
-		}
-		$ok = $conn->Execute($isql,$arr);
-		$conn->debug = $saved;
-		
-		if ($ok) {
-			$conn->_logsql = true; 
-		} else {
-			$err2 = $conn->ErrorMsg();
-			$conn->_logsql = true; // enable logsql error simulation
-			$perf =& NewPerfMonitor($conn);
-			if ($perf) {
-				if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr);
-			} else {
-				$ok = $conn->Execute("create table $perf_table (
-				created varchar(50),
-				sql0 varchar(250), 
-				sql1 varchar(4000),
-				params varchar(3000),
-				tracer varchar(500),
-				timer decimal(16,6))");
-			}
-			if (!$ok) {
-				ADOConnection::outp( "<p><b>LOGSQL Insert Failed</b>: $isql<br>$err2</p>");
-				$conn->_logsql = false;
-			}
-		}
-		$connx->_errorMsg = $errM;
-		$connx->_errorCode = $errN;
-	} 
-	$connx->fnExecute = 'adodb_log_sql';
-	return $rs;
-}
-
-	
-/*
-The settings data structure is an associative array that database parameter per element.
-
-Each database parameter element in the array is itself an array consisting of:
-
-0: category code, used to group related db parameters
-1: either
-	a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", 
-	b. array holding sql string and field to look for, e.g. array('show variables','table_cache'),
-	c. a string prefixed by =, then a PHP method of the class is invoked, 
-		e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue',
-2: description of the database parameter
-*/
-
-class adodb_perf {
-	var $conn;
-	var $color = '#F0F0F0';
-	var $table = '<table border=1 bgcolor=white>';
-	var $titles = '<tr><td><b>Parameter</b></td><td><b>Value</b></td><td><b>Description</b></td></tr>';
-	var $warnRatio = 90;
-	var $tablesSQL = false;
-	var $cliFormat = "%32s => %s \r\n";
-	var $sql1 = 'sql1';  // used for casting sql1 to text for mssql
-	var $explain = true;
-	var $helpurl = "<a href=http://phplens.com/adodb/reference.functions.fnexecute.and.fncacheexecute.properties.html#logsql>LogSQL help</a>";
-	var $createTableSQL = false;
-	var $maxLength = 2000;
-	
-    // Sets the tablename to be used            
-    function table($newtable = false)
-    {
-        static $_table;
-
-        if (!empty($newtable))  $_table = $newtable;
-		if (empty($_table)) $_table = 'adodb_logsql';
-        return $_table;
-    }
-
-	// returns array with info to calculate CPU Load
-	function _CPULoad()
-	{
-/*
-
-cpu  524152 2662 2515228 336057010
-cpu0 264339 1408 1257951 168025827
-cpu1 259813 1254 1257277 168031181
-page 622307 25475680
-swap 24 1891
-intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-disk_io: (3,0):(3144904,54369,610378,3090535,50936192) (3,1):(3630212,54097,633016,3576115,50951320)
-ctxt 66155838
-btime 1062315585
-processes 69293
-
-*/
-		// Algorithm is taken from
-		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp
-		if (strncmp(PHP_OS,'WIN',3)==0) {
-			if (PHP_VERSION == '5.0.0') return false;
-			if (PHP_VERSION == '5.0.1') return false;
-			if (PHP_VERSION == '5.0.2') return false;
-			if (PHP_VERSION == '5.0.3') return false;
-			if (PHP_VERSION == '4.3.10') return false; # see http://bugs.php.net/bug.php?id=31737
-			
-			@$c = new COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'");
-			if (!$c) return false;
-			
-			$info[0] = $c->PercentProcessorTime;
-			$info[1] = 0;
-			$info[2] = 0;
-			$info[3] = $c->TimeStamp_Sys100NS;
-			//print_r($info);
-			return $info;
-		}
-		
-		// Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com)
-		$statfile = '/proc/stat';
-		if (!file_exists($statfile)) return false;
-		
-		$fd = fopen($statfile,"r");
-		if (!$fd) return false;
-		
-		$statinfo = explode("\n",fgets($fd, 1024));
-		fclose($fd);
-		foreach($statinfo as $line) {
-			$info = explode(" ",$line);
-			if($info[0]=="cpu") {
-				array_shift($info);  // pop off "cpu"
-				if(!$info[0]) array_shift($info); // pop off blank space (if any)
-				return $info;
-			}
-		}
-		
-		return false;
-		
-	}
-	
-	/* NOT IMPLEMENTED */
-	function MemInfo()
-	{
-		/*
-
-        total:    used:    free:  shared: buffers:  cached:
-Mem:  1055289344 917299200 137990144        0 165437440 599773184
-Swap: 2146775040 11055104 2135719936
-MemTotal:      1030556 kB
-MemFree:        134756 kB
-MemShared:           0 kB
-Buffers:        161560 kB
-Cached:         581384 kB
-SwapCached:       4332 kB
-Active:         494468 kB
-Inact_dirty:    322856 kB
-Inact_clean:     24256 kB
-Inact_target:   168316 kB
-HighTotal:      131064 kB
-HighFree:         1024 kB
-LowTotal:       899492 kB
-LowFree:        133732 kB
-SwapTotal:     2096460 kB
-SwapFree:      2085664 kB
-Committed_AS:   348732 kB
-		*/
-	}
-	
-	
-	/*
-		Remember that this is client load, not db server load!
-	*/
-	var $_lastLoad;
-	function CPULoad()
-	{
-		$info = $this->_CPULoad();
-		if (!$info) return false;
-			
-		if (empty($this->_lastLoad)) {
-			sleep(1);
-			$this->_lastLoad = $info;
-			$info = $this->_CPULoad();
-		}
-		
-		$last = $this->_lastLoad;
-		$this->_lastLoad = $info;
-		
-		$d_user = $info[0] - $last[0];
-		$d_nice = $info[1] - $last[1];
-		$d_system = $info[2] - $last[2];
-		$d_idle = $info[3] - $last[3];
-		
-		//printf("Delta - User: %f  Nice: %f  System: %f  Idle: %f<br>",$d_user,$d_nice,$d_system,$d_idle);
-
-		if (strncmp(PHP_OS,'WIN',3)==0) {
-			if ($d_idle < 1) $d_idle = 1;
-			return 100*(1-$d_user/$d_idle);
-		}else {
-			$total=$d_user+$d_nice+$d_system+$d_idle;
-			if ($total<1) $total=1;
-			return 100*($d_user+$d_nice+$d_system)/$total; 
-		}
-	}
-	
-	function Tracer($sql)
-	{
-        $perf_table = adodb_perf::table();
-		$saveE = $this->conn->fnExecute;
-		$this->conn->fnExecute = false;
-		
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-				
-		$sqlq = $this->conn->qstr($sql);
-		$arr = $this->conn->GetArray(
-"select count(*),tracer 
-	from $perf_table where sql1=$sqlq 
-	group by tracer
-	order by 1 desc");
-		$s = '';
-		if ($arr) {
-			$s .= '<h3>Scripts Affected</h3>';
-			foreach($arr as $k) {
-				$s .= sprintf("%4d",$k[0]).' &nbsp; '.strip_tags($k[1]).'<br>';
-			}
-		}
-		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
-		$ADODB_CACHE_MODE = $save;
-		$this->conn->fnExecute = $saveE;
-		return $s;
-	}
-
-	/* 
-		Explain Plan for $sql.
-		If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the 
-			actual sql.
-	*/
-	function Explain($sql,$partial=false)
-	{	
-		return false;
-	}
-	
-	function InvalidSQL($numsql = 10)
-	{
-	
-		if (isset($_GET['sql'])) return;
-		$s = '<h3>Invalid SQL</h3>';
-		$saveE = $this->conn->fnExecute;
-		$this->conn->fnExecute = false;
-        $perf_table = adodb_perf::table();
-		$rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
-		$this->conn->fnExecute = $saveE;
-		if ($rs) {
-			$s .= rs2html($rs,false,false,false,false);
-		} else
-			return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
-		
-		return $s;
-	}
-
-	
-	/*
-		This script identifies the longest running SQL
-	*/	
-	function _SuspiciousSQL($numsql = 10)
-	{
-		global $ADODB_FETCH_MODE;
-		
-            $perf_table = adodb_perf::table();
-			$saveE = $this->conn->fnExecute;
-			$this->conn->fnExecute = false;
-			
-			if (isset($_GET['exps']) && isset($_GET['sql'])) {
-				$partial = !empty($_GET['part']);
-				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
-			}
-			
-			if (isset($_GET['sql'])) return;
-			$sql1 = $this->sql1;
-			
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-			//$this->conn->debug=1;
-			$rs =& $this->conn->SelectLimit(
-			"select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
-				from $perf_table
-				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT')
-				and (tracer is null or tracer not like 'ERROR:%')
-				group by sql1
-				order by 1 desc",$numsql);
-			if (isset($savem)) $this->conn->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			$this->conn->fnExecute = $saveE;
-			
-			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
-			$s = "<h3>Suspicious SQL</h3>
-<font size=1>The following SQL have high average execution times</font><br>
-<table border=1 bgcolor=white><tr><td><b>Avg Time</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
-			$max = $this->maxLength;
-			while (!$rs->EOF) {
-				$sql = $rs->fields[1];
-				$raw = urlencode($sql);
-				if (strlen($raw)>$max-100) {
-					$sql2 = substr($sql,0,$max-500);
-					$raw = urlencode($sql2).'&part='.crc32($sql);
-				}
-				$prefix = "<a target=sql".rand()." href=\"?hidem=1&exps=1&sql=".$raw."&x#explain\">";
-				$suffix = "</a>";
-				if ($this->explain == false || strlen($prefix)>$max) {
-					$suffix = ' ... <i>String too long for GET parameter: '.strlen($prefix).'</i>';
-					$prefix = '';
-				}
-				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
-					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
-				$rs->MoveNext();
-			}
-			return $s."</table>";
-		
-	}
-	
-	function CheckMemory()
-	{
-		return '';
-	}
-	
-	
-	function SuspiciousSQL($numsql=10)
-	{
-		return adodb_perf::_SuspiciousSQL($numsql);
-	}
-
-	function ExpensiveSQL($numsql=10)
-	{
-		return adodb_perf::_ExpensiveSQL($numsql);
-	}
-
-	
-	/*
-		This reports the percentage of load on the instance due to the most 
-		expensive few SQL statements. Tuning these statements can often 
-		make huge improvements in overall system performance. 
-	*/
-	function _ExpensiveSQL($numsql = 10)
-	{
-		global $ADODB_FETCH_MODE;
-		
-            $perf_table = adodb_perf::table();
-			$saveE = $this->conn->fnExecute;
-			$this->conn->fnExecute = false;
-			
-			if (isset($_GET['expe']) && isset($_GET['sql'])) {
-				$partial = !empty($_GET['part']);
-				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
-			}
-			
-			if (isset($_GET['sql'])) return;
-			
-			$sql1 = $this->sql1;
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-			
-			$rs =& $this->conn->SelectLimit(
-			"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
-				from $perf_table
-				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5))  not in ('DROP ','INSER','COMMI','CREAT')
-				and (tracer is null or tracer not like 'ERROR:%')
-				group by sql1
-				having count(*)>1
-				order by 1 desc",$numsql);
-			if (isset($savem)) $this->conn->SetFetchMode($savem);
-			$this->conn->fnExecute = $saveE;
-			$ADODB_FETCH_MODE = $save;
-			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
-			$s = "<h3>Expensive SQL</h3>
-<font size=1>Tuning the following SQL could reduce the server load substantially</font><br>
-<table border=1 bgcolor=white><tr><td><b>Load</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
-			$max = $this->maxLength;
-			while (!$rs->EOF) {
-				$sql = $rs->fields[1];
-				$raw = urlencode($sql);
-				if (strlen($raw)>$max-100) {
-					$sql2 = substr($sql,0,$max-500);
-					$raw = urlencode($sql2).'&part='.crc32($sql);
-				}
-				$prefix = "<a target=sqle".rand()." href=\"?hidem=1&expe=1&sql=".$raw."&x#explain\">";
-				$suffix = "</a>";
-				if($this->explain == false || strlen($prefix>$max)) {
-					$prefix = '';
-					$suffix = '';
-				}
-				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
-					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
-				$rs->MoveNext();
-			}
-			return $s."</table>";
-	}
-	
-	/*
-		Raw function to return parameter value from $settings.
-	*/
-	function DBParameter($param)
-	{
-		if (empty($this->settings[$param])) return false;
-		$sql = $this->settings[$param][1];
-		return $this->_DBParameter($sql);
-	}
-	
-	/*
-		Raw function returning array of poll paramters
-	*/
-	function &PollParameters()
-	{
-		$arr[0] = (float)$this->DBParameter('data cache hit ratio');
-		$arr[1] = (float)$this->DBParameter('data reads');
-		$arr[2] = (float)$this->DBParameter('data writes');
-		$arr[3] = (integer) $this->DBParameter('current connections');
-		return $arr;
-	}
-	
-	/*
-		Low-level Get Database Parameter
-	*/
-	function _DBParameter($sql)
-	{
-		$savelog = $this->conn->LogSQL(false);
-		if (is_array($sql)) {
-		global $ADODB_FETCH_MODE;
-		
-			$sql1 = $sql[0];
-			$key = $sql[1];
-			if (sizeof($sql)>2) $pos = $sql[2];
-			else $pos = 1;
-			if (sizeof($sql)>3) $coef = $sql[3];
-			else $coef = false;
-			$ret = false;
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
-			
-			$rs = $this->conn->Execute($sql1);
-			
-			if (isset($savem)) $this->conn->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			if ($rs) {
-				while (!$rs->EOF) {
-					$keyf = reset($rs->fields);
-					if (trim($keyf) == $key) {
-						$ret = $rs->fields[$pos];
-						if ($coef) $ret *= $coef;
-						break;
-					}
-					$rs->MoveNext();
-				}
-				$rs->Close();
-			}
-			$this->conn->LogSQL($savelog);
-			return $ret;
-		} else {
-			if (strncmp($sql,'=',1) == 0) {
-				$fn = substr($sql,1);
-				return $this->$fn();
-			}
-			$sql = str_replace('$DATABASE',$this->conn->database,$sql);
-			$ret = $this->conn->GetOne($sql);
-			$this->conn->LogSQL($savelog);
-			
-			return $ret;
-		}
-	}
-	
-	/*
-		Warn if cache ratio falls below threshold. Displayed in "Description" column.
-	*/
-	function WarnCacheRatio($val)
-	{
-		if ($val < $this->warnRatio) 
-			 return '<font color=red><b>Cache ratio should be at least '.$this->warnRatio.'%</b></font>';
-		else return '';
-	}
-	
-	/***********************************************************************************************/
-	//                                    HIGH LEVEL UI FUNCTIONS
-	/***********************************************************************************************/
-
-	
-	function UI($pollsecs=5)
-	{
-	
-    $perf_table = adodb_perf::table();
-	$conn = $this->conn;
-	
-	$app = $conn->host;
-	if ($conn->host && $conn->database) $app .= ', db=';
-	$app .= $conn->database;
-	
-	if ($app) $app .= ', ';
-	$savelog = $this->conn->LogSQL(false);	
-	$info = $conn->ServerInfo();
-	if (isset($_GET['clearsql'])) {
-		$this->conn->Execute("delete from $perf_table");
-	}
-	$this->conn->LogSQL($savelog);
-	
-	// magic quotes
-	
-	if (isset($_GET['sql']) && get_magic_quotes_gpc()) {
-		$_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']);
-	}
-	
-	if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10;
-	else  $nsql = $_SESSION['ADODB_PERF_SQL'];
-	
-	$app .= $info['description'];
-	
-	
-	if (isset($_GET['do'])) $do = $_GET['do'];
-	else if (isset($_POST['do'])) $do = $_POST['do'];
-	 else if (isset($_GET['sql'])) $do = 'viewsql';
-	 else $do = 'stats';
-	 
-	if (isset($_GET['nsql'])) {
-		if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql'];
-	}
-	echo "<title>ADOdb Performance Monitor on $app</title><body bgcolor=white>";
-	if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input type=submit value=Go></td></form>";
-	else $form = "<td>&nbsp;</td>";
-	
-	$allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
-	
-	if  (empty($_GET['hidem']))
-	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
-	<b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
-	<a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a href=?do=viewsql><b>View SQL</b></a>
-	 &nbsp; <a href=?do=tables><b>View Tables</b></a> &nbsp; <a href=?do=poll><b>Poll Stats</b></a>",
-	 $allowsql ? ' &nbsp; <a href=?do=dosql><b>Run SQL</b></a>' : '',
-	 "$form",
-	 "</tr></table>";
-
-	 
-	 	switch ($do) {
-		default:
-		case 'stats':
-			echo $this->HealthCheck();
-			//$this->conn->debug=1;
-			echo $this->CheckMemory();
-			break;
-		case 'poll':
-			echo "<iframe width=720 height=80% 
-				src=\"{$_SERVER['PHP_SELF']}?do=poll2&hidem=1\"></iframe>";
-			break;
-		case 'poll2':
-			echo "<pre>";
-			$this->Poll($pollsecs);
-			break;
-		
-		case 'dosql':
-			if (!$allowsql) break;
-			
-			$this->DoSQLForm();
-			break;
-		case 'viewsql':
-			if (empty($_GET['hidem']))
-				echo "&nbsp; <a href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
-			echo($this->SuspiciousSQL($nsql));
-			echo($this->ExpensiveSQL($nsql));
-			echo($this->InvalidSQL($nsql));
-			break;
-		case 'tables': 
-			echo $this->Tables(); break;
-		}
-		global $ADODB_vers;
-		echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
-	}
-	
-	/*
-		Runs in infinite loop, returning real-time statistics
-	*/
-	function Poll($secs=5)
-	{
-		$this->conn->fnExecute = false;
-		//$this->conn->debug=1;
-		if ($secs <= 1) $secs = 1;
-		echo "Accumulating statistics, every $secs seconds...\n";flush();
-		$arro =& $this->PollParameters();
-		$cnt = 0;
-		set_time_limit(0);
-		sleep($secs);
-		while (1) {
-
-			$arr =& $this->PollParameters();
-			
-			$hits   = sprintf('%2.2f',$arr[0]);
-			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
-			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
-			$sess = sprintf('%5d',$arr[3]);
-			
-			$load = $this->CPULoad();
-			if ($load !== false) {
-				$oslabel = 'WS-CPU%';
-				$osval = sprintf(" %2.1f  ",(float) $load);
-			}else {
-				$oslabel = '';
-				$osval = '';
-			}
-			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
-			$cnt += 1;
-			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
-			flush();
-			
-			if (connection_aborted()) return;
-			
-			sleep($secs);
-			$arro = $arr;
-		}
-	}
-	
-	/*
-		Returns basic health check in a command line interface
-	*/
-	function HealthCheckCLI()
-	{
-		return $this->HealthCheck(true);
-	}
-	
-		
-	/*
-		Returns basic health check as HTML
-	*/
-	function HealthCheck($cli=false)
-	{
-		$saveE = $this->conn->fnExecute;
-		$this->conn->fnExecute = false;	
-		if ($cli) $html = '';
-		else $html = $this->table.'<tr><td colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$this->titles;
-		
-		$oldc = false;
-		$bgc = '';
-		foreach($this->settings as $name => $arr) {
-			if ($arr === false) break;
-			
-			if (!is_string($name)) {
-				if ($cli) $html .= " -- $arr -- \n";
-				else $html .= "<tr bgcolor=$this->color><td colspan=3><i>$arr</i> &nbsp;</td></tr>";
-				continue;
-			}
-			
-			if (!is_array($arr)) break;
-			$category = $arr[0];
-			$how = $arr[1];
-			if (sizeof($arr)>2) $desc = $arr[2];
-			else $desc = ' &nbsp; ';
-			
-			
-			if ($category == 'HIDE') continue;
-			
-			$val = $this->_DBParameter($how);
-			
-			if ($desc && strncmp($desc,"=",1) === 0) {
-				$fn = substr($desc,1);
-				$desc = $this->$fn($val);
-			}
-			
-			if ($val === false) {
-				$m = $this->conn->ErrorMsg();
-				$val = "Error: $m"; 
-			} else {
-				if (is_numeric($val) && $val >= 256*1024) {
-					if ($val % (1024*1024) == 0) {
-						$val /= (1024*1024);
-						$val .= 'M';
-					} else if ($val % 1024 == 0) {
-						$val /= 1024;
-						$val .= 'K';
-					}
-					//$val = htmlspecialchars($val);
-				}
-			}
-			if ($category != $oldc) {
-				$oldc = $category;
-				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;
-			}
-			if (strlen($desc)==0) $desc = '&nbsp;';
-			if (strlen($val)==0) $val = '&nbsp;';
-			if ($cli) {
-				$html  .= str_replace('&nbsp;','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
-				
-			}else {
-				$html .= "<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";
-			}
-		}
-		
-		if (!$cli) $html .= "</table>\n";
-		$this->conn->fnExecute = $saveE;
-			
-		return $html;	
-	}
-	
-	function Tables($orderby='1')
-	{
-		if (!$this->tablesSQL) return false;
-		
-		$savelog = $this->conn->LogSQL(false);
-		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
-		$this->conn->LogSQL($savelog);
-		$html = rs2html($rs,false,false,false,false);
-		return $html;
-	}
-	
-
-	function CreateLogTable()
-	{
-		if (!$this->createTableSQL) return false;
-		
-		$table = $this->table();
-		$sql = str_replace('adodb_logsql',$table,$this->createTableSQL);
-		$savelog = $this->conn->LogSQL(false);
-		$ok = $this->conn->Execute($sql);
-		$this->conn->LogSQL($savelog);
-		return ($ok) ? true : false;
-	}
-	
-	function DoSQLForm()
-	{
-	
-		
-		$PHP_SELF = $_SERVER['PHP_SELF'];
-		$sql = isset($_REQUEST['sql']) ? $_REQUEST['sql'] : '';
-
-		if (isset($_SESSION['phplens_sqlrows'])) $rows = $_SESSION['phplens_sqlrows'];
-		else $rows = 3;
-		
-		if (isset($_REQUEST['SMALLER'])) {
-			$rows /= 2;
-			if ($rows < 3) $rows = 3;
-			$_SESSION['phplens_sqlrows'] = $rows;
-		}
-		if (isset($_REQUEST['BIGGER'])) {
-			$rows *= 2;
-			$_SESSION['phplens_sqlrows'] = $rows;
-		}
-		
-?>
-
-<form method="POST" action="<?php echo $PHP_SELF ?>">
-<table><tr>
-<td> Form size: <input type="submit" value=" &lt; " name="SMALLER"><input type="submit" value=" &gt; &gt; " name="BIGGER">
-</td>
-<td align=right>
-<input type="submit" value=" Run SQL Below " name="RUN"><input type=hidden name=do value=dosql>
-</td></tr>
-  <tr>
-  <td colspan=2><textarea rows=<?php print $rows; ?> name="sql" cols="80"><?php print htmlspecialchars($sql) ?></textarea>
-  </td>
-  </tr>
- </table>
-</form>
-
-<?php
-		if (!isset($_REQUEST['sql'])) return;
-		
-		$sql = $this->undomq(trim($sql));
-		if (substr($sql,strlen($sql)-1) === ';') {
-			$print = true;
-			$sqla = $this->SplitSQL($sql);
-		} else  {
-			$print = false;
-			$sqla = array($sql);
-		}
-		foreach($sqla as $sqls) {
-
-			if (!$sqls) continue;
-			
-			if ($print) {
-				print "<p>".htmlspecialchars($sqls)."</p>";
-				flush();
-			}
-			$savelog = $this->conn->LogSQL(false);
-			$rs = $this->conn->Execute($sqls);
-			$this->conn->LogSQL($savelog);
-			if ($rs && is_object($rs) && !$rs->EOF) {
-				rs2html($rs);
-				while ($rs->NextRecordSet()) {
-					print "<table width=98% bgcolor=#C0C0FF><tr><td>&nbsp;</td></tr></table>";
-					rs2html($rs);
-				}
-			} else {
-				$e1 = (integer) $this->conn->ErrorNo();
-				$e2 = $this->conn->ErrorMsg();
-				if (($e1) || ($e2)) {
-					if (empty($e1)) $e1 = '-1'; // postgresql fix
-					print ' &nbsp; '.$e1.': '.$e2;
-				} else {
-					print "<p>No Recordset returned<br></p>";
-				}
-			}
-		} // foreach
-	}
-	
-	function SplitSQL($sql)
-	{
-		$arr = explode(';',$sql);
-		return $arr;
-	}
-	
-	function undomq($m) 
-	{
-	if (get_magic_quotes_gpc()) {
-		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
-	}
-	return $m;
-}
-
-    
-   /************************************************************************/
-   
-    /** 
-     * Reorganise multiple table-indices/statistics/..
-     * OptimizeMode could be given by last Parameter
-     * 
-     * @example
-     *      <pre>
-     *          optimizeTables( 'tableA');
-     *      </pre>
-     *      <pre>
-     *          optimizeTables( 'tableA', 'tableB', 'tableC');
-     *      </pre>
-     *      <pre>
-     *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
-     *      </pre>
-     * 
-     * @param string table name of the table to optimize
-     * @param int mode optimization-mode
-     *      <code>ADODB_OPT_HIGH</code> for full optimization 
-     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
-     *      Default is LOW <code>ADODB_OPT_LOW</code> 
-     * @author Markus Staab
-     * @return Returns <code>true</code> on success and <code>false</code> on error
-     */
-    function OptimizeTables()
-    {
-        $args = func_get_args();
-        $numArgs = func_num_args();
-        
-        if ( $numArgs == 0) return false;
-        
-        $mode = ADODB_OPT_LOW; 
-        $lastArg = $args[ $numArgs - 1];
-        if ( !is_string($lastArg)) {
-            $mode = $lastArg;
-            unset( $args[ $numArgs - 1]);
-        }
-        
-        foreach( $args as $table) {
-            $this->optimizeTable( $table, $mode);
-        }
-	}
-
-    /** 
-     * Reorganise the table-indices/statistics/.. depending on the given mode.
-     * Default Implementation throws an error.
-     * 
-     * @param string table name of the table to optimize
-     * @param int mode optimization-mode
-     *      <code>ADODB_OPT_HIGH</code> for full optimization 
-     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
-     *      Default is LOW <code>ADODB_OPT_LOW</code> 
-     * @author Markus Staab
-     * @return Returns <code>true</code> on success and <code>false</code> on error
-     */
-    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
-    {
-        ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
-        return false;
-    }
-    
-    /** 
-     * Reorganise current database.
-     * Default implementation loops over all <code>MetaTables()</code> and 
-     * optimize each using <code>optmizeTable()</code>
-     * 
-     * @author Markus Staab
-     * @return Returns <code>true</code> on success and <code>false</code> on error
-     */
-    function optimizeDatabase() 
-    {
-        $conn = $this->conn;
-        if ( !$conn) return false;
-        
-        $tables = $conn->MetaTables( 'TABLES');
-        if ( !$tables ) return false;
-
-        foreach( $tables as $table) {
-            if ( !$this->optimizeTable( $table)) {
-                return false;
-            }
-        }
-      
-        return true;
-    }
-    // end hack 
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-pager.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-pager.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-pager.inc.php	(working copy)
@@ -1,290 +0,0 @@
-<?php
-
-/*
-	V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-	  Released under both BSD license and Lesser GPL library license. 
-	  Whenever there is any discrepancy between the two licenses, 
-	  the BSD license will take precedence. 
-	  Set tabs to 4 for best viewing.
-
-  	This class provides recordset pagination with 
-	First/Prev/Next/Last links. 
-	
-	Feel free to modify this class for your own use as
-	it is very basic. To learn how to use it, see the 
-	example in adodb/tests/testpaging.php.
-	
-	"Pablo Costa" <pablo@cbsp.com.br> implemented Render_PageLinks().
-	
-	Please note, this class is entirely unsupported, 
-	and no free support requests except for bug reports
-	will be entertained by the author.
-
-*/
-class ADODB_Pager {
-	var $id; 	// unique id for pager (defaults to 'adodb')
-	var $db; 	// ADODB connection object
-	var $sql; 	// sql used
-	var $rs;	// recordset generated
-	var $curr_page;	// current page number before Render() called, calculated in constructor
-	var $rows;		// number of rows per page
-    var $linksPerPage=10; // number of links per page in navigation bar
-    var $showPageLinks; 
-
-	var $gridAttributes = 'width=100% border=1 bgcolor=white';
-	
-	// Localize text strings here
-	var $first = '<code>|&lt;</code>';
-	var $prev = '<code>&lt;&lt;</code>';
-	var $next = '<code>>></code>';
-	var $last = '<code>>|</code>';
-	var $moreLinks = '...';
-	var $startLinks = '...';
-	var $gridHeader = false;
-	var $htmlSpecialChars = true;
-	var $page = 'Page';
-	var $linkSelectedColor = 'red';
-	var $cache = 0;  #secs to cache with CachePageExecute()
-	
-	//----------------------------------------------
-	// constructor
-	//
-	// $db	adodb connection object
-	// $sql	sql statement
-	// $id	optional id to identify which pager, 
-	//		if you have multiple on 1 page. 
-	//		$id should be only be [a-z0-9]*
-	//
-	function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false)
-	{
-	global $PHP_SELF;
-	
-		$curr_page = $id.'_curr_page';
-		if (empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks
-		
-		$this->sql = $sql;
-		$this->id = $id;
-		$this->db = $db;
-		$this->showPageLinks = $showPageLinks;
-		
-		$next_page = $id.'_next_page';	
-		
-		if (isset($_GET[$next_page])) {
-			$_SESSION[$curr_page] = (integer) $_GET[$next_page];
-		}
-		if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page
-		
-		$this->curr_page = $_SESSION[$curr_page];
-		
-	}
-	
-	//---------------------------
-	// Display link to first page
-	function Render_First($anchor=true)
-	{
-	global $PHP_SELF;
-		if ($anchor) {
-	?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a> &nbsp; 
-	<?php
-		} else {
-			print "$this->first &nbsp; ";
-		}
-	}
-	
-	//--------------------------
-	// Display link to next page
-	function render_next($anchor=true)
-	{
-	global $PHP_SELF;
-	
-		if ($anchor) {
-		?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a> &nbsp; 
-		<?php
-		} else {
-			print "$this->next &nbsp; ";
-		}
-	}
-	
-	//------------------
-	// Link to last page
-	// 
-	// for better performance with large recordsets, you can set
-	// $this->db->pageExecuteCountRows = false, which disables
-	// last page counting.
-	function render_last($anchor=true)
-	{
-	global $PHP_SELF;
-	
-		if (!$this->db->pageExecuteCountRows) return;
-		
-		if ($anchor) {
-		?>
-			<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a> &nbsp; 
-		<?php
-		} else {
-			print "$this->last &nbsp; ";
-		}
-	}
-	
-	//---------------------------------------------------
-	// original code by "Pablo Costa" <pablo@cbsp.com.br> 
-        function render_pagelinks()
-        {
-        global $PHP_SELF;
-            $pages        = $this->rs->LastPageNo();
-            $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages;
-            for($i=1; $i <= $pages; $i+=$linksperpage)
-            {
-                if($this->rs->AbsolutePage() >= $i)
-                {
-                    $start = $i;
-                }
-            }
-			$numbers = '';
-            $end = $start+$linksperpage-1;
-			$link = $this->id . "_next_page";
-            if($end > $pages) $end = $pages;
-			
-			
-			if ($this->startLinks && $start > 1) {
-				$pos = $start - 1;
-				$numbers .= "<a href=$PHP_SELF?$link=$pos>$this->startLinks</a>  ";
-            } 
-			
-			for($i=$start; $i <= $end; $i++) {
-                if ($this->rs->AbsolutePage() == $i)
-                    $numbers .= "<font color=$this->linkSelectedColor><b>$i</b></font>  ";
-                else 
-                     $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
-            
-            }
-			if ($this->moreLinks && $end < $pages) 
-				$numbers .= "<a href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
-            print $numbers . ' &nbsp; ';
-        }
-	// Link to previous page
-	function render_prev($anchor=true)
-	{
-	global $PHP_SELF;
-		if ($anchor) {
-	?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a> &nbsp; 
-	<?php 
-		} else {
-			print "$this->prev &nbsp; ";
-		}
-	}
-	
-	//--------------------------------------------------------
-	// Simply rendering of grid. You should override this for
-	// better control over the format of the grid
-	//
-	// We use output buffering to keep code clean and readable.
-	function RenderGrid()
-	{
-	global $gSQLBlockRows; // used by rs2html to indicate how many rows to display
-		include_once(ADODB_DIR.'/tohtml.inc.php');
-		ob_start();
-		$gSQLBlockRows = $this->rows;
-		rs2html($this->rs,$this->gridAttributes,$this->gridHeader,$this->htmlSpecialChars);
-		$s = ob_get_contents();
-		ob_end_clean();
-		return $s;
-	}
-	
-	//-------------------------------------------------------
-	// Navigation bar
-	//
-	// we use output buffering to keep the code easy to read.
-	function RenderNav()
-	{
-		ob_start();
-		if (!$this->rs->AtFirstPage()) {
-			$this->Render_First();
-			$this->Render_Prev();
-		} else {
-			$this->Render_First(false);
-			$this->Render_Prev(false);
-		}
-        if ($this->showPageLinks){
-            $this->Render_PageLinks();
-        }
-		if (!$this->rs->AtLastPage()) {
-			$this->Render_Next();
-			$this->Render_Last();
-		} else {
-			$this->Render_Next(false);
-			$this->Render_Last(false);
-		}
-		$s = ob_get_contents();
-		ob_end_clean();
-		return $s;
-	}
-	
-	//-------------------
-	// This is the footer
-	function RenderPageCount()
-	{
-		if (!$this->db->pageExecuteCountRows) return '';
-		$lastPage = $this->rs->LastPageNo();
-		if ($lastPage == -1) $lastPage = 1; // check for empty rs.
-		if ($this->curr_page > $lastPage) $this->curr_page = 1;
-		return "<font size=-1>$this->page ".$this->curr_page."/".$lastPage."</font>";
-	}
-	
-	//-----------------------------------
-	// Call this class to draw everything.
-	function Render($rows=10)
-	{
-	global $ADODB_COUNTRECS;
-	
-		$this->rows = $rows;
-		
-		if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL;
-		
-		$savec = $ADODB_COUNTRECS;
-		if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
-		if ($this->cache)
-			$rs = &$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
-		else
-			$rs = &$this->db->PageExecute($this->sql,$rows,$this->curr_page);
-		$ADODB_COUNTRECS = $savec;
-		
-		$this->rs = &$rs;
-		if (!$rs) {
-			print "<h3>Query failed: $this->sql</h3>";
-			return;
-		}
-		
-		if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) 
-			$header = $this->RenderNav();
-		else
-			$header = "&nbsp;";
-		
-		$grid = $this->RenderGrid();
-		$footer = $this->RenderPageCount();
-		
-		$this->RenderLayout($header,$grid,$footer);
-		
-		$rs->Close();
-		$this->rs = false;
-	}
-	
-	//------------------------------------------------------
-	// override this to control overall layout and formating
-	function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige')
-	{
-		echo "<table ".$attributes."><tr><td>",
-				$header,
-			"</td></tr><tr><td>",
-				$grid,
-			"</td></tr><tr><td>",
-				$footer,
-			"</td></tr></table>";
-	}
-}
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/xsl/convert-0.1-0.3.xsl
===================================================================
--- admin/include/lib/adodb/xsl/convert-0.1-0.3.xsl	(revision 6370)
+++ admin/include/lib/adodb/xsl/convert-0.1-0.3.xsl	(working copy)
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
->
-	<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-	
-	<!-- Schema -->
-	<xsl:template match="/">
-		<xsl:comment>
-ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
-</xsl:comment>
-		
-		<xsl:element name="schema">
-			<xsl:attribute name="version">0.3</xsl:attribute>
-			
-			<xsl:apply-templates select="schema/table|schema/sql"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Table -->
-	<xsl:template match="table">
-		<xsl:variable name="table_name" select="@name"/>
-		
-		<xsl:element name="table">
-			<xsl:attribute name="name"><xsl:value-of select="$table_name"/></xsl:attribute>
-			
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@version) > 0">
-				<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:choose>
-				<xsl:when test="count(DROP) > 0">
-					<xsl:element name="DROP"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="field"/>
-				</xsl:otherwise>
-			</xsl:choose>
-			
-			<xsl:apply-templates select="constraint"/>
-			
-			<xsl:apply-templates select="../index[@table=$table_name]"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Field -->
-	<xsl:template match="field">
-		<xsl:element name="field">
-			<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-			
-			<xsl:if test="string-length(@size) > 0">
-				<xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:choose>
-				<xsl:when test="string-length(@opts) = 0"/>
-				<xsl:when test="@opts = 'UNSIGNED'">
-					<xsl:element name="UNSIGNED"/>
-				</xsl:when>
-				<xsl:when test="contains(@opts,'UNSIGNED')">
-					<xsl:attribute name="opts">
-						<xsl:value-of select="concat(substring-before(@opts,'UNSIGNED'),substring-after(@opts,'UNSIGNED'))"/>
-					</xsl:attribute>
-					<xsl:element name="UNSIGNED"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:attribute name="opts"><xsl:value-of select="@opts"/></xsl:attribute>
-				</xsl:otherwise>
-			</xsl:choose>
-			
-			<xsl:choose>
-				<xsl:when test="count(PRIMARY) > 0">
-					<xsl:element name="PRIMARY"/>
-				</xsl:when>
-				<xsl:when test="count(KEY) > 0">
-					<xsl:element name="KEY"/>
-				</xsl:when>
-				<xsl:when test="count(NOTNULL) > 0">
-					<xsl:element name="NOTNULL"/>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:choose>
-				<xsl:when test="count(AUTO) > 0">
-					<xsl:element name="AUTO"/>
-				</xsl:when>
-				<xsl:when test="count(AUTOINCREMENT) > 0">
-					<xsl:element name="AUTOINCREMENT"/>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:choose>
-				<xsl:when test="count(DEFAULT) > 0">
-					<xsl:element name="DEFAULT">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFAULT[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-				<xsl:when test="count(DEFDATE) > 0">
-					<xsl:element name="DEFDATE">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFDATE[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-				<xsl:when test="count(DEFTIMESTAMP) > 0">
-					<xsl:element name="DEFTIMESTAMP">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFTIMESTAMP[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:if test="count(NOQUOTE) > 0">
-				<xsl:element name="NOQUOTE"/>
-			</xsl:if>
-			
-			<xsl:apply-templates select="constraint"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Constraint -->
-	<xsl:template match="constraint">
-		<xsl:element name="constraint">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Index -->
-	<xsl:template match="index">
-		<xsl:element name="index">
-			<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:if test="count(CLUSTERED) > 0">
-				<xsl:element name="CLUSTERED"/>
-			</xsl:if>
-			
-			<xsl:if test="count(BITMAP) > 0">
-				<xsl:element name="BITMAP"/>
-			</xsl:if>
-			
-			<xsl:if test="count(UNIQUE) > 0">
-				<xsl:element name="UNIQUE"/>
-			</xsl:if>
-			
-			<xsl:if test="count(FULLTEXT) > 0">
-				<xsl:element name="FULLTEXT"/>
-			</xsl:if>
-			
-			<xsl:if test="count(HASH) > 0">
-				<xsl:element name="HASH"/>
-			</xsl:if>
-			
-			<xsl:choose>
-				<xsl:when test="count(DROP) > 0">
-					<xsl:element name="DROP"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="col"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Index Column -->
-	<xsl:template match="col">
-		<xsl:element name="col">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- SQL QuerySet -->
-	<xsl:template match="sql">
-		<xsl:element name="sql">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@key) > 0">
-				<xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@prefixmethod) > 0">
-				<xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			<xsl:apply-templates select="query"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Query -->
-	<xsl:template match="query">
-		<xsl:element name="query">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Description -->
-	<xsl:template match="descr">
-		<xsl:element name="descr">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
Index: admin/include/lib/adodb/xsl/remove-0.2.xsl
===================================================================
--- admin/include/lib/adodb/xsl/remove-0.2.xsl	(revision 6370)
+++ admin/include/lib/adodb/xsl/remove-0.2.xsl	(working copy)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
->
-	<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-	
-	<!-- Schema -->
-	<xsl:template match="/">
-		<xsl:comment>
-ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
-</xsl:comment>
-		
-		<xsl:comment>
-Uninstallation Schema
-</xsl:comment>
-		
-		<xsl:element name="schema">
-			<xsl:attribute name="version">0.2</xsl:attribute>
-			
-			<xsl:apply-templates select="schema/table">
-				<xsl:sort select="position()" data-type="number" order="descending"/>
-			</xsl:apply-templates>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Table -->
-	<xsl:template match="table">
-		<xsl:if test="count(DROP) = 0">
-			<xsl:element name="table">
-				<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-				
-				<xsl:if test="string-length(@platform) > 0">
-					<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-				</xsl:if>
-				
-				<xsl:if test="string-length(@version) > 0">
-					<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
-				</xsl:if>
-				
-				<xsl:apply-templates select="descr[1]"/>
-				
-				<xsl:element name="DROP"/>
-			</xsl:element>
-		</xsl:if>
-	</xsl:template>
-	
-	<!-- Description -->
-	<xsl:template match="descr">
-		<xsl:element name="descr">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
Index: admin/include/lib/adodb/xsl/convert-0.2-0.3.xsl
===================================================================
--- admin/include/lib/adodb/xsl/convert-0.2-0.3.xsl	(revision 6370)
+++ admin/include/lib/adodb/xsl/convert-0.2-0.3.xsl	(working copy)
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
->
-	<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-	
-	<!-- Schema -->
-	<xsl:template match="/">
-		<xsl:comment>
-ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
-</xsl:comment>
-		
-		<xsl:element name="schema">
-			<xsl:attribute name="version">0.3</xsl:attribute>
-			
-			<xsl:apply-templates select="schema/table|schema/sql"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Table -->
-	<xsl:template match="table">
-		<xsl:element name="table">
-			<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@version) > 0">
-				<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:choose>
-				<xsl:when test="count(DROP) > 0">
-					<xsl:element name="DROP"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="field"/>
-				</xsl:otherwise>
-			</xsl:choose>
-			
-			<xsl:apply-templates select="constraint"/>
-			
-			<xsl:apply-templates select="opt"/>
-			
-			<xsl:apply-templates select="index"/>
-			
-			<xsl:apply-templates select="data"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Field -->
-	<xsl:template match="field">
-		<xsl:element name="field">
-			<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-			
-			<xsl:if test="string-length(@size) > 0">
-				<xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:choose>
-				<xsl:when test="string-length(@opts) = 0">
-					<xsl:if test="count(UNSIGNED) > 0">
-						<xsl:element name="UNSIGNED"/>
-					</xsl:if>
-				</xsl:when>
-				<xsl:when test="@opts = 'UNSIGNED'">
-					<xsl:element name="UNSIGNED"/>
-				</xsl:when>
-				<xsl:when test="contains(@opts,'UNSIGNED')">
-					<xsl:attribute name="opts">
-						<xsl:value-of select="concat(substring-before(@opts,'UNSIGNED'),substring-after(@opts,'UNSIGNED'))"/>
-					</xsl:attribute>
-					<xsl:element name="UNSIGNED"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:attribute name="opts"><xsl:value-of select="@opts"/></xsl:attribute>
-					<xsl:if test="count(UNSIGNED) > 0">
-						<xsl:element name="UNSIGNED"/>
-					</xsl:if>
-				</xsl:otherwise>
-			</xsl:choose>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:choose>
-				<xsl:when test="count(PRIMARY) > 0">
-					<xsl:element name="PRIMARY"/>
-				</xsl:when>
-				<xsl:when test="count(KEY) > 0">
-					<xsl:element name="KEY"/>
-				</xsl:when>
-				<xsl:when test="count(NOTNULL) > 0">
-					<xsl:element name="NOTNULL"/>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:choose>
-				<xsl:when test="count(AUTO) > 0">
-					<xsl:element name="AUTO"/>
-				</xsl:when>
-				<xsl:when test="count(AUTOINCREMENT) > 0">
-					<xsl:element name="AUTOINCREMENT"/>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:choose>
-				<xsl:when test="count(DEFAULT) > 0">
-					<xsl:element name="DEFAULT">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFAULT[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-				<xsl:when test="count(DEFDATE) > 0">
-					<xsl:element name="DEFDATE">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFDATE[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-				<xsl:when test="count(DEFTIMESTAMP) > 0">
-					<xsl:element name="DEFTIMESTAMP">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFTIMESTAMP[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:if test="count(NOQUOTE) > 0">
-				<xsl:element name="NOQUOTE"/>
-			</xsl:if>
-			
-			<xsl:apply-templates select="constraint"/>
-			
-			<xsl:apply-templates select="opt"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Constraint -->
-	<xsl:template match="constraint">
-		<xsl:element name="constraint">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Opt -->
-	<xsl:template match="opt">
-		<xsl:element name="opt">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Index -->
-	<xsl:template match="index">
-		<xsl:element name="index">
-			<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:if test="count(CLUSTERED) > 0">
-				<xsl:element name="CLUSTERED"/>
-			</xsl:if>
-			
-			<xsl:if test="count(BITMAP) > 0">
-				<xsl:element name="BITMAP"/>
-			</xsl:if>
-			
-			<xsl:if test="count(UNIQUE) > 0">
-				<xsl:element name="UNIQUE"/>
-			</xsl:if>
-			
-			<xsl:if test="count(FULLTEXT) > 0">
-				<xsl:element name="FULLTEXT"/>
-			</xsl:if>
-			
-			<xsl:if test="count(HASH) > 0">
-				<xsl:element name="HASH"/>
-			</xsl:if>
-			
-			<xsl:choose>
-				<xsl:when test="count(DROP) > 0">
-					<xsl:element name="DROP"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="col"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Index Column -->
-	<xsl:template match="col">
-		<xsl:element name="col">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- SQL QuerySet -->
-	<xsl:template match="sql">
-		<xsl:element name="sql">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@key) > 0">
-				<xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@prefixmethod) > 0">
-				<xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:apply-templates select="query"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Query -->
-	<xsl:template match="query">
-		<xsl:element name="query">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Description -->
-	<xsl:template match="descr">
-		<xsl:element name="descr">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Data -->
-	<xsl:template match="data">
-		<xsl:element name="data">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:apply-templates select="row"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Data Row -->
-	<xsl:template match="row">
-		<xsl:element name="row">
-			<xsl:apply-templates select="f"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Data Field -->
-	<xsl:template match="f">
-		<xsl:element name="f">
-			<xsl:if test="string-length(@name) > 0">
-				<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
Index: admin/include/lib/adodb/xsl/remove-0.3.xsl
===================================================================
--- admin/include/lib/adodb/xsl/remove-0.3.xsl	(revision 6370)
+++ admin/include/lib/adodb/xsl/remove-0.3.xsl	(working copy)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
->
-	<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-	
-	<!-- Schema -->
-	<xsl:template match="/">
-		<xsl:comment>
-ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
-</xsl:comment>
-		
-		<xsl:comment>
-Uninstallation Schema
-</xsl:comment>
-		
-		<xsl:element name="schema">
-			<xsl:attribute name="version">0.3</xsl:attribute>
-			
-			<xsl:apply-templates select="schema/table">
-				<xsl:sort select="position()" data-type="number" order="descending"/>
-			</xsl:apply-templates>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Table -->
-	<xsl:template match="table">
-		<xsl:if test="count(DROP) = 0">
-			<xsl:element name="table">
-				<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-				
-				<xsl:if test="string-length(@platform) > 0">
-					<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-				</xsl:if>
-				
-				<xsl:if test="string-length(@version) > 0">
-					<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
-				</xsl:if>
-				
-				<xsl:apply-templates select="descr[1]"/>
-				
-				<xsl:element name="DROP"/>
-			</xsl:element>
-		</xsl:if>
-	</xsl:template>
-	
-	<!-- Description -->
-	<xsl:template match="descr">
-		<xsl:element name="descr">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
Index: admin/include/lib/adodb/xsl/convert-0.1-0.2.xsl
===================================================================
--- admin/include/lib/adodb/xsl/convert-0.1-0.2.xsl	(revision 6370)
+++ admin/include/lib/adodb/xsl/convert-0.1-0.2.xsl	(working copy)
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
->
-	<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-	
-	<!-- Schema -->
-	<xsl:template match="/">
-		<xsl:comment>
-ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
-</xsl:comment>
-		
-		<xsl:element name="schema">
-			<xsl:attribute name="version">0.2</xsl:attribute>
-			
-			<xsl:apply-templates select="schema/table|schema/sql"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Table -->
-	<xsl:template match="table">
-		<xsl:variable name="table_name" select="@name"/>
-		
-		<xsl:element name="table">
-			<xsl:attribute name="name"><xsl:value-of select="$table_name"/></xsl:attribute>
-			
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@version) > 0">
-				<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:choose>
-				<xsl:when test="count(DROP) > 0">
-					<xsl:element name="DROP"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="field"/>
-				</xsl:otherwise>
-			</xsl:choose>
-			
-			<xsl:apply-templates select="constraint"/>
-			
-			<xsl:apply-templates select="../index[@table=$table_name]"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Field -->
-	<xsl:template match="field">
-		<xsl:element name="field">
-			<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-			
-			<xsl:if test="string-length(@size) > 0">
-				<xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:choose>
-				<xsl:when test="count(PRIMARY) > 0">
-					<xsl:element name="PRIMARY"/>
-				</xsl:when>
-				<xsl:when test="count(KEY) > 0">
-					<xsl:element name="KEY"/>
-				</xsl:when>
-				<xsl:when test="count(NOTNULL) > 0">
-					<xsl:element name="NOTNULL"/>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:choose>
-				<xsl:when test="count(AUTO) > 0">
-					<xsl:element name="AUTO"/>
-				</xsl:when>
-				<xsl:when test="count(AUTOINCREMENT) > 0">
-					<xsl:element name="AUTOINCREMENT"/>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:choose>
-				<xsl:when test="count(DEFAULT) > 0">
-					<xsl:element name="DEFAULT">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFAULT[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-				<xsl:when test="count(DEFDATE) > 0">
-					<xsl:element name="DEFDATE">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFDATE[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-				<xsl:when test="count(DEFTIMESTAMP) > 0">
-					<xsl:element name="DEFTIMESTAMP">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFTIMESTAMP[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:if test="count(NOQUOTE) > 0">
-				<xsl:element name="NOQUOTE"/>
-			</xsl:if>
-			
-			<xsl:apply-templates select="constraint"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Constraint -->
-	<xsl:template match="constraint">
-		<xsl:element name="constraint">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Index -->
-	<xsl:template match="index">
-		<xsl:element name="index">
-			<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:if test="count(CLUSTERED) > 0">
-				<xsl:element name="CLUSTERED"/>
-			</xsl:if>
-			
-			<xsl:if test="count(BITMAP) > 0">
-				<xsl:element name="BITMAP"/>
-			</xsl:if>
-			
-			<xsl:if test="count(UNIQUE) > 0">
-				<xsl:element name="UNIQUE"/>
-			</xsl:if>
-			
-			<xsl:if test="count(FULLTEXT) > 0">
-				<xsl:element name="FULLTEXT"/>
-			</xsl:if>
-			
-			<xsl:if test="count(HASH) > 0">
-				<xsl:element name="HASH"/>
-			</xsl:if>
-			
-			<xsl:choose>
-				<xsl:when test="count(DROP) > 0">
-					<xsl:element name="DROP"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="col"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Index Column -->
-	<xsl:template match="col">
-		<xsl:element name="col">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- SQL QuerySet -->
-	<xsl:template match="sql">
-		<xsl:element name="sql">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@key) > 0">
-				<xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@prefixmethod) > 0">
-				<xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			<xsl:apply-templates select="query"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Query -->
-	<xsl:template match="query">
-		<xsl:element name="query">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Description -->
-	<xsl:template match="descr">
-		<xsl:element name="descr">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
Index: admin/include/lib/adodb/xsl/convert-0.2-0.1.xsl
===================================================================
--- admin/include/lib/adodb/xsl/convert-0.2-0.1.xsl	(revision 6370)
+++ admin/include/lib/adodb/xsl/convert-0.2-0.1.xsl	(working copy)
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
->
-	<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-	
-	<!-- Schema -->
-	<xsl:template match="/">
-		<xsl:comment>
-ADODB XMLSchema
-http://adodb-xmlschema.sourceforge.net
-</xsl:comment>
-		
-		<xsl:element name="schema">
-			<xsl:attribute name="version">0.1</xsl:attribute>
-			
-			<xsl:apply-templates select="schema/table|schema/sql"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Table -->
-	<xsl:template match="table">
-		<xsl:variable name="table_name" select="@name"/>
-		
-		<xsl:element name="table">
-			<xsl:attribute name="name"><xsl:value-of select="$table_name"/></xsl:attribute>
-			
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@version) > 0">
-				<xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:choose>
-				<xsl:when test="count(DROP) > 0">
-					<xsl:element name="DROP"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="field"/>
-				</xsl:otherwise>
-			</xsl:choose>
-			
-			<xsl:apply-templates select="constraint"/>
-			
-		</xsl:element>
-		
-		<xsl:apply-templates select="index"/>
-	</xsl:template>
-	
-	<!-- Field -->
-	<xsl:template match="field">
-		<xsl:element name="field">
-			<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-			
-			<xsl:if test="string-length(@size) > 0">
-				<xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:choose>
-				<xsl:when test="count(PRIMARY) > 0">
-					<xsl:element name="PRIMARY"/>
-				</xsl:when>
-				<xsl:when test="count(KEY) > 0">
-					<xsl:element name="KEY"/>
-				</xsl:when>
-				<xsl:when test="count(NOTNULL) > 0">
-					<xsl:element name="NOTNULL"/>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:choose>
-				<xsl:when test="count(AUTO) > 0">
-					<xsl:element name="AUTO"/>
-				</xsl:when>
-				<xsl:when test="count(AUTOINCREMENT) > 0">
-					<xsl:element name="AUTOINCREMENT"/>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:choose>
-				<xsl:when test="count(DEFAULT) > 0">
-					<xsl:element name="DEFAULT">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFAULT[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-				<xsl:when test="count(DEFDATE) > 0">
-					<xsl:element name="DEFDATE">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFDATE[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-				<xsl:when test="count(DEFTIMESTAMP) > 0">
-					<xsl:element name="DEFDTIMESTAMP">
-						<xsl:attribute name="value">
-							<xsl:value-of select="DEFTIMESTAMP[1]/@value"/>
-						</xsl:attribute>
-					</xsl:element>
-				</xsl:when>
-			</xsl:choose>
-			
-			<xsl:if test="count(NOQUOTE) > 0">
-				<xsl:element name="NOQUOTE"/>
-			</xsl:if>
-			
-			<xsl:apply-templates select="constraint"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Constraint -->
-	<xsl:template match="constraint">
-		<xsl:element name="constraint">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Index -->
-	<xsl:template match="index">
-		<xsl:element name="index">
-			<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-			<xsl:attribute name="table"><xsl:value-of select="../@name"/></xsl:attribute>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			
-			<xsl:if test="count(CLUSTERED) > 0">
-				<xsl:element name="CLUSTERED"/>
-			</xsl:if>
-			
-			<xsl:if test="count(BITMAP) > 0">
-				<xsl:element name="BITMAP"/>
-			</xsl:if>
-			
-			<xsl:if test="count(UNIQUE) > 0">
-				<xsl:element name="UNIQUE"/>
-			</xsl:if>
-			
-			<xsl:if test="count(FULLTEXT) > 0">
-				<xsl:element name="FULLTEXT"/>
-			</xsl:if>
-			
-			<xsl:if test="count(HASH) > 0">
-				<xsl:element name="HASH"/>
-			</xsl:if>
-			
-			<xsl:choose>
-				<xsl:when test="count(DROP) > 0">
-					<xsl:element name="DROP"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="col"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Index Column -->
-	<xsl:template match="col">
-		<xsl:element name="col">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- SQL QuerySet -->
-	<xsl:template match="sql">
-		<xsl:element name="sql">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@key) > 0">
-				<xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:if test="string-length(@prefixmethod) > 0">
-				<xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="descr[1]"/>
-			<xsl:apply-templates select="query"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Query -->
-	<xsl:template match="query">
-		<xsl:element name="query">
-			<xsl:if test="string-length(@platform) > 0">
-				<xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute>
-			</xsl:if>
-			
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-	
-	<!-- Description -->
-	<xsl:template match="descr">
-		<xsl:element name="descr">
-			<xsl:value-of select="normalize-space(text())"/>
-		</xsl:element>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-errorpear.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-errorpear.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-errorpear.inc.php	(working copy)
@@ -1,88 +0,0 @@
-<?php
-/** 
- * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
- * Latest version is available at http://php.weblogs.com
- * 
-*/
-include_once('PEAR.php');
-
-if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR');
-
-/*
-* Enabled the following if you want to terminate scripts when an error occurs
-*/
-//PEAR::setErrorHandling (PEAR_ERROR_DIE);
-
-/*
-* Name of the PEAR_Error derived class to call.
-*/
-if (!defined('ADODB_PEAR_ERROR_CLASS')) define('ADODB_PEAR_ERROR_CLASS','PEAR_Error');
-
-/*
-* Store the last PEAR_Error object here
-*/
-global $ADODB_Last_PEAR_Error; $ADODB_Last_PEAR_Error = false;
-
-  /**
-* Error Handler with PEAR support. This will be called with the following params
-*
-* @param $dbms		the RDBMS you are connecting to
-* @param $fn		the name of the calling function (in uppercase)
-* @param $errno		the native error number from the database 
-* @param $errmsg	the native error msg from the database
-* @param $p1		$fn specific parameter - see below
-* @param $P2		$fn specific parameter - see below
-	*/
-function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
-{
-global $ADODB_Last_PEAR_Error;
-	
-	if (error_reporting() == 0) return; // obey @ protocol
-	switch($fn) {
-	case 'EXECUTE':
-		$sql = $p1;
-		$inputparams = $p2;
-		
-		$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
-		break;
-		
-	case 'PCONNECT':
-	case 'CONNECT':
-		$host = $p1;
-		$database = $p2;
-		
-		$s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')";
-		break;
-		
-	default:
-		$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
-		break;
-	}
-	
-	$class = ADODB_PEAR_ERROR_CLASS;
-	$ADODB_Last_PEAR_Error = new $class($s, $errno,
-		$GLOBALS['_PEAR_default_error_mode'],
-		$GLOBALS['_PEAR_default_error_options'], 
-		$errmsg);
-		
-	//print "<p>!$s</p>";
-}
-
-/**
-* Returns last PEAR_Error object. This error might be for an error that
-* occured several sql statements ago.
-*/
-function &ADODB_PEAR_Error()
-{
-global $ADODB_Last_PEAR_Error;
-
-	return $ADODB_Last_PEAR_Error;
-}
-		
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/pivottable.inc.php
===================================================================
--- admin/include/lib/adodb/pivottable.inc.php	(revision 6370)
+++ admin/include/lib/adodb/pivottable.inc.php	(working copy)
@@ -1,187 +0,0 @@
-<?php
-/** 
- * @version V4.93 10 Oct 2006 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
-*/
-
-/*
- * Concept from daniel.lucazeau@ajornet.com. 
- *
- * @param db		Adodb database connection
- * @param tables	List of tables to join
- * @rowfields		List of fields to display on each row
- * @colfield		Pivot field to slice and display in columns, if we want to calculate
- *						ranges, we pass in an array (see example2)
- * @where			Where clause. Optional.
- * @aggfield		This is the field to sum. Optional. 
- *						Since 2.3.1, if you can use your own aggregate function 
- *						instead of SUM, eg. $aggfield = 'fieldname'; $aggfn = 'AVG';
- * @sumlabel		Prefix to display in sum columns. Optional.
- * @aggfn			Aggregate function to use (could be AVG, SUM, COUNT)
- * @showcount		Show count of records
- *
- * @returns			Sql generated
- */
- 
- function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
- 	$aggfield = false,$sumlabel='Sum ',$aggfn ='SUM', $showcount = true)
- {
-	if ($aggfield) $hidecnt = true;
-	else $hidecnt = false;
-	
-	$iif = strpos($db->databaseType,'access') !== false; 
-		// note - vfp 6 still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
-	
-	//$hidecnt = false;
-	
- 	if ($where) $where = "\nWHERE $where";
-	if (!is_array($colfield)) $colarr = $db->GetCol("select distinct $colfield from $tables $where order by 1");
-	if (!$aggfield) $hidecnt = false;
-	
-	$sel = "$rowfields, ";
-	if (is_array($colfield)) {
-		foreach ($colfield as $k => $v) {
-			$k = trim($k);
-			if (!$hidecnt) {
-				$sel .= $iif ? 
-					"\n\t$aggfn(IIF($v,1,0)) AS \"$k\", "
-					:
-					"\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 END) AS \"$k\", ";
-			}
-			if ($aggfield) {
-				$sel .= $iif ?
-					"\n\t$aggfn(IIF($v,$aggfield,0)) AS \"$sumlabel$k\", "
-					:
-					"\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
-			}
-		} 
-	} else {
-		foreach ($colarr as $v) {
-			if (!is_numeric($v)) $vq = $db->qstr($v);
-			else $vq = $v;
-			$v = trim($v);
-			if (strlen($v) == 0	) $v = 'null';
-			if (!$hidecnt) {
-				$sel .= $iif ?
-					"\n\t$aggfn(IIF($colfield=$vq,1,0)) AS \"$v\", "
-					:
-					"\n\t$aggfn(CASE WHEN $colfield=$vq THEN 1 ELSE 0 END) AS \"$v\", ";
-			}
-			if ($aggfield) {
-				if ($hidecnt) $label = $v;
-				else $label = "{$v}_$aggfield";
-				$sel .= $iif ?
-					"\n\t$aggfn(IIF($colfield=$vq,$aggfield,0)) AS \"$label\", "
-					:
-					"\n\t$aggfn(CASE WHEN $colfield=$vq THEN $aggfield ELSE 0 END) AS \"$label\", ";
-			}
-		}
-	}
-	if ($aggfield && $aggfield != '1'){
-		$agg = "$aggfn($aggfield)";
-		$sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";		
-	}
-	
-	if ($showcount)
-		$sel .= "\n\tSUM(1) as Total";
-	else
-		$sel = substr($sel,0,strlen($sel)-2);
-	
-	
-	// Strip aliases
-	$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
-	
-	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
-	
-	return $sql;
- }
-
-/* EXAMPLES USING MS NORTHWIND DATABASE */
-if (0) {
-
-# example1
-#
-# Query the main "product" table
-# Set the rows to CompanyName and QuantityPerUnit
-# and the columns to the Categories
-# and define the joins to link to lookup tables 
-# "categories" and "suppliers"
-#
-
- $sql = PivotTableSQL(
- 	$gDB,  											# adodb connection
- 	'products p ,categories c ,suppliers s',  		# tables
-	'CompanyName,QuantityPerUnit',					# row fields
-	'CategoryName',									# column fields 
-	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
-);
- print "<pre>$sql";
- $rs = $gDB->Execute($sql);
- rs2html($rs);
- 
-/*
-Generated SQL:
-
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
-	SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
-	SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
-	SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy Products", 
-	SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
-	SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
-	SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
-	SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
-GROUP BY CompanyName,QuantityPerUnit
-*/
-//=====================================================================
-
-# example2
-#
-# Query the main "product" table
-# Set the rows to CompanyName and QuantityPerUnit
-# and the columns to the UnitsInStock for diiferent ranges
-# and define the joins to link to lookup tables 
-# "categories" and "suppliers"
-#
- $sql = PivotTableSQL(
- 	$gDB,										# adodb connection
- 	'products p ,categories c ,suppliers s',	# tables
-	'CompanyName,QuantityPerUnit',				# row fields
-												# column ranges
-array(										
-' 0 ' => 'UnitsInStock <= 0',
-"1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
-"6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
-"11 to 15"  => '10 < UnitsInStock and UnitsInStock <= 15',
-"16+" =>'15 < UnitsInStock'
-),
-	' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # joins/where
-	'UnitsInStock', 							# sum this field
-	'Sum'										# sum label prefix
-);
- print "<pre>$sql";
- $rs = $gDB->Execute($sql);
- rs2html($rs);
- /*
- Generated SQL:
- 
-SELECT CompanyName,QuantityPerUnit, 
-	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  0 ", 
-	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5", 
-	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10", 
-	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
-	SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 16+",
-	SUM(UnitsInStock) AS "Sum UnitsInStock", 
-	SUM(1) as Total 
-FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
-GROUP BY CompanyName,QuantityPerUnit
- */
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/readme.txt
===================================================================
--- admin/include/lib/adodb/readme.txt	(revision 6370)
+++ admin/include/lib/adodb/readme.txt	(working copy)
@@ -1,62 +0,0 @@
->> ADODB Library for PHP4
-
-(c) 2000-2004 John Lim (jlim@natsoft.com.my)
-
-Released under both BSD and GNU Lesser GPL library license. 
-This means you can use it in proprietary products.
- 
- 
->> Introduction
-
-PHP's database access functions are not standardised. This creates a 
-need for a database class library to hide the differences between the 
-different databases (encapsulate the differences) so we can easily 
-switch databases.
-
-We currently support MySQL, Interbase, Sybase, PostgreSQL, Oracle, 
-Microsoft SQL server,  Foxpro ODBC, Access ODBC, Informix, DB2,
-Sybase SQL Anywhere, generic ODBC and Microsoft's ADO. 
-
-We hope more people will contribute drivers to support other databases.
-
-
->> Documentation and Examples
-
-Refer to the adodb/docs directory for full documentation and examples. 
-There is also a  tutorial tute.htm that contrasts ADODB code with 
-mysql code.
-
-
->>> Files
-Adodb.inc.php is the main file. You need to include only this file.
-
-Adodb-*.inc.php are the database specific driver code.
-
-Test.php contains a list of test commands to exercise the class library.
-
-Adodb-session.php is the PHP4 session handling code.
-
-Testdatabases.inc.php contains the list of databases to apply the tests on.
-
-Benchmark.php is a simple benchmark to test the throughput of a simple SELECT 
-statement for databases described in testdatabases.inc.php. The benchmark
-tables are created in test.php.
-
-readme.htm is the main documentation.
-
-tute.htm is the tutorial.
-
-
->> More Info
-
-For more information, including installation see readme.htm
-or visit
-           http://adodb.sourceforge.net/
-
-
->> Feature Requests and Bug Reports
-
-Email to jlim@natsoft.com.my 
-
-
- 
\ No newline at end of file
Index: admin/include/lib/adodb/adodb-lib.inc.php
===================================================================
--- admin/include/lib/adodb/adodb-lib.inc.php	(revision 6370)
+++ admin/include/lib/adodb/adodb-lib.inc.php	(working copy)
@@ -1,1147 +0,0 @@
-<?php
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-global $ADODB_INCLUDED_LIB;
-$ADODB_INCLUDED_LIB = 1;
-
-/* 
- @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim\@natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Less commonly used functions are placed here to reduce size of adodb.inc.php. 
-*/ 
-
-function adodb_probetypes(&$array,&$types,$probe=8)
-{
-// probe and guess the type
-	$types = array();
-	if ($probe > sizeof($array)) $max = sizeof($array);
-	else $max = $probe;
-	
-	
-	for ($j=0;$j < $max; $j++) {
-		$row =& $array[$j];
-		if (!$row) break;
-		$i = -1;
-		foreach($row as $v) {
-			$i += 1;
-
-			if (isset($types[$i]) && $types[$i]=='C') continue;
-			
-			//print " ($i ".$types[$i]. "$v) ";
-			$v = trim($v);
-			
-			if (!preg_match('/^[+-]{0,1}[0-9\.]+$/',$v)) {
-				$types[$i] = 'C'; // once C, always C
-				
-				continue;
-			}
-			if ($j == 0) { 
-			// If empty string, we presume is character
-			// test for integer for 1st row only
-			// after that it is up to testing other rows to prove
-			// that it is not an integer
-				if (strlen($v) == 0) $types[$i] = 'C';
-				if (strpos($v,'.') !== false) $types[$i] = 'N';
-				else  $types[$i] = 'I';
-				continue;
-			}
-			
-			if (strpos($v,'.') !== false) $types[$i] = 'N';
-			
-		}
-	}
-	
-}
-
-function  adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs)
-{
-	$oldX = sizeof(reset($arr));
-	$oldY = sizeof($arr);	
-	
-	if ($hdr) {
-		$startx = 1;
-		$hdr = array('Fields');
-		for ($y = 0; $y < $oldY; $y++) {
-			$hdr[] = $arr[$y][0];
-		}
-	} else
-		$startx = 0;
-
-	for ($x = $startx; $x < $oldX; $x++) {
-		if ($fobjs) {
-			$o = $fobjs[$x];
-			$newarr[] = array($o->name);
-		} else
-			$newarr[] = array();
-			
-		for ($y = 0; $y < $oldY; $y++) {
-			$newarr[$x-$startx][] = $arr[$y][$x];
-		}
-	}
-}
-
-// Force key to upper. 
-// See also http://www.php.net/manual/en/function.array-change-key-case.php
-function _array_change_key_case($an_array)
-{
-	if (is_array($an_array)) {
-		$new_array = array();
-		foreach($an_array as $key=>$value)
-			$new_array[strtoupper($key)] = $value;
-
-	   	return $new_array;
-   }
-
-	return $an_array;
-}
-
-function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc)
-{
-		if (count($fieldArray) == 0) return 0;
-		$first = true;
-		$uSet = '';
-		
-		if (!is_array($keyCol)) {
-			$keyCol = array($keyCol);
-		}
-		foreach($fieldArray as $k => $v) {
-			if ($autoQuote && !is_numeric($v) and strncmp($v,"'",1) !== 0 and strcasecmp($v,$zthis->null2null)!=0) {
-				$v = $zthis->qstr($v);
-				$fieldArray[$k] = $v;
-			}
-			if (in_array($k,$keyCol)) continue; // skip UPDATE if is key
-			
-			if ($first) {
-				$first = false;			
-				$uSet = "$k=$v";
-			} else
-				$uSet .= ",$k=$v";
-		}
-		 
-		$where = false;
-		foreach ($keyCol as $v) {
-			if (isset($fieldArray[$v])) {
-				if ($where) $where .= ' and '.$v.'='.$fieldArray[$v];
-				else $where = $v.'='.$fieldArray[$v];
-			}
-		}
-		
-		if ($uSet && $where) {
-			$update = "UPDATE $table SET $uSet WHERE $where";
-
-			$rs = $zthis->Execute($update);
-			
-			
-			if ($rs) {
-				if ($zthis->poorAffectedRows) {
-				/*
-				 The Select count(*) wipes out any errors that the update would have returned. 
-				http://phplens.com/lens/lensforum/msgs.php?id=5696
-				*/
-					if ($zthis->ErrorNo()<>0) return 0;
-					
-				# affected_rows == 0 if update field values identical to old values
-				# for mysql - which is silly. 
-			
-					$cnt = $zthis->GetOne("select count(*) from $table where $where");
-					if ($cnt > 0) return 1; // record already exists
-				} else {
-					if (($zthis->Affected_Rows()>0)) return 1;
-				}
-			} else
-				return 0;
-		}
-		
-	//	print "<p>Error=".$this->ErrorNo().'<p>';
-		$first = true;
-		foreach($fieldArray as $k => $v) {
-			if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col
-			
-			if ($first) {
-				$first = false;			
-				$iCols = "$k";
-				$iVals = "$v";
-			} else {
-				$iCols .= ",$k";
-				$iVals .= ",$v";
-			}				
-		}
-		$insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; 
-		$rs = $zthis->Execute($insert);
-		return ($rs) ? 2 : 0;
-}
-
-// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
-function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='',$compareFields0=true)
-{
-	$hasvalue = false;
-
-	if ($multiple or is_array($defstr)) {
-		if ($size==0) $size=5;
-		$attr = ' multiple size="'.$size.'"';
-		if (!strpos($name,'[]')) $name .= '[]';
-	} else if ($size) $attr = ' size="'.$size.'"';
-	else $attr ='';
-	
-	$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
-	if ($blank1stItem) 
-		if (is_string($blank1stItem))  {
-			$barr = explode(':',$blank1stItem);
-			if (sizeof($barr) == 1) $barr[] = '';
-			$s .= "\n<option value=\"".$barr[0]."\">".$barr[1]."</option>";
-		} else $s .= "\n<option></option>";
-
-	if ($zthis->FieldCount() > 1) $hasvalue=true;
-	else $compareFields0 = true;
-	
-	$value = '';
-    $optgroup = null;
-    $firstgroup = true;
-    $fieldsize = $zthis->FieldCount();
-	while(!$zthis->EOF) {
-		$zval = rtrim(reset($zthis->fields));
-
-		if ($blank1stItem && $zval=="") {
-			$zthis->MoveNext();
-			continue;
-		}
-
-        if ($fieldsize > 1) {
-			if (isset($zthis->fields[1]))
-				$zval2 = rtrim($zthis->fields[1]);
-			else
-				$zval2 = rtrim(next($zthis->fields));
-		}
-		$selected = ($compareFields0) ? $zval : $zval2;
-		
-        $group = '';
-		if ($fieldsize > 2) {
-            $group = rtrim($zthis->fields[2]);
-        }
-/* 
-        if ($optgroup != $group) {
-            $optgroup = $group;
-            if ($firstgroup) {
-                $firstgroup = false;
-                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
-            } else {
-                $s .="\n</optgroup>";
-                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
-            }
-		}
-*/
-		if ($hasvalue) 
-			$value = " value='".htmlspecialchars($zval2)."'";
-		
-		if (is_array($defstr))  {
-			
-			if (in_array($selected,$defstr)) 
-				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else 
-				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-		}
-		else {
-			if (strcasecmp($selected,$defstr)==0) 
-				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else
-				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-		}
-		$zthis->MoveNext();
-	} // while
-	
-    // closing last optgroup
-    if($optgroup != null) {
-        $s .= "\n</optgroup>";
-	}
-	return $s ."\n</select>\n";
-}
-
-// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
-function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false,
-			$size=0, $selectAttr='',$compareFields0=true)
-{
-	$hasvalue = false;
-
-	if ($multiple or is_array($defstr)) {
-		if ($size==0) $size=5;
-		$attr = ' multiple size="'.$size.'"';
-		if (!strpos($name,'[]')) $name .= '[]';
-	} else if ($size) $attr = ' size="'.$size.'"';
-	else $attr ='';
-	
-	$s = '<select name="'.$name.'"'.$attr.' '.$selectAttr.'>';
-	if ($blank1stItem) 
-		if (is_string($blank1stItem))  {
-			$barr = explode(':',$blank1stItem);
-			if (sizeof($barr) == 1) $barr[] = '';
-			$s .= "\n<option value=\"".$barr[0]."\">".$barr[1]."</option>";
-		} else $s .= "\n<option></option>";
-
-	if ($zthis->FieldCount() > 1) $hasvalue=true;
-	else $compareFields0 = true;
-	
-	$value = '';
-    $optgroup = null;
-    $firstgroup = true;
-    $fieldsize = sizeof($zthis->fields);
-	while(!$zthis->EOF) {
-		$zval = rtrim(reset($zthis->fields));
-
-		if ($blank1stItem && $zval=="") {
-			$zthis->MoveNext();
-			continue;
-		}
-
-        if ($fieldsize > 1) {
-			if (isset($zthis->fields[1]))
-				$zval2 = rtrim($zthis->fields[1]);
-			else
-				$zval2 = rtrim(next($zthis->fields));
-		}
-		$selected = ($compareFields0) ? $zval : $zval2;
-		
-        $group = '';
-		if (isset($zthis->fields[2])) {
-            $group = rtrim($zthis->fields[2]);
-        }
- 
-        if ($optgroup != $group) {
-            $optgroup = $group;
-            if ($firstgroup) {
-                $firstgroup = false;
-                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
-            } else {
-                $s .="\n</optgroup>";
-                $s .="\n<optgroup label='". htmlspecialchars($group) ."'>";
-            }
-		}
-	
-		if ($hasvalue) 
-			$value = " value='".htmlspecialchars($zval2)."'";
-		
-		if (is_array($defstr))  {
-			
-			if (in_array($selected,$defstr)) 
-				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else 
-				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-		}
-		else {
-			if (strcasecmp($selected,$defstr)==0) 
-				$s .= "\n<option selected='selected'$value>".htmlspecialchars($zval).'</option>';
-			else
-				$s .= "\n<option".$value.'>'.htmlspecialchars($zval).'</option>';
-		}
-		$zthis->MoveNext();
-	} // while
-	
-    // closing last optgroup
-    if($optgroup != null) {
-        $s .= "\n</optgroup>";
-	}
-	return $s ."\n</select>\n";
-}
-
-
-/*
-	Count the number of records this sql statement will return by using
-	query rewriting heuristics...
-	
-	Does not work with UNIONs, except with postgresql and oracle.
-	
-	Usage:
-	
-	$conn->Connect(...);
-	$cnt = _adodb_getcount($conn, $sql);
-	
-*/
-function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) 
-{
-	$qryRecs = 0;
-	
-	 if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || 
-	 	preg_match('/\s+GROUP\s+BY\s+/is',$sql) || 
-		preg_match('/\s+UNION\s+/is',$sql)) {
-		// ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias
-		// but this is only supported by oracle and postgresql...
-		if ($zthis->dataProvider == 'oci8') {
-			
-			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$sql);
-			
-			// Allow Oracle hints to be used for query optimization, Chris Wrye
-			if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) {
-				$rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")"; 
-			} else
-				$rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")"; 
-			
-		} else if (strncmp($zthis->databaseType,'postgres',8) == 0)  {
-			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$sql);
-			$rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_";
-		}
-	} else {
-		// now replace SELECT ... FROM with SELECT COUNT(*) FROM
-		$rewritesql = preg_replace(
-					'/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
-
-		
-		
-		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails 
-		// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
-		// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
-		if (preg_match('/\sORDER\s+BY\s*\(/i',$rewritesql))
-			$rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql);
-		else
-			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$rewritesql);
-	}
-	
-	
-	
-	if (isset($rewritesql) && $rewritesql != $sql) {
-		if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[1];
-		 
-		if ($secs2cache) {
-			// we only use half the time of secs2cache because the count can quickly
-			// become inaccurate if new records are added
-			$qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr);
-			
-		} else {
-			$qryRecs = $zthis->GetOne($rewritesql,$inputarr);
-	  	}
-		if ($qryRecs !== false) return $qryRecs;
-	}
-	//--------------------------------------------
-	// query rewrite failed - so try slower way...
-	
-	
-	// strip off unneeded ORDER BY if no UNION
-	if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
-	else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); 
-	
-	if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
-		
-	$rstest = &$zthis->Execute($rewritesql,$inputarr);
-	if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
-	
-	if ($rstest) {
-	  		$qryRecs = $rstest->RecordCount();
-		if ($qryRecs == -1) { 
-		global $ADODB_EXTENSION;
-		// some databases will return -1 on MoveLast() - change to MoveNext()
-			if ($ADODB_EXTENSION) {
-				while(!$rstest->EOF) {
-					adodb_movenext($rstest);
-				}
-			} else {
-				while(!$rstest->EOF) {
-					$rstest->MoveNext();
-				}
-			}
-			$qryRecs = $rstest->_currentRow;
-		}
-		$rstest->Close();
-		if ($qryRecs == -1) return 0;
-	}
-	return $qryRecs;
-}
-
-/*
- 	Code originally from "Cornel G" <conyg@fx.ro>
-
-	This code might not work with SQL that has UNION in it	
-	
-	Also if you are using CachePageExecute(), there is a strong possibility that
-	data will get out of synch. use CachePageExecute() only with tables that
-	rarely change.
-*/
-function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, 
-						$inputarr=false, $secs2cache=0) 
-{
-	$atfirstpage = false;
-	$atlastpage = false;
-	$lastpageno=1;
-
-	// If an invalid nrows is supplied, 
-	// we assume a default value of 10 rows per page
-	if (!isset($nrows) || $nrows <= 0) $nrows = 10;
-
-	$qryRecs = false; //count records for no offset
-	
-	$qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache);
-	$lastpageno = (int) ceil($qryRecs / $nrows);
-	$zthis->_maxRecordCount = $qryRecs;
-	
-
-
-	// ***** Here we check whether $page is the last page or 
-	// whether we are trying to retrieve 
-	// a page number greater than the last page number.
-	if ($page >= $lastpageno) {
-		$page = $lastpageno;
-		$atlastpage = true;
-	}
-	
-	// If page number <= 1, then we are at the first page
-	if (empty($page) || $page <= 1) {	
-		$page = 1;
-		$atfirstpage = true;
-	}
-	
-	// We get the data we want
-	$offset = $nrows * ($page-1);
-	if ($secs2cache > 0) 
-		$rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
-	else 
-		$rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
-
-	
-	// Before returning the RecordSet, we set the pagination properties we need
-	if ($rsreturn) {
-		$rsreturn->_maxRecordCount = $qryRecs;
-		$rsreturn->rowsPerPage = $nrows;
-		$rsreturn->AbsolutePage($page);
-		$rsreturn->AtFirstPage($atfirstpage);
-		$rsreturn->AtLastPage($atlastpage);
-		$rsreturn->LastPageNo($lastpageno);
-	}
-	return $rsreturn;
-}
-
-// Iv�n Oliva version
-function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
-{
-
-	$atfirstpage = false;
-	$atlastpage = false;
-	
-	if (!isset($page) || $page <= 1) {	// If page number <= 1, then we are at the first page
-		$page = 1;
-		$atfirstpage = true;
-	}
-	if ($nrows <= 0) $nrows = 10;	// If an invalid nrows is supplied, we assume a default value of 10 rows per page
-	
-	// ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than 
-	// the last page number.
-	$pagecounter = $page + 1;
-	$pagecounteroffset = ($pagecounter * $nrows) - $nrows;
-	if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr);
-	else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache);
-	if ($rstest) {
-		while ($rstest && $rstest->EOF && $pagecounter>0) {
-			$atlastpage = true;
-			$pagecounter--;
-			$pagecounteroffset = $nrows * ($pagecounter - 1);
-			$rstest->Close();
-			if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr);
-			else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache);
-		}
-		if ($rstest) $rstest->Close();
-	}
-	if ($atlastpage) {	// If we are at the last page or beyond it, we are going to retrieve it
-		$page = $pagecounter;
-		if ($page == 1) $atfirstpage = true;	// We have to do this again in case the last page is the same as the first
-			//... page, that is, the recordset has only 1 page.
-	}
-	
-	// We get the data we want
-	$offset = $nrows * ($page-1);
-	if ($secs2cache > 0) $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr);
-	else $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
-	
-	// Before returning the RecordSet, we set the pagination properties we need
-	if ($rsreturn) {
-		$rsreturn->rowsPerPage = $nrows;
-		$rsreturn->AbsolutePage($page);
-		$rsreturn->AtFirstPage($atfirstpage);
-		$rsreturn->AtLastPage($atlastpage);
-	}
-	return $rsreturn;
-}
-
-function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=2)
-{
-	global $ADODB_QUOTE_FIELDNAMES;
-
-		if (!$rs) {
-			printf(ADODB_BAD_RS,'GetUpdateSQL');
-			return false;
-		}
-	
-		$fieldUpdatedCount = 0;
-		$arrFields = _array_change_key_case($arrFields);
-
-		$hasnumeric = isset($rs->fields[0]);
-		$setFields = '';
-		
-		// Loop through all of the fields in the recordset
-		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
-			// Get the field from the recordset
-			$field = $rs->FetchField($i);
-
-			// If the recordset field is one
-			// of the fields passed in then process.
-			$upperfname = strtoupper($field->name);
-			if (adodb_key_exists($upperfname,$arrFields,$force)) {
-				
-				// If the existing field value in the recordset
-				// is different from the value passed in then
-				// go ahead and append the field name and new value to
-				// the update query.
-				
-				if ($hasnumeric) $val = $rs->fields[$i];
-				else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname];
-				else if (isset($rs->fields[$field->name])) $val =  $rs->fields[$field->name];
-				else if (isset($rs->fields[strtolower($upperfname)])) $val =  $rs->fields[strtolower($upperfname)];
-				else $val = '';
-				
-			
-				if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) {
-					// Set the counter for the number of fields that will be updated.
-					$fieldUpdatedCount++;
-
-					// Based on the datatype of the field
-					// Format the value properly for the database
-					$type = $rs->MetaType($field->type);
-						
-
-					if ($type == 'null') {
-						$type = 'C';
-					}
-					
-					if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES))
-						$fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
-					else
-						$fnameq = $upperfname;
-					
-					
-                // is_null requires php 4.0.4
-                //********************************************************//
-                if (is_null($arrFields[$upperfname])
-					|| (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0)
-                    || $arrFields[$upperfname] === $zthis->null2null
-                    )
-                {
-                    switch ($force) {
-
-                        //case 0:
-                        //    //Ignore empty values. This is allready handled in "adodb_key_exists" function.
-                        //break;
-
-                        case 1:
-                            //Set null
-                            $setFields .= $field->name . " = null, ";
-                        break;
-							
-                        case 2:
-                            //Set empty
-                            $arrFields[$upperfname] = "";
-                            $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq);
-                        break;
-						default:
-                        case 3:
-                            //Set the value that was given in array, so you can give both null and empty values
-                            if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) {
-                                $setFields .= $field->name . " = null, ";
-                            } else {
-                                $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq);
-                            }
-                        break;
-                    }
-                //********************************************************//
-                } else {
-						//we do this so each driver can customize the sql for
-						//DB specific column types. 
-						//Oracle needs BLOB types to be handled with a returning clause
-						//postgres has special needs as well
-						$setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,
-														  $arrFields, $magicq);
-					}
-				}
-			}
-		}
-
-		// If there were any modified fields then build the rest of the update query.
-		if ($fieldUpdatedCount > 0 || $forceUpdate) {
-					// Get the table name from the existing query.
-			if (!empty($rs->tableName)) $tableName = $rs->tableName;
-			else {
-				preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName);
-				$tableName = $tableName[1];
-			}
-			// Get the full where clause excluding the word "WHERE" from
-			// the existing query.
-			preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause);
-			
-			$discard = false;
-			// not a good hack, improvements?
-			if ($whereClause) {
-			#var_dump($whereClause);
-				if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard));
-				else if (preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard));
-				else if (preg_match('/\s(FOR UPDATE.*)/is', $whereClause[1], $discard));
-				else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976
-			} else
-				$whereClause = array(false,false);
-				
-			if ($discard)
-				$whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1]));
-			
-			$sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 0, -2);
-			if (strlen($whereClause[1]) > 0) 
-				$sql .= ' WHERE '.$whereClause[1];
-
-			return $sql;
-
-		} else {
-			return false;
-	}
-}
-
-function adodb_key_exists($key, &$arr,$force=2)
-{
-	if ($force<=0) {
-		// the following is the old behaviour where null or empty fields are ignored
-		return (!empty($arr[$key])) || (isset($arr[$key]) && strlen($arr[$key])>0);
-	}
-
-	if (isset($arr[$key])) return true;
-	## null check below
-	if (ADODB_PHPVER >= 0x4010) return array_key_exists($key,$arr);
-	return false;
-}
-
-/**
- * There is a special case of this function for the oci8 driver.
- * The proper way to handle an insert w/ a blob in oracle requires
- * a returning clause with bind variables and a descriptor blob.
- * 
- * 
- */
-function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2)
-{
-static $cacheRS = false;
-static $cacheSig = 0;
-static $cacheCols;
-	global $ADODB_QUOTE_FIELDNAMES;
-
-	$tableName = '';
-	$values = '';
-	$fields = '';
-	$recordSet = null;
-	$arrFields = _array_change_key_case($arrFields);
-	$fieldInsertedCount = 0;
-	
-	if (is_string($rs)) {
-		//ok we have a table name
-		//try and get the column info ourself.
-		$tableName = $rs;			
-	
-		//we need an object for the recordSet
-		//because we have to call MetaType.
-		//php can't do a $rsclass::MetaType()
-		$rsclass = $zthis->rsPrefix.$zthis->databaseType;
-		$recordSet = new $rsclass(-1,$zthis->fetchMode);
-		$recordSet->connection = &$zthis;
-		
-		if (is_string($cacheRS) && $cacheRS == $rs) {
-			$columns =& $cacheCols;
-		} else {
-			$columns = $zthis->MetaColumns( $tableName );
-			$cacheRS = $tableName;
-			$cacheCols = $columns;
-		}
-	} else if (is_subclass_of($rs, 'adorecordset')) {
-		if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS == $rs->insertSig) {
-			$columns =& $cacheCols;
-		} else {
-			for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) 
-				$columns[] = $rs->FetchField($i);
-			$cacheRS = $cacheSig;
-			$cacheCols = $columns;
-			$rs->insertSig = $cacheSig++;
-		}
-		$recordSet =& $rs;
-	
-	} else {
-		printf(ADODB_BAD_RS,'GetInsertSQL');
-		return false;
-	}
-
-	// Loop through all of the fields in the recordset
-	foreach( $columns as $field ) { 
-		$upperfname = strtoupper($field->name);
-		if (adodb_key_exists($upperfname,$arrFields,$force)) {
-			$bad = false;
-			if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES))
-				$fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
-			else
-				$fnameq = $upperfname;
-			
-			$type = $recordSet->MetaType($field->type);
-			
-            /********************************************************/
-            if (is_null($arrFields[$upperfname])
-                || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0)
-                || $arrFields[$upperfname] === $zthis->null2null
-				)
-               {
-                    switch ($force) {
-
-                        case 0: // we must always set null if missing
-							$bad = true;
-							break;
-							
-                        case 1:
-                            $values  .= "null, ";
-                        break;
-		
-                        case 2:
-                            //Set empty
-                            $arrFields[$upperfname] = "";
-                            $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,$arrFields, $magicq);
-                        break;
-
-						default:
-                        case 3:
-                            //Set the value that was given in array, so you can give both null and empty values
-							if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) { 
-								$values  .= "null, ";
-							} else {
-                        		$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq);
-             				}
-              			break;
-             		} // switch
-
-            /*********************************************************/
-			} else {
-				//we do this so each driver can customize the sql for
-				//DB specific column types. 
-				//Oracle needs BLOB types to be handled with a returning clause
-				//postgres has special needs as well
-				$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,
-											   $arrFields, $magicq);
-			}
-			
-			if ($bad) continue;
-			// Set the counter for the number of fields that will be inserted.
-			$fieldInsertedCount++;
-			
-			
-			// Get the name of the fields to insert
-			$fields .= $fnameq . ", ";
-		}
-	}
-
-
-	// If there were any inserted fields then build the rest of the insert query.
-	if ($fieldInsertedCount <= 0)  return false;
-	
-	// Get the table name from the existing query.
-	if (!$tableName) {
-		if (!empty($rs->tableName)) $tableName = $rs->tableName;
-		else if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName))
-			$tableName = $tableName[1];
-		else 
-			return false;
-	}		
-
-	// Strip off the comma and space on the end of both the fields
-	// and their values.
-	$fields = substr($fields, 0, -2);
-	$values = substr($values, 0, -2);
-
-	// Append the fields and their values to the insert query.
-	return 'INSERT INTO '.$tableName.' ( '.$fields.' ) VALUES ( '.$values.' )';
-}
-
-
-/**
- * This private method is used to help construct
- * the update/sql which is generated by GetInsertSQL and GetUpdateSQL.
- * It handles the string construction of 1 column -> sql string based on
- * the column type.  We want to do 'safe' handling of BLOBs
- * 
- * @param string the type of sql we are trying to create
- *                'I' or 'U'. 
- * @param string column data type from the db::MetaType() method  
- * @param string the column name
- * @param array the column value
- * 
- * @return string
- * 
- */
-function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq) 
-{
-    $sql = '';
-    
-    // Based on the datatype of the field
-    // Format the value properly for the database
-    switch($type) {
-    case 'B':
-        //in order to handle Blobs correctly, we need
-        //to do some magic for Oracle
-
-        //we need to create a new descriptor to handle 
-        //this properly
-        if (!empty($zthis->hasReturningInto)) {
-            if ($action == 'I') {
-                $sql = 'empty_blob(), ';
-            } else {
-                $sql = $fnameq. '=empty_blob(), ';
-            }
-            //add the variable to the returning clause array
-            //so the user can build this later in
-            //case they want to add more to it
-            $zthis->_returningArray[$fname] = ':xx'.$fname.'xx';
-        } else if (empty($arrFields[$fname])){
-            if ($action == 'I') {
-                $sql = 'empty_blob(), ';
-            } else {
-                $sql = $fnameq. '=empty_blob(), ';
-            }            
-        } else {
-            //this is to maintain compatibility
-            //with older adodb versions.
-            $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false);
-        }
-        break;
-
-    case "X":
-        //we need to do some more magic here for long variables
-        //to handle these correctly in oracle.
-
-        //create a safe bind var name
-        //to avoid conflicts w/ dupes.
-       if (!empty($zthis->hasReturningInto)) {
-            if ($action == 'I') {
-                $sql = ':xx'.$fname.'xx, ';                
-            } else {
-                $sql = $fnameq.'=:xx'.$fname.'xx, ';
-            }
-            //add the variable to the returning clause array
-            //so the user can build this later in
-            //case they want to add more to it
-            $zthis->_returningArray[$fname] = ':xx'.$fname.'xx';
-        } else {
-            //this is to maintain compatibility
-            //with older adodb versions.
-            $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false);
-        }            
-        break;
-        
-    default:
-        $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq,  $arrFields, $magicq,false);
-        break;
-    }
-    
-    return $sql;
-}    
-	
-function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true) 
-{
-
-	if ($recurse) {
-		switch($zthis->dataProvider)  {
-		case 'postgres':
-			if ($type == 'L') $type = 'C';
-			break;
-		case 'oci8':
-			return _adodb_column_sql_oci8($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq);
-			
-		}
-	}
-		
-	switch($type) {
-		case "C":
-		case "X":
-		case 'B':
-			$val = $zthis->qstr($arrFields[$fname],$magicq);
-			break;
-
-		case "D":
-			$val = $zthis->DBDate($arrFields[$fname]);
-			break;
-
-		
-		case "T":
-			$val = $zthis->DBTimeStamp($arrFields[$fname]);
-            break;
-
-		case "N":
-		    $val = (float) $arrFields[$fname];
-		    break;
-
-		case "I":
-		case "R":
-		    $val = (int) $arrFields[$fname];
-		    break;
-
-		default:
-			$val = str_replace(array("'"," ","("),"",$arrFields[$fname]); // basic sql injection defence
-			if (empty($val)) $val = '0';
-			break;
-	}
-
-	if ($action == 'I') return $val . ", ";
-	
-	
-	return $fnameq . "=" . $val  . ", ";
-	
-}
-
-
-
-function _adodb_debug_execute(&$zthis, $sql, $inputarr)
-{
-	$ss = '';
-	if ($inputarr) {
-		foreach($inputarr as $kk=>$vv) {
-			if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...';
-			$ss .= "($kk=>'$vv') ";
-		}
-		$ss = "[ $ss ]";
-	}
-	$sqlTxt = is_array($sql) ? $sql[0] : $sql;
-	/*str_replace(', ','##1#__^LF',is_array($sql) ? $sql[0] : $sql);
-	$sqlTxt = str_replace(',',', ',$sqlTxt);
-	$sqlTxt = str_replace('##1#__^LF', ', ' ,$sqlTxt);
-	*/
-	// check if running from browser or command-line
-	$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
-	
-	$dbt = $zthis->databaseType;
-	if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType;
-	if ($inBrowser) {
-		if ($ss) {
-			$ss = '<code>'.htmlspecialchars($ss).'</code>';
-		}
-		if ($zthis->debug === -1)
-			ADOConnection::outp( "<br />\n($dbt): ".htmlspecialchars($sqlTxt)." &nbsp; $ss\n<br />\n",false);
-		else 
-			ADOConnection::outp( "<hr />\n($dbt): ".htmlspecialchars($sqlTxt)." &nbsp; $ss\n<hr />\n",false);
-	} else {
-		ADOConnection::outp("-----\n($dbt): ".$sqlTxt."\n-----\n",false);
-	}
-
-	$qID = $zthis->_query($sql,$inputarr);
-	
-	/* 
-		Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql
-		because ErrorNo() calls Execute('SELECT @ERROR'), causing recursion
-	*/
-	if ($zthis->databaseType == 'mssql') { 
-	// ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6
-		if($emsg = $zthis->ErrorMsg()) {
-			if ($err = $zthis->ErrorNo()) ADOConnection::outp($err.': '.$emsg);
-		}
-	} else if (!$qID) {
-		ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg());
-	}
-	
-	if ($zthis->debug === 99) _adodb_backtrace(true,9999,2);
-	return $qID;
-}
-
-# pretty print the debug_backtrace function
-function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0)
-{
-	if (!function_exists('debug_backtrace')) return '';
-	 
-	$html =  (isset($_SERVER['HTTP_USER_AGENT']));
-	$fmt =  ($html) ? "</font><font color=#808080 size=-1> %% line %4d, file: <a href=\"file:/%s\">%s</a></font>" : "%% line %4d, file: %s";
-
-	$MAXSTRLEN = 128;
-
-	$s = ($html) ? '<pre align=left>' : '';
-	
-	if (is_array($printOrArr)) $traceArr = $printOrArr;
-	else $traceArr = debug_backtrace();
-	array_shift($traceArr);
-	array_shift($traceArr);
-	$tabs = sizeof($traceArr)-2;
-	
-	foreach ($traceArr as $arr) {
-		if ($skippy) {$skippy -= 1; continue;}
-		$levels -= 1;
-		if ($levels < 0) break;
-		
-		$args = array();
-		for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? ' &nbsp; ' : "\t";
-		$tabs -= 1;
-		if ($html) $s .= '<font face="Courier New,Courier">';
-		if (isset($arr['class'])) $s .= $arr['class'].'.';
-		if (isset($arr['args']))
-		 foreach($arr['args'] as $v) {
-			if (is_null($v)) $args[] = 'null';
-			else if (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-			else if (is_object($v)) $args[] = 'Object:'.get_class($v);
-			else if (is_bool($v)) $args[] = $v ? 'true' : 'false';
-			else {
-				$v = (string) @$v;
-				$str = htmlspecialchars(substr($v,0,$MAXSTRLEN));
-				if (strlen($v) > $MAXSTRLEN) $str .= '...';
-				$args[] = $str;
-			}
-		}
-		$s .= $arr['function'].'('.implode(', ',$args).')';
-		
-		
-		$s .= @sprintf($fmt, $arr['line'],$arr['file'],basename($arr['file']));
-			
-		$s .= "\n";
-	}	
-	if ($html) $s .= '</pre>';
-	if ($printOrArr) print $s;
-	
-	return $s;
-}
-/*
-function _adodb_find_from($sql) 
-{
-
-	$sql = str_replace(array("\n","\r"), ' ', $sql);
-	$charCount = strlen($sql);
-	
-	$inString = false;
-	$quote = '';
-	$parentheseCount = 0;
-	$prevChars = '';
-	$nextChars = '';
-	
-
-	for($i = 0; $i < $charCount; $i++) {
-
-    	$char = substr($sql,$i,1);
-	    $prevChars = substr($sql,0,$i);
-    	$nextChars = substr($sql,$i+1);
-
-		if((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === false) {
-			$quote = $char;
-			$inString = true;
-		}
-
-		elseif((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === true && $quote == $char) {
-			$quote = "";
-			$inString = false;
-		}
-
-		elseif($char == "(" && $inString === false)
-			$parentheseCount++;
-
-		elseif($char == ")" && $inString === false && $parentheseCount > 0)
-			$parentheseCount--;
-
-		elseif($parentheseCount <= 0 && $inString === false && $char == " " && strtoupper(substr($prevChars,-5,5)) == " FROM")
-			return $i;
-
-	}
-}
-*/
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-mssql_n.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-mssql_n.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-mssql_n.inc.php	(working copy)
@@ -1,166 +0,0 @@
-<?php  
-
-/// $Id $
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// ADOdb  - Database Abstraction Library for PHP                         //
-//          http://adodb.sourceforge.net/                                //
-//                                                                       //
-// Copyright (C) 2000-2007 John Lim (jlim\@natsoft.com.my)               //
-//          All rights reserved.                                         //
-//          Released under both BSD license and LGPL library license.    //
-//          Whenever there is any discrepancy between the two licenses,  //
-//          the BSD license will take precedence                         //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
-*  MSSQL Driver with auto-prepended "N" for correct unicode storage
-*  of SQL literal strings. Intended to be used with MSSQL drivers that
-*  are sending UCS-2 data to MSSQL (FreeTDS and ODBTP) in order to get
-*  true cross-db compatibility from the application point of view.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-// one useful constant
-if (!defined('SINGLEQUOTE')) define('SINGLEQUOTE', "'");
-
-include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
-
-class ADODB_mssql_n extends ADODB_mssql {
-	var $databaseType = "mssql_n";
-	
-	function ADODB_mssqlpo()
-	{
-		ADODB_mssql::ADODB_mssql();
-	}
-
-	function _query($sql,$inputarr)
-	{
-        $sql = $this->_appendN($sql);
-		return ADODB_mssql::_query($sql,$inputarr);
-	}
-
-    /**
-     * This function will intercept all the literals used in the SQL, prepending the "N" char to them
-     * in order to allow mssql to store properly data sent in the correct UCS-2 encoding (by freeTDS
-     * and ODBTP) keeping SQL compatibility at ADOdb level (instead of hacking every project to add
-     * the "N" notation when working against MSSQL.
-     *
-     * Note that this hack only must be used if ALL the char-based columns in your DB are of type nchar,
-     * nvarchar and ntext 
-     */
-    function _appendN($sql) {
-
-        $result = $sql;
-
-    /// Check we have some single quote in the query. Exit ok.
-        if (strpos($sql, SINGLEQUOTE) === false) {
-            return $sql;
-        }
-
-    /// Check we haven't an odd number of single quotes (this can cause problems below
-    /// and should be considered one wrong SQL). Exit with debug info.
-        if ((substr_count($sql, SINGLEQUOTE) & 1)) {
-            if ($this->debug) {
-                ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Wrong number of quotes (odd)");
-            }
-            return $sql;
-        }
-
-    /// Check we haven't any backslash + single quote combination. It should mean wrong
-    /// backslashes use (bad magic_quotes_sybase?). Exit with debug info.
-        $regexp = '/(\\\\' . SINGLEQUOTE . '[^' . SINGLEQUOTE . '])/';
-        if (preg_match($regexp, $sql)) {
-            if ($this->debug) {
-                ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Found bad use of backslash + single quote");
-            }
-            return $sql;
-        }
-
-    /// Remove pairs of single-quotes
-        $pairs = array();
-        $regexp = '/(' . SINGLEQUOTE . SINGLEQUOTE . ')/';
-        preg_match_all($regexp, $result, $list_of_pairs);
-        if ($list_of_pairs) {
-            foreach (array_unique($list_of_pairs[0]) as $key=>$value) {
-                $pairs['<@#@#@PAIR-'.$key.'@#@#@>'] = $value;
-            }
-            if (!empty($pairs)) {
-                $result = str_replace($pairs, array_keys($pairs), $result);
-            }
-        }
-
-    /// Remove the rest of literals present in the query
-        $literals = array();
-        $regexp = '/(N?' . SINGLEQUOTE . '.*?' . SINGLEQUOTE . ')/is';
-        preg_match_all($regexp, $result, $list_of_literals);
-        if ($list_of_literals) {
-            foreach (array_unique($list_of_literals[0]) as $key=>$value) {
-                $literals['<#@#@#LITERAL-'.$key.'#@#@#>'] = $value;
-            }
-            if (!empty($literals)) {
-                $result = str_replace($literals, array_keys($literals), $result);
-            }
-        }
-
-    /// Analyse literals to prepend the N char to them if their contents aren't numeric
-        if (!empty($literals)) {
-            foreach ($literals as $key=>$value) {
-                if (!is_numeric(trim($value, SINGLEQUOTE))) {
-                /// Non numeric string, prepend our dear N
-                    $literals[$key] = 'N' . trim($value, 'N'); //Trimming potentially existing previous "N"
-                }
-            }
-        }
-
-    /// Re-apply literals to the text
-        if (!empty($literals)) {
-            $result = str_replace(array_keys($literals), $literals, $result);
-        }
-
-    /// Re-apply pairs of single-quotes to the text
-        if (!empty($pairs)) {
-            $result = str_replace(array_keys($pairs), $pairs, $result);
-        }
-
-    /// Print transformation if debug = on
-        if ($result != $sql && $this->debug) {
-            ADOConnection::outp("{$this->databaseType} internal transformation:<br>{$sql}<br>to<br>{$result}");
-        }
-
-        return $result;
-    }
-}
-
-class ADORecordset_mssql_n extends ADORecordset_mssql {
-	var $databaseType = "mssql_n";
-	function ADORecordset_mssql_n($id,$mode=false)
-	{
-		$this->ADORecordset_mssql($id,$mode);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-pdo_oci.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-pdo_oci.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-pdo_oci.inc.php	(working copy)
@@ -1,93 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
- 
-*/ 
-
-class ADODB_pdo_oci extends ADODB_pdo_base {
-
-	var $concat_operator='||';
-	var $sysDate = "TRUNC(SYSDATE)";
-	var $sysTimeStamp = 'SYSDATE';
-	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
-	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
-	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW')";
-	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; 
-		
- 	var $_initdate = true;
-	var $_hasdual = true;
-	
-	function _init($parentDriver)
-	{
-		$parentDriver->_bindInputArray = true;
-		$parentDriver->_nestedSQL = true;
-		if ($this->_initdate) {
-			$parentDriver->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
-		}
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtoupper($mask));
-			$this->metaTablesSQL .= " AND table_name like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	function &MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!$rs) {
-			return $false;
-		}
-		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-	   		$fld->name = $rs->fields[0];
-	   		$fld->type = $rs->fields[1];
-	   		$fld->max_length = $rs->fields[2];
-			$fld->scale = $rs->fields[3];
-			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
-				$fld->type ='INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
-		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
-			$fld->binary = (strpos($fld->type,'BLOB') !== false);
-			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if (empty($retarr))
-			return  $false;
-		else 
-			return $retarr;
-	}
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-odbtp_unicode.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-odbtp_unicode.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-odbtp_unicode.inc.php	(working copy)
@@ -1,39 +0,0 @@
-<?php
-/*
-	V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-  Latest version is available at http://adodb.sourceforge.net
-*/
-
-// Code contributed by "Robert Twitty" <rtwitty#neutron.ushmm.org>
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-    Because the ODBTP server sends and reads UNICODE text data using UTF-8
-    encoding, the following HTML meta tag must be included within the HTML
-    head section of every HTML form and script page:
-
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-    Also, all SQL query strings must be submitted as UTF-8 encoded text.
-*/
-
-if (!defined('_ADODB_ODBTP_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbtp.inc.php");
-}
-
-class ADODB_odbtp_unicode extends ADODB_odbtp {
-	var $databaseType = 'odbtp';
-	var $_useUnicodeSQL = true;
-
-	function ADODB_odbtp_unicode()
-	{
-		$this->ADODB_odbtp();
-	}
-}
-?>
Index: admin/include/lib/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-ldap.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-ldap.inc.php	(working copy)
@@ -1,406 +0,0 @@
-<?php
-/*
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-   Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
-  
-  Revision 1: (02/25/2005) Updated codebase to include the _inject_bind_options function. This allows
-  users to access the options in the ldap_set_option function appropriately. Most importantly
-  LDAP Version 3 is now supported. See the examples for more information. Also fixed some minor
-  bugs that surfaced when PHP error levels were set high.
-  
-  Joshua Eldridge (joshuae74#hotmail.com)
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('LDAP_ASSOC')) {
-	 define('LDAP_ASSOC',ADODB_FETCH_ASSOC);
-	 define('LDAP_NUM',ADODB_FETCH_NUM);
-	 define('LDAP_BOTH',ADODB_FETCH_BOTH);
-}
-
-class ADODB_ldap extends ADOConnection {
-    var $databaseType = 'ldap';
-	var $dataProvider = 'ldap';
-	
-	# Connection information
-    var $username = false;
-    var $password = false;
-    
-    # Used during searches
-    var $filter;
-    var $dn;
-	var $version;
-	var $port = 389;
-
-	# Options configuration information
-	var $LDAP_CONNECT_OPTIONS;
-
-	function ADODB_ldap() 
-	{		
-	}
-  		
-	// returns true or false
-	
-	function _connect( $host, $username, $password, $ldapbase)
-	{
-	global $LDAP_CONNECT_OPTIONS;
-		
-		if ( !function_exists( 'ldap_connect' ) ) return null;
-		
-		$conn_info = array( $host,$this->port);
-		
-		if ( strstr( $host, ':' ) ) {
-		    $conn_info = split( ':', $host );
-		} 
-		
-		$this->_connectionID = ldap_connect( $conn_info[0], $conn_info[1] );
-		if (!$this->_connectionID) {
-			$e = 'Could not connect to ' . $conn_info[0];
-			$this->_errorMsg = $e;
-			if ($this->debug) ADOConnection::outp($e);
-			return false;
-		}
-		if( count( $LDAP_CONNECT_OPTIONS ) > 0 ) {
-			$this->_inject_bind_options( $LDAP_CONNECT_OPTIONS );
-		}
-		
-		if ($username) {
-		    $bind = ldap_bind( $this->_connectionID, $username, $password );
-		} else {
-			$username = 'anonymous';
-		    $bind = ldap_bind( $this->_connectionID );		
-		}
-		
-		if (!$bind) {
-			$e = 'Could not bind to ' . $conn_info[0] . " as ".$username;
-			$this->_errorMsg = $e;
-			if ($this->debug) ADOConnection::outp($e);
-			return false;
-		}
-		$this->_errorMsg = '';
-		$this->database = $ldapbase;
-		return $this->_connectionID;
-	}
-    
-/*
-	Valid Domain Values for LDAP Options:
-
-	LDAP_OPT_DEREF (integer)
-	LDAP_OPT_SIZELIMIT (integer)
-	LDAP_OPT_TIMELIMIT (integer)
-	LDAP_OPT_PROTOCOL_VERSION (integer)
-	LDAP_OPT_ERROR_NUMBER (integer)
-	LDAP_OPT_REFERRALS (boolean)
-	LDAP_OPT_RESTART (boolean)
-	LDAP_OPT_HOST_NAME (string)
-	LDAP_OPT_ERROR_STRING (string)
-	LDAP_OPT_MATCHED_DN (string)
-	LDAP_OPT_SERVER_CONTROLS (array)
-	LDAP_OPT_CLIENT_CONTROLS (array)
-
-	Make sure to set this BEFORE calling Connect()
-
-	Example:
-
-	$LDAP_CONNECT_OPTIONS = Array(
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_DEREF,
-			"OPTION_VALUE"=>2
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_SIZELIMIT,
-			"OPTION_VALUE"=>100
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_TIMELIMIT,
-			"OPTION_VALUE"=>30
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_PROTOCOL_VERSION,
-			"OPTION_VALUE"=>3
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_ERROR_NUMBER,
-			"OPTION_VALUE"=>13
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_REFERRALS,
-			"OPTION_VALUE"=>FALSE
-		),
-		Array (
-			"OPTION_NAME"=>LDAP_OPT_RESTART,
-			"OPTION_VALUE"=>FALSE
-		)
-	);
-*/
-
-	function _inject_bind_options( $options ) {
-		foreach( $options as $option ) {
-			ldap_set_option( $this->_connectionID, $option["OPTION_NAME"], $option["OPTION_VALUE"] )
-				or die( "Unable to set server option: " . $option["OPTION_NAME"] );
-		}
-	}
-	
-	/* returns _queryID or false */
-	function _query($sql,$inputarr)
-	{
-		$rs = ldap_search( $this->_connectionID, $this->database, $sql );
-		$this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql;
-		return $rs; 
-	}
-
-    /* closes the LDAP connection */
-	function _close()
-	{
-		@ldap_close( $this->_connectionID );
-		$this->_connectionID = false;
-	}
-    
-	function SelectDB($db) {
-		$this->database = $db;
-		return true;
-	} // SelectDB
-
-    function ServerInfo()
-    {
-        if( !empty( $this->version ) ) return $this->version;
-        $version = array();
-        /*
-        Determines how aliases are handled during search. 
-        LDAP_DEREF_NEVER (0x00)
-        LDAP_DEREF_SEARCHING (0x01)
-        LDAP_DEREF_FINDING (0x02)
-        LDAP_DEREF_ALWAYS (0x03)
-        The LDAP_DEREF_SEARCHING value means aliases are dereferenced during the search but 
-        not when locating the base object of the search. The LDAP_DEREF_FINDING value means 
-        aliases are dereferenced when locating the base object but not during the search.  
-        Default: LDAP_DEREF_NEVER
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, $version['LDAP_OPT_DEREF'] ) ;
-        switch ( $version['LDAP_OPT_DEREF'] ) {
-          case 0:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_NEVER';
-          case 1:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_SEARCHING';
-          case 2:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_FINDING';
-          case 3:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS';
-        }
-        
-        /* 
-        A limit on the number of entries to return from a search. 
-        LDAP_NO_LIMIT (0) means no limit.
-        Default: LDAP_NO_LIMIT
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_SIZELIMIT, $version['LDAP_OPT_SIZELIMIT'] );
-        if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) {
-           $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT';
-        }
-        
-        /*
-        A limit on the number of seconds to spend on a search. 
-        LDAP_NO_LIMIT (0) means no limit.
-        Default: LDAP_NO_LIMIT
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_TIMELIMIT, $version['LDAP_OPT_TIMELIMIT'] );
-        if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) {
-           $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT';
-        }
-        
-        /*
-        Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. 
-        LDAP_OPT_ON
-        LDAP_OPT_OFF
-        Default: ON
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_REFERRALS, $version['LDAP_OPT_REFERRALS'] );
-        if ( $version['LDAP_OPT_REFERRALS'] == 0 ) {
-           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF';
-        } else {
-           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON';
-        
-        }
-        /*
-        Determines whether LDAP I/O operations are automatically restarted if they abort prematurely. 
-        LDAP_OPT_ON
-        LDAP_OPT_OFF
-        Default: OFF
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_RESTART, $version['LDAP_OPT_RESTART'] );
-        if ( $version['LDAP_OPT_RESTART'] == 0 ) {
-           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF';
-        } else {
-           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON';
-        
-        }
-        /*
-        This option indicates the version of the LDAP protocol used when communicating with the primary LDAP server.
-        LDAP_VERSION2 (2)
-        LDAP_VERSION3 (3)
-        Default: LDAP_VERSION2 (2)
-        */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_PROTOCOL_VERSION, $version['LDAP_OPT_PROTOCOL_VERSION'] );
-        if ( $version['LDAP_OPT_PROTOCOL_VERSION'] == 2 ) {
-           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2';
-        } else {
-           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3';
-        
-        }
-        /* The host name (or list of hosts) for the primary LDAP server. */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); 
-        
-        return $this->version = $version;
-    
-    }
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_ldap extends ADORecordSet{	
-	
-	var $databaseType = "ldap";
-	var $canSeek = false;
-	var $_entryID; /* keeps track of the entry resource identifier */
-	
-	function ADORecordSet_ldap($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: 
-		  $this->fetchMode = LDAP_NUM; 
-		break;
-		case ADODB_FETCH_ASSOC: 
-		  $this->fetchMode = LDAP_ASSOC; 
-		break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH: 
-		default:
-		  $this->fetchMode = LDAP_BOTH; 
-		break;
-		}
-	
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function _initrs()
-	{
-	   /* 
-	   This could be teaked to respect the $COUNTRECS directive from ADODB
-	   It's currently being used in the _fetch() function and the
-	   GetAssoc() function
-       */
-	    $this->_numOfRows = ldap_count_entries( $this->connection->_connectionID, $this->_queryID );
-
-	}
-
-    /*
-    Return whole recordset as a multi-dimensional associative array
-	*/
-	function &GetAssoc($force_array = false, $first2cols = false) 
-	{
-		$records = $this->_numOfRows;
-        $results = array();
-            for ( $i=0; $i < $records; $i++ ) {
-                foreach ( $this->fields as $k=>$v ) {
-                    if ( is_array( $v ) ) {
-                        if ( $v['count'] == 1 ) {
-                            $results[$i][$k] = $v[0];
-                        } else {
-                            array_shift( $v );
-                            $results[$i][$k] = $v;
-                        } 
-                    }
-                }
-            }
-        
-		return $results; 
-	}
-    
-    function &GetRowAssoc()
-	{
-        $results = array();
-        foreach ( $this->fields as $k=>$v ) {
-            if ( is_array( $v ) ) {
-                if ( $v['count'] == 1 ) {
-                    $results[$k] = $v[0];
-                } else {
-                    array_shift( $v );
-                    $results[$k] = $v;
-                } 
-            }
-        }
- 
-		return $results; 
-	}
-		
-    function GetRowNums()
-    {
-        $results = array();
-        foreach ( $this->fields as $k=>$v ) {
-        static $i = 0;
-            if (is_array( $v )) {
-                if ( $v['count'] == 1 ) {
-                    $results[$i] = $v[0];
-                } else {
-                    array_shift( $v );
-                    $results[$i] = $v;
-                } 
-            $i++;
-            }
-        }
-        return $results;
-    }
-	
-	function _fetch()
-	{		
-		if ( $this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0 )
-        	return false;
-        	
-        if ( $this->_currentRow == 0 ) {
-		  $this->_entryID = ldap_first_entry( $this->connection->_connectionID, $this->_queryID );
-        } else {
-          $this->_entryID = ldap_next_entry( $this->connection->_connectionID, $this->_entryID );
-        }
-	    
-	    $this->fields = ldap_get_attributes( $this->connection->_connectionID, $this->_entryID );
-	    $this->_numOfFields = $this->fields['count'];	
-	    switch ( $this->fetchMode ) {
-            
-            case LDAP_ASSOC:
-            $this->fields = $this->GetRowAssoc();
-            break;
-            
-            case LDAP_NUM:
-			$this->fields = array_merge($this->GetRowNums(),$this->GetRowAssoc());
-            break;
-            
-            case LDAP_BOTH:
-            default:
-			$this->fields = $this->GetRowNums();
-            break;
-        }
-        return ( is_array( $this->fields ) );        
-	}
-	
-	function _close() {
-		@ldap_free_result( $this->_queryID );	
-		$this->_queryID = false;
-	}
-	
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-postgres64.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-postgres64.inc.php	(working copy)
@@ -1,1064 +0,0 @@
-<?php
-/*
- V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
-  
-  Original version derived from Alberto Cerezal (acerezalp@dbnet.es) - DBNet Informatica & Comunicaciones. 
-  08 Nov 2000 jlim - Minor corrections, removing mysql stuff
-  09 Nov 2000 jlim - added insertid support suggested by "Christopher Kings-Lynne" <chriskl@familyhealth.com.au>
-					jlim - changed concat operator to || and data types to MetaType to match documented pgsql types 
-		 	see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm  
-  22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" <raser@mail.zen.com.tw>
-  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" <leen@wirehub.nl>
-  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk. 
-  31 Jan 2002 jlim - finally installed postgresql. testing
-  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
-  
-  See http://www.varlena.com/varlena/GeneralBits/47.php
-  
-	-- What indexes are on my table?
-	select * from pg_indexes where tablename = 'tablename';
-	
-	-- What triggers are on my table?
-	select c.relname as "Table", t.tgname as "Trigger Name", 
-	   t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
-	   t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
-	   p.proname as "Function Name"
-	from pg_trigger t, pg_class c, pg_class cc, pg_proc p
-	where t.tgfoid = p.oid and t.tgrelid = c.oid
-	   and t.tgconstrrelid = cc.oid
-	   and c.relname = 'tablename';
-	
-	-- What constraints are on my table?
-	select r.relname as "Table", c.conname as "Constraint Name",
-	   contype as "Constraint Type", conkey as "Key Columns",
-	   confkey as "Foreign Columns", consrc as "Source"
-	from pg_class r, pg_constraint c
-	where r.oid = c.conrelid
-	   and relname = 'tablename';
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-function adodb_addslashes($s)
-{
-	$len = strlen($s);
-	if ($len == 0) return "''";
-	if (strncmp($s,"'",1) === 0 && substr($s,$len-1) == "'") return $s; // already quoted
-	
-	return "'".addslashes($s)."'";
-}
-
-class ADODB_postgres64 extends ADOConnection{
-	var $databaseType = 'postgres64';
-	var $dataProvider = 'postgres';
-	var $hasInsertID = true;
-	var $_resultid = false;
-  	var $concat_operator='||';
-	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
-    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
-	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
-	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
-	var $isoDates = true; // accepts dates in ISO format
-	var $sysDate = "CURRENT_DATE";
-	var $sysTimeStamp = "CURRENT_TIMESTAMP";
-	var $blobEncodeType = 'C';
-	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
-		FROM pg_class c, pg_attribute a,pg_type t 
-		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
-AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-
-	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
-WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
-	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
-	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
-	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
-	var $hasAffectedRows = true;
-	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
-	var $true = 'TRUE';		// string that represents TRUE for a database
-	var $false = 'FALSE';		// string that represents FALSE for a database
-	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d H:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
-	var $hasMoveFirst = true;
-	var $hasGenID = true;
-	var $_genIDSQL = "SELECT NEXTVAL('%s')";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START %s";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
-	var $random = 'random()';		/// random function
-	var $autoRollback = true; // apparently pgsql does not autorollback properly before php 4.3.4
-							// http://bugs.php.net/bug.php?id=25404
-							
-	var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
-	var $disableBlobs = false; // set to true to disable blob checking, resulting in 2-5% improvement in performance.
-	
-	// The last (fmtTimeStamp is not entirely correct: 
-	// PostgreSQL also has support for time zones, 
-	// and writes these time in this format: "2001-03-01 18:59:26+02". 
-	// There is no code for the "+02" time zone information, so I just left that out. 
-	// I'm not familiar enough with both ADODB as well as Postgres 
-	// to know what the concequences are. The other values are correct (wheren't in 0.94)
-	// -- Freek Dijkstra 
-
-	function ADODB_postgres64() 
-	{
-	// changes the metaColumnsSQL, adds columns: attnum[6]
-	}
-	
-	function ServerInfo()
-	{
-		if (isset($this->version)) return $this->version;
-		
-		$arr['description'] = $this->GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		$this->version = $arr;
-		return $arr;
-	}
-
-	function IfNull( $field, $ifNull ) 
-	{
-		return " coalesce($field, $ifNull) "; 
-	}
-
-	// get the last id - never tested
-	function pg_insert_id($tablename,$fieldname)
-	{
-		$result=pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
-		if ($result) {
-			$arr = @pg_fetch_row($result,0);
-			pg_freeresult($result);
-			if (isset($arr[0])) return $arr[0];
-		}
-		return false;
-	}
-	
-/* Warning from http://www.php.net/manual/function.pg-getlastoid.php:
-Using a OID as a unique identifier is not generally wise. 
-Unless you are very careful, you might end up with a tuple having 
-a different OID if a database must be reloaded. */
-	function _insertid($table,$column)
-	{
-		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-		$oid = pg_getlastoid($this->_resultid);
-		// to really return the id, we need the table and column-name, else we can only return the oid != id
-		return empty($table) || empty($column) ? $oid : $this->GetOne("SELECT $column FROM $table WHERE oid=".(int)$oid);
-	}
-
-// I get this error with PHP before 4.0.6 - jlim
-// Warning: This compilation does not support pg_cmdtuples() in adodb-postgres.inc.php on line 44
-   function _affectedrows()
-   {
-   		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-	   	return pg_cmdtuples($this->_resultid);
-   }
-   
-	
-		// returns true/false
-	function BeginTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
-	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore') 
-	{
-		if (!$this->transCnt) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
-	}
-
-	// returns true/false. 
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		
-		$this->transCnt -= 1;
-		return @pg_Exec($this->_connectionID, "commit");
-	}
-	
-	// returns true/false
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt -= 1;
-		return @pg_Exec($this->_connectionID, "rollback");
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		$info = $this->ServerInfo();
-		if ($info['version'] >= 7.3) {
-	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
-		}
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtolower($mask));
-			if ($info['version']>=7.3)
-				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
-select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
-			else
-				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
-select viewname,'V' from pg_views where viewname like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	
-	// if magic quotes disabled, use pg_escape_string()
-	function qstr($s,$magic_quotes=false)
-	{
-		if (!$magic_quotes) {
-			if (ADODB_PHPVER >= 0x5200) {
-				return  "'".pg_escape_string($this->_connectionID,$s)."'";
-			} 
-			if (ADODB_PHPVER >= 0x4200) {
-				return  "'".pg_escape_string($s)."'";
-			}
-			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
-	}
-	
-	
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'TO_CHAR('.$col.",'";
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
-				
-			case 'M':
-				$s .= 'Mon';
-				break;
-				
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
-			
-			case 'H':
-				$s.= 'HH24';
-				break;
-				
-			case 'h':
-				$s .= 'HH';
-				break;
-				
-			case 'i':
-				$s .= 'MI';
-				break;
-			
-			case 's':
-				$s .= 'SS';
-				break;
-			
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
-				
-			case 'w':
-				$s .= 'D';
-				break;
-			
-			case 'l':
-				$s .= 'DAY';
-				break;
-			
-			 case 'W':
-				$s .= 'WW';
-				break;
-
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
-				
-			}
-		}
-		return $s. "')";
-	}
-	
-	
-	
-	/* 
-	* Load a Large Object from a file 
-	* - the procedure stores the object id in the table and imports the object using 
-	* postgres proprietary blob handling routines 
-	*
-	* contributed by Mattia Rossi mattia@technologist.com
-	* modified for safe mode by juraj chlebec
-	*/ 
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		pg_exec ($this->_connectionID, "begin"); 
-		
-		$fd = fopen($path,'r');
-		$contents = fread($fd,filesize($path));
-		fclose($fd);
-		
-		$oid = pg_lo_create($this->_connectionID);
-		$handle = pg_lo_open($this->_connectionID, $oid, 'w');
-		pg_lo_write($handle, $contents);
-		pg_lo_close($handle);
-		
-		// $oid = pg_lo_import ($path); 
-		pg_exec($this->_connectionID, "commit"); 
-		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
-		$rez = !empty($rs); 
-		return $rez; 
-	} 
-	
-	/*
-	* Deletes/Unlinks a Blob from the database, otherwise it 
-	* will be left behind
-	*
-	* Returns TRUE on success or FALSE on failure.
-	*
-	* contributed by Todd Rogers todd#windfox.net
-	*/
-	function BlobDelete( $blob )
-	{
-		pg_exec ($this->_connectionID, "begin");
-		$result = @pg_lo_unlink($blob);
-		pg_exec ($this->_connectionID, "commit");
-		return( $result );
-	}
-
-	/*
-		Hueristic - not guaranteed to work.
-	*/
-	function GuessOID($oid)
-	{
-		if (strlen($oid)>16) return false;
-		return is_numeric($oid);
-	}
-	
-	/* 
-	* If an OID is detected, then we use pg_lo_* to open the oid file and read the
-	* real blob from the db using the oid supplied as a parameter. If you are storing
-	* blobs using bytea, we autodetect and process it so this function is not needed.
-	*
-	* contributed by Mattia Rossi mattia@technologist.com
-	*
-	* see http://www.postgresql.org/idocs/index.php?largeobjects.html
-	*
-	* Since adodb 4.54, this returns the blob, instead of sending it to stdout. Also
-	* added maxsize parameter, which defaults to $db->maxblobsize if not defined.
-	*/ 
-	function BlobDecode($blob,$maxsize=false,$hastrans=true) 
-	{
-		if (!$this->GuessOID($blob)) return $blob;
-		
-		if ($hastrans) @pg_exec($this->_connectionID,"begin"); 
-		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
-		if ($fd === false) {
-			if ($hastrans) @pg_exec($this->_connectionID,"commit");
-			return $blob;
-		}
-		if (!$maxsize) $maxsize = $this->maxblobsize;
-		$realblob = @pg_loread($fd,$maxsize); 
-		@pg_loclose($fd); 
-		if ($hastrans) @pg_exec($this->_connectionID,"commit"); 
-		return $realblob;
-	}
-	
-	/* 
-		See http://www.postgresql.org/idocs/index.php?datatype-binary.html
-	 	
-		NOTE: SQL string literals (input strings) must be preceded with two backslashes 
-		due to the fact that they must pass through two parsers in the PostgreSQL 
-		backend.
-	*/
-	function BlobEncode($blob)
-	{
-		if (ADODB_PHPVER >= 0x5200) return pg_escape_bytea($this->_connectionID, $blob);
-		if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
-		
-		/*92=backslash, 0=null, 39=single-quote*/
-		$badch = array(chr(92),chr(0),chr(39)); # \  null  '
-		$fixch = array('\\\\134','\\\\000','\\\\047');
-		return adodb_str_replace($badch,$fixch,$blob);
-		
-		// note that there is a pg_escape_bytea function only for php 4.2.0 or later
-	}
-	
-	// assumes bytea for blob, and varchar for clob
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-	
-		if ($blobtype == 'CLOB') {
-    		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
-		}
-		// do not use bind params which uses qstr(), as blobencode() already quotes data
-		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
-	}
-	
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		else if (strncmp($date,"'",1) == 0) {
-			$len = strlen($date);
-			if (10 <= $len && $len <= 12) $date = 'date '.$date;
-			else $date = 'timestamp '.$date;
-		}
-		return "($date+interval'$dayFraction days')";
-	}
-	
-
-	// for schema support, pass in the $table param "$schema.$tabname".
-	// converts field names to lowercase, $upper is ignored
-	// see http://phplens.com/lens/lensforum/msgs.php?id=14018 for more info
-	function &MetaColumns($table,$normalize=true) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$schema = false;
-		$false = false;
-		$this->_findschema($table,$schema);
-		
-		if ($normalize) $table = strtolower($table);
-
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		if ($schema) $rs =& $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-		else $rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ($rs === false) {
-			return $false;
-		}
-		if (!empty($this->metaKeySQL)) {
-			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
-			// not support OUTER JOINS. So here is the clumsy way.
-			
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
-			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
-			// fetch all result in once for performance.
-			$keys =& $rskey->GetArray();
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			$rskey->Close();
-			unset($rskey);
-		}
-
-		$rsdefa = array();
-		if (!empty($this->metaDefaultsSQL)) {
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			$sql = sprintf($this->metaDefaultsSQL, ($table));
-			$rsdef = $this->Execute($sql);
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			if ($rsdef) {
-				while (!$rsdef->EOF) {
-					$num = $rsdef->fields['num'];
-					$s = $rsdef->fields['def'];
-					if (strpos($s,'::')===false && substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
-						$s = substr($s, 1);
-						$s = substr($s, 0, strlen($s) - 1);
-					}
-
-					$rsdefa[$num] = $s;
-					$rsdef->MoveNext();
-				}
-			} else {
-				ADOConnection::outp( "==> SQL => " . $sql);
-			}
-			unset($rsdef);
-		}
-	
-		$retarr = array();
-		while (!$rs->EOF) { 	
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$fld->type = $rs->fields[1];
-			$fld->max_length = $rs->fields[2];
-			$fld->attnum = $rs->fields[6];
-			
-			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
-			if ($fld->max_length <= 0) $fld->max_length = -1;
-			if ($fld->type == 'numeric') {
-				$fld->scale = $fld->max_length & 0xFFFF;
-				$fld->max_length >>= 16;
-			}
-			// dannym
-			// 5 hasdefault; 6 num-of-column
-			$fld->has_default = ($rs->fields[5] == 't');
-			if ($fld->has_default) {
-				$fld->default_value = $rsdefa[$rs->fields[6]];
-			}
-
-			//Freek
-			$fld->not_null = $rs->fields[4] == 't';
-			
-			
-			// Freek
-			if (is_array($keys)) {
-				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't') 
-						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't') 
-						$fld->unique = true; // What name is more compatible?
-				}
-			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if (empty($retarr))
-			return  $false;
-		else
-			return $retarr;	
-		
-	}
-
-	  function &MetaIndexes ($table, $primary = FALSE)
-      {
-         global $ADODB_FETCH_MODE;
-                
-				$schema = false;
-				$this->_findschema($table,$schema);
-
-				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
-					$sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
-FROM pg_catalog.pg_class c 
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-	,pg_namespace n 
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\'';
-				} else {
-	                $sql = '
-SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
-FROM pg_catalog.pg_class c
-JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
-JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
-    			}
-				            
-                if ($primary == FALSE) {
-                	$sql .= ' AND i.indisprimary=false;';
-                }
-                
-                $save = $ADODB_FETCH_MODE;
-                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                if ($this->fetchMode !== FALSE) {
-                        $savem = $this->SetFetchMode(FALSE);
-                }
-                
-                $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
-                if (isset($savem)) {
-                        $this->SetFetchMode($savem);
-                }
-                $ADODB_FETCH_MODE = $save;
-
-                if (!is_object($rs)) {
-                	$false = false;
-					return $false;
-                }
-				
-                $col_names = $this->MetaColumnNames($table,true,true); 
-				//3rd param is use attnum, 
-				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
-                $indexes = array();
-                while ($row = $rs->FetchRow()) {
-                        $columns = array();
-                        foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col];
-                        }
-                        
-                        $indexes[$row[0]] = array(
-                                'unique' => ($row[1] == 't'),
-                                'columns' => $columns
-                        );
-                }
-                return $indexes;
-        }
-
-	// returns true or false
-	//
-	// examples:
-	// 	$db->Connect("host=host1 user=user1 password=secret port=4341");
-	// 	$db->Connect('host1','user1','secret');
-	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
-	{
-		
-		if (!function_exists('pg_connect')) return null;
-		
-		$this->_errorMsg = false;
-		
-		if ($user || $pwd || $db) {
-			$user = adodb_addslashes($user);
-			$pwd = adodb_addslashes($pwd);
-			if (strlen($db) == 0) $db = 'template1';
-			$db = adodb_addslashes($db);
-		   	if ($str)  {
-			 	$host = split(":", $str);
-				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
-				else $str = '';
-				if (isset($host[1])) $str .= " port=$host[1]";
-				else if (!empty($this->port)) $str .= " port=".$this->port;
-			}
-		   		if ($user) $str .= " user=".$user;
-		   		if ($pwd)  $str .= " password=".$pwd;
-				if ($db)   $str .= " dbname=".$db;
-		}
-
-		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
-		
-		if ($ctype === 1) { // persistent
-			$this->_connectionID = pg_pconnect($str);
-		} else {
-			if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
-			static $ncnt;
-			
-				if (empty($ncnt)) $ncnt = 1;
-				else $ncnt += 1;
-				
-				$str .= str_repeat(' ',$ncnt);
-			}
-			$this->_connectionID = pg_connect($str);
-		}
-		if ($this->_connectionID === false) return false;
-		$this->Execute("set datestyle='ISO'");
-		
-		$info = $this->ServerInfo();
-		$this->pgVersion = (float) substr($info['version'],0,3);
-		if ($this->pgVersion >= 7.1) { // good till version 999
-			$this->_nestedSQL = true;
-		}
-		return true;
-	}
-	
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
-	{
-	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
-	}
-	 
-	// returns true or false
-	//
-	// examples:
-	// 	$db->PConnect("host=host1 user=user1 password=secret port=4341");
-	// 	$db->PConnect('host1','user1','secret');
-	function _pconnect($str,$user='',$pwd='',$db='')
-	{
-		return $this->_connect($str,$user,$pwd,$db,1);
-	}
-	
-
-	// returns queryID or false
-	function _query($sql,$inputarr)
-	{
-		$this->_errorMsg = false;
-		if ($inputarr) {
-		/*
-			It appears that PREPARE/EXECUTE is slower for many queries.
-			
-			For query executed 1000 times:
-			"select id,firstname,lastname from adoxyz 
-				where firstname not like ? and lastname not like ? and id = ?"
-				
-			with plan = 1.51861286163 secs
-			no plan =   1.26903700829 secs
-
-			
-
-		*/
-			$plan = 'P'.md5($sql);
-				
-			$execp = '';
-			foreach($inputarr as $v) {
-				if ($execp) $execp .= ',';
-				if (is_string($v)) {
-					if (strncmp($v,"'",1) !== 0) $execp .= $this->qstr($v);
-				} else {
-					$execp .= $v;
-				}
-			}
-			
-			if ($execp) $exsql = "EXECUTE $plan ($execp)";
-			else $exsql = "EXECUTE $plan";
-			
-			
-			$rez = @pg_exec($this->_connectionID,$exsql);
-			if (!$rez) {
-			# Perhaps plan does not exist? Prepare/compile plan.
-				$params = '';
-				foreach($inputarr as $v) {
-					if ($params) $params .= ',';
-					if (is_string($v)) {
-						$params .= 'VARCHAR';
-					} else if (is_integer($v)) {
-						$params .= 'INTEGER';
-					} else {
-						$params .= "REAL";
-					}
-				}
-				$sqlarr = explode('?',$sql);
-				//print_r($sqlarr);
-				$sql = '';
-				$i = 1;
-				foreach($sqlarr as $v) {
-					$sql .= $v.' $'.$i;
-					$i++;
-				}
-				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
-				//adodb_pr($s);
-				$rez = pg_exec($this->_connectionID,$s);
-				//echo $this->ErrorMsg();
-			}
-			if ($rez)
-				$rez = pg_exec($this->_connectionID,$exsql);
-		} else {
-			//adodb_backtrace();
-			$rez = pg_exec($this->_connectionID,$sql);
-		}
-		// check if no data returned, then no need to create real recordset
-		if ($rez && pg_numfields($rez) <= 0) {
-			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
-				pg_freeresult($this->_resultid);
-			}
-			$this->_resultid = $rez;
-			return true;
-		}
-		
-		return $rez;
-	}
-	
-	function _errconnect()
-	{
-		if (defined('DB_ERROR_CONNECT_FAILED')) return DB_ERROR_CONNECT_FAILED;
-		else return 'Database connection failed';
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-		if (ADODB_PHPVER >= 0x4300) {
-			if (!empty($this->_resultid)) {
-				$this->_errorMsg = @pg_result_error($this->_resultid);
-				if ($this->_errorMsg) return $this->_errorMsg;
-			}
-			
-			if (!empty($this->_connectionID)) {
-				$this->_errorMsg = @pg_last_error($this->_connectionID);
-			} else $this->_errorMsg = $this->_errconnect();
-		} else {
-			if (empty($this->_connectionID)) $this->_errconnect();
-			else $this->_errorMsg = @pg_errormessage($this->_connectionID);
-		}
-		return $this->_errorMsg;
-	}
-	
-	function ErrorNo()
-	{
-		$e = $this->ErrorMsg();
-		if (strlen($e)) {
-			return ADOConnection::MetaError($e);
-		 }
-		 return 0;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		if ($this->transCnt) $this->RollbackTrans();
-		if ($this->_resultid) {
-			@pg_freeresult($this->_resultid);
-			$this->_resultid = false;
-		}
-		@pg_close($this->_connectionID);
-		$this->_connectionID = false;
-		return true;
-	}
-	
-	
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
-	{
-		return 1000000000;  // should be 1 Gb?
-	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
-	{
-		return 1000000000; // should be 1 Gb?
-	}
-	
-		
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_postgres64 extends ADORecordSet{
-	var $_blobArr;
-	var $databaseType = "postgres64";
-	var $canSeek = true;
-	function ADORecordSet_postgres64($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = PGSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-	
-	function &GetRowAssoc($upper=true)
-	{
-		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
-		$row =& ADORecordSet::GetRowAssoc($upper);
-		return $row;
-	}
-
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$qid = $this->_queryID;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($qid):-1;
-		$this->_numOfFields = @pg_numfields($qid);
-		
-		// cache types for blob decode check
-		// apparently pg_fieldtype actually performs an sql query on the database to get the type.
-		if (empty($this->connection->noBlobs))
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {  
-			if (pg_fieldtype($qid,$i) == 'bytea') {
-				$this->_blobArr[$i] = pg_fieldname($qid,$i);
-			}
-		}
-	}
-
-		/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-	function &FetchField($off = 0) 
-	{
-		// offsets begin at 0
-		
-		$o= new ADOFieldObject();
-		$o->name = @pg_fieldname($this->_queryID,$off);
-		$o->type = @pg_fieldtype($this->_queryID,$off);
-		$o->max_length = @pg_fieldsize($this->_queryID,$off);
-		return $o;	
-	}
-
-	function _seek($row)
-	{
-		return @pg_fetch_row($this->_queryID,$row);
-	}
-	
-	function _decode($blob)
-	{
-		eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
-		return $realblob;	
-	}
-	
-	function _fixblobs()
-	{
-		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
-				$this->fields[$k] = ADORecordSet_postgres64::_decode($this->fields[$k]);
-			}
-		}
-		if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
-				$this->fields[$v] = ADORecordSet_postgres64::_decode($this->fields[$v]);
-			}
-		}
-	}
-	
-	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-				if (is_array($this->fields) && $this->fields) {
-					if (isset($this->_blobArr)) $this->_fixblobs();
-					return true;
-				}
-			}
-			$this->fields = false;
-			$this->EOF = true;
-		}
-		return false;
-	}		
-	
-	function _fetch()
-	{
-				
-		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
-
-		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
-		if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-			
-		return (is_array($this->fields));
-	}
-
-	function _close() 
-	{ 
-		return @pg_freeresult($this->_queryID);
-	}
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-				case 'MONEY': // stupid, postgres expects money to be a string
-				case 'INTERVAL':
-				case 'CHAR':
-				case 'CHARACTER':
-				case 'VARCHAR':
-				case 'NAME':
-		   		case 'BPCHAR':
-				case '_VARCHAR':
-				case 'INET':
-				case 'MACADDR':
-					if ($len <= $this->blobSize) return 'C';
-				
-				case 'TEXT':
-					return 'X';
-		
-				case 'IMAGE': // user defined type
-				case 'BLOB': // user defined type
-				case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
-				case 'VARBIT':
-				case 'BYTEA':
-					return 'B';
-				
-				case 'BOOL':
-				case 'BOOLEAN':
-					return 'L';
-				
-				case 'DATE':
-					return 'D';
-				
-				
-				case 'TIMESTAMP WITHOUT TIME ZONE':
-				case 'TIME':
-				case 'DATETIME':
-				case 'TIMESTAMP':
-				case 'TIMESTAMPTZ':
-					return 'T';
-				
-				case 'SMALLINT': 
-				case 'BIGINT': 
-				case 'INTEGER': 
-				case 'INT8': 
-				case 'INT4':
-				case 'INT2':
-					if (isset($fieldobj) &&
-				empty($fieldobj->primary_key) && empty($fieldobj->unique)) return 'I';
-				
-				case 'OID':
-				case 'SERIAL':
-					return 'R';
-				
-				 default:
-				 	return 'N';
-			}
-	}
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-ado_mssql.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-ado_mssql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-ado_mssql.inc.php	(working copy)
@@ -1,154 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
-  Works only on MS Windows.
-  
-  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used. 
-  Please check http://bugs.php.net/ for more info.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ADO_LAYER')) {
-	if (PHP_VERSION >= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
-	else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
-}
-
-
-class  ADODB_ado_mssql extends ADODB_ado {        
-	var $databaseType = 'ado_mssql';
-	var $hasTop = 'top';
-	var $hasInsertID = true;
-	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-	var $sysTimeStamp = 'GetDate()';
-	var $leftOuter = '*=';
-	var $rightOuter = '=*';
-	var $ansiOuter = true; // for mssql7 or later
-	var $substr = "substring";
-	var $length = 'len';
-	var $_dropSeqSQL = "drop table %s";
-	
-	//var $_inTransaction = 1; // always open recordsets, so no transaction problems.
-	
-	function ADODB_ado_mssql()
-	{
-	        $this->ADODB_ado();
-	}
-	
-	function _insertid()
-	{
-	        return $this->GetOne('select @@identity');
-	}
-	
-	function _affectedrows()
-	{
-	        return $this->GetOne('select @@rowcount');
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET TRANSACTION ".$transaction_mode);
-	}
-	
-	function qstr($s,$magic_quotes=false)
-	{
-		$s = ADOConnection::qstr($s, $magic_quotes);
-		return str_replace("\0", "\\\\000", $s);
-	}
-	
-	function MetaColumns($table)
-	{
-        $table = strtoupper($table);
-        $arr= array();
-        $dbc = $this->_connectionID;
-        
-        $osoptions = array();
-        $osoptions[0] = null;
-        $osoptions[1] = null;
-        $osoptions[2] = $table;
-        $osoptions[3] = null;
-        
-        $adors=@$dbc->OpenSchema(4, $osoptions);//tables
-
-        if ($adors){
-                while (!$adors->EOF){
-                        $fld = new ADOFieldObject();
-                        $c = $adors->Fields(3);
-                        $fld->name = $c->Value;
-                        $fld->type = 'CHAR'; // cannot discover type in ADO!
-                        $fld->max_length = -1;
-                        $arr[strtoupper($fld->name)]=$fld;
-        
-                        $adors->MoveNext();
-                }
-                $adors->Close();
-        }
-        $false = false;
-		return empty($arr) ? $false : $arr;
-	}
-	
-	function CreateSequence($seq='adodbseq',$start=1)
-	{
-		
-		$this->Execute('BEGIN TRANSACTION adodbseq');
-		$start -= 1;
-		$this->Execute("create table $seq (id float(53))");
-		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-		if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-		}
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return true;
-	}
-
-	function GenID($seq='adodbseq',$start=1)
-	{
-		//$this->debug=1;
-		$this->Execute('BEGIN TRANSACTION adodbseq');
-		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
-		if (!$ok) {
-			$this->Execute("create table $seq (id float(53))");
-			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-			if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-			}
-			$this->Execute('COMMIT TRANSACTION adodbseq'); 
-			return $start;
-		}
-		$num = $this->GetOne("select id from $seq");
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return $num;
-		
-		// in old implementation, pre 1.90, we returned GUID...
-		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
-	}
-	
-	} // end class 
-	
-	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        
-	
-	var $databaseType = 'ado_mssql';
-	
-	function ADORecordSet_ado_mssql($id,$mode=false)
-	{
-	        return $this->ADORecordSet_ado($id,$mode);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-ibase.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-ibase.inc.php	(working copy)
@@ -1,887 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.  
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Interbase data driver. Requires interbase client. Works on Windows and Unix.
-
-  3 Jan 2002 -- suggestions by Hans-Peter Oeri <kampfcaspar75@oeri.ch>
-  	changed transaction handling and added experimental blob stuff
-  
-  Docs to interbase at the website
-   http://www.synectics.co.za/php3/tutorial/IB_PHP3_API.html
-   
-  To use gen_id(), see
-   http://www.volny.cz/iprenosil/interbase/ip_ib_code.htm#_code_creategen
-   
-   $rs = $conn->Execute('select gen_id(adodb,1) from rdb$database');
-   $id = $rs->fields[0];
-   $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB_ibase extends ADOConnection {
-	var $databaseType = "ibase";
-	var $dataProvider = "ibase";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $ibase_datefmt = '%Y-%m-%d'; // For hours,mins,secs change to '%Y-%m-%d %H:%M:%S';
-	var $fmtDate = "'Y-m-d'";
-	var $ibase_timestampfmt = "%Y-%m-%d %H:%M:%S";
-	var $ibase_timefmt = "%H:%M:%S";
-	var $fmtTimeStamp = "'Y-m-d, H:i:s'";
-	var $concat_operator='||';
-	var $_transactionID;
-	var $metaTablesSQL = "select rdb\$relation_name from rdb\$relations where rdb\$relation_name not like 'RDB\$%'";
-	//OPN STUFF start
-	var $metaColumnsSQL = "select a.rdb\$field_name, a.rdb\$null_flag, a.rdb\$default_source, b.rdb\$field_length, b.rdb\$field_scale, b.rdb\$field_sub_type, b.rdb\$field_precision, b.rdb\$field_type from rdb\$relation_fields a, rdb\$fields b where a.rdb\$field_source = b.rdb\$field_name and a.rdb\$relation_name = '%s' order by a.rdb\$field_position asc";
-	//OPN STUFF end
-	var $ibasetrans;
-	var $hasGenID = true;
-	var $_bindInputArray = true;
-	var $buffers = 0;
-	var $dialect = 1;
-	var $sysDate = "cast('TODAY' as timestamp)";
-	var $sysTimeStamp = "CURRENT_TIMESTAMP"; //"cast('NOW' as timestamp)";
-	var $ansiOuter = true;
-	var $hasAffectedRows = false;
-	var $poorAffectedRows = true;
-	var $blobEncodeType = 'C';
-	var $role = false;
-	
-	function ADODB_ibase() 
-	{
-		 if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT;
-  	}
-	
-	
-	   // returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false)
-	{  
-		if (!function_exists('ibase_pconnect')) return null;
-		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
-		$fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
-		if ($this->role)
-			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
-					$this->charSet,$this->buffers,$this->dialect,$this->role);
-		else	
-			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
-					$this->charSet,$this->buffers,$this->dialect);
-		
-		if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
-			$this->replaceQuote = "''";
-		}
-		if ($this->_connectionID === false) {
-			$this->_handleerror();
-			return false;
-		}
-		
-		// PHP5 change.
-		if (function_exists('ibase_timefmt')) {
-			ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
-			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
-			else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
-			ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
-			
-		} else {
-			ini_set("ibase.timestampformat", $this->ibase_timestampfmt);
-			ini_set("ibase.dateformat", $this->ibase_datefmt);
-			ini_set("ibase.timeformat", $this->ibase_timefmt);
-		}
-		return true;
-	}
-	   // returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,true);
-	}	
-	
-	
-	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
-	{	
-		if ($internalKey) return array('RDB$DB_KEY');
-		
-		$table = strtoupper($table);
-		
-		$sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
-	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME  
-	WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\'
-	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
-
-		$a = $this->GetCol($sql,false,true);
-		if ($a && sizeof($a)>0) return $a;
-		return false;	  
-	}
-	
-	function ServerInfo()
-	{
-		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Interbase 5.5 or earlier'; break;
-		case '2': $s = 'Interbase 5.6'; break;
-		default:
-		case '3': $s = 'Interbase 6.0'; break;
-		}
-		$arr['version'] = ADOConnection::_findvers($s);
-		$arr['description'] = $s;
-		return $arr;
-	}
-
-	function BeginTrans()
-	{	 
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-	 	$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
-		return $this->_transactionID;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = false;
-		$this->autoCommit = true;
-		if ($this->_transactionID) {
-			   		//print ' commit ';
-			$ret = ibase_commit($this->_transactionID);
-		}
-		$this->_transactionID = false;
-		return $ret;
-	}
-	
-	// there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently.
-	// it appears that ibase extension cannot support multiple concurrent queryid's
-	function &_Execute($sql,$inputarr=false) 
-	{
-	global $ADODB_COUNTRECS;
-	
-		if ($this->_logsql) {
-			$savecrecs = $ADODB_COUNTRECS;
-			$ADODB_COUNTRECS = true; // force countrecs
-			$ret =& ADOConnection::_Execute($sql,$inputarr);
-			$ADODB_COUNTRECS = $savecrecs;
-		} else {
-			$ret =& ADOConnection::_Execute($sql,$inputarr);
-		}
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = false;
-		$this->autoCommit = true;
-		if ($this->_transactionID) 
-				  $ret = ibase_rollback($this->_transactionID);
-		$this->_transactionID = false;   
-		
-		return $ret;
-	}
-	
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        $false = false;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        $table = strtoupper($table);
-        $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '".$table."'";
-        if (!$primary) {
-        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
-        } else {
-        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
-        }
-        // get index details
-        $rs = $this->Execute($sql);
-        if (!is_object($rs)) {
-	        // restore fetchmode
-	        if (isset($savem)) {
-	            $this->SetFetchMode($savem);
-	        }
-	        $ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-        
-        $indexes = array();
-		while ($row = $rs->FetchRow()) {
-			$index = $row[0];
-             if (!isset($indexes[$index])) {
-             		if (is_null($row[3])) {$row[3] = 0;}
-                     $indexes[$index] = array(
-                             'unique' => ($row[3] == 1),
-                             'columns' => array()
-                     );
-             }
-			$sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE RDB\$INDEX_NAME = '".$index."' ORDER BY RDB\$FIELD_POSITION ASC";
-			$rs1 = $this->Execute($sql);
-            while ($row1 = $rs1->FetchRow()) {
-             	$indexes[$index]['columns'][$row1[2]] = $row1[1];
-        	}
-		}
-        // restore fetchmode
-        if (isset($savem)) {
-            $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-        
-        return $indexes;
-	}
-
-	
-	// See http://community.borland.com/article/0,1410,25844,00.html
-	function RowLock($tables,$where,$col)
-	{
-		if ($this->autoCommit) $this->BeginTrans();
-		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
-		return 1;
-	}
-	
-	
-	function CreateSequence($seqname,$startID=1)
-	{
-		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-		if (!$ok) return false;
-		return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
-	}
-	
-	function DropSequence($seqname)
-	{
-		$seqname = strtoupper($seqname);
-		$this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'");
-	}
-	
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			$this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-			$this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
-			$rs = $this->Execute($getnext);
-		}
-		if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields);
-		else $this->genID = 0; // false
-		
-		if ($rs) $rs->Close();
-		
-		return $this->genID;
-	}
-
-	function SelectDB($dbName) 
-	{
-		   return false;
-	}
-
-	function _handleerror()
-	{
-		$this->_errorMsg = ibase_errmsg();
-	}
-
-	function ErrorNo() 
-	{
-		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
-		else return 0;
-	}
-
-	function ErrorMsg() 
-	{
-			return $this->_errorMsg;
-	}
-
-	function Prepare($sql)
-	{
-		$stmt = ibase_prepare($this->_connectionID,$sql);
-		if (!$stmt) return false;
-		return array($sql,$stmt);
-	}
-
-	   // returns query ID if successful, otherwise false
-	   // there have been reports of problems with nested queries - the code is probably not re-entrant?
-	function _query($sql,$iarr=false)
-	{ 
-
-		if (!$this->autoCommit && $this->_transactionID) {
-			$conn = $this->_transactionID;
-			$docommit = false;
-		} else {
-			$conn = $this->_connectionID;
-			$docommit = true;
-		}
-		if (is_array($sql)) {
-			$fn = 'ibase_execute';
-			$sql = $sql[1];
-			if (is_array($iarr)) {
-				if  (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-					if ( !isset($iarr[0]) ) $iarr[0] = ''; // PHP5 compat hack
-					$fnarr =& array_merge( array($sql) , $iarr);
-					$ret = call_user_func_array($fn,$fnarr);
-				} else {
-					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($sql,$iarr[0]); break;
-					case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
-					}
-				}
-			} else $ret = $fn($sql); 
-		} else {
-			$fn = 'ibase_query';
-		
-			if (is_array($iarr)) {	
-				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-					if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack
-					$fnarr =& array_merge( array($conn,$sql) , $iarr);
-					$ret = call_user_func_array($fn,$fnarr);
-				} else {
-					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
-					case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
-					}
-				}
-			} else $ret = $fn($conn,$sql); 
-		}
-		if ($docommit && $ret === true) ibase_commit($this->_connectionID);
-
-		$this->_handleerror();
-		return $ret;
-	}
-
-	 // returns true or false
-	 function _close()
-	 {	   
-		if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
-		return @ibase_close($this->_connectionID);
-	 }
-	
-	//OPN STUFF start
-	function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3)
-	{
-		$fscale = abs($fscale);
-		$fld->max_length = $flen;
-		$fld->scale = null;
-		switch($ftype){
-			case 7: 
-			case 8:
-				if ($dialect3) {
-				    switch($fsubtype){
-				    	case 0: 
-				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
-				    		break;
-				    	case 1: 
-				    		$fld->type = 'numeric';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    	case 2:
-				    		$fld->type = 'decimal';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    } // switch
-				} else {
-					if ($fscale !=0) {
-					    $fld->type = 'decimal';
-						$fld->scale = $fscale;
-						$fld->max_length = ($ftype == 7 ? 4 : 9);
-					} else {
-						$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
-					}
-				}
-				break;
-			case 16: 
-				if ($dialect3) {
-				    switch($fsubtype){
-				    	case 0: 
-				    		$fld->type = 'decimal';
-							$fld->max_length = 18;
-							$fld->scale = 0;
-				    		break;
-				    	case 1: 
-				    		$fld->type = 'numeric';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    	case 2:
-				    		$fld->type = 'decimal';
-							$fld->max_length = $fprecision;
-							$fld->scale = $fscale;
-				    		break;
-				    } // switch
-				}
-				break;
-			case 10:
-				$fld->type = 'float';
-				break;
-			case 14:
-				$fld->type = 'char';
-				break;
-			case 27:
-				if ($fscale !=0) {
-				    $fld->type = 'decimal';
-					$fld->max_length = 15;
-					$fld->scale = 5;
-				} else {
-					$fld->type = 'double';
-				}
-				break;
-			case 35:
-				if ($dialect3) {
-				    $fld->type = 'timestamp';
-				} else {
-					$fld->type = 'date';
-				}
-				break;
-			case 12:
-				$fld->type = 'date';
-				break;
-			case 13:
-				$fld->type = 'time';
-				break;
-			case 37:
-				$fld->type = 'varchar';
-				break;
-			case 40:
-				$fld->type = 'cstring';
-				break;
-			case 261:
-				$fld->type = 'blob';
-				$fld->max_length = -1;
-				break;
-		} // switch
-	}
-	//OPN STUFF end
-		// returns array of ADOFieldObjects for current table
-	function &MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-		
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-	
-		$ADODB_FETCH_MODE = $save;
-		$false = false;
-		if ($rs === false) {
-			return $false;
-		}
-		
-		$retarr = array();
-		//OPN STUFF start
-		$dialect3 = ($this->dialect==3 ? true : false);
-		//OPN STUFF end
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-			$fld->name = trim($rs->fields[0]);
-			//OPN STUFF start
-			$this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3);
-			if (isset($rs->fields[1]) && $rs->fields[1]) {
-				$fld->not_null = true;
-			}				
-			if (isset($rs->fields[2])) {
-				
-				$fld->has_default = true;
-				$d = substr($rs->fields[2],strlen('default '));
-				switch ($fld->type)
-				{
-				case 'smallint':
-				case 'integer': $fld->default_value = (int) $d; break;
-				case 'char': 
-				case 'blob':
-				case 'text':
-				case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
-				case 'double':
-				case 'float': $fld->default_value = (float) $d; break;
-				default: $fld->default_value = $d; break;
-				}
-		//	case 35:$tt = 'TIMESTAMP'; break;
-			}
-			if ((isset($rs->fields[5])) && ($fld->type == 'blob')) {
-				$fld->sub_type = $rs->fields[5];
-			} else {
-				$fld->sub_type = null;
-			}
-			//OPN STUFF end
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if ( empty($retarr)) return $false;
-		else return $retarr;	
-	}
-	
-	function BlobEncode( $blob ) 
-	{
-		$blobid = ibase_blob_create( $this->_connectionID);
-		ibase_blob_add( $blobid, $blob );
-		return ibase_blob_close( $blobid );
-	}
-	
-	// since we auto-decode all blob's since 2.42, 
-	// BlobDecode should not do any transforms
-	function BlobDecode($blob)
-	{
-		return $blob; 
-	}
-	
-	
-	
-	
-	// old blobdecode function
-	// still used to auto-decode all blob's
-	function _BlobDecode_old( $blob ) 
-	{
-		$blobid = ibase_blob_open($this->_connectionID, $blob );
-		$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet <kevinboillet@yahoo.fr>
-		while($string = ibase_blob_get($blobid, 8192)){ 
-			$realblob .= $string; 
-		}
-		ibase_blob_close( $blobid );
-
-		return( $realblob );
-	} 
-	
-	function _BlobDecode( $blob ) 
-    {
-        if  (ADODB_PHPVER >= 0x5000) {
-            $blob_data = ibase_blob_info($this->_connectionID, $blob );
-            $blobid = ibase_blob_open($this->_connectionID, $blob );
-        } else {
-
-            $blob_data = ibase_blob_info( $blob );
-            $blobid = ibase_blob_open( $blob );
-        }
-
-        if( $blob_data[0] > $this->maxblobsize ) {
-
-            $realblob = ibase_blob_get($blobid, $this->maxblobsize);
-
-            while($string = ibase_blob_get($blobid, 8192)){
-                $realblob .= $string; 
-            }
-        } else {
-            $realblob = ibase_blob_get($blobid, $blob_data[0]);
-        }
-
-        ibase_blob_close( $blobid );
-        return( $realblob );
-	}
-	
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
-		$fd = fopen($path,'rb'); 
-		if ($fd === false) return false; 
-		$blob_id = ibase_blob_create($this->_connectionID); 
-		
-		/* fill with data */ 
-		
-		while ($val = fread($fd,32768)){ 
-			ibase_blob_add($blob_id, $val); 
-		} 
-		
-		/* close and get $blob_id_str for inserting into table */ 
-		$blob_id_str = ibase_blob_close($blob_id); 
-		
-		fclose($fd); 
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	} 
-	
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-		
-		Usage:
-		 
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
-	{ 
-	$blob_id = ibase_blob_create($this->_connectionID); 
-	
-	// ibase_blob_add($blob_id, $val); 
-	
-	// replacement that solves the problem by which only the first modulus 64K / 
-	// of $val are stored at the blob field //////////////////////////////////// 
-	// Thx Abel Berenstein  aberenstein#afip.gov.ar
-	$len = strlen($val); 
-	$chunk_size = 32768; 
-	$tail_size = $len % $chunk_size; 
-	$n_chunks = ($len - $tail_size) / $chunk_size; 
-	
-	for ($n = 0; $n < $n_chunks; $n++) { 
-		$start = $n * $chunk_size; 
-		$data = substr($val, $start, $chunk_size); 
-		ibase_blob_add($blob_id, $data); 
-	} 
-	
-	if ($tail_size) {
-		$start = $n_chunks * $chunk_size; 
-		$data = substr($val, $start, $tail_size); 
-		ibase_blob_add($blob_id, $data); 
-	}
-	// end replacement ///////////////////////////////////////////////////////// 
-	
-	$blob_id_str = ibase_blob_close($blob_id); 
-	
-	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
-	
-	} 
-	
-	
-	function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		$blob_id = ibase_blob_create($this->_connectionID);
-		ibase_blob_add($blob_id, $val);
-		$blob_id_str = ibase_blob_close($blob_id);
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	// Only since Interbase 6.0 - uses EXTRACT
-	// problem - does not zero-fill the day and month yet
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysDate;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '||';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "extract(year from $col)";
-				break;
-			case 'M':
-			case 'm':
-				$s .= "extract(month from $col)";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "cast(((extract(month from $col)+2) / 3) as integer)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "(extract(day from $col))";
-				break;
-			case 'H':
-			case 'h':
-			  $s .= "(extract(hour from $col))";
-			  break;                        
-			case 'I':
-			case 'i':
-			  $s .= "(extract(minute from $col))";
-			  break;                
-			case 'S':
-			case 's':
-			  $s .= "CAST((extract(second from $col)) AS INTEGER)";
-			  break;        
-
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_ibase extends ADORecordSet
-{
-
-	var $databaseType = "ibase";
-	var $bind=false;
-	var $_cacheType;
-	
-	function ADORecordset_ibase($id,$mode=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-			$this->fetchMode = ($mode === false) ? $ADODB_FETCH_MODE : $mode;
-			$this->ADORecordSet($id);
-	}
-
-	/*		Returns: an object containing field information.
-			Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			fetchField() is retrieved.		*/
-
-	function &FetchField($fieldOffset = -1)
-	{
-			 $fld = new ADOFieldObject;
-			 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
-			 switch (ADODB_ASSOC_CASE) {
-			 case 2: // the default
-			 	$fld->name = ($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = ($ibf['name']);
-				 break;
-			 case 0: 
-				 $fld->name = strtoupper($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
-				 break;
-			 case 1: 
-			 	$fld->name = strtolower($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
-				 break;
-			 }
-			 
-			 $fld->type = $ibf['type'];
-			 $fld->max_length = $ibf['length'];
-			 
-			 /*       This needs to be populated from the metadata */ 
-			 $fld->not_null = false;
-			 $fld->has_default = false;
-			 $fld->default_value = 'null';
-			 return $fld;
-	}
-
-	function _initrs()
-	{
-		$this->_numOfRows = -1;
-		$this->_numOfFields = @ibase_num_fields($this->_queryID);
-
-		// cache types for blob decode check
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-			$f1 = $this->FetchField($i); 
-			$this->_cacheType[] = $f1->type;
-		}				
-	}
-
-	function _seek($row)
-	{
-		return false;
-	}
-	
-	function _fetch() 
-	{
-		$f = @ibase_fetch_row($this->_queryID); 
-		if ($f === false) {
-			$this->fields = false;
-			return false;
-		}
-		// OPN stuff start - optimized
-		// fix missing nulls and decode blobs automatically
-	
-		global $ADODB_ANSI_PADDING_OFF;
-		//$ADODB_ANSI_PADDING_OFF=1;
-		$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
-		
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-			if ($this->_cacheType[$i]=="BLOB") {
-				if (isset($f[$i])) { 
-					$f[$i] = $this->connection->_BlobDecode($f[$i]); 
-				} else { 
-					$f[$i] = null; 
-				} 
-			} else { 
-				if (!isset($f[$i])) { 
-					$f[$i] = null; 
-				} else if ($rtrim && is_string($f[$i])) {
-					$f[$i] = rtrim($f[$i]);
-				}
-			} 
-		} 
-		// OPN stuff end 
-		
-		$this->fields = $f;
-		if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-			$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
-		} else if ($this->fetchMode == ADODB_FETCH_BOTH) {
-			$this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
-		}
-		return true;
-	}
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		return $this->fields[$this->bind[strtoupper($colname)]];
-		
-	}
-	
-
-	function _close() 
-	{
-			return @ibase_free_result($this->_queryID);
-	}
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-		case 'CHAR':
-			return 'C';
-			
-		case 'TEXT':
-		case 'VARCHAR':
-		case 'VARYING':
-		if ($len <= $this->blobSize) return 'C';
-			return 'X';
-		case 'BLOB':
-			return 'B';
-			   
-		case 'TIMESTAMP':
-		case 'DATE': return 'D';
-		case 'TIME': return 'T';
-				//case 'T': return 'T';
-
-				//case 'L': return 'L';
-		case 'INT': 
-		case 'SHORT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
-		}
-	}
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-borland_ibase.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-borland_ibase.inc.php	(working copy)
@@ -1,92 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Support Borland Interbase 6.5 and later
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
-
-class ADODB_borland_ibase extends ADODB_ibase {
-	var $databaseType = "borland_ibase";	
-	
-	
-	function ADODB_borland_ibase()
-	{
-		$this->ADODB_ibase();
-	}
-	
-	function BeginTrans()
-	{	 
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-	 	$this->_transactionID = ibase_trans($this->ibasetrans, $this->_connectionID);
-		return $this->_transactionID;
-	}
-	
-	function ServerInfo()
-	{
-		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Interbase 6.5, Dialect 1'; break;
-		case '2': $s = 'Interbase 6.5, Dialect 2'; break;
-		default:
-		case '3': $s = 'Interbase 6.5, Dialect 3'; break;
-		}
-		$arr['version'] = '6.5';
-		$arr['description'] = $s;
-		return $arr;
-	}
-	
-	// Note that Interbase 6.5 uses ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
-	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
-	// Firebird uses
-	//		SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
-	{
-		if ($nrows > 0) {
-			if ($offset <= 0) $str = " ROWS $nrows "; 
-			else {
-				$a = $offset+1;
-				$b = $offset+$nrows;
-				$str = " ROWS $a TO $b";
-			}
-		} else {
-			// ok, skip 
-			$a = $offset + 1;
-			$str = " ROWS $a TO 999999999"; // 999 million
-		}
-		$sql .= $str;
-		
-		return ($secs2cache) ? 
-				$this->CacheExecute($secs2cache,$sql,$inputarr)
-			:
-				$this->Execute($sql,$inputarr);
-	}
-	
-};
- 
-
-class  ADORecordSet_borland_ibase extends ADORecordSet_ibase {	
-	
-	var $databaseType = "borland_ibase";		
-	
-	function ADORecordSet_borland_ibase($id,$mode=false)
-	{
-		$this->ADORecordSet_ibase($id,$mode);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-firebird.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-firebird.inc.php	(working copy)
@@ -1,77 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
-
-class ADODB_firebird extends ADODB_ibase {
-	var $databaseType = "firebird";	
-	var $dialect = 3;
-	
-	var $sysTimeStamp = "CURRENT_TIMESTAMP"; //"cast('NOW' as timestamp)";
-	
-	function ADODB_firebird()
-	{	
-		$this->ADODB_ibase();
-	}
-	
-	function ServerInfo()
-	{
-		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Firebird Dialect 1'; break;
-		case '2': $s = 'Firebird Dialect 2'; break;
-		default:
-		case '3': $s = 'Firebird Dialect 3'; break;
-		}
-		$arr['version'] = ADOConnection::_findvers($s);
-		$arr['description'] = $s;
-		return $arr;
-	}
-	
-	// Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars!
-	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
-	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0)
-	{
-		$nrows = (integer) $nrows;
-		$offset = (integer) $offset;
-		$str = 'SELECT ';
-		if ($nrows >= 0) $str .= "FIRST $nrows "; 
-		$str .=($offset>=0) ? "SKIP $offset " : '';
-		
-		$sql = preg_replace('/^[ \t]*select/i',$str,$sql); 
-		if ($secs)
-			$rs =& $this->CacheExecute($secs,$sql,$inputarr);
-		else
-			$rs =& $this->Execute($sql,$inputarr);
-			
-		return $rs;
-	}
-	
-	
-};
- 
-
-class  ADORecordSet_firebird extends ADORecordSet_ibase {	
-	
-	var $databaseType = "firebird";		
-	
-	function ADORecordSet_firebird($id,$mode=false)
-	{
-		$this->ADORecordSet_ibase($id,$mode);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-sybase.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-sybase.inc.php	(working copy)
@@ -1,418 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim. All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Sybase driver contributed by Toni (toni.tunkkari@finebyte.com)
-  
-  - MSSQL date patch applied.
-  
-  Date patch by Toni 15 Feb 2002
-*/
- 
- // security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB_sybase extends ADOConnection {
-	var $databaseType = "sybase";	
-	var $dataProvider = 'sybase';
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;
-  	var $metaTablesSQL="select name from sysobjects where type='U' or type='V'";
-	// see http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
-	var $metaColumnsSQL = "SELECT c.column_name, c.column_type, c.width FROM syscolumn c, systable t WHERE t.table_name='%s' AND c.table_id=t.table_id AND t.table_type='BASE'";
-	/*
-	"select c.name,t.name,c.length from 
-	syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id 
-	where o.name='%s'";
-	*/
-	var $concat_operator = '+'; 
-	var $arrayClass = 'ADORecordSet_array_sybase';
-	var $sysDate = 'GetDate()';
-	var $leftOuter = '*=';
-	var $rightOuter = '=*';
-	
-	function ADODB_sybase() 
-	{			
-	}
- 
-	// might require begintrans -- committrans
-	function _insertid()
-	{
-		return $this->GetOne('select @@identity');
-	}
-	  // might require begintrans -- committrans
-	function _affectedrows()
-	{
-	   return $this->GetOne('select @@rowcount');
-	}
-
-			  
-	function BeginTrans()
-	{	
-	
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		   
-		$this->Execute('BEGIN TRAN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		
-		if (!$ok) return $this->RollbackTrans();
-	
-		$this->transCnt -= 1;
-		$this->Execute('COMMIT TRAN');
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt -= 1;
-		$this->Execute('ROLLBACK TRAN');
-		return true;
-	}
-	
-	// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
-	function RowLock($tables,$where,$flds='top 1 null as ignore') 
-	{
-		if (!$this->_hastrans) $this->BeginTrans();
-		$tables = str_replace(',',' HOLDLOCK,',$tables);
-		return $this->GetOne("select $flds from $tables HOLDLOCK where $where");
-		
-	}	
-		
-	function SelectDB($dbName) 
-	{
-		$this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		if ($this->_connectionID) {
-			return @sybase_select_db($dbName);		
-		}
-		else return false;	
-	}
-
-	/*	Returns: the last error message from previous database operation
-		Note: This function is NOT available for Microsoft SQL Server.	*/	
-
-	
-	function ErrorMsg()
-	{
-		if ($this->_logsql) return $this->_errorMsg;
-		if (function_exists('sybase_get_last_message'))
-			$this->_errorMsg = sybase_get_last_message();
-		else
-			$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : 'SYBASE error messages not supported on this platform';
-		return $this->_errorMsg;
-	}
-
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sybase_connect')) return null;
-		
-		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sybase_connect')) return null;
-		
-		$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-	global $ADODB_COUNTRECS;
-	
-		if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
-			return sybase_unbuffered_query($sql,$this->_connectionID);
-		else
-			return sybase_query($sql,$this->_connectionID);
-	}
-	
-	// See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{
-		if ($secs2cache > 0) {// we do not cache rowcount, so we have to load entire recordset
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			return $rs;
-		}
-		
-		$nrows = (integer) $nrows;
-		$offset = (integer) $offset;
-		
-		$cnt = ($nrows >= 0) ? $nrows : 999999999;
-		if ($offset > 0 && $cnt) $cnt += $offset;
-		
-		$this->Execute("set rowcount $cnt"); 
-		$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
-		$this->Execute("set rowcount 0");
-		
-		return $rs;
-	}
-
-	// returns true or false
-	function _close()
-	{ 
-		return @sybase_close($this->_connectionID);
-	}
-	
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_sybase::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_sybase::UnixTimeStamp($v);
-	}	
-	
-	
-
-	# Added 2003-10-05 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    // Format date column in sql string given an input format that understands Y M D
-    function SQLDate($fmt, $col=false)
-    {
-        if (!$col) $col = $this->sysTimeStamp;
-        $s = '';
-
-        $len = strlen($fmt);
-        for ($i=0; $i < $len; $i++) {
-            if ($s) $s .= '+';
-            $ch = $fmt[$i];
-            switch($ch) {
-            case 'Y':
-            case 'y':
-                $s .= "datename(yy,$col)";
-                break;
-            case 'M':
-                $s .= "convert(char(3),$col,0)";
-                break;
-            case 'm':
-                $s .= "replace(str(month($col),2),' ','0')";
-                break;
-            case 'Q':
-            case 'q':
-                $s .= "datename(qq,$col)";
-                break;
-            case 'D':
-            case 'd':
-                $s .= "replace(str(datepart(dd,$col),2),' ','0')";
-                break;
-            case 'h':
-                $s .= "substring(convert(char(14),$col,0),13,2)";
-                break;
-
-            case 'H':
-                $s .= "replace(str(datepart(hh,$col),2),' ','0')";
-                break;
-
-            case 'i':
-                $s .= "replace(str(datepart(mi,$col),2),' ','0')";
-                break;
-            case 's':
-                $s .= "replace(str(datepart(ss,$col),2),' ','0')";
-                break;
-            case 'a':
-            case 'A':
-                $s .= "substring(convert(char(19),$col,0),18,2)";
-                break;
-
-            default:
-                if ($ch == '\\') {
-                    $i++;
-                    $ch = substr($fmt,$i,1);
-                }
-                $s .= $this->qstr($ch);
-                break;
-            }
-        }
-        return $s;
-    }
-	
-	# Added 2003-10-07 by Chris Phillipson
-    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
-    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
-    function MetaPrimaryKeys($table)
-    {
-        $sql = "SELECT c.column_name " .
-               "FROM syscolumn c, systable t " .
-               "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
-               "AND t.table_type='BASE' " .
-               "AND c.pkey = 'Y' " .
-               "ORDER BY c.column_id";
-
-        $a = $this->GetCol($sql);
-        if ($a && sizeof($a)>0) return $a;
-        return false;
-    }
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-global $ADODB_sybase_mths;
-$ADODB_sybase_mths = array(
-	'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
-	'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
-
-class ADORecordset_sybase extends ADORecordSet {	
-
-	var $databaseType = "sybase";
-	var $canSeek = true;
-	// _mths works only in non-localised system
-	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);	
-
-	function ADORecordset_sybase($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
-		else $this->fetchMode = $mode;
-		$this->ADORecordSet($id,$mode);
-	}
-	
-	/*	Returns: an object containing field information. 
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-	function &FetchField($fieldOffset = -1) 
-	{
-		if ($fieldOffset != -1) {
-			$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$o = @sybase_fetch_field($this->_queryID);
-		}
-		// older versions of PHP did not support type, only numeric
-		if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
-		return $o;
-	}
-	
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
-		$this->_numOfFields = @sybase_num_fields($this->_queryID);
-	}
-	
-	function _seek($row) 
-	{
-		return @sybase_data_seek($this->_queryID, $row);
-	}		
-
-	function _fetch($ignore_fields=false) 
-	{
-		if ($this->fetchMode == ADODB_FETCH_NUM) {
-			$this->fields = @sybase_fetch_row($this->_queryID);
-		} else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-			$this->fields = @sybase_fetch_row($this->_queryID);
-			if (is_array($this->fields)) {
-				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				return true;
-			}
-			return false;
-		}  else {
-			$this->fields = @sybase_fetch_array($this->_queryID);
-		}
-		if ( is_array($this->fields)) {
-			return true;
-		}
-
-		return false;
-	}
-	
-	/*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-	function _close() {
-		return @sybase_free_result($this->_queryID);		
-	}
-	
-	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_sybase::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_sybase::UnixTimeStamp($v);
-	}
-}
-
-class ADORecordSet_array_sybase extends ADORecordSet_array {
-	function ADORecordSet_array_sybase($id=-1)
-	{
-		$this->ADORecordSet_array($id);
-	}
-	
-		// sybase/mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-	global $ADODB_sybase_mths;
-	
-		//Dec 30 2000 12:00AM
-		if (!ereg( "([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})"
-			,$v, $rr)) return parent::UnixDate($v);
-			
-		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-		$themth = substr(strtoupper($rr[1]),0,3);
-		$themth = $ADODB_sybase_mths[$themth];
-		if ($themth <= 0) return false;
-		// h-m-s-MM-DD-YY
-		return  mktime(0,0,0,$themth,$rr[2],$rr[3]);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-	global $ADODB_sybase_mths;
-		//11.02.2001 Toni Tunkkari toni.tunkkari@finebyte.com
-		//Changed [0-9] to [0-9 ] in day conversion
-		if (!ereg( "([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-		$themth = substr(strtoupper($rr[1]),0,3);
-		$themth = $ADODB_sybase_mths[$themth];
-		if ($themth <= 0) return false;
-		
-		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
-		}
-		// h-m-s-MM-DD-YY
-		return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
-	}
-}
-?>
Index: admin/include/lib/adodb/drivers/adodb-pdo_pgsql.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-pdo_pgsql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-pdo_pgsql.inc.php	(working copy)
@@ -1,230 +0,0 @@
-<?php
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
- 
-*/ 
-
-class ADODB_pdo_pgsql extends ADODB_pdo {
-	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
-    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
-	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
-	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
-	var $isoDates = true; // accepts dates in ISO format
-	var $sysDate = "CURRENT_DATE";
-	var $sysTimeStamp = "CURRENT_TIMESTAMP";
-	var $blobEncodeType = 'C';
-	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
-		FROM pg_class c, pg_attribute a,pg_type t 
-		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
-AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-
-	// used when schema defined
-	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
-WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
-	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
-	
-	// get primary key etc -- from Freek Dijkstra
-	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
-	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
-	
-	var $hasAffectedRows = true;
-	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	// below suggested by Freek Dijkstra 
-	var $true = 't';		// string that represents TRUE for a database
-	var $false = 'f';		// string that represents FALSE for a database
-	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
-	var $hasMoveFirst = true;
-	var $hasGenID = true;
-	var $_genIDSQL = "SELECT NEXTVAL('%s')";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START %s";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
-	var $random = 'random()';		/// random function
-	var $concat_operator='||';
-	
-	function _init($parentDriver)
-	{
-	
-		$parentDriver->hasTransactions = false; ## <<< BUG IN PDO pgsql driver
-		$parentDriver->hasInsertID = true;
-		$parentDriver->_nestedSQL = true;
-	}
-	
-	function ServerInfo()
-	{
-		$arr['description'] = ADOConnection::GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{
-		 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
-		 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
-		 if ($secs2cache)
-		  	$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-		 else
-		  	$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
-		return $rs;
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		$info = $this->ServerInfo();
-		if ($info['version'] >= 7.3) {
-	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
-			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
-        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
-		}
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtolower($mask));
-			if ($info['version']>=7.3)
-				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
-select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
-			else
-				$this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
-select viewname,'V' from pg_views where viewname like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	function &MetaColumns($table,$normalize=true) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$schema = false;
-		$this->_findschema($table,$schema);
-		
-		if ($normalize) $table = strtolower($table);
-
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		if ($schema) $rs =& $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-		else $rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ($rs === false) {
-			$false = false;
-			return $false;
-		}
-		if (!empty($this->metaKeySQL)) {
-			// If we want the primary keys, we have to issue a separate query
-			// Of course, a modified version of the metaColumnsSQL query using a 
-			// LEFT JOIN would have been much more elegant, but postgres does 
-			// not support OUTER JOINS. So here is the clumsy way.
-			
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			
-			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
-			// fetch all result in once for performance.
-			$keys =& $rskey->GetArray();
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			$rskey->Close();
-			unset($rskey);
-		}
-
-		$rsdefa = array();
-		if (!empty($this->metaDefaultsSQL)) {
-			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-			$sql = sprintf($this->metaDefaultsSQL, ($table));
-			$rsdef = $this->Execute($sql);
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			
-			if ($rsdef) {
-				while (!$rsdef->EOF) {
-					$num = $rsdef->fields['num'];
-					$s = $rsdef->fields['def'];
-					if (strpos($s,'::')===false && substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
-						$s = substr($s, 1);
-						$s = substr($s, 0, strlen($s) - 1);
-					}
-
-					$rsdefa[$num] = $s;
-					$rsdef->MoveNext();
-				}
-			} else {
-				ADOConnection::outp( "==> SQL => " . $sql);
-			}
-			unset($rsdef);
-		}
-	
-		$retarr = array();
-		while (!$rs->EOF) { 	
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$fld->type = $rs->fields[1];
-			$fld->max_length = $rs->fields[2];
-			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
-			if ($fld->max_length <= 0) $fld->max_length = -1;
-			if ($fld->type == 'numeric') {
-				$fld->scale = $fld->max_length & 0xFFFF;
-				$fld->max_length >>= 16;
-			}
-			// dannym
-			// 5 hasdefault; 6 num-of-column
-			$fld->has_default = ($rs->fields[5] == 't');
-			if ($fld->has_default) {
-				$fld->default_value = $rsdefa[$rs->fields[6]];
-			}
-
-			//Freek
-			if ($rs->fields[4] == $this->true) {
-				$fld->not_null = true;
-			}
-			
-			// Freek
-			if (is_array($keys)) {
-				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
-						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
-						$fld->unique = true; // What name is more compatible?
-				}
-			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if (empty($retarr)) {
-			$false = false;
-			return $false;
-		} else return $retarr;	
-		
-	}
-
-}
-
-?>
Index: admin/include/lib/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-sapdb.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-sapdb.inc.php	(working copy)
@@ -1,184 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  SAPDB data driver. Requires ODBC.
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-if (!defined('ADODB_SAPDB')){
-define('ADODB_SAPDB',1);
-
-class ADODB_SAPDB extends ADODB_odbc {
-	var $databaseType = "sapdb";	
-	var $concat_operator = '||';
-	var $sysDate = 'DATE';
-	var $sysTimeStamp = 'TIMESTAMP';
-	var $fmtDate = "'Y-m-d'";	/// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d H:i:s'"; /// used by DBTimeStamp as the default timestamp fmt.
-	var $hasInsertId = true;
-	var $_bindInputArray = true;
-	
-	function ADODB_SAPDB()
-	{
-		//if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
-		$this->ADODB_odbc();
-	}
-	
-	function ServerInfo()
-	{
-		$info = ADODB_odbc::ServerInfo();
-		if (!$info['version'] && preg_match('/([0-9.]+)/',$info['description'],$matches)) {
-			$info['version'] = $matches[1];
-		}
-		return $info;
-	}
-
-	function MetaPrimaryKeys($table)
-	{
-		$table = $this->Quote(strtoupper($table));
-
-		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos");
-	}
-		
- 	function &MetaIndexes ($table, $primary = FALSE)
-	{
-		$table = $this->Quote(strtoupper($table));
-
-		$sql = "SELECT INDEXNAME,TYPE,COLUMNNAME FROM INDEXCOLUMNS ".
-			" WHERE TABLENAME=$table".
-			" ORDER BY INDEXNAME,COLUMNNO";
-
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
-
-		$indexes = array();
-		while ($row = $rs->FetchRow()) {
-            $indexes[$row[0]]['unique'] = $row[1] == 'UNIQUE';
-            $indexes[$row[0]]['columns'][] = $row[2];
-    	}
-		if ($primary) {
-			$indexes['SYSPRIMARYKEYINDEX'] = array(
-					'unique' => True,	// by definition
-					'columns' => $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos"),
-				);
-		}
-        return $indexes;
-	}
-	
- 	function &MetaColumns ($table)
-	{
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-		$table = $this->Quote(strtoupper($table));
-		
-		$retarr = array();
-		foreach($this->GetAll("SELECT COLUMNNAME,DATATYPE,LEN,DEC,NULLABLE,MODE,\"DEFAULT\",CASE WHEN \"DEFAULT\" IS NULL THEN 0 ELSE 1 END AS HAS_DEFAULT FROM COLUMNS WHERE tablename=$table ORDER BY pos") as $column)
-		{
-			$fld = new ADOFieldObject();
-			$fld->name = $column[0];
-			$fld->type = $column[1];
-			$fld->max_length = $fld->type == 'LONG' ? 2147483647 : $column[2];
-			$fld->scale = $column[3];
-			$fld->not_null = $column[4] == 'NO';
-			$fld->primary_key = $column[5] == 'KEY';
-			if ($fld->has_default = $column[7]) {
-				if ($fld->primary_key && $column[6] == 'DEFAULT SERIAL (1)') {
-					$fld->auto_increment = true;
-					$fld->has_default = false;
-				} else {
-					$fld->default_value = $column[6];
-					switch($fld->type) {
-						case 'VARCHAR':
-						case 'CHARACTER':
-						case 'LONG':
-							$fld->default_value = $column[6];
-							break;
-						default:
-							$fld->default_value = trim($column[6]);
-							break;
-					}
-				}
-			}
-			$retarr[$fld->name] = $fld;	
-		}
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-		return $retarr;
-	}
-	
-	function MetaColumnNames($table)
-	{
-		$table = $this->Quote(strtoupper($table));
-
-		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table ORDER BY pos");
-	}
-	
-	// unlike it seems, this depends on the db-session and works in a multiuser environment
-	function _insertid($table,$column)
-	{
-		return empty($table) ? False : $this->GetOne("SELECT $table.CURRVAL FROM DUAL");
-	}
-
-	/*
-		SelectLimit implementation problems:
-	
-	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
-	 	which is not ideal...
-		
-	  		select * from table where rowno < 10 order by 1
-	  
-	  	This means that we have to use the adoconnection base class SelectLimit when
-	  	there is an "order by".
-		
-		See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
-	 */
-	
-};
- 
-
-class  ADORecordSet_sapdb extends ADORecordSet_odbc {	
-	
-	var $databaseType = "sapdb";		
-	
-	function ADORecordSet_sapdb($id,$mode=false)
-	{
-		$this->ADORecordSet_odbc($id,$mode);
-	}
-}
-
-} //define
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-csv.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-csv.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-csv.inc.php	(working copy)
@@ -1,207 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 4.
-  
-  Currently unsupported: MetaDatabases, MetaTables and MetaColumns, and also inputarr in Execute.
-  Native types have been converted to MetaTypes.
-  Transactions not supported yet.
-  
-  Limitation of url length. For IIS, see MaxClientRequestBuffer registry value.
-  
-	  http://support.microsoft.com/default.aspx?scid=kb;en-us;260694
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_CSV_LAYER")) {
- define("_ADODB_CSV_LAYER", 1 );
-
-include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
- 
-class ADODB_csv extends ADOConnection {
-	var $databaseType = 'csv';
-	var $databaseProvider = 'csv';
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $_affectedrows=0;
-	var $_insertid=0;
-	var $_url;
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $hasTransactions = false;
-	var $_errorNo = false;
-	
-	function ADODB_csv() 
-	{		
-	}
-	
-	function _insertid()
-	{
-			return $this->_insertid;
-	}
-	
-	function _affectedrows()
-	{
-			return $this->_affectedrows;
-	}
-  
-  	function &MetaDatabases()
-	{
-		return false;
-	}
-
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
-		$this->_url = $argHostname;
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
-		$this->_url = $argHostname;
-		return true;
-	}
-	
- 	function &MetaColumns($table) 
-	{
-		return false;
-	}
-		
-		
-	// parameters use PostgreSQL convention, not MySQL
-	function &SelectLimit($sql,$nrows=-1,$offset=-1)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
-			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE).
-			"&offset=$offset";
-		$err = false;
-		$rs = csv2rs($url,$err,false);
-		
-		if ($this->debug) print "$url<br><i>$err</i><br>";
-
-		$at = strpos($err,'::::');
-		if ($at === false) {
-			$this->_errorMsg = $err;
-			$this->_errorNo = (integer)$err;
-		} else {
-			$this->_errorMsg = substr($err,$at+4,1024);
-			$this->_errorNo = -9999;
-		}
-		if ($this->_errorNo) 
-			if ($fn = $this->raiseErrorFn) {
-				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
-			}
-			
-		if (is_object($rs)) {	
-		
-			$rs->databaseType='csv';		
-			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
-			$rs->connection = &$this;
-		}
-		return $rs;
-	}
-	
-	// returns queryID or false
-	function &_Execute($sql,$inputarr=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if (!$this->_bindInputArray && $inputarr) {
-			$sqlarr = explode('?',$sql);
-			$sql = '';
-			$i = 0;
-			foreach($inputarr as $v) {
-
-				$sql .= $sqlarr[$i];
-				if (gettype($v) == 'string')
-					$sql .= $this->qstr($v);
-				else if ($v === null)
-					$sql .= 'NULL';
-				else
-					$sql .= $v;
-				$i += 1;
-	
-			}
-			$sql .= $sqlarr[$i];
-			if ($i+1 != sizeof($sqlarr))	
-				print "Input Array does not match ?: ".htmlspecialchars($sql);
-			$inputarr = false;
-		}
-		
-		$url =  $this->_url.'?sql='.urlencode($sql)."&fetch=".
-			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
-		$err = false;
-		
-		
-		$rs = csv2rs($url,$err,false);
-		if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
-		$at = strpos($err,'::::');
-		if ($at === false) {		
-			$this->_errorMsg = $err;
-			$this->_errorNo = (integer)$err;
-		} else {
-			$this->_errorMsg = substr($err,$at+4,1024);
-			$this->_errorNo = -9999;
-		}
-		
-		if ($this->_errorNo) 
-			if ($fn = $this->raiseErrorFn) {
-				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
-			}
-		if (is_object($rs)) {
-			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
-			
-			$this->_affectedrows = $rs->affectedrows;
-			$this->_insertid = $rs->insertid;
-			$rs->databaseType='csv';
-			$rs->connection = &$this;
-		}
-		return $rs;
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-			return $this->_errorMsg;
-	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	{
-		return $this->_errorNo;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		return true;
-	}
-} // class
-
-class ADORecordset_csv extends ADORecordset {
-	function ADORecordset_csv($id,$mode=false)
-	{
-		$this->ADORecordset($id,$mode);
-	}
-	
-	function _close()
-	{
-		return true;
-	}
-}
-
-} // define
-	
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-postgres7.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-postgres7.inc.php	(working copy)
@@ -1,264 +0,0 @@
-<?php
-/*
- V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 4.
-  
-  Postgres7 support.
-  28 Feb 2001: Currently indicate that we support LIMIT
-  01 Dec 2001: dannym added support for default values
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-postgres64.inc.php");
-
-class ADODB_postgres7 extends ADODB_postgres64 {
-	var $databaseType = 'postgres7';	
-	var $hasLimit = true;	// set to true for pgsql 6.5+ only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
-	var $ansiOuter = true;
-	var $charSet = true; //set to true for Postgres 7 and above - PG client supports encodings
-	
-	function ADODB_postgres7() 
-	{
-		$this->ADODB_postgres64();
-		if (ADODB_ASSOC_CASE !== 2) {
-			$this->rsPrefix .= 'assoc_';
-		}
-		$this->_bindInputArray = PHP_VERSION >= 5.1;
-	}
-
-	
-	// the following should be compat with postgresql 7.2, 
-	// which makes obsolete the LIMIT limit,offset syntax
-	 function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	 {
-		 $offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : '';
-		 $limitStr  = ($nrows >= 0)  ? " LIMIT ".((integer)$nrows) : '';
-		 if ($secs2cache)
-		  	$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-		 else
-		  	$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-		
-		return $rs;
-	 }
- 	/*
- 	function Prepare($sql)
-	{
-		$info = $this->ServerInfo();
-		if ($info['version']>=7.3) {
-			return array($sql,false);
-		}
-		return $sql;
-	}
- 	*/
-
-
-	// from  Edward Jaramilla, improved version - works on pg 7.4
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-		$sql = 'SELECT t.tgargs as args
-		FROM
-		pg_trigger t,pg_class c,pg_proc p
-		WHERE
-		t.tgenabled AND
-		t.tgrelid = c.oid AND
-		t.tgfoid = p.oid AND
-		p.proname = \'RI_FKey_check_ins\' AND
-		c.relname = \''.strtolower($table).'\'
-		ORDER BY
-			t.tgrelid';
-		
-		$rs =& $this->Execute($sql);
-		
-		if (!$rs || $rs->EOF) return false;
-		
-		$arr =& $rs->GetArray();
-		$a = array();
-		foreach($arr as $v) {
-			$data = explode(chr(0), $v['args']);
-			$size = count($data)-1; //-1 because the last node is empty
-			for($i = 4; $i < $size; $i++) {
-				if ($upper) 
-					$a[strtoupper($data[2])][] = strtoupper($data[$i].'='.$data[++$i]);
-				else 
-					$a[$data[2]][] = $data[$i].'='.$data[++$i];
-			}
-		}
-		return $a;
-	}
-
-	function _query($sql,$inputarr)
-	{
-		if (! $this->_bindInputArray) {
-			// We don't have native support for parameterized queries, so let's emulate it at the parent
-			return ADODB_postgres64::_query($sql, $inputarr);
-		}
-		$this->_errorMsg = false;
-		// -- added Cristiano da Cunha Duarte
-		if ($inputarr) {
-			$sqlarr = explode('?',trim($sql));
-			$sql = '';
-			$i = 1;
-			$last = sizeof($sqlarr)-1;
-			foreach($sqlarr as $v) {
-				if ($last < $i) $sql .= $v;
-				else $sql .= $v.' $'.$i;
-				$i++;
-			}
-			
-			$rez = pg_query_params($this->_connectionID,$sql, $inputarr);
-		} else {
-			$rez = pg_query($this->_connectionID,$sql);
-		}
-		// check if no data returned, then no need to create real recordset
-		if ($rez && pg_numfields($rez) <= 0) {
-			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
-				pg_freeresult($this->_resultid);
-			}
-			$this->_resultid = $rez;
-			return true;
-		}		
-		return $rez;
-	}
-	
- 	 // this is a set of functions for managing client encoding - very important if the encodings
-	// of your database and your output target (i.e. HTML) don't match
-	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.
-	// GetCharSet - get the name of the character set the client is using now
-	// the functions should work with Postgres 7.0 and above, the set of charsets supported
-	// depends on compile flags of postgres distribution - if no charsets were compiled into the server
-	// it will return 'SQL_ANSI' always
-	function GetCharSet()
-	{
-		//we will use ADO's builtin property charSet
-		$this->charSet = @pg_client_encoding($this->_connectionID);
-		if (!$this->charSet) {
-			return false;
-		} else {
-			return $this->charSet;
-		}
-	}
-	
-	// SetCharSet - switch the client encoding
-	function SetCharSet($charset_name)
-	{
-		$this->GetCharSet();
-		if ($this->charSet !== $charset_name) {
-			$if = pg_set_client_encoding($this->_connectionID, $charset_name);
-			if ($if == "0" & $this->GetCharSet() == $charset_name) {
-				return true;
-			} else return false;
-		} else return true;
-	}
-
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
-
-	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_postgres7($queryID,$mode=false) 
-	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
-	}
-	
-	 	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
-				if (is_array($this->fields)) {
-					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
-					return true;
-				}
-			}
-			$this->fields = false;
-			$this->EOF = true;
-		}
-		return false;
-	}		
-
-}
-
-class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
-
-	var $databaseType = "postgres7";
-	
-	
-	function ADORecordSet_assoc_postgres7($queryID,$mode=false) 
-	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
-	}
-	
-	function _fetch()
-	{
-		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
-
-		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-		
-		if ($this->fields) {
-			if (isset($this->_blobArr)) $this->_fixblobs();
-			$this->_updatefields();
-		}
-			
-		return (is_array($this->fields));
-	}
-	
-		// Create associative array
-	function _updatefields()
-	{
-		if (ADODB_ASSOC_CASE == 2) return; // native
-	
-		$arr = array();
-		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
-		foreach($this->fields as $k => $v) {
-			if (is_integer($k)) $arr[$k] = $v;
-			else {
-				if ($lowercase)
-					$arr[strtolower($k)] = $v;
-				else
-					$arr[strtoupper($k)] = $v;
-			}
-		}
-		$this->fields = $arr;
-	}
-	
-	function MoveNext() 
-	{
-		if (!$this->EOF) {
-			$this->_currentRow++;
-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-			
-				if (is_array($this->fields)) {
-					if ($this->fields) {
-						if (isset($this->_blobArr)) $this->_fixblobs();
-					
-						$this->_updatefields();
-					}
-					return true;
-				}
-			}
-			
-			
-			$this->fields = false;
-			$this->EOF = true;
-		}
-		return false;
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-postgres8.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-postgres8.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-postgres8.inc.php	(working copy)
@@ -1,12 +0,0 @@
-<?php
-/*
- V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 4.
-  
-  NOTE: The "postgres8" driver is remapped to "postgres7". 
-*/
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-mssql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-mssql.inc.php	(working copy)
@@ -1,1037 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Native mssql driver. Requires mssql client. Works on Windows. 
-  To configure for Unix, see 
-   	http://phpbuilder.com/columns/alberto20000919.php3
-	
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-//----------------------------------------------------------------
-// MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
-// and this causes tons of problems because localized versions of 
-// MSSQL will return the dates in dmy or  mdy order; and also the 
-// month strings depends on what language has been configured. The 
-// following two variables allow you to control the localization
-// settings - Ugh.
-//
-// MORE LOCALIZATION INFO
-// ----------------------
-// To configure datetime, look for and modify sqlcommn.loc, 
-//  	typically found in c:\mssql\install
-// Also read :
-//	 http://support.microsoft.com/default.aspx?scid=kb;EN-US;q220918
-// Alternatively use:
-// 	   CONVERT(char(12),datecol,120)
-//----------------------------------------------------------------
-
-
-// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
-if (ADODB_PHPVER >= 0x4300) {
-// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
-	ini_set('mssql.datetimeconvert',0); 
-} else {
-global $ADODB_mssql_mths;		// array, months must be upper-case
-
-
-	$ADODB_mssql_date_order = 'mdy'; 
-	$ADODB_mssql_mths = array(
-		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
-		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
-}
-
-//---------------------------------------------------------------------------
-// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
-// just after you connect to the database. Supports mdy and dmy only.
-// Not required for PHP 4.2.0 and above.
-function AutoDetect_MSSQL_Date_Order($conn)
-{
-global $ADODB_mssql_date_order;
-	$adate = $conn->GetOne('select getdate()');
-	if ($adate) {
-		$anum = (int) $adate;
-		if ($anum > 0) {
-			if ($anum > 31) {
-				//ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
-			} else
-				$ADODB_mssql_date_order = 'dmy';
-		} else
-			$ADODB_mssql_date_order = 'mdy';
-	}
-}
-
-class ADODB_mssql extends ADOConnection {
-	var $databaseType = "mssql";	
-	var $dataProvider = "mssql";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasInsertID = true;
-	var $substr = "substring";
-	var $length = 'len';
-	var $hasAffectedRows = true;
-	var $metaDatabasesSQL = "select name from sysdatabases where name <> 'master'";
-	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
-	var $metaColumnsSQL = # xtype==61 is datetime
-"select c.name,t.name,c.length,
-	(case when c.xusertype=61 then 0 else c.xprec end),
-	(case when c.xusertype=61 then 0 else c.xscale end) 
-	from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
-	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
-	var $hasGenID = true;
-	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-	var $sysTimeStamp = 'GetDate()';
-	var $_has_mssql_init;
-	var $maxParameterLen = 4000;
-	var $arrayClass = 'ADORecordSet_array_mssql';
-	var $uniqueSort = true;
-	var $leftOuter = '*=';
-	var $rightOuter = '=*';
-	var $ansiOuter = true; // for mssql7 or later
-	var $poorAffectedRows = true;
-	var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # for mssql 2000
-	var $uniqueOrderBy = true;
-	var $_bindInputArray = true;
-	
-	function ADODB_mssql() 
-	{		
-		$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
-	}
-
-	function ServerInfo()
-	{
-	global $ADODB_FETCH_MODE;
-	
-	
-		if ($this->fetchMode === false) {
-			$savem = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		} else 
-			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
-				
-		if (0) {
-			$stmt = $this->PrepareSP('sp_server_info');
-			$val = 2;
-			$this->Parameter($stmt,$val,'attribute_id');
-			$row = $this->GetRow($stmt);
-		}
-		
-		$row = $this->GetRow("execute sp_server_info 2");
-		
-		
-		if ($this->fetchMode === false) {
-			$ADODB_FETCH_MODE = $savem;
-		} else
-			$this->SetFetchMode($savem);
-		
-		$arr['description'] = $row[2];
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " ISNULL($field, $ifNull) "; // if MS SQL Server
-	}
-	
-	function _insertid()
-	{
-	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
-	// they are in the same stored procedure, function, or batch.
-			return $this->GetOne($this->identitySQL);
-	}
-
-	function _affectedrows()
-	{
-		return $this->GetOne('select @@rowcount');
-	}
-
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seq='adodbseq',$start=1)
-	{
-		
-		$this->Execute('BEGIN TRANSACTION adodbseq');
-		$start -= 1;
-		$this->Execute("create table $seq (id float(53))");
-		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-		if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-		}
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return true;
-	}
-
-	function GenID($seq='adodbseq',$start=1)
-	{
-		//$this->debug=1;
-		$this->Execute('BEGIN TRANSACTION adodbseq');
-		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
-		if (!$ok) {
-			$this->Execute("create table $seq (id float(53))");
-			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-			if (!$ok) {
-				$this->Execute('ROLLBACK TRANSACTION adodbseq');
-				return false;
-			}
-			$this->Execute('COMMIT TRANSACTION adodbseq'); 
-			return $start;
-		}
-		$num = $this->GetOne("select id from $seq");
-		$this->Execute('COMMIT TRANSACTION adodbseq'); 
-		return $num;
-		
-		// in old implementation, pre 1.90, we returned GUID...
-		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
-	}
-	
-
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($nrows > 0 && $offset <= 0) {
-			$sql = preg_replace(
-				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
-			$rs =& $this->Execute($sql,$inputarr);
-		} else
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-	
-		return $rs;
-	}
-	
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '+';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "datename(yyyy,$col)";
-				break;
-			case 'M':
-				$s .= "convert(char(3),$col,0)";
-				break;
-			case 'm':
-				$s .= "replace(str(month($col),2),' ','0')";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "datename(quarter,$col)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "replace(str(day($col),2),' ','0')";
-				break;
-			case 'h':
-				$s .= "substring(convert(char(14),$col,0),13,2)";
-				break;
-			
-			case 'H':
-				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
-				break;
-				
-			case 'i':
-				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
-				break;
-			case 's':
-				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
-				break;
-			case 'a':
-			case 'A':
-				$s .= "substring(convert(char(19),$col,0),18,2)";
-				break;
-				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-
-	
-	function BeginTrans()
-	{
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-	   	$this->Execute('BEGIN TRAN');
-	   	return true;
-	}
-		
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT TRAN');
-		return true;
-	}
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK TRAN');
-		return true;
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET TRANSACTION ".$transaction_mode);
-	}
-	
-	/*
-		Usage:
-		
-		$this->BeginTrans();
-		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
-		
-		# some operation on both tables table1 and table2
-		
-		$this->CommitTrans();
-		
-		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
-	*/
-	function RowLock($tables,$where,$flds='top 1 null as ignore') 
-	{
-		if (!$this->transCnt) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables with (ROWLOCK,HOLDLOCK) where $where");
-	}
-	
-	
-	function &MetaIndexes($table,$primary=false)
-	{
-		$table = $this->qstr($table);
-
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
-			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
-			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
-			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
-			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
-			ORDER BY O.name, I.Name, K.keyno";
-
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
-
-		$indexes = array();
-		while ($row = $rs->FetchRow()) {
-			if (!$primary && $row[5]) continue;
-			
-            $indexes[$row[0]]['unique'] = $row[6];
-            $indexes[$row[0]]['columns'][] = $row[1];
-    	}
-        return $indexes;
-	}
-	
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
-"select object_name(constid) as constraint_name,
-	col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where upper(object_name(fkeyid)) = $table
-order by constraint_name, referenced_table_name, keyno";
-		
-		$constraints =& $this->GetArray($sql);
-		
-		$ADODB_FETCH_MODE = $save;
-		
-		$arr = false;
-		foreach($constraints as $constr) {
-			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
-		}
-		if (!$arr) return false;
-		
-		$arr2 = false;
-		
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
-				$arr2[$a] = $b;
-			}
-		}
-		return $arr2;
-	}
-
-	//From: Fernando Moreira <FMoreira@imediata.pt>
-	function MetaDatabases() 
-	{ 
-		if(@mssql_select_db("master")) { 
-				 $qry=$this->metaDatabasesSQL; 
-				 if($rs=@mssql_query($qry,$this->_connectionID)){ 
-						 $tmpAr=$ar=array(); 
-						 while($tmpAr=@mssql_fetch_row($rs)) 
-								 $ar[]=$tmpAr[0]; 
-						@mssql_select_db($this->database); 
-						 if(sizeof($ar)) 
-								 return($ar); 
-						 else 
-								 return(false); 
-				 } else { 
-						 @mssql_select_db($this->database); 
-						 return(false); 
-				 } 
-		 } 
-		 return(false); 
-	} 
-
-	// "Stein-Aksel Basma" <basma@accelero.no>
-	// tested with MSSQL 2000
-	function &MetaPrimaryKeys($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$schema = '';
-		$this->_findschema($table,$schema);
-		if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-
-		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
-		where tc.constraint_name = k.constraint_name and tc.constraint_type =
-		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$a = $this->GetCol($sql);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if ($a && sizeof($a)>0) return $a;
-		$false = false;
-		return $false;	  
-	}
-
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(($mask));
-			$this->metaTablesSQL .= " AND name like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
- 
-	function SelectDB($dbName) 
-	{
-		$this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		if ($this->_connectionID) {
-			return @mssql_select_db($dbName);		
-		}
-		else return false;	
-	}
-	
-	function ErrorMsg() 
-	{
-		if (empty($this->_errorMsg)){
-			$this->_errorMsg = mssql_get_last_message();
-		}
-		return $this->_errorMsg;
-	}
-	
-	function ErrorNo() 
-	{
-		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
-		if (empty($this->_errorMsg)) {
-			$this->_errorMsg = mssql_get_last_message();
-		}
-		$id = @mssql_query("select @@ERROR",$this->_connectionID);
-		if (!$id) return false;
-		$arr = mssql_fetch_array($id);
-		@mssql_free_result($id);
-		if (is_array($arr)) return $arr[0];
-	   else return -1;
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('mssql_pconnect')) return null;
-		$this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('mssql_pconnect')) return null;
-		$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		
-		// persistent connections can forget to rollback on crash, so we do it here.
-		if ($this->autoRollback) {
-			$cnt = $this->GetOne('select @@TRANCOUNT');
-			while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); 
-		}
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	function Prepare($sql)
-	{
-		$sqlarr = explode('?',$sql);
-		if (sizeof($sqlarr) <= 1) return $sql;
-		$sql2 = $sqlarr[0];
-		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
-			$sql2 .=  '@P'.($i-1) . $sqlarr[$i];
-		} 
-		return array($sql,$this->qstr($sql2),$max);
-	}
-	
-	function PrepareSP($sql)
-	{
-		if (!$this->_has_mssql_init) {
-			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
-			return $sql;
-		}
-		$stmt = mssql_init($sql,$this->_connectionID);
-		if (!$stmt)  return $sql;
-		return array($sql,$stmt);
-	}
-	
-	// returns concatenated string
-    // MSSQL requires integers to be cast as strings
-    // automatically cast every datatype to VARCHAR(255)
-    // @author David Rogers (introspectshun)
-    function Concat()
-    {
-            $s = "";
-            $arr = func_get_args();
-
-            // Split single record on commas, if possible
-            if (sizeof($arr) == 1) {
-                foreach ($arr as $arg) {
-                    $args = explode(',', $arg);
-                }
-                $arr = $args;
-            }
-
-            array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
-            $s = implode('+',$arr);
-            if (sizeof($arr) > 0) return "$s";
-            
-			return '';
-    }
-	
-	/* 
-	Usage:
-		$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
-		
-		# note that the parameter does not have @ in front!
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group',false,64);
-		$db->Execute($stmt);
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to. Can set to null (for isNull support).
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-		
-		See mssql_bind documentation at php.net.
-	*/
-	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
-	{
-		if (!$this->_has_mssql_init) {
-			ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0");
-			return false;
-		}
-
-		$isNull = is_null($var); // php 4.0.4 and above...
-			
-		if ($type === false) 
-			switch(gettype($var)) {
-			default:
-			case 'string': $type = SQLCHAR; break;
-			case 'double': $type = SQLFLT8; break;
-			case 'integer': $type = SQLINT4; break;
-			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
-			}
-		
-		if  ($this->debug) {
-			$prefix = ($isOutput) ? 'Out' : 'In';
-			$ztype = (empty($type)) ? 'false' : $type;
-			ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
-		}
-		/*
-			See http://phplens.com/lens/lensforum/msgs.php?id=7231
-			
-			RETVAL is HARD CODED into php_mssql extension:
-			The return value (a long integer value) is treated like a special OUTPUT parameter, 
-			called "RETVAL" (without the @). See the example at mssql_execute to 
-			see how it works. - type: one of this new supported PHP constants. 
-				SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 
-		*/
-		if ($name !== 'RETVAL') $name = '@'.$name;
-		return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen);
-	}
-	
-	/* 
-		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
-		So all your blobs must be of type "image".
-		
-		Remember to set in php.ini the following...
-		
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textlimit = 0 ; zero to pass through 
-
-		; Valid range 0 - 2147483647. Default = 4096. 
-		mssql.textsize = 0 ; zero to pass through 
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-	
-		if (strtoupper($blobtype) == 'CLOB') {
-			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
-			return $this->Execute($sql) != false;
-		}
-		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
-		return $this->Execute($sql) != false;
-	}
-	
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-		$this->_errorMsg = false;
-		if (is_array($inputarr)) {
-			
-			# bind input params with sp_executesql: 
-			# see http://www.quest-pipelines.com/newsletter-v3/0402_F.htm
-			# works only with sql server 7 and newer
-			if (!is_array($sql)) $sql = $this->Prepare($sql);
-			$params = '';
-			$decl = '';
-			$i = 0;
-			foreach($inputarr as $v) {
-				if ($decl) {
-					$decl .= ', ';
-					$params .= ', ';
-				}	
-				if (is_string($v)) {
-					$len = strlen($v);
-					if ($len == 0) $len = 1;
-					
-					if ($len > 4000 ) {
-						// NVARCHAR is max 4000 chars. Let's use NTEXT
-						$decl .= "@P$i NTEXT";
-					} else {
-						$decl .= "@P$i NVARCHAR($len)";
-					}
-
-					$params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
-				} else if (is_integer($v)) {
-					$decl .= "@P$i INT";
-					$params .= "@P$i=".$v;
-				} else if (is_float($v)) {
-					$decl .= "@P$i FLOAT";
-					$params .= "@P$i=".$v;
-				} else if (is_bool($v)) {
-					$decl .= "@P$i INT"; # Used INT just in case BIT in not supported on the user's MSSQL version. It will cast appropriately.
-					$params .= "@P$i=".(($v)?'1':'0'); # True == 1 in MSSQL BIT fields and acceptable for storing logical true in an int field
-				} else {
-					$decl .= "@P$i CHAR"; # Used char because a type is required even when the value is to be NULL.
-					$params .= "@P$i=NULL";
-					}
-				$i += 1;
-			}
-			$decl = $this->qstr($decl);
-			if ($this->debug) ADOConnection::outp("<font size=-1>sp_executesql N{$sql[1]},N$decl,$params</font>");
-			$rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params", $this->_connectionID);
-			
-		} else if (is_array($sql)) {
-			# PrepareSP()
-			$rez = mssql_execute($sql[1]);
-			
-		} else {
-			$rez = mssql_query($sql,$this->_connectionID);
-		}
-		return $rez;
-	}
-	
-	// returns true or false
-	function _close()
-	{ 
-		if ($this->transCnt) $this->RollbackTrans();
-		$rez = @mssql_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $rez;
-	}
-	
-	// mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_mssql::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_mssql::UnixTimeStamp($v);
-	}	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_mssql extends ADORecordSet {	
-
-	var $databaseType = "mssql";
-	var $canSeek = true;
-	var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083
-	// _mths works only in non-localised system
-	
-	function ADORecordset_mssql($id,$mode=false)
-	{
-		// freedts check...
-		$this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
-
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-	
-	
-	function _initrs()
-	{
-	GLOBAL $ADODB_COUNTRECS;	
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
-		$this->_numOfFields = @mssql_num_fields($this->_queryID);
-	}
-	
-
-	//Contributed by "Sven Axelsson" <sven.axelsson@bokochwebb.se>
-	// get next resultset - requires PHP 4.0.5 or later
-	function NextRecordSet()
-	{
-		if (!mssql_next_result($this->_queryID)) return false;
-		$this->_inited = false;
-		$this->bind = false;
-		$this->_currentRow = -1;
-		$this->Init();
-		return true;
-	}
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	/*	Returns: an object containing field information. 
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-
-	function &FetchField($fieldOffset = -1) 
-	{
-		if ($fieldOffset != -1) {
-			$f = @mssql_fetch_field($this->_queryID, $fieldOffset);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$f = @mssql_fetch_field($this->_queryID);
-		}
-		$false = false;
-		if (empty($f)) return $false;
-		return $f;
-	}
-	
-	function _seek($row) 
-	{
-		return @mssql_data_seek($this->_queryID, $row);
-	}
-
-	// speedup
-	function MoveNext() 
-	{
-		if ($this->EOF) return false;
-		
-		$this->_currentRow++;
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
-				//ADODB_FETCH_BOTH mode
-				$this->fields = @mssql_fetch_array($this->_queryID);
-			}
-			else {
-				if ($this->hasFetchAssoc) {// only for PHP 4.2.0 or later
-					 $this->fields = @mssql_fetch_assoc($this->_queryID);
-				} else {
-					$flds = @mssql_fetch_array($this->_queryID);
-					if (is_array($flds)) {
-						$fassoc = array();
-						foreach($flds as $k => $v) {
-							if (is_numeric($k)) continue;
-							$fassoc[$k] = $v;
-						}
-						$this->fields = $fassoc;
-					} else
-						$this->fields = false;
-				}
-			}
-			
-			if (is_array($this->fields)) {
-				if (ADODB_ASSOC_CASE == 0) {
-					foreach($this->fields as $k=>$v) {
-						$this->fields[strtolower($k)] = $v;
-					}
-				} else if (ADODB_ASSOC_CASE == 1) {
-					foreach($this->fields as $k=>$v) {
-						$this->fields[strtoupper($k)] = $v;
-					}
-				}
-			}
-		} else {
-			$this->fields = @mssql_fetch_row($this->_queryID);
-		}
-		if ($this->fields) return true;
-		$this->EOF = true;
-		
-		return false;
-	}
-
-	
-	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
-	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
-	function _fetch($ignore_fields=false) 
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
-				//ADODB_FETCH_BOTH mode
-				$this->fields = @mssql_fetch_array($this->_queryID);
-			} else {
-				if ($this->hasFetchAssoc) // only for PHP 4.2.0 or later
-					$this->fields = @mssql_fetch_assoc($this->_queryID);
-				else {
-					$this->fields = @mssql_fetch_array($this->_queryID);
-					if (@is_array($$this->fields)) {
-						$fassoc = array();
-						foreach($$this->fields as $k => $v) {
-							if (is_integer($k)) continue;
-							$fassoc[$k] = $v;
-						}
-						$this->fields = $fassoc;
-					}
-				}
-			}
-			
-			if (!$this->fields) {
-			} else if (ADODB_ASSOC_CASE == 0) {
-				foreach($this->fields as $k=>$v) {
-					$this->fields[strtolower($k)] = $v;
-				}
-			} else if (ADODB_ASSOC_CASE == 1) {
-				foreach($this->fields as $k=>$v) {
-					$this->fields[strtoupper($k)] = $v;
-				}
-			}
-		} else {
-			$this->fields = @mssql_fetch_row($this->_queryID);
-		}
-		return $this->fields;
-	}
-	
-	/*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-
-	function _close() 
-	{
-		$rez = mssql_free_result($this->_queryID);	
-		$this->_queryID = false;
-		return $rez;
-	}
-	// mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-		return ADORecordSet_array_mssql::UnixDate($v);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-		return ADORecordSet_array_mssql::UnixTimeStamp($v);
-	}
-	
-}
-
-
-class ADORecordSet_array_mssql extends ADORecordSet_array {
-	function ADORecordSet_array_mssql($id=-1,$mode=false) 
-	{
-		$this->ADORecordSet_array($id,$mode);
-	}
-	
-		// mssql uses a default date like Dec 30 2000 12:00AM
-	function UnixDate($v)
-	{
-	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
-		
-	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM 
-		if ($ADODB_mssql_date_order == 'dmy') {
-			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
-				return parent::UnixDate($v);
-			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-			
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-		// h-m-s-MM-DD-YY
-		return  mktime(0,0,0,$themth,$theday,$rr[3]);
-	}
-	
-	function UnixTimeStamp($v)
-	{
-	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
-		
-	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
-	
-		//Dec 30 2000 12:00AM
-		 if ($ADODB_mssql_date_order == 'dmy') {
-			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
-		
-			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
-		}
-		
-		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
-		
-		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
-		}
-		// h-m-s-MM-DD-YY
-		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
-	}
-}
-
-/*
-Code Example 1:
-
-select 	object_name(constid) as constraint_name,
-       	object_name(fkeyid) as table_name, 
-        col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where object_name(fkeyid) = x
-order by constraint_name, table_name, referenced_table_name,  keyno
-
-Code Example 2:
-select 	constraint_name,
-	column_name,
-	ordinal_position
-from information_schema.key_column_usage
-where constraint_catalog = db_name()
-and table_name = x
-order by constraint_name, ordinal_position
-
-http://www.databasejournal.com/scripts/article.php/1440551
-*/
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-sqlitepo.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-sqlitepo.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-sqlitepo.inc.php	(working copy)
@@ -1,62 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Portable version of sqlite driver, to make it more similar to other database drivers.
-  The main differences are
-
-   1. When selecting (joining) multiple tables, in assoc mode the table
-   	  names are included in the assoc keys in the "sqlite" driver.
-	  
-	  In "sqlitepo" driver, the table names are stripped from the returned column names. 
-	  When this results in a conflict,  the first field get preference.
-
-	Contributed by Herman Kuiper  herman#ozuzo.net  
-*/
-
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-sqlite.inc.php');
-
-class ADODB_sqlitepo extends ADODB_sqlite {
-   var $databaseType = 'sqlitepo';
-
-   function ADODB_sqlitepo()
-   {
-      $this->ADODB_sqlite();
-   }
-}
-
-/*--------------------------------------------------------------------------------------
-       Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_sqlitepo extends ADORecordset_sqlite {
-
-   var $databaseType = 'sqlitepo';
-
-   function ADORecordset_sqlitepo($queryID,$mode=false)
-   {
-      $this->ADORecordset_sqlite($queryID,$mode);
-   }
-   
-   // Modified to strip table names from returned fields
-   function _fetch($ignore_fields=false)
-   {
-      $this->fields = array();
-      $fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
-      if(is_array($fields))
-         foreach($fields as $n => $v)
-         {
-            if(($p = strpos($n, ".")) !== false)
-               $n = substr($n, $p+1);
-            $this->fields[$n] = $v;
-         }
-
-      return !empty($this->fields);
-   }
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-pdo_mssql.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-pdo_mssql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-pdo_mssql.inc.php	(working copy)
@@ -1,61 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
- 
-*/ 
-
-class ADODB_pdo_mssql extends ADODB_pdo {
-	
-	var $hasTop = 'top';
-	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-	var $sysTimeStamp = 'GetDate()';
-	
-	
-	function _init($parentDriver)
-	{
-	
-		$parentDriver->hasTransactions = false; ## <<< BUG IN PDO mssql driver
-		$parentDriver->_bindInputArray = false;
-		$parentDriver->hasInsertID = true;
-	}
-	
-	function ServerInfo()
-	{
-		return ADOConnection::ServerInfo();
-	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
-	{
-		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		return $ret;
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET TRANSACTION ".$transaction_mode);
-	}
-	
-	function MetaTables()
-	{
-		return false;
-	}
-	
-	function MetaColumns()
-	{
-		return false;
-	}
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-access.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-access.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-access.inc.php	(working copy)
@@ -1,87 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. See License.txt. 
-  Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Microsoft Access data driver. Requires ODBC. Works only on MS Windows.
-*/
-if (!defined('_ADODB_ODBC_LAYER')) {
-	if (!defined('ADODB_DIR')) die();
-	
-	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
- if (!defined('_ADODB_ACCESS')) {
- 	define('_ADODB_ACCESS',1);
-
-class  ADODB_access extends ADODB_odbc {	
-	var $databaseType = 'access';
-	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
-	var $fmtDate = "#Y-m-d#";
-	var $fmtTimeStamp = "#Y-m-d h:i:sA#"; // note not comma
-	var $_bindInputArray = false; // strangely enough, setting to true does not work reliably
-	var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
-	var $sysTimeStamp = 'NOW';
-	var $hasTransactions = false;
-	var $upperCase = 'ucase';
-	
-	function ADODB_access()
-	{
-	global $ADODB_EXTENSION;
-	
-		$ADODB_EXTENSION = false;
-		$this->ADODB_odbc();
-	}
-	
-	function Time()
-	{
-		return time();
-	}
-	
-	function BeginTrans() { return false;}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " IIF(IsNull($field), $ifNull, $field) "; // if Access
-	}
-/*
-	function &MetaTables()
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID);
-		$rs = new ADORecordSet_odbc($qid);
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) return false;
-		
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr = &$rs->GetArray();
-		//print_pre($arr);
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][2] && $arr[$i][3] != 'SYSTEM TABLE')
-				$arr2[] = $arr[$i][2];
-		}
-		return $arr2;
-	}*/
-}
-
- 
-class  ADORecordSet_access extends ADORecordSet_odbc {	
-	
-	var $databaseType = "access";		
-	
-	function ADORecordSet_access($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
-}// class
-} 
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-oci8po.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-oci8po.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-oci8po.inc.php	(working copy)
@@ -1,217 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim. All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Portable version of oci8 driver, to make it more similar to other database drivers.
-  The main differences are
-
-   1. that the OCI_ASSOC names are in lowercase instead of uppercase.
-   2. bind variables are mapped using ? instead of :<bindvar>
-
-   Should some emulation of RecordCount() be implemented?
-  
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
-
-class ADODB_oci8po extends ADODB_oci8 {
-	var $databaseType = 'oci8po';
-	var $dataProvider = 'oci8';
-	var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
-	var $metaTablesSQL = "select lower(table_name),table_type from cat where table_type in ('TABLE','VIEW')";
-	
-	function ADODB_oci8po()
-	{
-		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-		# oci8po does not support adodb extension: adodb_movenext()
-	}
-	
-	function Param($name)
-	{
-		return '?';
-	}
-	
-	function Prepare($sql,$cursor=false)
-	{
-		$sqlarr = explode('?',$sql);
-		$sql = $sqlarr[0];
-		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
-			$sql .=  ':'.($i-1) . $sqlarr[$i];
-		} 
-		return ADODB_oci8::Prepare($sql,$cursor);
-	}
-	
-	// emulate handling of parameters ? ?, replacing with :bind0 :bind1
-	function _query($sql,$inputarr)
-	{
-		if (is_array($inputarr)) {
-			$i = 0;
-			if (is_array($sql)) {
-				foreach($inputarr as $v) {
-					$arr['bind'.$i++] = $v;
-				} 
-			} else {
-				$sqlarr = explode('?',$sql);
-				$sql = $sqlarr[0];
-				foreach($inputarr as $k => $v) {
-					$sql .=  ":$k" . $sqlarr[++$i];
-				}
-			}
-		}
-		return ADODB_oci8::_query($sql,$inputarr);
-	}
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oci8po extends ADORecordset_oci8 {
-
-	var $databaseType = 'oci8po';
-	
-	function ADORecordset_oci8po($queryID,$mode=false)
-	{
-		$this->ADORecordset_oci8($queryID,$mode);
-	}
-
-	function Fields($colname)
-	{
-		if ($this->fetchMode & OCI_ASSOC) return $this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	// lowercase field names...
-	function &_FetchField($fieldOffset = -1)
-	{
-		 $fld = new ADOFieldObject;
- 		 $fieldOffset += 1;
-		 $fld->name = strtolower(OCIcolumnname($this->_queryID, $fieldOffset));
-		 $fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
-		 $fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-		 if ($fld->type == 'NUMBER') {
-		 	//$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
-			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-			if ($sc == 0) $fld->type = 'INT';
-		 }
-		 return $fld;
-	}
-	/*
-	function MoveNext()
-	{
-		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}*/
-
-	// 10% speedup to move MoveNext to child class
-	function MoveNext() 
-	{
-		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-		global $ADODB_ANSI_PADDING_OFF;
-			$this->_currentRow++;
-			
-			if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-			if (!empty($ADODB_ANSI_PADDING_OFF)) {
-				foreach($this->fields as $k => $v) {
-					if (is_string($v)) $this->fields[$k] = rtrim($v);
-				}
-			}
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->EOF = true;
-			$this->_currentRow++;
-		}
-		return false;
-	}	
-	
-	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$arr = $this->GetArray($nrows);
-			return $arr;
-		}
-		for ($i=1; $i < $offset; $i++) 
-			if (!@OCIFetch($this->_queryID)) {
-				$arr = array();
-				return $arr;
-			}
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-			$arr = array();
-			return $arr;
-		}
-		if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-
-	// Create associative array
-	function _updatefields()
-	{
-		if (ADODB_ASSOC_CASE == 2) return; // native
-	
-		$arr = array();
-		$lowercase = (ADODB_ASSOC_CASE == 0);
-		
-		foreach($this->fields as $k => $v) {
-			if (is_integer($k)) $arr[$k] = $v;
-			else {
-				if ($lowercase)
-					$arr[strtolower($k)] = $v;
-				else
-					$arr[strtoupper($k)] = $v;
-			}
-		}
-		$this->fields = $arr;
-	}
-	
-	function _fetch() 
-	{
-		$ret = @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-		if ($ret) {
-		global $ADODB_ANSI_PADDING_OFF;
-	
-				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
-				if (!empty($ADODB_ANSI_PADDING_OFF)) {
-					foreach($this->fields as $k => $v) {
-						if (is_string($v)) $this->fields[$k] = rtrim($v);
-					}
-				}
-		}
-		return $ret;
-	}
-	
-}
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-ado.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-ado.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-ado.inc.php	(working copy)
@@ -1,634 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-	Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-	
-define("_ADODB_ADO_LAYER", 1 );
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-
-	
-class ADODB_ado extends ADOConnection {
-	var $databaseType = "ado";	
-	var $_bindInputArray = false;
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $dataProvider = "ado";	
-	var $hasAffectedRows = true;
-	var $adoParameterType = 201; // 201 = long varchar, 203=long wide varchar, 205 = long varbinary
-	var $_affectedRows = false;
-	var $_thisTransactions;
-	var $_cursor_type = 3; // 3=adOpenStatic,0=adOpenForwardOnly,1=adOpenKeyset,2=adOpenDynamic
-	var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
-	var $_lock_type = -1;
-	var $_execute_option = -1;
-	var $poorAffectedRows = true; 
-	var $charPage;
-		
-	function ADODB_ado() 
-	{ 	
-		$this->_affectedRows = new VARIANT;
-	}
-
-	function ServerInfo()
-	{
-		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
-		return array('description' => $desc, 'version' => '');
-	}
-	
-	function _affectedrows()
-	{
-		if (PHP_VERSION >= 5) return $this->_affectedRows;
-		
-		return $this->_affectedRows->value;
-	}
-	
-	// you can also pass a connection string like this:
-	//
-	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
-	{
-		$u = 'UID';
-		$p = 'PWD';
-	
-		if (!empty($this->charPage))
-			$dbc = new COM('ADODB.Connection',null,$this->charPage);
-		else
-			$dbc = new COM('ADODB.Connection');
-			
-		if (! $dbc) return false;
-
-		/* special support if provider is mssql or access */
-		if ($argProvider=='mssql') {
-			$u = 'User Id';  //User parameter name for OLEDB
-			$p = 'Password'; 
-			$argProvider = "SQLOLEDB"; // SQL Server Provider
-			
-			// not yet
-			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-			
-			//use trusted conection for SQL if username not specified
-			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
-		} else if ($argProvider=='access')
-			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-		
-		if ($argProvider) $dbc->Provider = $argProvider;	
-		
-		if ($argUsername) $argHostname .= ";$u=$argUsername";
-		if ($argPassword)$argHostname .= ";$p=$argPassword";
-		
-		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."<BR>\n version=$dbc->version");
-		// @ added below for php 4.0.1 and earlier
-		@$dbc->Open((string) $argHostname);
-		
-		$this->_connectionID = $dbc;
-		
-		$dbc->CursorLocation = $this->_cursor_location;
-		return  $dbc->State > 0;
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
-	{
-		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-	}	
-	
-/*
-	adSchemaCatalogs	= 1,
-	adSchemaCharacterSets	= 2,
-	adSchemaCollations	= 3,
-	adSchemaColumns	= 4,
-	adSchemaCheckConstraints	= 5,
-	adSchemaConstraintColumnUsage	= 6,
-	adSchemaConstraintTableUsage	= 7,
-	adSchemaKeyColumnUsage	= 8,
-	adSchemaReferentialContraints	= 9,
-	adSchemaTableConstraints	= 10,
-	adSchemaColumnsDomainUsage	= 11,
-	adSchemaIndexes	= 12,
-	adSchemaColumnPrivileges	= 13,
-	adSchemaTablePrivileges	= 14,
-	adSchemaUsagePrivileges	= 15,
-	adSchemaProcedures	= 16,
-	adSchemaSchemata	= 17,
-	adSchemaSQLLanguages	= 18,
-	adSchemaStatistics	= 19,
-	adSchemaTables	= 20,
-	adSchemaTranslations	= 21,
-	adSchemaProviderTypes	= 22,
-	adSchemaViews	= 23,
-	adSchemaViewColumnUsage	= 24,
-	adSchemaViewTableUsage	= 25,
-	adSchemaProcedureParameters	= 26,
-	adSchemaForeignKeys	= 27,
-	adSchemaPrimaryKeys	= 28,
-	adSchemaProcedureColumns	= 29,
-	adSchemaDBInfoKeywords	= 30,
-	adSchemaDBInfoLiterals	= 31,
-	adSchemaCubes	= 32,
-	adSchemaDimensions	= 33,
-	adSchemaHierarchies	= 34,
-	adSchemaLevels	= 35,
-	adSchemaMeasures	= 36,
-	adSchemaProperties	= 37,
-	adSchemaMembers	= 38
-
-*/
-	
-	function &MetaTables()
-	{
-		$arr= array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(20);//tables
-		if ($adors){
-			$f = $adors->Fields(2);//table/view name
-			$t = $adors->Fields(3);//table type
-			while (!$adors->EOF){
-				$tt=substr($t->value,0,6);
-				if ($tt!='SYSTEM' && $tt !='ACCESS')
-					$arr[]=$f->value;
-				//print $f->value . ' ' . $t->value.'<br>';
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		
-		return $arr;
-	}
-	
-	function &MetaColumns($table)
-	{
-		$table = strtoupper($table);
-		$arr = array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(4);//tables
-	
-		if ($adors){
-			$t = $adors->Fields(2);//table/view name
-			while (!$adors->EOF){
-				
-				
-				if (strtoupper($t->Value) == $table) {
-				
-					$fld = new ADOFieldObject();
-					$c = $adors->Fields(3);
-					$fld->name = $c->Value;
-					$fld->type = 'CHAR'; // cannot discover type in ADO!
-					$fld->max_length = -1;
-					$arr[strtoupper($fld->name)]=$fld;
-				}
-		
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		$false = false;
-		return empty($arr) ? $false : $arr;
-	}
-	
-
-
-	
-	/* returns queryID or false */
-	function &_query($sql,$inputarr=false) 
-	{
-		
-		$dbc = $this->_connectionID;
-		$false = false;
-		
-	//	return rs	
-		if ($inputarr) {
-			
-			if (!empty($this->charPage))
-				$oCmd = new COM('ADODB.Command',null,$this->charPage);
-			else
-				$oCmd = new COM('ADODB.Command');
-			$oCmd->ActiveConnection = $dbc;
-			$oCmd->CommandText = $sql;
-			$oCmd->CommandType = 1;
-
-			foreach($inputarr as $val) {
-				// name, type, direction 1 = input, len,
-				$this->adoParameterType = 130;
-				$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val);
-				//print $p->Type.' '.$p->value;
-				$oCmd->Parameters->Append($p);
-			}
-			$p = false;
-			$rs = $oCmd->Execute();
-			$e = $dbc->Errors;
-			if ($dbc->Errors->Count > 0) return $false;
-			return $rs;
-		}
-		
-		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
-
-		if ($dbc->Errors->Count > 0) return $false;
-		if (! $rs) return $false;
-		
-		if ($rs->State == 0) {
-			$true = true;
-			return $true; // 0 = adStateClosed means no records returned
-		}
-		return $rs;
-	}
-
-	
-	function BeginTrans() 
-	{ 
-		if ($this->transOff) return true;
-		
-		if (isset($this->_thisTransactions))
-			if (!$this->_thisTransactions) return false;
-		else {
-			$o = $this->_connectionID->Properties("Transaction DDL");
-			$this->_thisTransactions = $o ? true : false;
-			if (!$o) return false;
-		}
-		@$this->_connectionID->BeginTrans();
-		$this->transCnt += 1;
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		
-		@$this->_connectionID->CommitTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	function RollbackTrans() {
-		if ($this->transOff) return true;
-		@$this->_connectionID->RollbackTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	
-	/*	Returns: the last error message from previous database operation	*/	
-
-	function ErrorMsg() 
-	{
-		if (!$this->_connectionID) return "No connection established";
-		$errc = $this->_connectionID->Errors;
-		if (!$errc) return "No Errors object found";
-		if ($errc->Count == 0) return '';
-		$err = $errc->Item($errc->Count-1);
-		return $err->Description;
-	}
-	
-	function ErrorNo() 
-	{
-		$errc = $this->_connectionID->Errors;
-		if ($errc->Count == 0) return 0;
-		$err = $errc->Item($errc->Count-1);
-		return $err->NativeError;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		if ($this->_connectionID) $this->_connectionID->Close();
-		$this->_connectionID = false;
-		return true;
-	}
-	
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_ado extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "ado";	
-	var $dataProvider = "ado";	
-	var $_tarr = false; // caches the types
-	var $_flds; // and field objects
-	var $canSeek = true;
-  	var $hideErrors = true;
-		  
-	function ADORecordSet_ado($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-
-
-	// returns the field object
-	function &FetchField($fieldOffset = -1) {
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$rs = $this->_queryID;
-		$f = $rs->Fields($fieldOffset);
-		$o->name = $f->Name;
-		$t = $f->Type;
-		$o->type = $this->MetaType($t);
-		$o->max_length = $f->DefinedSize;
-		$o->ado_type = $t;	
-
-		//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-		
-	function _initrs()
-	{
-		$rs = $this->_queryID;
-		$this->_numOfRows = $rs->RecordCount;
-		
-		$f = $rs->Fields;
-		$this->_numOfFields = $f->Count;
-	}
-	
-	
-	 // should only be used to move forward as we normally use forward-only cursors
-	function _seek($row)
-	{
-	   $rs = $this->_queryID; 
-		// absoluteposition doesn't work -- my maths is wrong ?
-		//	$rs->AbsolutePosition->$row-2;
-		//	return true;
-		if ($this->_currentRow > $row) return false;
-		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
-		return true;
-	}
-	
-/*
-	OLEDB types
-	
-	 enum DBTYPEENUM
-	{	DBTYPE_EMPTY	= 0,
-	DBTYPE_NULL	= 1,
-	DBTYPE_I2	= 2,
-	DBTYPE_I4	= 3,
-	DBTYPE_R4	= 4,
-	DBTYPE_R8	= 5,
-	DBTYPE_CY	= 6,
-	DBTYPE_DATE	= 7,
-	DBTYPE_BSTR	= 8,
-	DBTYPE_IDISPATCH	= 9,
-	DBTYPE_ERROR	= 10,
-	DBTYPE_BOOL	= 11,
-	DBTYPE_VARIANT	= 12,
-	DBTYPE_IUNKNOWN	= 13,
-	DBTYPE_DECIMAL	= 14,
-	DBTYPE_UI1	= 17,
-	DBTYPE_ARRAY	= 0x2000,
-	DBTYPE_BYREF	= 0x4000,
-	DBTYPE_I1	= 16,
-	DBTYPE_UI2	= 18,
-	DBTYPE_UI4	= 19,
-	DBTYPE_I8	= 20,
-	DBTYPE_UI8	= 21,
-	DBTYPE_GUID	= 72,
-	DBTYPE_VECTOR	= 0x1000,
-	DBTYPE_RESERVED	= 0x8000,
-	DBTYPE_BYTES	= 128,
-	DBTYPE_STR	= 129,
-	DBTYPE_WSTR	= 130,
-	DBTYPE_NUMERIC	= 131,
-	DBTYPE_UDT	= 132,
-	DBTYPE_DBDATE	= 133,
-	DBTYPE_DBTIME	= 134,
-	DBTYPE_DBTIMESTAMP	= 135
-	
-	ADO Types
-	
-   	adEmpty	= 0,
-	adTinyInt	= 16,
-	adSmallInt	= 2,
-	adInteger	= 3,
-	adBigInt	= 20,
-	adUnsignedTinyInt	= 17,
-	adUnsignedSmallInt	= 18,
-	adUnsignedInt	= 19,
-	adUnsignedBigInt	= 21,
-	adSingle	= 4,
-	adDouble	= 5,
-	adCurrency	= 6,
-	adDecimal	= 14,
-	adNumeric	= 131,
-	adBoolean	= 11,
-	adError	= 10,
-	adUserDefined	= 132,
-	adVariant	= 12,
-	adIDispatch	= 9,
-	adIUnknown	= 13,	
-	adGUID	= 72,
-	adDate	= 7,
-	adDBDate	= 133,
-	adDBTime	= 134,
-	adDBTimeStamp	= 135,
-	adBSTR	= 8,
-	adChar	= 129,
-	adVarChar	= 200,
-	adLongVarChar	= 201,
-	adWChar	= 130,
-	adVarWChar	= 202,
-	adLongVarWChar	= 203,
-	adBinary	= 128,
-	adVarBinary	= 204,
-	adLongVarBinary	= 205,
-	adChapter	= 136,
-	adFileTime	= 64,
-	adDBFileTime	= 137,
-	adPropVariant	= 138,
-	adVarNumeric	= 139
-*/
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		if (!is_numeric($t)) return $t;
-		
-		switch ($t) {
-		case 0:
-		case 12: // variant
-		case 8: // bstr
-		case 129: //char
-		case 130: //wc
-		case 200: // varc
-		case 202:// varWC
-		case 128: // bin
-		case 204: // varBin
-		case 72: // guid
-			if ($len <= $this->blobSize) return 'C';
-		
-		case 201:
-		case 203:
-			return 'X';
-		case 128:
-		case 204:
-		case 205:
-			 return 'B';
-		case 7:
-		case 133: return 'D';
-		
-		case 134:
-		case 135: return 'T';
-		
-		case 11: return 'L';
-		
-		case 16://	adTinyInt	= 16,
-		case 2://adSmallInt	= 2,
-		case 3://adInteger	= 3,
-		case 4://adBigInt	= 20,
-		case 17://adUnsignedTinyInt	= 17,
-		case 18://adUnsignedSmallInt	= 18,
-		case 19://adUnsignedInt	= 19,
-		case 20://adUnsignedBigInt	= 21,
-			return 'I';
-		default: return 'N';
-		}
-	}
-	
-	// time stamp not supported yet
-	function _fetch()
-	{	
-		$rs = $this->_queryID;
-		if (!$rs or $rs->EOF) {
-			$this->fields = false;
-			return false;
-		}
-		$this->fields = array();
-	
-		if (!$this->_tarr) {
-			$tarr = array();
-			$flds = array();
-			for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-				$f = $rs->Fields($i);
-				$flds[] = $f;
-				$tarr[] = $f->Type;
-			}
-			// bind types and flds only once
-			$this->_tarr = $tarr; 
-			$this->_flds = $flds;
-		}
-		$t = reset($this->_tarr);
-		$f = reset($this->_flds);
-		
-		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
-		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-			//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
-			switch($t) {
-			case 135: // timestamp
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
-						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
-						$val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
-					else 
-						$val = $f->value;
-					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
-				if ($val = $f->value) {
-					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
-				} else
-					$this->fields[] = false;
-				break;
-			case 7: // adDate
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
-					else $val = $f->value;
-					
-					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
-					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;
-			case 1: // null
-				$this->fields[] = false;
-				break;
-			case 6: // currency is not supported properly;
-				ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
-				$this->fields[] = (float) $f->value;
-				break;
-			default:
-				$this->fields[] = $f->value; 
-				break;
-			}
-			//print " $f->value $t, ";
-			$f = next($this->_flds);
-			$t = next($this->_tarr);
-		} // for
-		if ($this->hideErrors) error_reporting($olde);
-		@$rs->MoveNext(); // @ needed for some versions of PHP!
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		return true;
-	}
-	
-		function NextRecordSet()
-		{
-			$rs = $this->_queryID;
-			$this->_queryID = $rs->NextRecordSet();
-			//$this->_queryID = $this->_QueryId->NextRecordSet();
-			if ($this->_queryID == null) return false;
-			
-			$this->_currentRow = -1;
-			$this->_currentPage = -1;
-			$this->bind = false;
-			$this->fields = false;
-			$this->_flds = false;
-			$this->_tarr = false;
-			
-			$this->_inited = false;
-			$this->Init();
-			return true;
-		}
-
-	function _close() {
-		$this->_flds = false;
-		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
-		$this->_queryID = false;	
-	}
-
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-mysql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-mysql.inc.php	(working copy)
@@ -1,788 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
-  
-  MySQL code that does not support transactions. Use mysqlt if you need transactions.
-  Requires mysql client. Works on Windows and Unix.
-  
- 28 Feb 2001: MetaColumns bug fix - suggested by  Freek Dijkstra (phpeverywhere@macfreek.com)
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_MYSQL_LAYER")) {
- define("_ADODB_MYSQL_LAYER", 1 );
-
-class ADODB_mysql extends ADOConnection {
-	var $databaseType = 'mysql';
-	var $dataProvider = 'mysql';
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
-	var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasLimit = true;
-	var $hasMoveFirst = true;
-	var $hasGenID = true;
-	var $isoDates = true; // accepts dates in ISO format
-	var $sysDate = 'CURDATE()';
-	var $sysTimeStamp = 'NOW()';
-	var $hasTransactions = false;
-	var $forceNewConnect = false;
-	var $poorAffectedRows = true;
-	var $clientFlags = 0;
-	var $substr = "substring";
-	var $nameQuote = '`';		/// string to use to quote identifiers and names
-	var $compat323 = false; 		// true if compat with mysql 3.23
-	
-	function ADODB_mysql() 
-	{			
-		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
-	}
-	
-	function ServerInfo()
-	{
-		$arr['description'] = ADOConnection::GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " IFNULL($field, $ifNull) "; // if MySQL
-	}
-	
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
-		$save = $this->metaTablesSQL;
-		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
-		}
-		
-		if ($mask) {
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		$this->metaTablesSQL = $save;
-		return $ret;
-	}
-	
-	
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        
-		$false = false;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        
-        // get index details
-        $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
-        
-        // restore fetchmode
-        if (isset($savem)) {
-                $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-        
-        if (!is_object($rs)) {
-                return $false;
-        }
-        
-        $indexes = array ();
-        
-        // parse index data into array
-        while ($row = $rs->FetchRow()) {
-                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
-                        continue;
-                }
-                
-                if (!isset($indexes[$row[2]])) {
-                        $indexes[$row[2]] = array(
-                                'unique' => ($row[1] == 0),
-                                'columns' => array()
-                        );
-                }
-                
-                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
-        }
-        
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index )
-        {
-                ksort ($indexes[$index]['columns']);
-        }
-        
-        return $indexes;
-	}
-
-	
-	// if magic quotes disabled, use mysql_real_escape_string()
-	function qstr($s,$magic_quotes=false)
-	{
-		if (!$magic_quotes) {
-		
-			if (ADODB_PHPVER >= 0x4300) {
-				if (is_resource($this->_connectionID))
-					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
-			}
-			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		return "'$s'";
-	}
-	
-	function _insertid()
-	{
-		return ADOConnection::GetOne('SELECT LAST_INSERT_ID()');
-		//return mysql_insert_id($this->_connectionID);
-	}
-	
-	function GetOne($sql,$inputarr=false)
-	{
-		if ($this->compat323 == false && strncasecmp($sql,'sele',4) == 0) {
-			$rs =& $this->SelectLimit($sql,1,-1,$inputarr);
-			if ($rs) {
-				$rs->Close();
-				if ($rs->EOF) return false;
-				return reset($rs->fields);
-			}
-		} else {
-			return ADOConnection::GetOne($sql,$inputarr);
-		}
-		return false;
-	}
-	
-	function BeginTrans()
-	{
-		if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
-	}
-	
-	function _affectedrows()
-	{
-			return mysql_affected_rows($this->_connectionID);
-	}
-  
- 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
-	// Reference on Last_Insert_ID on the recommended way to simulate sequences
- 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
-	var $_genSeqSQL = "create table %s (id int not null)";
-	var $_genSeqCountSQL = "select count(*) from %s";
-	var $_genSeq2SQL = "insert into %s values (%s)";
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$u = strtoupper($seqname);
-		
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-	}
-	
-
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		// post-nuke sets hasGenID to false
-		if (!$this->hasGenID) return false;
-		
-		$savelog = $this->_logsql;
-		$this->_logsql = false;
-		$getnext = sprintf($this->_genIDSQL,$seqname);
-		$holdtransOK = $this->_transOK; // save the current status
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
-			$u = strtoupper($seqname);
-			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
-			$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seqname));
-			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-			$rs = $this->Execute($getnext);
-		}
-		
-		if ($rs) {
-			$this->genID = mysql_insert_id($this->_connectionID);
-			$rs->Close();
-		} else
-			$this->genID = 0;
-		
-		$this->_logsql = $savelog;
-		return $this->genID;
-	}
-	
-  	function &MetaDatabases()
-	{
-		$qid = mysql_list_dbs($this->_connectionID);
-		$arr = array();
-		$i = 0;
-		$max = mysql_num_rows($qid);
-		while ($i < $max) {
-			$db = mysql_tablename($qid,$i);
-			if ($db != 'mysql') $arr[] = $db;
-			$i += 1;
-		}
-		return $arr;
-	}
-	
-		
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'DATE_FORMAT('.$col.",'";
-		$concat = false;
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				/** FALL THROUGH */
-			case '-':
-			case '/':
-				$s .= $ch;
-				break;
-				
-			case 'Y':
-			case 'y':
-				$s .= '%Y';
-				break;
-			case 'M':
-				$s .= '%b';
-				break;
-				
-			case 'm':
-				$s .= '%m';
-				break;
-			case 'D':
-			case 'd':
-				$s .= '%d';
-				break;
-			
-			case 'Q':
-			case 'q':
-				$s .= "'),Quarter($col)";
-				
-				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-				else $s .= ",('";
-				$concat = true;
-				break;
-			
-			case 'H': 
-				$s .= '%H';
-				break;
-				
-			case 'h':
-				$s .= '%I';
-				break;
-				
-			case 'i':
-				$s .= '%i';
-				break;
-				
-			case 's':
-				$s .= '%s';
-				break;
-				
-			case 'a':
-			case 'A':
-				$s .= '%p';
-				break;
-				
-			case 'w':
-				$s .= '%w';
-				break;
-				
-			 case 'W':
-				$s .= '%U';
-				break;
-				
-			case 'l':
-				$s .= '%W';
-				break;
-			}
-		}
-		$s.="')";
-		if ($concat) $s = "CONCAT($s)";
-		return $s;
-	}
-	
-
-	// returns concatenated string
-	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
-	function Concat()
-	{
-		$s = "";
-		$arr = func_get_args();
-		
-		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
-		if (strlen($s) > 0) return "CONCAT($s)";
-		else return '';
-	}
-	
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		
-		$fraction = $dayFraction * 24 * 3600;
-		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
-//		return "from_unixtime(unix_timestamp($date)+$fraction)";
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
-		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect,$this->clientFlags);
-		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect);
-		else
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
-	
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
-		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
-		else
-			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($this->autoRollback) $this->RollbackTrans();
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		$this->forceNewConnect = true;
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
-	}
-	
- 	function &MetaColumns($table) 
-	{
-		$this->_findschema($table,$schema);
-		if ($schema) {
-			$dbName = $this->database;
-			$this->SelectDB($schema);
-		}
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
-		if ($schema) {
-			$this->SelectDB($dbName);
-		}
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!is_object($rs)) {
-			$false = false;
-			return $false;
-		}
-			
-		$retarr = array();
-		while (!$rs->EOF){
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$type = $rs->fields[1];
-			
-			// split type into type(length):
-			$fld->scale = null;
-			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
-			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$arr = explode(",",$query_array[2]);
-				$fld->enums = $arr;
-				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
-				$fld->max_length = ($zlen > 0) ? $zlen : 1;
-			} else {
-				$fld->type = $type;
-				$fld->max_length = -1;
-			}
-			$fld->not_null = ($rs->fields[2] != 'YES');
-			$fld->primary_key = ($rs->fields[3] == 'PRI');
-			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-			$fld->binary = (strpos($type,'blob') !== false);
-			$fld->unsigned = (strpos($type,'unsigned') !== false);	
-			$fld->zerofill = (strpos($type,'zerofill') !== false);
-			
-			if (!$fld->binary) {
-				$d = $rs->fields[4];
-				if ($d != '' && $d != 'NULL') {
-					$fld->has_default = true;
-					$fld->default_value = $d;
-				} else {
-					$fld->has_default = false;
-				}
-			}
-			
-			if ($save == ADODB_FETCH_NUM) {
-				$retarr[] = $fld;
-			} else {
-				$retarr[strtoupper($fld->name)] = $fld;
-			}
-				$rs->MoveNext();
-			}
-		
-			$rs->Close();
-			return $retarr;	
-	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
-	{
-		$this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		if ($this->_connectionID) {
-			return @mysql_select_db($dbName,$this->_connectionID);		
-		}
-		else return false;	
-	}
-	
-	// parameters use PostgreSQL convention, not MySQL
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
-	{
-		$offsetStr =($offset>=0) ? ((integer)$offset)."," : '';
-		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
-		if ($secs)
-			$rs =& $this->CacheExecute($secs,$sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
-		else
-			$rs =& $this->Execute($sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
-		return $rs;
-	}
-	
-	// returns queryID or false
-	function _query($sql,$inputarr)
-	{
-	//global $ADODB_COUNTRECS;
-		//if($ADODB_COUNTRECS) 
-		return mysql_query($sql,$this->_connectionID);
-		//else return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-	
-		if ($this->_logsql) return $this->_errorMsg;
-		if (empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
-		else $this->_errorMsg = @mysql_error($this->_connectionID);
-		return $this->_errorMsg;
-	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	{
-		if ($this->_logsql) return $this->_errorCode;
-		if (empty($this->_connectionID))  return @mysql_errno();
-		else return @mysql_errno($this->_connectionID);
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		@mysql_close($this->_connectionID);
-		$this->_connectionID = false;
-	}
-
-	
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
-	{
-		return 255; 
-	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
-	{
-		return 4294967295; 
-	}
-	
-	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
-	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
-     {
-	 global $ADODB_FETCH_MODE;
-		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
-
-         if ( !empty($owner) ) {
-            $table = "$owner.$table";
-         }
-         $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
-		 if ($associative) $create_sql = $a_create_table["Create Table"];
-         else $create_sql  = $a_create_table[1];
-
-         $matches = array();
-
-         if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	     $foreign_keys = array();	 	 
-         $num_keys = count($matches[0]);
-         for ( $i = 0;  $i < $num_keys;  $i ++ ) {
-             $my_field  = explode('`, `', $matches[1][$i]);
-             $ref_table = $matches[2][$i];
-             $ref_field = explode('`, `', $matches[3][$i]);
-
-             if ( $upper ) {
-                 $ref_table = strtoupper($ref_table);
-             }
-
-             $foreign_keys[$ref_table] = array();
-             $num_fields = count($my_field);
-             for ( $j = 0;  $j < $num_fields;  $j ++ ) {
-                 if ( $associative ) {
-                     $foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
-                 } else {
-                     $foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
-                 }
-             }
-         }
-         
-         return  $foreign_keys;
-     }
-	 
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-
-class ADORecordSet_mysql extends ADORecordSet{	
-	
-	var $databaseType = "mysql";
-	var $canSeek = true;
-	
-	function ADORecordSet_mysql($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default:
-			$this->fetchMode = MYSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function _initrs()
-	{
-	//GLOBAL $ADODB_COUNTRECS;
-	//	$this->_numOfRows = ($ADODB_COUNTRECS) ? @mysql_num_rows($this->_queryID):-1;
-		$this->_numOfRows = @mysql_num_rows($this->_queryID);
-		$this->_numOfFields = @mysql_num_fields($this->_queryID);
-	}
-	
-	function &FetchField($fieldOffset = -1) 
-	{	
-		if ($fieldOffset != -1) {
-			$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
-			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
-			$o->max_length = @mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson (jnich#att.com)
-			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
-			$o->binary = (strpos($f,'binary')!== false);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$o = @mysql_fetch_field($this->_queryID);
-		$o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich#att.com)
-		//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
-		}
-			
-		return $o;
-	}
-
-	function &GetRowAssoc($upper=true)
-	{
-		if ($this->fetchMode == MYSQL_ASSOC && !$upper) $row = $this->fields;
-		else $row =& ADORecordSet::GetRowAssoc($upper);
-		return $row;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{	
-		// added @ by "Michael William Miller" <mille562@pilot.msu.edu>
-		if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	function _seek($row)
-	{
-		if ($this->_numOfRows == 0) return false;
-		return @mysql_data_seek($this->_queryID,$row);
-	}
-	
-	function MoveNext()
-	{
-		//return adodb_movenext($this);
-		//if (defined('ADODB_EXTENSION')) return adodb_movenext($this);
-		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}
-	
-	function _fetch()
-	{
-		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
-		return is_array($this->fields);
-	}
-	
-	function _close() {
-		@mysql_free_result($this->_queryID);	
-		$this->_queryID = false;	
-	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		$len = -1; // mysql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'STRING': 
-		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET': 
-			if ($len <= $this->blobSize) return 'C';
-			
-		case 'TEXT':
-		case 'LONGTEXT': 
-		case 'MEDIUMTEXT':
-			return 'X';
-			
-		// php_mysql extension always returns 'blob' even if 'text'
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
-		case 'YEAR':
-		case 'DATE': return 'D';
-		
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'TINYINT':
-		case 'MEDIUMINT':
-		case 'SMALLINT': 
-			
-			if (!empty($fieldobj->primary_key)) return 'R';
-			else return 'I';
-		
-		default: return 'N';
-		}
-	}
-
-}
-
-class ADORecordSet_ext_mysql extends ADORecordSet_mysql {	
-	function ADORecordSet_ext_mysql($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default:
-		$this->fetchMode = MYSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-	
-	function MoveNext()
-	{
-		return @adodb_movenext($this);
-	}
-}
-
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-postgres.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-postgres.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-postgres.inc.php	(working copy)
@@ -1,14 +0,0 @@
-<?php
-/*
- V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 4.
-  
-  NOTE: Since 3.31, this file is no longer used, and the "postgres" driver is
-  remapped to "postgres7". Maintaining multiple postgres drivers is no easy
-  job, so hopefully this will ensure greater consistency and fewer bugs.
-*/
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-pdo_mysql.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-pdo_mysql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-pdo_mysql.inc.php	(working copy)
@@ -1,168 +0,0 @@
-<?php
-
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
- 
-*/ 
-
-class ADODB_pdo_mysql extends ADODB_pdo {
-	var $metaTablesSQL = "SHOW TABLES";	
-	var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
-	var $sysDate = 'CURDATE()';
-	var $sysTimeStamp = 'NOW()';
-	var $nameQuote = '`';
-
-	function _init($parentDriver)
-	{
-	
-		$parentDriver->hasTransactions = false;
-		$parentDriver->_bindInputArray = false;
-		$parentDriver->hasInsertID = true;
-		$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
-	}
-	
-		// dayFraction is a day in floating point
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		
-		$fraction = $dayFraction * 24 * 3600;
-		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
-//		return "from_unixtime(unix_timestamp($date)+$fraction)";
-	}
-	
-	function ServerInfo()
-	{
-		$arr['description'] = ADOConnection::GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
-		$save = $this->metaTablesSQL;
-		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
-		}
-		
-		if ($mask) {
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		$this->metaTablesSQL = $save;
-		return $ret;
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL REPEATABLE READ');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
-	}
-	
- 	function &MetaColumns($table) 
-	{
-		$this->_findschema($table,$schema);
-		if ($schema) {
-			$dbName = $this->database;
-			$this->SelectDB($schema);
-		}
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
-		if ($schema) {
-			$this->SelectDB($dbName);
-		}
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!is_object($rs)) {
-			$false = false;
-			return $false;
-		}
-			
-		$retarr = array();
-		while (!$rs->EOF){
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$type = $rs->fields[1];
-			
-			// split type into type(length):
-			$fld->scale = null;
-			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
-			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$arr = explode(",",$query_array[2]);
-				$fld->enums = $arr;
-				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
-				$fld->max_length = ($zlen > 0) ? $zlen : 1;
-			} else {
-				$fld->type = $type;
-				$fld->max_length = -1;
-			}
-			$fld->not_null = ($rs->fields[2] != 'YES');
-			$fld->primary_key = ($rs->fields[3] == 'PRI');
-			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-			$fld->binary = (strpos($type,'blob') !== false);
-			$fld->unsigned = (strpos($type,'unsigned') !== false);
-				
-			if (!$fld->binary) {
-				$d = $rs->fields[4];
-				if ($d != '' && $d != 'NULL') {
-					$fld->has_default = true;
-					$fld->default_value = $d;
-				} else {
-					$fld->has_default = false;
-				}
-			}
-			
-			if ($save == ADODB_FETCH_NUM) {
-				$retarr[] = $fld;
-			} else {
-				$retarr[strtoupper($fld->name)] = $fld;
-			}
-				$rs->MoveNext();
-			}
-		
-			$rs->Close();
-			return $retarr;	
-	}
-		
-	
-	// parameters use PostgreSQL convention, not MySQL
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
-	{
-		$offsetStr =($offset>=0) ? "$offset," : '';
-		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
-		
-		if ($secs)
-			$rs =& $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr);
-		else
-			$rs =& $this->Execute($sql." LIMIT $offsetStr$nrows",$inputarr);
-		return $rs;
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-fbsql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-fbsql.inc.php	(working copy)
@@ -1,266 +0,0 @@
-<?php
-/*
- @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
- Contribution by Frank M. Kromann <frank@frontbase.com>. 
-  Set tabs to 8.
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_FBSQL_LAYER")) {
- define("_ADODB_FBSQL_LAYER", 1 );
-
-class ADODB_fbsql extends ADOConnection {
-	var $databaseType = 'fbsql';
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
-	var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasLimit = false;
-	
-	function ADODB_fbsql() 
-	{			
-	}
-	
-	function _insertid()
-	{
-			return fbsql_insert_id($this->_connectionID);
-	}
-	
-	function _affectedrows()
-	{
-			return fbsql_affected_rows($this->_connectionID);
-	}
-  
-  	function &MetaDatabases()
-	{
-		$qid = fbsql_list_dbs($this->_connectionID);
-		$arr = array();
-		$i = 0;
-		$max = fbsql_num_rows($qid);
-		while ($i < $max) {
-			$arr[] = fbsql_tablename($qid,$i);
-			$i += 1;
-		}
-		return $arr;
-	}
-
-	// returns concatenated string
-	function Concat()
-	{
-		$s = "";
-		$arr = func_get_args();
-		$first = true;
-
-		$s = implode(',',$arr);
-		if (sizeof($arr) > 0) return "CONCAT($s)";
-		else return '';
-	}
-	
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		$this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		$this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
-	}
-	
- 	function &MetaColumns($table) 
-	{
-		if ($this->metaColumnsSQL) {
-			
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			
-			if ($rs === false) return false;
-			
-			$retarr = array();
-			while (!$rs->EOF){
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-				$fld->type = $rs->fields[1];
-					
-				// split type into type(length):
-				if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array)) {
-					$fld->type = $query_array[1];
-					$fld->max_length = $query_array[2];
-				} else {
-					$fld->max_length = -1;
-				}
-				$fld->not_null = ($rs->fields[2] != 'YES');
-				$fld->primary_key = ($rs->fields[3] == 'PRI');
-				$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-				$fld->binary = (strpos($fld->type,'blob') !== false);
-				
-				$retarr[strtoupper($fld->name)] = $fld;	
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return false;
-	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
-	{
-		$this->database = $dbName;
-		if ($this->_connectionID) {
-			return @fbsql_select_db($dbName,$this->_connectionID);		
-		}
-		else return false;	
-	}
-	
-	
-	// returns queryID or false
-	function _query($sql,$inputarr)
-	{
-		return fbsql_query("$sql;",$this->_connectionID);
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	{
-		$this->_errorMsg = @fbsql_error($this->_connectionID);
-			return $this->_errorMsg;
-	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	{
-		return @fbsql_errno($this->_connectionID);
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		return @fbsql_close($this->_connectionID);
-	}
-		
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_fbsql extends ADORecordSet{	
-	
-	var $databaseType = "fbsql";
-	var $canSeek = true;
-	
-	function ADORecordSet_fbsql($queryID,$mode=false) 
-	{
-		if (!$mode) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode) {
-		case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
-		case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
-		case ADODB_FETCH_BOTH: 
-		default:
-		$this->fetchMode = FBSQL_BOTH; break;
-		}
-		return $this->ADORecordSet($queryID);
-	}
-	
-	function _initrs()
-	{
-	GLOBAL $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @fbsql_num_rows($this->_queryID):-1;
-		$this->_numOfFields = @fbsql_num_fields($this->_queryID);
-	}
-	
-
-
-	function &FetchField($fieldOffset = -1) {
-		if ($fieldOffset != -1) {
-			$o =  @fbsql_fetch_field($this->_queryID, $fieldOffset);
-			//$o->max_length = -1; // fbsql returns the max length less spaces -- so it is unrealiable
-			$f = @fbsql_field_flags($this->_queryID,$fieldOffset);
-			$o->binary = (strpos($f,'binary')!== false);
-		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
-			$o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable
-			//$o->max_length = -1;
-		}
-		
-		return $o;
-	}
-		
-	function _seek($row)
-	{
-		return @fbsql_data_seek($this->_queryID,$row);
-	}
-	
-	function _fetch($ignore_fields=false)
-	{
-		$this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode);
-		return ($this->fields == true);
-	}
-	
-	function _close() {
-		return @fbsql_free_result($this->_queryID);		
-	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		$len = -1; // fbsql max_length is not accurate
-		switch (strtoupper($t)) {
-		case 'CHARACTER':
-		case 'CHARACTER VARYING': 
-		case 'BLOB': 
-		case 'CLOB': 
-		case 'BIT': 
-		case 'BIT VARYING': 
-			if ($len <= $this->blobSize) return 'C';
-			
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
-		case 'DATE': return 'D';
-		
-		case 'TIME':
-		case 'TIME WITH TIME ZONE':
-		case 'TIMESTAMP': 
-		case 'TIMESTAMP WITH TIME ZONE': return 'T';
-		
-		case 'PRIMARY_KEY':
-			return 'R';
-		case 'INTEGER':
-		case 'SMALLINT': 
-		case 'BOOLEAN':
-			
-			if (!empty($fieldobj->primary_key)) return 'R';
-			else return 'I';
-		
-		default: return 'N';
-		}
-	}
-
-} //class
-} // defined
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-db2.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-db2.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-db2.inc.php	(working copy)
@@ -1,828 +0,0 @@
-<?php
-/* 
-  V4.94 23 Jan 2007  (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
-
-  This is a version of the ADODB driver for DB2.  It uses the 'ibm_db2' PECL extension
-  for PHP (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2 or
-  higher.
-
-  Originally tested with PHP 5.1.1 and Apache 2.0.55 on Windows XP SP2.
-  More recently tested with PHP 5.1.2 and Apache 2.0.55 on Windows XP SP2.
-
-  This file was ported from "adodb-odbc.inc.php" by Larry Menard, "larry.menard#rogers.com".
-  I ripped out what I believed to be a lot of redundant or obsolete code, but there are
-  probably still some remnants of the ODBC support in this file; I'm relying on reviewers
-  of this code to point out any other things that can be removed.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-  define("_ADODB_DB2_LAYER", 2 );
-	 
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-
-
-class ADODB_db2 extends ADOConnection {
-	var $databaseType = "db2";	
-	var $fmtDate = "'Y-m-d'";
-	var $concat_operator = '||';
-	
-	var $sysTime = 'CURRENT TIME';
-	var $sysDate = 'CURRENT DATE';
-	var $sysTimeStamp = 'CURRENT TIMESTAMP';
-	
-	var $fmtTimeStamp = "'Y-m-d-H:i:s'";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $dataProvider = "db2";
-	var $hasAffectedRows = true;
-
-	var $binmode = DB2_BINARY;
-
-	var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive
-								// breaking backward-compat
-	var $_bindInputArray = false;	
-	var $_genIDSQL = "VALUES NEXTVAL FOR %s";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH 1 NO MAXVALUE NO CYCLE";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $_autocommit = true;
-	var $_haserrorfunctions = true;
-	var $_lastAffectedRows = 0;
-	var $uCaseTables = true; // for meta* functions, uppercase table names
-	var $hasInsertID = true;
-	
-    function _insertid()
-    {
-        return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()');
-    }
-	
-	function ADODB_db2() 
-	{ 	
-		$this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
-	}
-	
-		// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-		global $php_errormsg;
-		
-		if (!function_exists('db2_connect')) {
-			ADOConnection::outp("Warning: The old ODBC based DB2 driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 extension.");
-			return null;
-		}
-		// This needs to be set before the connect().
-		// Replaces the odbc_binmode() call that was in Execute()
-		ini_set('ibm_db2.binmode', $this->binmode);
-
-		if ($argDatabasename) {
-			$this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword);
-		} else {
-			$this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword);
-		}
-		if (isset($php_errormsg)) $php_errormsg = '';
-
-		// For db2_connect(), there is an optional 4th arg.  If present, it must be
-		// an array of valid options.  So far, we don't use them.
-
-		$this->_errorMsg = @db2_conn_errormsg();
- 
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		return $this->_connectionID != false;
-	}
-	
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-		global $php_errormsg;
-	
-		if (!function_exists('db2_connect')) return null;
-		
-		// This needs to be set before the connect().
-		// Replaces the odbc_binmode() call that was in Execute()
-		ini_set('ibm_db2.binmode', $this->binmode);
-
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		
-		if ($argDatabasename) {
-			$this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword);
-		} else {
-			$this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword);
-		}
-		if (isset($php_errormsg)) $php_errormsg = '';
-
-		$this->_errorMsg = @db2_conn_errormsg();
-		if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID);
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		return $this->_connectionID != false;
-	}
-
-	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
-		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')";
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-	// use right() and replace() ?
-		if (!$col) $col = $this->sysDate;
-
-		/* use TO_CHAR() if $fmt is TO_CHAR() allowed fmt */
-		if ($fmt== 'Y-m-d H:i:s')
-			return 'TO_CHAR('.$col.", 'YYYY-MM-DD HH24:MI:SS')";
-
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= $this->concat_operator;
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				if ($len==1) return "year($col)";
-				$s .= "char(year($col))";
-				break;
-			case 'M':
-				if ($len==1) return "monthname($col)";
-				$s .= "substr(monthname($col),1,3)";
-				break;
-			case 'm':
-				if ($len==1) return "month($col)";
-				$s .= "right(digits(month($col)),2)";
-				break;
-			case 'D':
-			case 'd':
-				if ($len==1) return "day($col)";
-				$s .= "right(digits(day($col)),2)";
-				break;
-			case 'H':
-			case 'h':
-				if ($len==1) return "hour($col)";
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
-				else $s .= "''";
-				break;
-			case 'i':
-			case 'I':
-				if ($len==1) return "minute($col)";
-				if ($col != $this->sysDate)
-					$s .= "right(digits(minute($col)),2)";
-					else $s .= "''";
-				break;
-			case 'S':
-			case 's':
-				if ($len==1) return "second($col)";
-				if ($col != $this->sysDate)
-					$s .= "right(digits(second($col)),2)";
-				else $s .= "''";
-				break;
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-			}
-		}
-		return $s;
-	} 
- 
-	
-	function ServerInfo()
-	{
-	
-		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
-			$dsn = strtoupper($this->host);
-			$first = true;
-			$found = false;
-			
-			if (!function_exists('db2_data_source')) return false;
-			
-			while(true) {
-				
-				$rez = @db2_data_source($this->_connectionID,
-					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
-				$first = false;
-				if (!is_array($rez)) break;
-				if (strtoupper($rez['server']) == $dsn) {
-					$found = true;
-					break;
-				}
-			} 
-			if (!$found) return ADOConnection::ServerInfo();
-			if (!isset($rez['version'])) $rez['version'] = '';
-			return $rez;
-		} else {
-			return ADOConnection::ServerInfo();
-		}
-	}
-
-	
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		return true;
-	}
-	
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-	
-	/*
-		This algorithm is not very efficient, but works even if table locking
-		is not available.
-		
-		Will return false if unable to generate an ID after $MAXLOOPS attempts.
-	*/
-	function GenID($seq='adodbseq',$start=1)
-	{	
-		// if you have to modify the parameter below, your database is overloaded,
-		// or you need to implement generation of id's yourself!
-		$num = $this->GetOne("VALUES NEXTVAL FOR $seq");
-				return $num;
-			}
-
-
-	function ErrorMsg()
-	{
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorMsg !== false) return $this->_errorMsg;
-			if (empty($this->_connectionID)) return @db2_conn_errormsg();
-			return @db2_conn_errormsg($this->_connectionID);
-		} else return ADOConnection::ErrorMsg();
-	}
-	
-	function ErrorNo()
-	{
-		
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorCode !== false) {
-				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
-			}
-
-			if (empty($this->_connectionID)) $e = @db2_conn_error(); 
-			else $e = @db2_conn_error($this->_connectionID);
-			
-			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-			 // so we check and patch
-			if (strlen($e)<=2) return 0;
-			return $e;
-		} else return ADOConnection::ErrorNo();
-	}
-	
-	
-
-	function BeginTrans()
-	{	
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-		$this->_autocommit = false;
-		return db2_autocommit($this->_connectionID,false);
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = db2_commit($this->_connectionID);
-		db2_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = db2_rollback($this->_connectionID);
-		db2_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function MetaPrimaryKeys($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = @db2_primarykeys($this->_connectionID,'',$schema,$table);
-		
-		if (!$qid) {
-			$ADODB_FETCH_MODE = $savem;
-			return false;
-		}
-		$rs = new ADORecordSet_db2($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return false;
-		
-		$arr =& $rs->GetArray();
-		$rs->Close();
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
-		}
-		return $arr2;
-	}
-	
-	function MetaForeignKeys($table, $owner = FALSE, $upper = FALSE, $asociative = FALSE )
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = @db2_foreign_keys($this->_connectionID,'',$schema,$table);
-		if (!$qid) {
-			$ADODB_FETCH_MODE = $savem;
-			return false;
-		}
-		$rs = new ADORecordSet_db2($qid);
-
-		$ADODB_FETCH_MODE = $savem;
-		/*
-		$rs->fields indices
-		0 PKTABLE_CAT
-		1 PKTABLE_SCHEM
-		2 PKTABLE_NAME
-		3 PKCOLUMN_NAME
-		4 FKTABLE_CAT
-		5 FKTABLE_SCHEM
-		6 FKTABLE_NAME
-		7 FKCOLUMN_NAME
-		*/	
-		if (!$rs) return false;
-
-		$foreign_keys = array();	 	 
-		while (!$rs->EOF) {
-			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				if (!is_array($foreign_keys[$rs->fields[5].'.'.$rs->fields[6]])) 
-					$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]] = array();
-				$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3];	 		
-			}
-			$rs->MoveNext();
-		}
-
-		$rs->Close();
-		return $foreign_key;
-	}
-	
-	
-	function &MetaTables($ttype=false,$schema=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = db2_tables($this->_connectionID);
-		
-		$rs = new ADORecordSet_db2($qid);
-		
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		
-		$arr =& $rs->GetArray();
-		
-		$rs->Close();
-		$arr2 = array();
-		
-		if ($ttype) {
-			$isview = strncmp($ttype,'V',1) === 0;
-		}
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if (!$arr[$i][2]) continue;
-			$type = $arr[$i][3];
-			$schemaval = ($schema) ? $arr[$i][1].'.' : '';
-			if ($ttype) { 
-				if ($isview) {
-					if (strncmp($type,'V',1) === 0) $arr2[] = $schemaval.$arr[$i][2];
-				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
-			} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
-		}
-		return $arr2;
-	}
-	
-/*
-See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp
-/ SQL data type codes /
-#define	SQL_UNKNOWN_TYPE	0
-#define SQL_CHAR			1
-#define SQL_NUMERIC		 2
-#define SQL_DECIMAL		 3
-#define SQL_INTEGER		 4
-#define SQL_SMALLINT		5
-#define SQL_FLOAT		   6
-#define SQL_REAL			7
-#define SQL_DOUBLE		  8
-#if (DB2VER >= 0x0300)
-#define SQL_DATETIME		9
-#endif
-#define SQL_VARCHAR		12
-
-
-/ One-parameter shortcuts for date/time data types /
-#if (DB2VER >= 0x0300)
-#define SQL_TYPE_DATE	  91
-#define SQL_TYPE_TIME	  92
-#define SQL_TYPE_TIMESTAMP 93
-
-#define SQL_UNICODE                             (-95)
-#define SQL_UNICODE_VARCHAR                     (-96)
-#define SQL_UNICODE_LONGVARCHAR                 (-97)
-*/
-	function DB2Types($t)
-	{
-		switch ((integer)$t) {
-		case 1:	
-		case 12:
-		case 0:
-		case -95:
-		case -96:
-			return 'C';
-		case -97:
-		case -1: //text
-			return 'X';
-		case -4: //image
-			return 'B';
-				
-		case 9:	
-		case 91:
-			return 'D';
-		
-		case 10:
-		case 11:
-		case 92:
-		case 93:
-			return 'T';
-			
-		case 4:
-		case 5:
-		case -6:
-			return 'I';
-			
-		case -11: // uniqidentifier
-			return 'R';
-		case -7: //bit
-			return 'L';
-		
-		default:
-			return 'N';
-		}
-	}
-	
-	function &MetaColumns($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-        	$colname = "%";
-	        $qid = db2_columns($this->_connectionID, "", $schema, $table, $colname);
-		if (empty($qid)) return $false;
-		
-		$rs =& new ADORecordSet_db2($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return $false;
-		$rs->_fetch();
-		
-		$retarr = array();
-		
-		/*
-		$rs->fields indices
-		0 TABLE_QUALIFIER
-		1 TABLE_SCHEM
-		2 TABLE_NAME
-		3 COLUMN_NAME
-		4 DATA_TYPE
-		5 TYPE_NAME
-		6 PRECISION
-		7 LENGTH
-		8 SCALE
-		9 RADIX
-		10 NULLABLE
-		11 REMARKS
-		*/
-		while (!$rs->EOF) {
-			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[3];
-				$fld->type = $this->DB2Types($rs->fields[4]);
-				
-				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
-				// access uses precision to store length for char/varchar
-				if ($fld->type == 'C' or $fld->type == 'X') {
-					if ($rs->fields[4] <= -95) // UNICODE
-						$fld->max_length = $rs->fields[7]/2;
-					else
-						$fld->max_length = $rs->fields[7];
-				} else 
-					$fld->max_length = $rs->fields[7];
-				$fld->not_null = !empty($rs->fields[10]);
-				$fld->scale = $rs->fields[8];
-				$fld->primary_key = false;
-				$retarr[strtoupper($fld->name)] = $fld;	
-			} else if (sizeof($retarr)>0)
-				break;
-			$rs->MoveNext();
-		}
-		$rs->Close(); 
-		if (empty($retarr)) $retarr = false;
-
-	      $qid = db2_primary_keys($this->_connectionID, "", $schema, $table);
-		if (empty($qid)) return $false;
-		
-		$rs =& new ADORecordSet_db2($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return $retarr;
-		$rs->_fetch();
-		
-		/*
-		$rs->fields indices
-		0 TABLE_CAT
-		1 TABLE_SCHEM
-		2 TABLE_NAME
-		3 COLUMN_NAME
-		4 KEY_SEQ
-		5 PK_NAME
-		*/
-		while (!$rs->EOF) {
-			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				$retarr[strtoupper($rs->fields[3])]->primary_key = true;
-			} else if (sizeof($retarr)>0)
-				break;
-			$rs->MoveNext();
-		}
-		$rs->Close(); 
-		
-		if (empty($retarr)) $retarr = false;
-		return $retarr;
-	}
-	
-	function Prepare($sql)
-	{
-		if (! $this->_bindInputArray) return $sql; // no binding
-		$stmt = db2_prepare($this->_connectionID,$sql);
-		if (!$stmt) {
-			// we don't know whether db2 driver is parsing prepared stmts, so just return sql
-			return $sql;
-		}
-		return array($sql,$stmt,false);
-	}
-
-	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
-	{
-	GLOBAL $php_errormsg;
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_error = '';
-		
-		if ($inputarr) {
-			if (is_array($sql)) {
-				$stmtid = $sql[1];
-			} else {
-				$stmtid = db2_prepare($this->_connectionID,$sql);
-	
-				if ($stmtid == false) {
-					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-					return false;
-				}
-			}
-			
-			if (! db2_execute($stmtid,$inputarr)) {
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = db2_stmt_errormsg();
-					$this->_errorCode = db2_stmt_error();
-				}
-				return false;
-			}
-		
-		} else if (is_array($sql)) {
-			$stmtid = $sql[1];
-			if (!db2_execute($stmtid)) {
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = db2_stmt_errormsg();
-					$this->_errorCode = db2_stmt_error();
-				}
-				return false;
-			}
-		} else
-			$stmtid = @db2_exec($this->_connectionID,$sql);
-		
-		$this->_lastAffectedRows = 0;
-		if ($stmtid) {
-			if (@db2_num_fields($stmtid) == 0) {
-				$this->_lastAffectedRows = db2_num_rows($stmtid);
-				$stmtid = true;
-			} else {
-				$this->_lastAffectedRows = 0;
-			}
-			
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = '';
-				$this->_errorCode = 0;
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		} else {
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = db2_stmt_errormsg();
-				$this->_errorCode = db2_stmt_error();
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-
-		}
-		return $stmtid;
-	}
-
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-		
-		Usage:
-		 
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		$ret = @db2_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $ret;
-	}
-
-	function _affectedrows()
-	{
-		return $this->_lastAffectedRows;
-	}
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_db2 extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "db2";		
-	var $dataProvider = "db2";
-	var $useFetchArray;
-	
-	function ADORecordSet_db2($id,$mode=false)
-	{
-		if ($mode === false) {  
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $id;
-	}
-
-
-	// returns the field object
-	function &FetchField($offset = -1) 
-	{
-		$o= new ADOFieldObject();
-		$o->name = @db2_field_name($this->_queryID,$offset);
-		$o->type = @db2_field_type($this->_queryID,$offset);
-		$o->max_length = db2_field_width($this->_queryID,$offset);
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-		
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @db2_num_rows($this->_queryID) : -1;
-		$this->_numOfFields = @db2_num_fields($this->_queryID);
-		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
-		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
-	}	
-	
-	function _seek($row)
-	{
-		return false;
-	}
-	
-	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$rs =& $this->GetArray($nrows);
-			return $rs;
-		}
-		$savem = $this->fetchMode;
-		$this->fetchMode = ADODB_FETCH_NUM;
-		$this->Move($offset);
-		$this->fetchMode = $savem;
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-	
-	
-	function MoveNext() 
-	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
-			$this->_currentRow++;
-			
-			$this->fields = @db2_fetch_array($this->_queryID);
-			if ($this->fields) {
-				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-					$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				}
-				return true;
-			}
-		}
-		$this->fields = false;
-		$this->EOF = true;
-		return false;
-	}	
-	
-	function _fetch()
-	{
-
-		$this->fields = db2_fetch_array($this->_queryID);
-		if ($this->fields) {
-			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-				$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-			}
-			return true;
-		}
-		$this->fields = false;
-		return false;
-	}
-	
-	function _close() 
-	{
-		return @db2_free_result($this->_queryID);		
-	}
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-oci805.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-oci805.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-oci805.inc.php	(working copy)
@@ -1,59 +0,0 @@
-<?php
-/** 
- * @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
- * Whenever there is any discrepancy between the two licenses, 
- * the BSD license will take precedence. 
- *
- * Set tabs to 4 for best viewing.
- * 
- * Latest version is available at http://php.weblogs.com
- *
- * Oracle 8.0.5 driver
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
-
-class ADODB_oci805 extends ADODB_oci8 {
-	var $databaseType = "oci805";	
-	var $connectSID = true;
-	
-	function ADODB_oci805() 
-	{
-		$this->ADODB_oci8();
-	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		// seems that oracle only supports 1 hint comment in 8i
-		if (strpos($sql,'/*+') !== false)
-			$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-		else
-			$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		
-		/* 
-			The following is only available from 8.1.5 because order by in inline views not 
-			available before then...
-			http://www.jlcomp.demon.co.uk/faq/top_sql.html
-		if ($nrows > 0) {	
-			if ($offset > 0) $nrows += $offset;
-			$sql = "select * from ($sql) where rownum <= $nrows";
-			$nrows = -1;
-		}
-		*/
-
-		return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-	}
-}
-
-class ADORecordset_oci805 extends ADORecordset_oci8 {	
-	var $databaseType = "oci805";
-	function ADORecordset_oci805($id,$mode=false)
-	{
-		$this->ADORecordset_oci8($id,$mode);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-sybase_ase.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-sybase_ase.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-sybase_ase.inc.php	(working copy)
@@ -1,119 +0,0 @@
-<?php
-/*
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Set tabs to 4.
-  
-  Contributed by Interakt Online. Thx Cristian MARIN cristic#interaktonline.com
-*/
-
-
-require_once ADODB_DIR."/drivers/adodb-sybase.inc.php";
-
-class ADODB_sybase_ase extends ADODB_sybase {
- 	var $databaseType = "sybase_ase";
-	
-	 var $metaTablesSQL="SELECT sysobjects.name FROM sysobjects, sysusers WHERE sysobjects.type='U' AND sysobjects.uid = sysusers.uid";
-	 var $metaColumnsSQL = "SELECT syscolumns.name AS field_name, systypes.name AS type, systypes.length AS width FROM sysobjects, syscolumns, systypes WHERE sysobjects.name='%s' AND syscolumns.id = sysobjects.id AND systypes.type=syscolumns.type";
-	 var $metaDatabasesSQL ="SELECT a.name FROM master.dbo.sysdatabases a, master.dbo.syslogins b WHERE a.suid = b.suid and a.name like '%' and a.name != 'tempdb' and a.status3 != 256  order by 1";
-
-	function ADODB_sybase_ase()
-	{
-	}
-	
-	// split the Views, Tables and procedures.
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false)
-	{
-		$false = false;
-		if ($this->metaTablesSQL) {
-			// complicated state saving by the need for backward compat
-			
-			if ($ttype == 'VIEWS'){
-						$sql = str_replace('U', 'V', $this->metaTablesSQL);
-			}elseif (false === $ttype){
-						$sql = str_replace('U',"U' OR type='V", $this->metaTablesSQL);
-			}else{ // TABLES OR ANY OTHER 
-						$sql = $this->metaTablesSQL;
-			}
-			$rs = $this->Execute($sql);
-			
-			if ($rs === false || !method_exists($rs, 'GetArray')){
-					return $false;
-			}
-			$arr =& $rs->GetArray();
-
-			$arr2 = array();
-			foreach($arr as $key=>$value){
-					$arr2[] = trim($value['name']);
-			}
-			return $arr2;
-		}
-		return $false;
-	}
-
-	function MetaDatabases()
-	{
-			$arr = array();
-			if ($this->metaDatabasesSQL!='') {
-				$rs = $this->Execute($this->metaDatabasesSQL);
-				if ($rs && !$rs->EOF){
-					while (!$rs->EOF){
-						$arr[] = $rs->Fields('name');
-						$rs->MoveNext();
-					}
-					return $arr;
-				}
-			}
-			return false;
-	}
-
-	// fix a bug which prevent the metaColumns query to be executed for Sybase ASE
-	function &MetaColumns($table,$upper=false) 
-	{
-		$false = false;
-		if (!empty($this->metaColumnsSQL)) {
-		
-			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			if ($rs === false) return $false;
-
-			$retarr = array();
-			while (!$rs->EOF) {
-				$fld =& new ADOFieldObject();
-				$fld->name = $rs->Fields('field_name');
-				$fld->type = $rs->Fields('type');
-				$fld->max_length = $rs->Fields('width');
-				$retarr[strtoupper($fld->name)] = $fld;
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			return $retarr;	
-		}
-		return $false;
-	}
-	
-	function getProcedureList($schema)
-	{
-			return false;
-	}
-
-	function ErrorMsg()
-	{
-		if (!function_exists('sybase_connect')){
-				return 'Your PHP doesn\'t contain the Sybase connection module!';
-		}
-		return parent::ErrorMsg();	
-	}
-}
-
-class adorecordset_sybase_ase extends ADORecordset_sybase {
-var $databaseType = "sybase_ase";
-function ADORecordset_sybase_ase($id,$mode=false)
-	{
-		$this->ADORecordSet_sybase($id,$mode);
-	}
-	
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-mysqli.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-mysqli.inc.php	(working copy)
@@ -1,1025 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
-  
-  MySQL code that does not support transactions. Use mysqlt if you need transactions.
-  Requires mysql client. Works on Windows and Unix.
- 
-21 October 2003: MySQLi extension implementation by Arjen de Rijke (a.de.rijke@xs4all.nl)
-Based on adodb 3.40
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_MYSQLI_LAYER")) {
- define("_ADODB_MYSQLI_LAYER", 1 );
- 
- // PHP5 compat...
- if (! defined("MYSQLI_BINARY_FLAG"))  define("MYSQLI_BINARY_FLAG", 128); 
- if (!defined('MYSQLI_READ_DEFAULT_GROUP')) define('MYSQLI_READ_DEFAULT_GROUP',1);
-
- // disable adodb extension - currently incompatible.
- global $ADODB_EXTENSION; $ADODB_EXTENSION = false;
-
-class ADODB_mysqli extends ADOConnection {
-	var $databaseType = 'mysqli';
-	var $dataProvider = 'native';
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
-	var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasLimit = true;
-	var $hasMoveFirst = true;
-	var $hasGenID = true;
-	var $isoDates = true; // accepts dates in ISO format
-	var $sysDate = 'CURDATE()';
-	var $sysTimeStamp = 'NOW()';
-	var $hasTransactions = true;
-	var $forceNewConnect = false;
-	var $poorAffectedRows = true;
-	var $clientFlags = 0;
-	var $substr = "substring";
-	var $port = false;
-	var $socket = false;
-	var $_bindInputArray = false;
-	var $nameQuote = '`';		/// string to use to quote identifiers and names
-	var $optionFlags = array(array(MYSQLI_READ_DEFAULT_GROUP,0));
-	
-	function ADODB_mysqli() 
-	{			
-	 // if(!extension_loaded("mysqli"))
-	      ;//trigger_error("You must have the mysqli extension installed.", E_USER_ERROR);
-	    
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
-	}
-
-	// returns true or false
-	// To add: parameter int $port,
-	//         parameter string $socket
-	function _connect($argHostname = NULL, 
-			  $argUsername = NULL, 
-			  $argPassword = NULL, 
-			  $argDatabasename = NULL, $persist=false)
-	  {
-	  	 if(!extension_loaded("mysqli")) {
-			return null;
-		 }
-	    $this->_connectionID = @mysqli_init();
-	    
-	    if (is_null($this->_connectionID)) {
-	      // mysqli_init only fails if insufficient memory
-	      if ($this->debug) 
-				ADOConnection::outp("mysqli_init() failed : "  . $this->ErrorMsg());
-	      return false;
-	    }
-		/*
-		I suggest a simple fix which would enable adodb and mysqli driver to
-		read connection options from the standard mysql configuration file
-		/etc/my.cnf - "Bastien Duclaux" <bduclaux#yahoo.com>
-		*/
-		foreach($this->optionFlags as $arr) {	
-			mysqli_options($this->_connectionID,$arr[0],$arr[1]);
-		}
-
-		#if (!empty($this->port)) $argHostname .= ":".$this->port;
-		$ok = mysqli_real_connect($this->_connectionID,
- 				    $argHostname,
- 				    $argUsername,
- 				    $argPassword,
- 				    $argDatabasename,
-					$this->port,
-					$this->socket,
-					$this->clientFlags);
- 	     
-		if ($ok) {
-	 		if ($argDatabasename)  return $this->SelectDB($argDatabasename);
- 			return true;
- 	   } else {
-			if ($this->debug) 
-		  		ADOConnection::outp("Could't connect : "  . $this->ErrorMsg());
-			return false;
-	   }
-	}
-	
-	// returns true or false
-	// How to force a persistent connection
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
-
-	}
-	
-	// When is this used? Close old connection first?
-	// In _connect(), check $this->forceNewConnect? 
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	  {
-	    $this->forceNewConnect = true;
-	    return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
-	  }
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " IFNULL($field, $ifNull) "; // if MySQL
-	}
-	
-	// do not use $ADODB_COUNTRECS
-	function GetOne($sql,$inputarr=false)
-	{
-		$ret = false;
-		$rs = &$this->Execute($sql,$inputarr);
-		if ($rs) {	
-			if (!$rs->EOF) $ret = reset($rs->fields);
-			$rs->Close();
-		}
-		return $ret;
-	}
-	
-	function ServerInfo()
-	{
-		$arr['description'] = $this->GetOne("select version()");
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-	
-	
-	function BeginTrans()
-	{	  
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		
-		//$this->Execute('SET AUTOCOMMIT=0');
-		mysqli_autocommit($this->_connectionID, false);
-		$this->Execute('BEGIN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		
-		//$this->Execute('SET AUTOCOMMIT=1');
-		mysqli_autocommit($this->_connectionID, true);
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		//$this->Execute('SET AUTOCOMMIT=1');
-		mysqli_autocommit($this->_connectionID, true);
-		return true;
-	}
-	
-	function RowLock($tables,$where='',$flds='1 as adodb_ignore') 
-	{
-		if ($this->transCnt==0) $this->BeginTrans();
-		if ($where) $where = ' where '.$where;
-		$rs =& $this->Execute("select $flds from $tables $where for update");
-		return !empty($rs); 
-	}
-	
-	// if magic quotes disabled, use mysql_real_escape_string()
-	// From readme.htm:
-	// Quotes a string to be sent to the database. The $magic_quotes_enabled
-	// parameter may look funny, but the idea is if you are quoting a 
-	// string extracted from a POST/GET variable, then 
-	// pass get_magic_quotes_gpc() as the second parameter. This will 
-	// ensure that the variable is not quoted twice, once by qstr and once 
-	// by the magic_quotes_gpc.
-	//
-	//Eg. $s = $db->qstr(_GET['name'],get_magic_quotes_gpc());
-	function qstr($s, $magic_quotes = false)
-	{
-		if (!$magic_quotes) {
-	    	if (PHP_VERSION >= 5)
-	      		return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";   
-	    
-		if ($this->replaceQuote[0] == '\\')
-			$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
-	    return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
-	  }
-	  // undo magic quotes for "
-	  $s = str_replace('\\"','"',$s);
-	  return "'$s'";
-	}
-	
-	function _insertid()
-	{
-	  $result = @mysqli_insert_id($this->_connectionID);
-	  if ($result == -1){
-	      if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed : "  . $this->ErrorMsg());
-	  }
-	  return $result;
-	}
-	
-	// Only works for INSERT, UPDATE and DELETE query's
-	function _affectedrows()
-	{
-	  $result =  @mysqli_affected_rows($this->_connectionID);
-	  if ($result == -1) {
-	      if ($this->debug) ADOConnection::outp("mysqli_affected_rows() failed : "  . $this->ErrorMsg());
-	  }
-	  return $result;
-	}
-  
- 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
-	// Reference on Last_Insert_ID on the recommended way to simulate sequences
- 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
-	var $_genSeqSQL = "create table %s (id int not null)";
-	var $_genSeq2SQL = "insert into %s values (%s)";
-	var $_dropSeqSQL = "drop table %s";
-	
-	function CreateSequence($seqname='adodbseq',$startID=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$u = strtoupper($seqname);
-		
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-	}
-	
-	function GenID($seqname='adodbseq',$startID=1)
-	{
-		// post-nuke sets hasGenID to false
-		if (!$this->hasGenID) return false;
-		
-		$getnext = sprintf($this->_genIDSQL,$seqname);
-		$holdtransOK = $this->_transOK; // save the current status
-		$rs = @$this->Execute($getnext);
-		if (!$rs) {
-			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
-			$u = strtoupper($seqname);
-			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
-			$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seqname));
-			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
-			$rs = $this->Execute($getnext);
-		}
-		
-		if ($rs) {
-			$this->genID = mysqli_insert_id($this->_connectionID);
-			$rs->Close();
-		} else
-			$this->genID = 0;
-			
-		return $this->genID;
-	}
-	
-  	function &MetaDatabases()
-	{
-		$query = "SHOW DATABASES";
-		$ret =& $this->Execute($query);
-		if ($ret && is_object($ret)){
-		   $arr = array();
-			while (!$ret->EOF){
-				$db = $ret->Fields('Database');
-				if ($db != 'mysql') $arr[] = $db;
-				$ret->MoveNext();
-			}
-   		   return $arr;
-		}
-        return $ret;
-	}
-
-	  
-	function &MetaIndexes ($table, $primary = FALSE)
-	{
-		// save old fetch mode
-		global $ADODB_FETCH_MODE;
-		
-		$false = false;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== FALSE) {
-		       $savem = $this->SetFetchMode(FALSE);
-		}
-		
-		// get index details
-		$rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
-		
-		// restore fetchmode
-		if (isset($savem)) {
-		        $this->SetFetchMode($savem);
-		}
-		$ADODB_FETCH_MODE = $save;
-		
-		if (!is_object($rs)) {
-		        return $false;
-		}
-		
-		$indexes = array ();
-		
-		// parse index data into array
-		while ($row = $rs->FetchRow()) {
-		        if ($primary == FALSE AND $row[2] == 'PRIMARY') {
-		                continue;
-		        }
-		        
-		        if (!isset($indexes[$row[2]])) {
-		                $indexes[$row[2]] = array(
-		                        'unique' => ($row[1] == 0),
-		                        'columns' => array()
-		                );
-		        }
-		        
-		        $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
-		}
-		
-		// sort columns by order in the index
-		foreach ( array_keys ($indexes) as $index )
-		{
-		        ksort ($indexes[$index]['columns']);
-		}
-		
-		return $indexes;
-	}
-
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'DATE_FORMAT('.$col.",'";
-		$concat = false;
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= '%Y';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "'),Quarter($col)";
-				
-				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-				else $s .= ",('";
-				$concat = true;
-				break;
-			case 'M':
-				$s .= '%b';
-				break;
-				
-			case 'm':
-				$s .= '%m';
-				break;
-			case 'D':
-			case 'd':
-				$s .= '%d';
-				break;
-			
-			case 'H': 
-				$s .= '%H';
-				break;
-				
-			case 'h':
-				$s .= '%I';
-				break;
-				
-			case 'i':
-				$s .= '%i';
-				break;
-				
-			case 's':
-				$s .= '%s';
-				break;
-				
-			case 'a':
-			case 'A':
-				$s .= '%p';
-				break;
-			
-			case 'w':
-				$s .= '%w';
-				break;
-				
-			case 'l':
-				$s .= '%W';
-				break;
-				
-			default:
-				
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $ch;
-				break;
-			}
-		}
-		$s.="')";
-		if ($concat) $s = "CONCAT($s)";
-		return $s;
-	}
-	
-	// returns concatenated string
-	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
-	function Concat()
-	{
-		$s = "";
-		$arr = func_get_args();
-		
-		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
-		if (strlen($s) > 0) return "CONCAT($s)";
-		else return '';
-	}
-	
-	// dayFraction is a day in floating point
-	function OffsetDate($dayFraction,$date=false)
-	{		
-		if (!$date) $date = $this->sysDate;
-		
-		$fraction = $dayFraction * 24 * 3600;
-		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
-		
-//		return "from_unixtime(unix_timestamp($date)+$fraction)";
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
-		$save = $this->metaTablesSQL;
-		if ($showSchema && is_string($showSchema)) {
-			$this->metaTablesSQL .= " from $showSchema";
-		}
-		
-		if ($mask) {
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		$this->metaTablesSQL = $save;
-		return $ret;
-	}
-	
-	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
-	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
-	{
-	 global $ADODB_FETCH_MODE;
-		
-		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
-		
-	    if ( !empty($owner) ) {
-	       $table = "$owner.$table";
-	    }
-	    $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
-		if ($associative) $create_sql = $a_create_table["Create Table"];
-	    else $create_sql  = $a_create_table[1];
-	
-	    $matches = array();
-	
-	    if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
-	 	$foreign_keys = array();	 	 
-	    $num_keys = count($matches[0]);
-	    for ( $i = 0;  $i < $num_keys;  $i ++ ) {
-	        $my_field  = explode('`, `', $matches[1][$i]);
-	        $ref_table = $matches[2][$i];
-	        $ref_field = explode('`, `', $matches[3][$i]);
-	
-	        if ( $upper ) {
-	            $ref_table = strtoupper($ref_table);
-	        }
-	
-	        $foreign_keys[$ref_table] = array();
-	        $num_fields               = count($my_field);
-	        for ( $j = 0;  $j < $num_fields;  $j ++ ) {
-	            if ( $associative ) {
-	                $foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
-	            } else {
-	                $foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
-	            }
-	        }
-	    }
-	    
-	    return  $foreign_keys;
-	}
-	
- 	function &MetaColumns($table) 
-	{
-		$false = false;
-		if (!$this->metaColumnsSQL)
-			return $false;
-		
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false)
-			$savem = $this->SetFetchMode(false);
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!is_object($rs))
-			return $false;
-		
-		$retarr = array();
-		while (!$rs->EOF) {
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$type = $rs->fields[1];
-			
-			// split type into type(length):
-			$fld->scale = null;
-			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
-			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
-			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
-				$fld->type = $query_array[1];
-				$fld->max_length = max(array_map("strlen",explode(",",$query_array[2]))) - 2; // PHP >= 4.0.6
-				$fld->max_length = ($fld->max_length == 0 ? 1 : $fld->max_length);
-			} else {
-				$fld->type = $type;
-				$fld->max_length = -1;
-			}
-			$fld->not_null = ($rs->fields[2] != 'YES');
-			$fld->primary_key = ($rs->fields[3] == 'PRI');
-			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
-			$fld->binary = (strpos($type,'blob') !== false);
-			$fld->unsigned = (strpos($type,'unsigned') !== false);
-			$fld->zerofill = (strpos($type,'zerofill') !== false);
-
-			if (!$fld->binary) {
-				$d = $rs->fields[4];
-				if ($d != '' && $d != 'NULL') {
-					$fld->has_default = true;
-					$fld->default_value = $d;
-				} else {
-					$fld->has_default = false;
-				}
-			}
-			
-			if ($save == ADODB_FETCH_NUM) {
-				$retarr[] = $fld;
-			} else {
-				$retarr[strtoupper($fld->name)] = $fld;
-			}
-			$rs->MoveNext();
-		}
-		
-		$rs->Close();
-		return $retarr;
-	}
-		
-	// returns true or false
-	function SelectDB($dbName) 
-	{
-//	    $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
-	    $this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		
-	    if ($this->_connectionID) {
-        	$result = @mysqli_select_db($this->_connectionID, $dbName);
-			if (!$result) {
-		    	ADOConnection::outp("Select of database " . $dbName . " failed. " . $this->ErrorMsg());
-			}
-			return $result;		
-		}
-	    return false;	
-	}
-	
-	// parameters use PostgreSQL convention, not MySQL
-	function &SelectLimit($sql,
-			      $nrows = -1,
-			      $offset = -1,
-			      $inputarr = false, 
-			      $arg3 = false,
-			      $secs = 0)
-	{
-		$offsetStr = ($offset >= 0) ? "$offset," : '';
-		if ($nrows < 0) $nrows = '18446744073709551615';
-		
-		if ($secs)
-			$rs =& $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
-		else
-			$rs =& $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
-			
-		return $rs;
-	}
-	
-	
-	function Prepare($sql)
-	{
-		return $sql;
-		
-		$stmt = $this->_connectionID->prepare($sql);
-		if (!$stmt) {
-			echo $this->ErrorMsg();
-			return $sql;
-		}
-		return array($sql,$stmt);
-	}
-	
-	
-	// returns queryID or false
-	function _query($sql, $inputarr)
-	{
-	global $ADODB_COUNTRECS;
-		
-		if (is_array($sql)) {
-			$stmt = $sql[1];
-			$a = '';
-			foreach($inputarr as $k => $v) {
-				if (is_string($v)) $a .= 's';
-				else if (is_integer($v)) $a .= 'i'; 
-				else $a .= 'd';
-			}
-			
-			$fnarr = array_merge( array($stmt,$a) , $inputarr);
-			$ret = call_user_func_array('mysqli_stmt_bind_param',$fnarr);
-
-			$ret = mysqli_stmt_execute($stmt);
-			return $ret;
-		}
-		if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, ($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
-		    if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
-		    return false;
-		}
-		
-		return $mysql_res;
-	}
-
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
-	  {
-	    if (empty($this->_connectionID)) 
-	      $this->_errorMsg = @mysqli_connect_error();
-	    else 
-	      $this->_errorMsg = @mysqli_error($this->_connectionID);
-	    return $this->_errorMsg;
-	  }
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
-	  {
-	    if (empty($this->_connectionID))  
-	      return @mysqli_connect_errno();
-	    else 
-	      return @mysqli_errno($this->_connectionID);
-	  }
-	
-	// returns true or false
-	function _close()
-	  {
-	    @mysqli_close($this->_connectionID);
-	    $this->_connectionID = false;
-	  }
-
-	/*
-	* Maximum size of C field
-	*/
-	function CharMax()
-	{
-		return 255; 
-	}
-	
-	/*
-	* Maximum size of X field
-	*/
-	function TextMax()
-	{
-	  return 4294967295; 
-	}
-
-
-
-	// this is a set of functions for managing client encoding - very important if the encodings
-	// of your database and your output target (i.e. HTML) don't match
-	// for instance, you may have UTF8 database and server it on-site as latin1 etc.
-	// GetCharSet - get the name of the character set the client is using now
-	// Under Windows, the functions should work with MySQL 4.1.11 and above, the set of charsets supported
-	// depends on compile flags of mysql distribution 
-
-  function GetCharSet()
-  {
-    //we will use ADO's builtin property charSet
-    if (!method_exists($this->_connectionID,'character_set_name'))
-    	return false;
-    	
-    $this->charSet = @$this->_connectionID->character_set_name();
-    if (!$this->charSet) {
-      return false;
-    } else {
-      return $this->charSet;
-    }
-  }
-
-  // SetCharSet - switch the client encoding
-  function SetCharSet($charset_name)
-  {
-    if (!method_exists($this->_connectionID,'set_charset'))
-    	return false;
-
-    if ($this->charSet !== $charset_name) {
-      $if = @$this->_connectionID->set_charset($charset_name);
-      if ($if == "0" & $this->GetCharSet() == $charset_name) {
-        return true;
-      } else return false;
-    } else return true;
-  }
-
-
-
-
-}
- 
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_mysqli extends ADORecordSet{	
-	
-	var $databaseType = "mysqli";
-	var $canSeek = true;
-	
-	function ADORecordSet_mysqli($queryID, $mode = false) 
-	{
-	  if ($mode === false) 
-	   { 
-	      global $ADODB_FETCH_MODE;
-	      $mode = $ADODB_FETCH_MODE;
-	   }
-	   
-	  switch ($mode)
-	    {
-	    case ADODB_FETCH_NUM: 
-	      $this->fetchMode = MYSQLI_NUM; 
-	      break;
-	    case ADODB_FETCH_ASSOC:
-	      $this->fetchMode = MYSQLI_ASSOC; 
-	      break;
-	    case ADODB_FETCH_DEFAULT:
-	    case ADODB_FETCH_BOTH:
-	    default:
-	      $this->fetchMode = MYSQLI_BOTH; 
-	      break;
-	    }
-	  $this->adodbFetchMode = $mode;
-	  $this->ADORecordSet($queryID);	
-	}
-	
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-	
-		$this->_numOfRows = $ADODB_COUNTRECS ? @mysqli_num_rows($this->_queryID) : -1;
-		$this->_numOfFields = @mysqli_num_fields($this->_queryID);
-	}
-	
-/*
-1      = MYSQLI_NOT_NULL_FLAG
-2      = MYSQLI_PRI_KEY_FLAG
-4      = MYSQLI_UNIQUE_KEY_FLAG
-8      = MYSQLI_MULTIPLE_KEY_FLAG
-16     = MYSQLI_BLOB_FLAG
-32     = MYSQLI_UNSIGNED_FLAG
-64     = MYSQLI_ZEROFILL_FLAG
-128    = MYSQLI_BINARY_FLAG
-256    = MYSQLI_ENUM_FLAG
-512    = MYSQLI_AUTO_INCREMENT_FLAG
-1024   = MYSQLI_TIMESTAMP_FLAG
-2048   = MYSQLI_SET_FLAG
-32768  = MYSQLI_NUM_FLAG
-16384  = MYSQLI_PART_KEY_FLAG
-32768  = MYSQLI_GROUP_FLAG
-65536  = MYSQLI_UNIQUE_FLAG
-131072 = MYSQLI_BINCMP_FLAG
-*/
-
-	function &FetchField($fieldOffset = -1) 
-	{	
-		$fieldnr = $fieldOffset;
-		if ($fieldOffset != -1) {
-		  $fieldOffset = mysqli_field_seek($this->_queryID, $fieldnr);
-		}
-		$o = mysqli_fetch_field($this->_queryID);
-		/* Properties of an ADOFieldObject as set by MetaColumns */
-		$o->primary_key = $o->flags & MYSQLI_PRI_KEY_FLAG;
-		$o->not_null = $o->flags & MYSQLI_NOT_NULL_FLAG;
-		$o->auto_increment = $o->flags & MYSQLI_AUTO_INCREMENT_FLAG;
-		$o->binary = $o->flags & MYSQLI_BINARY_FLAG;
-		// $o->blob = $o->flags & MYSQLI_BLOB_FLAG; /* not returned by MetaColumns */
-		$o->unsigned = $o->flags & MYSQLI_UNSIGNED_FLAG;
-
-		return $o;
-	}
-
-	function &GetRowAssoc($upper = true)
-	{
-		if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
-		  return $this->fields;
-		$row =& ADORecordSet::GetRowAssoc($upper);
-		return $row;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{	
-	  if ($this->fetchMode != MYSQLI_NUM) 
-	    return @$this->fields[$colname];
-		
-	  if (!$this->bind) {
-	    $this->bind = array();
-	    for ($i = 0; $i < $this->_numOfFields; $i++) {
-	      $o = $this->FetchField($i);
-	      $this->bind[strtoupper($o->name)] = $i;
-	    }
-	  }
-	  return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-	function _seek($row)
-	{
-	  if ($this->_numOfRows == 0) 
-	    return false;
-
-	  if ($row < 0)
-	    return false;
-
-	  mysqli_data_seek($this->_queryID, $row);
-	  $this->EOF = false;
-	  return true;
-	}
-		
-	// 10% speedup to move MoveNext to child class
-	// This is the only implementation that works now (23-10-2003).
-	// Other functions return no or the wrong results.
-	function MoveNext() 
-	{
-		if ($this->EOF) return false;
-		$this->_currentRow++;
-		$this->fields = @mysqli_fetch_array($this->_queryID,$this->fetchMode);
-		
-		if (is_array($this->fields)) return true;
-		$this->EOF = true;
-		return false;
-	}	
-	
-	function _fetch()
-	{
-		$this->fields = mysqli_fetch_array($this->_queryID,$this->fetchMode);  
-	  	return is_array($this->fields);
-	}
-	
-	function _close() 
-	{
-		mysqli_free_result($this->_queryID); 
-	  	$this->_queryID = false;	
-	}
-	
-/*
-
-0 = MYSQLI_TYPE_DECIMAL
-1 = MYSQLI_TYPE_CHAR
-1 = MYSQLI_TYPE_TINY
-2 = MYSQLI_TYPE_SHORT
-3 = MYSQLI_TYPE_LONG
-4 = MYSQLI_TYPE_FLOAT
-5 = MYSQLI_TYPE_DOUBLE
-6 = MYSQLI_TYPE_NULL
-7 = MYSQLI_TYPE_TIMESTAMP
-8 = MYSQLI_TYPE_LONGLONG
-9 = MYSQLI_TYPE_INT24
-10 = MYSQLI_TYPE_DATE
-11 = MYSQLI_TYPE_TIME
-12 = MYSQLI_TYPE_DATETIME
-13 = MYSQLI_TYPE_YEAR
-14 = MYSQLI_TYPE_NEWDATE
-247 = MYSQLI_TYPE_ENUM
-248 = MYSQLI_TYPE_SET
-249 = MYSQLI_TYPE_TINY_BLOB
-250 = MYSQLI_TYPE_MEDIUM_BLOB
-251 = MYSQLI_TYPE_LONG_BLOB
-252 = MYSQLI_TYPE_BLOB
-253 = MYSQLI_TYPE_VAR_STRING
-254 = MYSQLI_TYPE_STRING
-255 = MYSQLI_TYPE_GEOMETRY
-*/
-
-	function MetaType($t, $len = -1, $fieldobj = false)
-	{
-		if (is_object($t)) {
-		    $fieldobj = $t;
-		    $t = $fieldobj->type;
-		    $len = $fieldobj->max_length;
-		}
-		
-		
-		 $len = -1; // mysql max_length is not accurate
-		 switch (strtoupper($t)) {
-		 case 'STRING': 
-		 case 'CHAR':
-		 case 'VARCHAR': 
-		 case 'TINYBLOB': 
-		 case 'TINYTEXT': 
-		 case 'ENUM': 
-		 case 'SET': 
-		
-		case MYSQLI_TYPE_TINY_BLOB :
-		case MYSQLI_TYPE_CHAR :
-		case MYSQLI_TYPE_STRING :
-		case MYSQLI_TYPE_ENUM :
-		case MYSQLI_TYPE_SET :
-		case 253 :
-		   if ($len <= $this->blobSize) return 'C';
-		   
-		case 'TEXT':
-		case 'LONGTEXT': 
-		case 'MEDIUMTEXT':
-		   return 'X';
-		
-		
-		   // php_mysql extension always returns 'blob' even if 'text'
-		   // so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-		
-		case MYSQLI_TYPE_BLOB :
-		case MYSQLI_TYPE_LONG_BLOB :
-		case MYSQLI_TYPE_MEDIUM_BLOB :
-		
-		   return !empty($fieldobj->binary) ? 'B' : 'X';
-		case 'YEAR':
-		case 'DATE': 
-		case MYSQLI_TYPE_DATE :
-		case MYSQLI_TYPE_YEAR :
-		
-		   return 'D';
-		
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP':
-		
-		case MYSQLI_TYPE_DATETIME :
-		case MYSQLI_TYPE_NEWDATE :
-		case MYSQLI_TYPE_TIME :
-		case MYSQLI_TYPE_TIMESTAMP :
-		
-			return 'T';
-		
-		case 'INT': 
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'TINYINT':
-		case 'MEDIUMINT':
-		case 'SMALLINT': 
-		
-		case MYSQLI_TYPE_INT24 :
-		case MYSQLI_TYPE_LONG :
-		case MYSQLI_TYPE_LONGLONG :
-		case MYSQLI_TYPE_SHORT :
-		case MYSQLI_TYPE_TINY :
-		
-		   if (!empty($fieldobj->primary_key)) return 'R';
-		   
-		   return 'I';
-		
-		
-		   // Added floating-point types
-		   // Maybe not necessery.
-		 case 'FLOAT':
-		 case 'DOUBLE':
-		   //		case 'DOUBLE PRECISION':
-		 case 'DECIMAL':
-		 case 'DEC':
-		 case 'FIXED':
-		 default:
-		 	//if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>"; 
-		 	return 'N';
-		}
-	} // function
-	
-
-} // rs class
- 
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-netezza.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-netezza.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-netezza.inc.php	(working copy)
@@ -1,170 +0,0 @@
-<?php
-/*
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
- 
-  First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
- Based on the previous postgres drivers.
- http://www.netezza.com/
- Major Additions/Changes:
-    MetaDatabasesSQL, MetaTablesSQL, MetaColumnsSQL
-    Note: You have to have admin privileges to access the system tables
-    Removed non-working keys code (Netezza has no concept of keys)
-    Fixed the way data types and lengths are returned in MetaColumns()
-    as well as added the default lengths for certain types
-    Updated public variables for Netezza
-    Still need to remove blob functions, as Netezza doesn't suppport blob
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-postgres64.inc.php');
-
-class ADODB_netezza extends ADODB_postgres64 {
-    var $databaseType = 'netezza';	
-	var $dataProvider = 'netezza';
-	var $hasInsertID = false;
-	var $_resultid = false;
-  	var $concat_operator='||';
-  	var $random = 'random';
-	var $metaDatabasesSQL = "select objname from _v_object_data where objtype='database' order by 1";
-    var $metaTablesSQL = "select objname from _v_object_data where objtype='table' order by 1";
-	var $isoDates = true; // accepts dates in ISO format
-	var $sysDate = "CURRENT_DATE";
-	var $sysTimeStamp = "CURRENT_TIMESTAMP";
-	var $blobEncodeType = 'C';
-	var $metaColumnsSQL = "SELECT attname, atttype FROM _v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
-	var $metaColumnsSQL1 = "SELECT attname, atttype FROM _v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
-	// netezza doesn't have keys. it does have distributions, so maybe this is 
-	// something that can be pulled from the system tables
-	var $metaKeySQL = "";
-	var $hasAffectedRows = true;
-	var $hasLimit = true;	
-	var $true = 't';		// string that represents TRUE for a database
-	var $false = 'f';		// string that represents FALSE for a database
-	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
-	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
-	var $ansiOuter = true;
-	var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
-							// http://bugs.php.net/bug.php?id=25404
-
-							
-	function ADODB_netezza() 
-	{
-	
-	}
-	
-	function &MetaColumns($table,$upper=true) 
-	{
-	
-	// Changed this function to support Netezza which has no concept of keys
-	// could posisbly work on other things from the system table later.
-	
-	global $ADODB_FETCH_MODE;
-	
-		$table = strtolower($table);
-
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ($rs === false) return false;
-
-		$retarr = array();
-		while (!$rs->EOF) { 	
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			
-			// since we're returning type and length as one string, 
-			// split them out here.
-			
-			if ($first = strstr($rs->fields[1], "(")) {
-			 $fld->max_length = trim($first, "()");
-			} else {
-			 $fld->max_length = -1;
-			}
-		
-			if ($first = strpos($rs->fields[1], "(")) {
-			 $fld->type = substr($rs->fields[1], 0, $first);
-			} else {
-			 $fld->type = $rs->fields[1];
-			}
-			
-			switch ($fld->type) {
-			 case "byteint":
-			 case "boolean":
-			 $fld->max_length = 1;
-			 break;
-			 case "smallint":
-			 $fld->max_length = 2;
-			 break;
-			 case "integer":
-			 case "numeric":
-			 case "date":
-			 $fld->max_length = 4;
-			 break;
-			 case "bigint":
-			 case "time":
-			 case "timestamp":
-			 $fld->max_length = 8;
-			 break;
-			 case "timetz":
-			 case "time with time zone":
-			 $fld->max_length = 12;
-			 break;
-			}
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		return $retarr;	
-		
-	}
-
-		
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_netezza extends ADORecordSet_postgres64
-{
-	var $databaseType = "netezza";
-	var $canSeek = true;
-	
-	function ADORecordSet_netezza($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = PGSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-	
-	// _initrs modified to disable blob handling
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($this->_queryID):-1;
-		$this->_numOfFields = @pg_numfields($this->_queryID);
-	}
-
-}
-?>
Index: admin/include/lib/adodb/drivers/adodb-proxy.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-proxy.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-proxy.inc.php	(working copy)
@@ -1,33 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 4.
-  
-  Synonym for csv driver.
-*/ 
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (! defined("_ADODB_PROXY_LAYER")) {
-	 define("_ADODB_PROXY_LAYER", 1 );
-	 include(ADODB_DIR."/drivers/adodb-csv.inc.php");
-	 
-	class ADODB_proxy extends ADODB_csv {
-		var $databaseType = 'proxy';
-		var $databaseProvider = 'csv';
-	}
-	class ADORecordset_proxy extends ADORecordset_csv {
-	var $databaseType = "proxy";		
-	
-		function ADORecordset_proxy($id,$mode=false) 
-		{
-			$this->ADORecordset($id,$mode);
-		}
-	};
-} // define
-	
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-pdo.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-pdo.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-pdo.inc.php	(working copy)
@@ -1,569 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Requires ODBC. Works on Windows and Unix.
-
-	Problems: 
-		Where is float/decimal type in pdo_param_type
-		LOB handling for CLOB/BLOB differs significantly
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-
-/*
-enum pdo_param_type {
-PDO::PARAM_NULL, 0
-
-/* int as in long (the php native int type).
- * If you mark a column as an int, PDO expects get_col to return
- * a pointer to a long 
-PDO::PARAM_INT, 1
-
-/* get_col ptr should point to start of the string buffer 
-PDO::PARAM_STR, 2
-
-/* get_col: when len is 0 ptr should point to a php_stream *,
- * otherwise it should behave like a string. Indicate a NULL field
- * value by setting the ptr to NULL 
-PDO::PARAM_LOB, 3
-
-/* get_col: will expect the ptr to point to a new PDOStatement object handle,
- * but this isn't wired up yet 
-PDO::PARAM_STMT, 4 /* hierarchical result set 
-
-/* get_col ptr should point to a zend_bool 
-PDO::PARAM_BOOL, 5
-
-
-/* magic flag to denote a parameter as being input/output 
-PDO::PARAM_INPUT_OUTPUT = 0x80000000
-};
-*/
-	
-function adodb_pdo_type($t)
-{
-	switch($t) {
-	case 2: return 'VARCHAR';
-	case 3: return 'BLOB';
-	default: return 'NUMERIC';
-	}
-}
-	 
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-
-////////////////////////////////////////////////
-
-
-
-class ADODB_pdo_base extends ADODB_pdo {
-
-	var $sysDate = "'?'";
-	var $sysTimeStamp = "'?'";
-	
-
-	function _init($parentDriver)
-	{
-		$parentDriver->_bindInputArray = true;
-		#$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
-	}
-	
-	function ServerInfo()
-	{
-		return ADOConnection::ServerInfo();
-	}
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
-	{
-		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		return $ret;
-	}
-	
-	function MetaTables()
-	{
-		return false;
-	}
-	
-	function MetaColumns()
-	{
-		return false;
-	}
-}
-
-
-class ADODB_pdo extends ADOConnection {
-	var $databaseType = "pdo";	
-	var $dataProvider = "pdo";
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $hasAffectedRows = true;
-	var $_bindInputArray = true;	
-	var $_genSeqSQL = "create table %s (id integer)";
-	var $_autocommit = true;
-	var $_haserrorfunctions = true;
-	var $_lastAffectedRows = 0;
-	
-	var $_errormsg = false;
-	var $_errorno = false;
-	
-	var $dsnType = '';
-	var $stmt = false;
-	
-	function ADODB_pdo()
-	{
-	}
-	
-	function _UpdatePDO()
-	{
-		$d = &$this->_driver;
-		$this->fmtDate = $d->fmtDate;
-		$this->fmtTimeStamp = $d->fmtTimeStamp;
-		$this->replaceQuote = $d->replaceQuote;
-		$this->sysDate = $d->sysDate;
-		$this->sysTimeStamp = $d->sysTimeStamp;
-		$this->random = $d->random;
-		$this->concat_operator = $d->concat_operator;
-		$this->nameQuote = $d->nameQuote;
-				
-		$this->hasGenID = $d->hasGenID;
-		$this->_genIDSQL = $d->_genIDSQL;
-		$this->_genSeqSQL = $d->_genSeqSQL;
-		$this->_dropSeqSQL = $d->_dropSeqSQL;
-
-		$d->_init($this);
-	}
-	
-	function Time()
-	{
-		if (!empty($this->_driver->_hasdual)) $sql = "select $this->sysTimeStamp from dual";
-		else $sql = "select $this->sysTimeStamp";
-		
-		$rs =& $this->_Execute($sql);
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
-		return false;
-	}
-	
-	// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persist=false)
-	{
-		$at = strpos($argDSN,':');
-		$this->dsnType = substr($argDSN,0,$at);
-
-		if ($argDatabasename) {
-			$argDSN .= ';dbname='.$argDatabasename;
-		}
-		try {
-			$this->_connectionID = new PDO($argDSN, $argUsername, $argPassword);
-		} catch (Exception $e) {
-			$this->_connectionID = false;
-			$this->_errorno = -1;
-			//var_dump($e);
-			$this->_errormsg = 'Connection attempt failed: '.$e->getMessage();
-			return false;
-		}
-		
-		if ($this->_connectionID) {
-			switch(ADODB_ASSOC_CASE){
-			case 0: $m = PDO::CASE_LOWER; break;
-			case 1: $m = PDO::CASE_UPPER; break;
-			default:
-			case 2: $m = PDO::CASE_NATURAL; break;
-			}
-			
-			//$this->_connectionID->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_SILENT );
-			$this->_connectionID->setAttribute(PDO::ATTR_CASE,$m);
-			
-			$class = 'ADODB_pdo_'.$this->dsnType;
-			//$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
-			switch($this->dsnType) {
-			case 'oci':
-			case 'mysql':
-			case 'pgsql':
-			case 'mssql':
-				include_once(ADODB_DIR.'/drivers/adodb-pdo_'.$this->dsnType.'.inc.php');
-				break;
-			}
-			if (class_exists($class))
-				$this->_driver = new $class();
-			else
-				$this->_driver = new ADODB_pdo_base();
-			
-			$this->_driver->_connectionID = $this->_connectionID;
-			$this->_UpdatePDO();
-			return true;
-		}
-		$this->_driver = new ADODB_pdo_base();
-		return false;
-	}
-	
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argDSN, $argUsername, $argPassword, $argDatabasename, true);
-	}
-	
-	/*------------------------------------------------------------------------------*/
-	
-	
-	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{	
-		$save = $this->_driver->fetchMode;
-		$this->_driver->fetchMode = $this->fetchMode;
-	 	$this->_driver->debug = $this->debug;
-		$ret = $this->_driver->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		$this->_driver->fetchMode = $save;
-		return $ret;
-	}
-	
-	
-	function ServerInfo()
-	{
-		return $this->_driver->ServerInfo();
-	}
-	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false)
-	{
-		return $this->_driver->MetaTables($ttype,$showSchema,$mask);
-	}
-	
-	function MetaColumns($table,$normalize=true)
-	{
-		return $this->_driver->MetaColumns($table,$normalize);
-	}
-	
-	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
-	{
-		$obj = $stmt[1];
-		if ($type) $obj->bindParam($name,$var,$type,$maxLen);
-		else $obj->bindParam($name, $var);
-	}
-	
-	
-	function ErrorMsg()
-	{
-		if ($this->_errormsg !== false) return $this->_errormsg;
-		if (!empty($this->_stmt)) $arr = $this->_stmt->errorInfo();
-		else if (!empty($this->_connectionID)) $arr = $this->_connectionID->errorInfo();
-		else return 'No Connection Established';
-		
-		
-		if ($arr) {
-		 	if (sizeof($arr)<2) return '';
-			if ((integer)$arr[1]) return $arr[2];
-			else return '';
-		} else return '-1';
-	}
-	
-
-	function ErrorNo()
-	{
-		if ($this->_errorno !== false) return $this->_errorno;
-		if (!empty($this->_stmt)) $err = $this->_stmt->errorCode();
-		else if (!empty($this->_connectionID)) {
-			$arr = $this->_connectionID->errorInfo();
-			if (isset($arr[0])) $err = $arr[0];
-			else $err = -1;
-		} else
-			return 0;
-			
-		if ($err == '00000') return 0; // allows empty check
-		return $err;
-	}
-
-	function BeginTrans()
-	{	
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-		$this->_autocommit = false;
-		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,false);
-		return $this->_connectionID->beginTransaction();
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		
-		$ret = $this->_connectionID->commit();
-		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		
-		$ret = $this->_connectionID->rollback();
-		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
-		return $ret;
-	}
-	
-	function Prepare($sql)
-	{
-		$this->_stmt = $this->_connectionID->prepare($sql);
-		if ($this->_stmt) return array($sql,$this->_stmt);
-		
-		return false;
-	}
-	
-	function PrepareStmt($sql)
-	{
-		$stmt = $this->_connectionID->prepare($sql);
-		if (!$stmt) return false;
-		$obj = new ADOPDOStatement($stmt,$this);
-		return $obj;
-	}
-	
-	
-	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
-	{
-		if (is_array($sql)) {
-			$stmt = $sql[1];
-		} else {
-			$stmt = $this->_connectionID->prepare($sql);
-		}
-		#adodb_backtrace();
-		#var_dump($this->_bindInputArray);
-		if ($stmt) {
-			$this->_driver->debug = $this->debug;
-			if ($inputarr) $ok = $stmt->execute($inputarr);
-			else $ok = $stmt->execute();
-		} 
-		
-		
-		$this->_errormsg = false;
-		$this->_errorno = false;
-			
-		if ($ok) {
-			$this->_stmt = $stmt;
-			return $stmt;
-		}
-		
-		if ($stmt) {
-			
-			$arr = $stmt->errorinfo();
-			if ((integer)$arr[1]) {
-				$this->_errormsg = $arr[2];
-				$this->_errorno = $arr[1];
-			}
-
-		} else {
-			$this->_errormsg = false;
-			$this->_errorno = false;
-		}
-		return false;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		$this->_stmt = false;
-		return true;
-	}
-
-	function _affectedrows()
-	{
-		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
-	}
-	
-	function _insertid()
-	{
-		return ($this->_connectionID) ? $this->_connectionID->lastInsertId() : 0;
-	}
-}
-
-class ADOPDOStatement {
-
-	var $databaseType = "pdo";		
-	var $dataProvider = "pdo";
-	var $_stmt;
-	var $_connectionID;
-	
-	function ADOPDOStatement($stmt,$connection)
-	{
-		$this->_stmt = $stmt;
-		$this->_connectionID = $connection;
-	}
-	
-	function Execute($inputArr=false)
-	{
-		$savestmt = $this->_connectionID->_stmt;
-		$rs = $this->_connectionID->Execute(array(false,$this->_stmt),$inputArr);
-		$this->_connectionID->_stmt = $savestmt;
-		return $rs;
-	}
-	
-	function InParameter(&$var,$name,$maxLen=4000,$type=false)
-	{
-
-		if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
-		else $this->_stmt->bindParam($name, $var);
-	}
-	
-	function Affected_Rows()
-	{
-		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
-	}
-	
-	function ErrorMsg()
-	{
-		if ($this->_stmt) $arr = $this->_stmt->errorInfo();
-		else $arr = $this->_connectionID->errorInfo();
-
-		if (is_array($arr)) {
-			if ((integer) $arr[0] && isset($arr[2])) return $arr[2];
-			else return '';
-		} else return '-1';
-	}
-	
-	function NumCols()
-	{
-		return ($this->_stmt) ? $this->_stmt->columnCount() : 0;
-	}
-	
-	function ErrorNo()
-	{
-		if ($this->_stmt) return $this->_stmt->errorCode();
-		else return $this->_connectionID->errorInfo();
-	}
-}
-
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_pdo extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "pdo";		
-	var $dataProvider = "pdo";
-	
-	function ADORecordSet_pdo($id,$mode=false)
-	{
-		if ($mode === false) {  
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->adodbFetchMode = $mode;
-		switch($mode) {
-		case ADODB_FETCH_NUM: $mode = PDO::FETCH_NUM; break;
-		case ADODB_FETCH_ASSOC:  $mode = PDO::FETCH_ASSOC; break;
-		
-		case ADODB_FETCH_BOTH: 
-		default: $mode = PDO::FETCH_BOTH; break;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $id;
-		$this->ADORecordSet($id);
-	}
-
-	
-	function Init()
-	{
-		if ($this->_inited) return;
-		$this->_inited = true;
-		if ($this->_queryID) @$this->_initrs();
-		else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-		}
-		if ($this->_numOfRows != 0 && $this->_currentRow == -1) {
-			$this->_currentRow = 0;
-			if ($this->EOF = ($this->_fetch() === false)) {
-				$this->_numOfRows = 0; // _numOfRows could be -1
-			}
-		} else {
-			$this->EOF = true;
-		}
-	}
-	
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-	
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @$this->_queryID->rowCount() : -1;
-		if (!$this->_numOfRows) $this->_numOfRows = -1;
-		$this->_numOfFields = $this->_queryID->columnCount();
-	}
-
-	// returns the field object
-	function &FetchField($fieldOffset = -1) 
-	{
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$arr = @$this->_queryID->getColumnMeta($fieldOffset);
-		if (!$arr) {
-			$o->name = 'bad getColumnMeta()';
-			$o->max_length = -1;
-			$o->type = 'VARCHAR';
-			$o->precision = 0;
-	#		$false = false;
-			return $o;
-		}
-		//adodb_pr($arr);
-		$o->name = $arr['name'];
-		if (isset($arr['native_type']) && $arr['native_type'] <> "null") $o->type = $arr['native_type'];
-		else $o->type = adodb_pdo_type($arr['pdo_type']);
-		$o->max_length = $arr['len'];
-		$o->precision = $arr['precision'];
-		
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-		return $o;
-	}
-	
-	function _seek($row)
-	{
-		return false;
-	}
-	
-	function _fetch()
-	{
-		if (!$this->_queryID) return false;
-		
-		$this->fields = $this->_queryID->fetch($this->fetchMode);
-		return !empty($this->fields);
-	}
-	
-	function _close() 
-	{
-		$this->_queryID = false;
-	}
-	
-	function Fields($colname)
-	{
-		if ($this->adodbFetchMode != ADODB_FETCH_NUM) return @$this->fields[$colname];
-		
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-ado_access.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-ado_access.inc.php	(working copy)
@@ -1,55 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-Released under both BSD license and Lesser GPL library license. 
-Whenever there is any discrepancy between the two licenses, 
-the BSD license will take precedence. See License.txt. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-	Microsoft Access ADO data driver. Requires ADO and ODBC. Works only on MS Windows.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ADO_LAYER')) {
-	if (PHP_VERSION >= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
-	else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
-}
-
-class  ADODB_ado_access extends ADODB_ado {	
-	var $databaseType = 'ado_access';
-	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
-	var $fmtDate = "#Y-m-d#";
-	var $fmtTimeStamp = "#Y-m-d h:i:sA#";// note no comma
-	var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
-	var $sysTimeStamp = 'NOW';
-	var $hasTransactions = false;
-	var $upperCase = 'ucase';
-	
-	function ADODB_ado_access()
-	{
-		$this->ADODB_ado();
-	}
-	
-	function BeginTrans() { return false;}
-	
-	function CommitTrans() { return false;}
-	
-	function RollbackTrans() { return false;}
-
-}
-
- 
-class  ADORecordSet_ado_access extends ADORecordSet_ado {	
-	
-	var $databaseType = "ado_access";		
-	
-	function ADORecordSet_ado_access($id,$mode=false)
-	{
-		return $this->ADORecordSet_ado($id,$mode);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-odbc_mssql.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-odbc_mssql.inc.php	(working copy)
@@ -1,306 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  MSSQL support via ODBC. Requires ODBC. Works on Windows and Unix. 
-  For Unix configuration, see http://phpbuilder.com/columns/alberto20000919.php3
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-
- 
-class  ADODB_odbc_mssql extends ADODB_odbc {	
-	var $databaseType = 'odbc_mssql';
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $_bindInputArray = true;
-	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE'))";
-	var $metaColumnsSQL = "select c.name,t.name,c.length from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
-	var $hasTop = 'top';		// support mssql/interbase SELECT TOP 10 * FROM TABLE
-	var $sysDate = 'GetDate()';
-	var $sysTimeStamp = 'GetDate()';
-	var $leftOuter = '*=';
-	var $rightOuter = '=*';
-	var $substr = 'substring';
-	var $length = 'len';
-	var $ansiOuter = true; // for mssql7 or later
-	var $identitySQL = 'select @@IDENTITY'; // 'select SCOPE_IDENTITY'; # for mssql 2000
-	var $hasInsertID = true;
-	var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET CONCAT_NULL_YIELDS_NULL is ON, 
-														  # concatenating a null value with a string yields a NULL result
-	
-	function ADODB_odbc_mssql()
-	{
-		$this->ADODB_odbc();
-		//$this->curmode = SQL_CUR_USE_ODBC;	
-	}
-
-	// crashes php...
-	function ServerInfo()
-	{
-	global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$row = $this->GetRow("execute sp_server_info 2");
-		$ADODB_FETCH_MODE = $save;
-		if (!is_array($row)) return false;
-		$arr['description'] = $row[2];
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-
-	function IfNull( $field, $ifNull ) 
-	{
-		return " ISNULL($field, $ifNull) "; // if MS SQL Server
-	}
-	
-	function _insertid()
-	{
-	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in 
-	// the same scope. A scope is a module -- a stored procedure, trigger, 
-	// function, or batch. Thus, two statements are in the same scope if 
-	// they are in the same stored procedure, function, or batch.
-			return $this->GetOne($this->identitySQL);
-	}
-	
-	
-	function MetaForeignKeys($table, $owner=false, $upper=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		
-		$sql = 
-"select object_name(constid) as constraint_name,
-	col_name(fkeyid, fkey) as column_name,
-	object_name(rkeyid) as referenced_table_name,
-   	col_name(rkeyid, rkey) as referenced_column_name
-from sysforeignkeys
-where upper(object_name(fkeyid)) = $table
-order by constraint_name, referenced_table_name, keyno";
-		
-		$constraints =& $this->GetArray($sql);
-		
-		$ADODB_FETCH_MODE = $save;
-		
-		$arr = false;
-		foreach($constraints as $constr) {
-			//print_r($constr);
-			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
-		}
-		if (!$arr) return false;
-		
-		$arr2 = false;
-		
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
-				$arr2[$a] = $b;
-			}
-		}
-		return $arr2;
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {$this->debug=1;
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr($mask);
-			$this->metaTablesSQL .= " AND name like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	function &MetaColumns($table)
-	{
-		$arr = ADOConnection::MetaColumns($table);
-		return $arr;
-	}
-	
-	
-	function &MetaIndexes($table,$primary=false)
-	{
-		$table = $this->qstr($table);
-
-		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
-			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
-			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
-			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
-			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
-			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
-			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
-			ORDER BY O.name, I.Name, K.keyno";
-
-		global $ADODB_FETCH_MODE;
-		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
-        
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
-
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
-
-		$indexes = array();
-		while ($row = $rs->FetchRow()) {
-			if (!$primary && $row[5]) continue;
-			
-            $indexes[$row[0]]['unique'] = $row[6];
-            $indexes[$row[0]]['columns'][] = $row[1];
-    	}
-        return $indexes;
-	}
-	
-	function _query($sql,$inputarr)
-	{
-		if (is_string($sql)) $sql = str_replace('||','+',$sql);
-		return ADODB_odbc::_query($sql,$inputarr);
-	}
-	
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET TRANSACTION ".$transaction_mode);
-	}
-	
-	// "Stein-Aksel Basma" <basma@accelero.no>
-	// tested with MSSQL 2000
-	function &MetaPrimaryKeys($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$schema = '';
-		$this->_findschema($table,$schema);
-		//if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
-	
-		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
-		information_schema.table_constraints tc 
-		where tc.constraint_name = k.constraint_name and tc.constraint_type =
-		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		$a = $this->GetCol($sql);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if ($a && sizeof($a)>0) return $a;
-		$false = false;
-		return $false;	  
-	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		if ($nrows > 0 && $offset <= 0) {
-			$sql = preg_replace(
-				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
-			$rs =& $this->Execute($sql,$inputarr);
-		} else
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			
-		return $rs;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '+';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "datename(yyyy,$col)";
-				break;
-			case 'M':
-				$s .= "convert(char(3),$col,0)";
-				break;
-			case 'm':
-				$s .= "replace(str(month($col),2),' ','0')";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "datename(quarter,$col)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "replace(str(day($col),2),' ','0')";
-				break;
-			case 'h':
-				$s .= "substring(convert(char(14),$col,0),13,2)";
-				break;
-			
-			case 'H':
-				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
-				break;
-				
-			case 'i':
-				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
-				break;
-			case 's':
-				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
-				break;
-			case 'a':
-			case 'A':
-				$s .= "substring(convert(char(19),$col,0),18,2)";
-				break;
-				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
-			}
-		}
-		return $s;
-	}
-
-} 
- 
-class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {	
-	
-	var $databaseType = 'odbc_mssql';
-	
-	function ADORecordSet_odbc_mssql($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}	
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-ado5.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-ado5.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-ado5.inc.php	(working copy)
@@ -1,665 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-	Microsoft ADO data driver. Requires ADO. Works only on MS Windows. PHP5 compat version.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-	
-define("_ADODB_ADO_LAYER", 1 );
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-
-	
-class ADODB_ado extends ADOConnection {
-	var $databaseType = "ado";	
-	var $_bindInputArray = false;
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $dataProvider = "ado";	
-	var $hasAffectedRows = true;
-	var $adoParameterType = 201; // 201 = long varchar, 203=long wide varchar, 205 = long varbinary
-	var $_affectedRows = false;
-	var $_thisTransactions;
-	var $_cursor_type = 3; // 3=adOpenStatic,0=adOpenForwardOnly,1=adOpenKeyset,2=adOpenDynamic
-	var $_cursor_location = 3; // 2=adUseServer, 3 = adUseClient;
-	var $_lock_type = -1;
-	var $_execute_option = -1;
-	var $poorAffectedRows = true; 
-	var $charPage;
-		
-	function ADODB_ado() 
-	{ 	
-		$this->_affectedRows = new VARIANT;
-	}
-
-	function ServerInfo()
-	{
-		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
-		return array('description' => $desc, 'version' => '');
-	}
-	
-	function _affectedrows()
-	{
-		if (PHP_VERSION >= 5) return $this->_affectedRows;
-		
-		return $this->_affectedRows->value;
-	}
-	
-	// you can also pass a connection string like this:
-	//
-	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-	function _connect($argHostname, $argUsername, $argPassword,$argDBorProvider, $argProvider= '')
-	{
-	// two modes
-	//	-	if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
-	//	- 	if $argProvider is not empty, then $argDBorProvider holds db
-	
-		
-		 if ($argProvider) {
-		 	$argDatabasename = $argDBorProvider;
-		 } else {
-		 	$argDatabasename = '';
-		 	if ($argDBorProvider) $argProvider = $argDBorProvider;
-			else $argProvider = 'MSDASQL';
-		}
-		
-		
-		try {
-		$u = 'UID';
-		$p = 'PWD';
-	
-		if (!empty($this->charPage))
-			$dbc = new COM('ADODB.Connection',null,$this->charPage);
-		else
-			$dbc = new COM('ADODB.Connection');
-			
-		if (! $dbc) return false;
-
-		/* special support if provider is mssql or access */
-		if ($argProvider=='mssql') {
-			$u = 'User Id';  //User parameter name for OLEDB
-			$p = 'Password'; 
-			$argProvider = "SQLOLEDB"; // SQL Server Provider
-			
-			// not yet
-			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
-			
-			//use trusted conection for SQL if username not specified
-			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
-		} else if ($argProvider=='access')
-			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
-		
-		if ($argProvider) $dbc->Provider = $argProvider;	
-
-		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";		
-		if ($argUsername) $argHostname .= ";$u=$argUsername";
-		if ($argPassword)$argHostname .= ";$p=$argPassword";
-		
-		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."<BR>\n version=$dbc->version");
-		// @ added below for php 4.0.1 and earlier
-		@$dbc->Open((string) $argHostname);
-		
-		$this->_connectionID = $dbc;
-		
-		$dbc->CursorLocation = $this->_cursor_location;
-		return  $dbc->State > 0;
-		} catch (exception $e) {
-		}
-		
-		return false;
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
-	{
-		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
-	}	
-	
-/*
-	adSchemaCatalogs	= 1,
-	adSchemaCharacterSets	= 2,
-	adSchemaCollations	= 3,
-	adSchemaColumns	= 4,
-	adSchemaCheckConstraints	= 5,
-	adSchemaConstraintColumnUsage	= 6,
-	adSchemaConstraintTableUsage	= 7,
-	adSchemaKeyColumnUsage	= 8,
-	adSchemaReferentialContraints	= 9,
-	adSchemaTableConstraints	= 10,
-	adSchemaColumnsDomainUsage	= 11,
-	adSchemaIndexes	= 12,
-	adSchemaColumnPrivileges	= 13,
-	adSchemaTablePrivileges	= 14,
-	adSchemaUsagePrivileges	= 15,
-	adSchemaProcedures	= 16,
-	adSchemaSchemata	= 17,
-	adSchemaSQLLanguages	= 18,
-	adSchemaStatistics	= 19,
-	adSchemaTables	= 20,
-	adSchemaTranslations	= 21,
-	adSchemaProviderTypes	= 22,
-	adSchemaViews	= 23,
-	adSchemaViewColumnUsage	= 24,
-	adSchemaViewTableUsage	= 25,
-	adSchemaProcedureParameters	= 26,
-	adSchemaForeignKeys	= 27,
-	adSchemaPrimaryKeys	= 28,
-	adSchemaProcedureColumns	= 29,
-	adSchemaDBInfoKeywords	= 30,
-	adSchemaDBInfoLiterals	= 31,
-	adSchemaCubes	= 32,
-	adSchemaDimensions	= 33,
-	adSchemaHierarchies	= 34,
-	adSchemaLevels	= 35,
-	adSchemaMeasures	= 36,
-	adSchemaProperties	= 37,
-	adSchemaMembers	= 38
-
-*/
-	
-	function &MetaTables()
-	{
-		$arr= array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(20);//tables
-		if ($adors){
-			$f = $adors->Fields(2);//table/view name
-			$t = $adors->Fields(3);//table type
-			while (!$adors->EOF){
-				$tt=substr($t->value,0,6);
-				if ($tt!='SYSTEM' && $tt !='ACCESS')
-					$arr[]=$f->value;
-				//print $f->value . ' ' . $t->value.'<br>';
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		
-		return $arr;
-	}
-	
-	function &MetaColumns($table)
-	{
-		$table = strtoupper($table);
-		$arr= array();
-		$dbc = $this->_connectionID;
-		
-		$adors=@$dbc->OpenSchema(4);//tables
-	
-		if ($adors){
-			$t = $adors->Fields(2);//table/view name
-			while (!$adors->EOF){
-				
-				
-				if (strtoupper($t->Value) == $table) {
-				
-					$fld = new ADOFieldObject();
-					$c = $adors->Fields(3);
-					$fld->name = $c->Value;
-					$fld->type = 'CHAR'; // cannot discover type in ADO!
-					$fld->max_length = -1;
-					$arr[strtoupper($fld->name)]=$fld;
-				}
-		
-				$adors->MoveNext();
-			}
-			$adors->Close();
-		}
-		
-		return $arr;
-	}
-	
-	/* returns queryID or false */
-	function &_query($sql,$inputarr=false) 
-	{
-		try { // In PHP5, all COM errors are exceptions, so to maintain old behaviour...
-		
-		$dbc = $this->_connectionID;
-		
-	//	return rs	
-	
-		$false = false;
-		
-		if ($inputarr) {
-			
-			if (!empty($this->charPage))
-				$oCmd = new COM('ADODB.Command',null,$this->charPage);
-			else
-				$oCmd = new COM('ADODB.Command');
-			$oCmd->ActiveConnection = $dbc;
-			$oCmd->CommandText = $sql;
-			$oCmd->CommandType = 1;
-
-			foreach($inputarr as $val) {
-				// name, type, direction 1 = input, len,
-				$this->adoParameterType = 130;
-				$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val);
-				//print $p->Type.' '.$p->value;
-				$oCmd->Parameters->Append($p);
-			}
-			$p = false;
-			$rs = $oCmd->Execute();
-			$e = $dbc->Errors;
-			if ($dbc->Errors->Count > 0) return $false;
-			return $rs;
-		}
-		
-		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
-			
-		if ($dbc->Errors->Count > 0) return $false;
-		if (! $rs) return $false;
-		
-		if ($rs->State == 0) {
-			$true = true;
-			return $true; // 0 = adStateClosed means no records returned
-		}
-		return $rs;
-		
-		} catch (exception $e) {
-			
-		}
-		return $false;
-	}
-
-	
-	function BeginTrans() 
-	{ 
-		if ($this->transOff) return true;
-		
-		if (isset($this->_thisTransactions))
-			if (!$this->_thisTransactions) return false;
-		else {
-			$o = $this->_connectionID->Properties("Transaction DDL");
-			$this->_thisTransactions = $o ? true : false;
-			if (!$o) return false;
-		}
-		@$this->_connectionID->BeginTrans();
-		$this->transCnt += 1;
-		return true;
-	}
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		
-		@$this->_connectionID->CommitTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	function RollbackTrans() {
-		if ($this->transOff) return true;
-		@$this->_connectionID->RollbackTrans();
-		if ($this->transCnt) @$this->transCnt -= 1;
-		return true;
-	}
-	
-	/*	Returns: the last error message from previous database operation	*/	
-
-	function ErrorMsg() 
-	{
-		if (!$this->_connectionID) return "No connection established";
-		$errmsg = '';
-		
-		try {
-			$errc = $this->_connectionID->Errors;
-			if (!$errc) return "No Errors object found";
-			if ($errc->Count == 0) return '';
-			$err = $errc->Item($errc->Count-1);
-			$errmsg = $err->Description;
-		}catch(exception $e) {
-		}
-		return $errmsg;
-	}
-	
-	function ErrorNo() 
-	{
-		$errc = $this->_connectionID->Errors;
-		if ($errc->Count == 0) return 0;
-		$err = $errc->Item($errc->Count-1);
-		return $err->NativeError;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		if ($this->_connectionID) $this->_connectionID->Close();
-		$this->_connectionID = false;
-		return true;
-	}
-	
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_ado extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "ado";	
-	var $dataProvider = "ado";	
-	var $_tarr = false; // caches the types
-	var $_flds; // and field objects
-	var $canSeek = true;
-  	var $hideErrors = true;
-		  
-	function ADORecordSet_ado($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
-	}
-
-
-	// returns the field object
-	function &FetchField($fieldOffset = -1) {
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$rs = $this->_queryID;
-		$f = $rs->Fields($fieldOffset);
-		$o->name = $f->Name;
-		$t = $f->Type;
-		$o->type = $this->MetaType($t);
-		$o->max_length = $f->DefinedSize;
-		$o->ado_type = $t;
-		
-
-		//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-		
-	function _initrs()
-	{
-		$rs = $this->_queryID;
-		$this->_numOfRows = $rs->RecordCount;
-		
-		$f = $rs->Fields;
-		$this->_numOfFields = $f->Count;
-	}
-	
-	
-	 // should only be used to move forward as we normally use forward-only cursors
-	function _seek($row)
-	{
-	   $rs = $this->_queryID; 
-		// absoluteposition doesn't work -- my maths is wrong ?
-		//	$rs->AbsolutePosition->$row-2;
-		//	return true;
-		if ($this->_currentRow > $row) return false;
-		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
-		return true;
-	}
-	
-/*
-	OLEDB types
-	
-	 enum DBTYPEENUM
-	{	DBTYPE_EMPTY	= 0,
-	DBTYPE_NULL	= 1,
-	DBTYPE_I2	= 2,
-	DBTYPE_I4	= 3,
-	DBTYPE_R4	= 4,
-	DBTYPE_R8	= 5,
-	DBTYPE_CY	= 6,
-	DBTYPE_DATE	= 7,
-	DBTYPE_BSTR	= 8,
-	DBTYPE_IDISPATCH	= 9,
-	DBTYPE_ERROR	= 10,
-	DBTYPE_BOOL	= 11,
-	DBTYPE_VARIANT	= 12,
-	DBTYPE_IUNKNOWN	= 13,
-	DBTYPE_DECIMAL	= 14,
-	DBTYPE_UI1	= 17,
-	DBTYPE_ARRAY	= 0x2000,
-	DBTYPE_BYREF	= 0x4000,
-	DBTYPE_I1	= 16,
-	DBTYPE_UI2	= 18,
-	DBTYPE_UI4	= 19,
-	DBTYPE_I8	= 20,
-	DBTYPE_UI8	= 21,
-	DBTYPE_GUID	= 72,
-	DBTYPE_VECTOR	= 0x1000,
-	DBTYPE_RESERVED	= 0x8000,
-	DBTYPE_BYTES	= 128,
-	DBTYPE_STR	= 129,
-	DBTYPE_WSTR	= 130,
-	DBTYPE_NUMERIC	= 131,
-	DBTYPE_UDT	= 132,
-	DBTYPE_DBDATE	= 133,
-	DBTYPE_DBTIME	= 134,
-	DBTYPE_DBTIMESTAMP	= 135
-	
-	ADO Types
-	
-   	adEmpty	= 0,
-	adTinyInt	= 16,
-	adSmallInt	= 2,
-	adInteger	= 3,
-	adBigInt	= 20,
-	adUnsignedTinyInt	= 17,
-	adUnsignedSmallInt	= 18,
-	adUnsignedInt	= 19,
-	adUnsignedBigInt	= 21,
-	adSingle	= 4,
-	adDouble	= 5,
-	adCurrency	= 6,
-	adDecimal	= 14,
-	adNumeric	= 131,
-	adBoolean	= 11,
-	adError	= 10,
-	adUserDefined	= 132,
-	adVariant	= 12,
-	adIDispatch	= 9,
-	adIUnknown	= 13,	
-	adGUID	= 72,
-	adDate	= 7,
-	adDBDate	= 133,
-	adDBTime	= 134,
-	adDBTimeStamp	= 135,
-	adBSTR	= 8,
-	adChar	= 129,
-	adVarChar	= 200,
-	adLongVarChar	= 201,
-	adWChar	= 130,
-	adVarWChar	= 202,
-	adLongVarWChar	= 203,
-	adBinary	= 128,
-	adVarBinary	= 204,
-	adLongVarBinary	= 205,
-	adChapter	= 136,
-	adFileTime	= 64,
-	adDBFileTime	= 137,
-	adPropVariant	= 138,
-	adVarNumeric	= 139
-*/
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		if (!is_numeric($t)) return $t;
-		
-		switch ($t) {
-		case 0:
-		case 12: // variant
-		case 8: // bstr
-		case 129: //char
-		case 130: //wc
-		case 200: // varc
-		case 202:// varWC
-		case 128: // bin
-		case 204: // varBin
-		case 72: // guid
-			if ($len <= $this->blobSize) return 'C';
-		
-		case 201:
-		case 203:
-			return 'X';
-		case 128:
-		case 204:
-		case 205:
-			 return 'B';
-		case 7:
-		case 133: return 'D';
-		
-		case 134:
-		case 135: return 'T';
-		
-		case 11: return 'L';
-		
-		case 16://	adTinyInt	= 16,
-		case 2://adSmallInt	= 2,
-		case 3://adInteger	= 3,
-		case 4://adBigInt	= 20,
-		case 17://adUnsignedTinyInt	= 17,
-		case 18://adUnsignedSmallInt	= 18,
-		case 19://adUnsignedInt	= 19,
-		case 20://adUnsignedBigInt	= 21,
-			return 'I';
-		default: return 'N';
-		}
-	}
-	
-	// time stamp not supported yet
-	function _fetch()
-	{	
-		$rs = $this->_queryID;
-		if (!$rs or $rs->EOF) {
-			$this->fields = false;
-			return false;
-		}
-		$this->fields = array();
-	
-		if (!$this->_tarr) {
-			$tarr = array();
-			$flds = array();
-			for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-				$f = $rs->Fields($i);
-				$flds[] = $f;
-				$tarr[] = $f->Type;
-			}
-			// bind types and flds only once
-			$this->_tarr = $tarr; 
-			$this->_flds = $flds;
-		}
-		$t = reset($this->_tarr);
-		$f = reset($this->_flds);
-		
-		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
-		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
-			//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
-			switch($t) {
-			case 135: // timestamp
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
-						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
-						$val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
-					else 
-						$val = $f->value;
-					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
-				if ($val = $f->value) {
-					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
-				} else
-					$this->fields[] = false;
-				break;
-			case 7: // adDate
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
-					else $val = $f->value;
-					
-					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
-					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;
-			case 1: // null
-				$this->fields[] = false;
-				break;
-			case 6: // currency is not supported properly;
-				ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
-				$this->fields[] = (float) $f->value;
-				break;
-			default:
-				$this->fields[] = $f->value; 
-				break;
-			}
-			//print " $f->value $t, ";
-			$f = next($this->_flds);
-			$t = next($this->_tarr);
-		} // for
-		if ($this->hideErrors) error_reporting($olde);
-		@$rs->MoveNext(); // @ needed for some versions of PHP!
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		return true;
-	}
-	
-		function NextRecordSet()
-		{
-			$rs = $this->_queryID;
-			$this->_queryID = $rs->NextRecordSet();
-			//$this->_queryID = $this->_QueryId->NextRecordSet();
-			if ($this->_queryID == null) return false;
-			
-			$this->_currentRow = -1;
-			$this->_currentPage = -1;
-			$this->bind = false;
-			$this->fields = false;
-			$this->_flds = false;
-			$this->_tarr = false;
-			
-			$this->_inited = false;
-			$this->Init();
-			return true;
-		}
-
-	function _close() {
-		$this->_flds = false;
-		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
-		$this->_queryID = false;	
-	}
-
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-mysqlt.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-mysqlt.inc.php	(working copy)
@@ -1,155 +0,0 @@
-<?php
-
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  Set tabs to 8.
-  
-  MySQL code that supports transactions. For MySQL 3.23 or later.
-  Code from James Poon <jpoon88@yahoo.com>
-  
-  Requires mysql client. Works on Windows and Unix.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
-
-
-class ADODB_mysqlt extends ADODB_mysql {
-	var $databaseType = 'mysqlt';
-	var $ansiOuter = true; // for Version 3.23.17 or later
-	var $hasTransactions = true;
-	var $autoRollback = true; // apparently mysql does not autorollback properly 
-	
-	function ADODB_mysqlt() 
-	{			
-	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
-	}
-	
-	/* set transaction mode
-	
-	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
-{ READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
-
-	*/
-	function SetTransactionMode( $transaction_mode ) 
-	{
-		$this->_transmode  = $transaction_mode;
-		if (empty($transaction_mode)) {
-			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
-			return;
-		}
-		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
-		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
-	}
-	
-	function BeginTrans()
-	{	  
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->Execute('SET AUTOCOMMIT=0');
-		$this->Execute('BEGIN');
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		$this->Execute('SET AUTOCOMMIT=1');
-		return true;
-	}
-	
-	function RowLock($tables,$where='',$flds='1 as adodb_ignore') 
-	{
-		if ($this->transCnt==0) $this->BeginTrans();
-		if ($where) $where = ' where '.$where;
-		$rs =& $this->Execute("select $flds from $tables $where for update");
-		return !empty($rs); 
-	}
-	
-}
-
-class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
-	var $databaseType = "mysqlt";
-	
-	function ADORecordSet_mysqlt($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = MYSQL_BOTH; break;
-		}
-	
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function MoveNext()
-	{
-		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}
-}
-
-class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
-
-	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: 
-			$this->fetchMode = MYSQL_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
-	}
-	
-	function MoveNext()
-	{
-		return adodb_movenext($this);
-	}
-}
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-informix.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-informix.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-informix.inc.php	(working copy)
@@ -1,40 +0,0 @@
-<?php
-/**
-* @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-* Released under both BSD license and Lesser GPL library license.
-* Whenever there is any discrepancy between the two licenses,
-* the BSD license will take precedence.
-*
-* Set tabs to 4 for best viewing.
-*
-* Latest version is available at http://php.weblogs.com
-*
-* Informix 9 driver that supports SELECT FIRST
-*
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-include_once(ADODB_DIR.'/drivers/adodb-informix72.inc.php');
-
-class ADODB_informix extends ADODB_informix72 {
-	var $databaseType = "informix";
-	var $hasTop = 'FIRST';
-	var $ansiOuter = true;
-	
-	function IfNull( $field, $ifNull )
-	{
-		return " NVL($field, $ifNull) "; // if Informix 9.X or 10.X
-	}
-}
-
-class ADORecordset_informix extends ADORecordset_informix72 {
-	var $databaseType = "informix";
-	
-	function ADORecordset_informix($id,$mode=false)
-	{
-		$this->ADORecordset_informix72($id,$mode);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-vfp.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-vfp.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-vfp.inc.php	(working copy)
@@ -1,107 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-if (!defined('ADODB_VFP')){
-define('ADODB_VFP',1);
-class ADODB_vfp extends ADODB_odbc {
-	var $databaseType = "vfp";	
-	var $fmtDate = "{^Y-m-d}";
-	var $fmtTimeStamp = "{^Y-m-d, h:i:sA}";
-	var $replaceQuote = "'+chr(39)+'" ;
-	var $true = '.T.';
-	var $false = '.F.';
-	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
-	var $_bindInputArray = false; // strangely enough, setting to true does not work reliably
-	var $sysTimeStamp = 'datetime()';
-	var $sysDate = 'date()';
-	var $ansiOuter = true;
-	var $hasTransactions = false;
-	var $curmode = false ; // See sqlext.h, SQL_CUR_DEFAULT == SQL_CUR_USE_DRIVER == 2L
-	
-	function ADODB_vfp()
-	{
-		$this->ADODB_odbc();
-	}
-	
-	function Time()
-	{
-		return time();
-	}
-	
-	function BeginTrans() { return false;}
-	
-	// quote string to be sent back to database
-	function qstr($s,$nofixquotes=false)
-	{
-		if (!$nofixquotes) return  "'".str_replace("\r\n","'+chr(13)+'",str_replace("'",$this->replaceQuote,$s))."'";
-		return "'".$s."'";
-	}
-
-	
-	// TOP requires ORDER BY for VFP
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		$this->hasTop = preg_match('/ORDER[ \t\r\n]+BY/is',$sql) ? 'top' : false;
-		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		return $ret;
-	}
-	
-
-
-};
- 
-
-class  ADORecordSet_vfp extends ADORecordSet_odbc {	
-	
-	var $databaseType = "vfp";		
-
-	
-	function ADORecordSet_vfp($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-		case 'C':
-			if ($len <= $this->blobSize) return 'C';
-		case 'M':
-			return 'X';
-			 
-		case 'D': return 'D';
-		
-		case 'T': return 'T';
-		
-		case 'L': return 'L';
-		
-		case 'I': return 'I';
-		
-		default: return 'N';
-		}
-	}
-}
-
-} //define
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-odbc_oracle.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-odbc_oracle.inc.php	(working copy)
@@ -1,115 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Oracle support via ODBC. Requires ODBC. Works on Windows. 
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-
- 
-class  ADODB_odbc_oracle extends ADODB_odbc {	
-	var $databaseType = 'odbc_oracle';
- 	var $replaceQuote = "''"; // string to use to replace quotes
-	var $concat_operator='||';
-	var $fmtDate = "'Y-m-d 00:00:00'"; 
-	var $fmtTimeStamp = "'Y-m-d h:i:sA'";
-	var $metaTablesSQL = 'select table_name from cat';
-	var $metaColumnsSQL = "select cname,coltype,width from col where tname='%s' order by colno";
-	var $sysDate = "TRUNC(SYSDATE)";
-	var $sysTimeStamp = 'SYSDATE';
-	
-	//var $_bindInputArray = false;
-	
-	function ADODB_odbc_oracle()
-	{
-		$this->ADODB_odbc();
-	}
-		
-	function &MetaTables() 
-	{
-		$false = false;
-		$rs = $this->Execute($this->metaTablesSQL);
-		if ($rs === false) return $false;
-		$arr = $rs->GetArray();
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			$arr2[] = $arr[$i][0];
-		}
-		$rs->Close();
-		return $arr2;
-	}
-	
-	function &MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		if ($rs === false) {	
-			$false = false;
-			return $false;
-		}
-		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-			$fld->name = $rs->fields[0];
-			$fld->type = $rs->fields[1];
-			$fld->max_length = $rs->fields[2];
-			
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		return $retarr;	
-	}
-
-	// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-	
-		$php_errormsg = '';
-		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
-		$this->_errorMsg = $php_errormsg;
-		
-		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
-		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
-		return $this->_connectionID != false;
-	}
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-		$php_errormsg = '';
-		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
-		$this->_errorMsg = $php_errormsg;
-		
-		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
-		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
-		return $this->_connectionID != false;
-	}
-} 
- 
-class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {	
-	
-	var $databaseType = 'odbc_oracle';
-	
-	function ADORecordSet_odbc_oracle($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbc($id,$mode);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-odbc_db2.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-odbc_db2.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-odbc_db2.inc.php	(working copy)
@@ -1,368 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  DB2 data driver. Requires ODBC.
- 
-From phpdb list:
-
-Hi Andrew,
-
-thanks a lot for your help. Today we discovered what
-our real problem was:
-
-After "playing" a little bit with the php-scripts that try
-to connect to the IBM DB2, we set the optional parameter
-Cursortype when calling odbc_pconnect(....).
-
-And the exciting thing: When we set the cursor type
-to SQL_CUR_USE_ODBC Cursor Type, then
-the whole query speed up from 1 till 10 seconds
-to 0.2 till 0.3 seconds for 100 records. Amazing!!!
-
-Therfore, PHP is just almost fast as calling the DB2
-from Servlets using JDBC (don't take too much care
-about the speed at whole: the database was on a
-completely other location, so the whole connection
-was made over a slow network connection).
-
-I hope this helps when other encounter the same
-problem when trying to connect to DB2 from
-PHP.
-
-Kind regards,
-Christian Szardenings
-
-2 Oct 2001
-Mark Newnham has discovered that the SQL_CUR_USE_ODBC is not supported by 
-IBM's DB2 ODBC driver, so this must be a 3rd party ODBC driver.
-
-From the IBM CLI Reference:
-
-SQL_ATTR_ODBC_CURSORS (DB2 CLI v5) 
-This connection attribute is defined by ODBC, but is not supported by DB2
-CLI. Any attempt to set or get this attribute will result in an SQLSTATE of
-HYC00 (Driver not capable). 
-
-A 32-bit option specifying how the Driver Manager uses the ODBC cursor
-library. 
-
-So I guess this means the message [above] was related to using a 3rd party
-odbc driver.
-
-Setting SQL_CUR_USE_ODBC
-========================
-To set SQL_CUR_USE_ODBC for drivers that require it, do this:
-
-$db = NewADOConnection('odbc_db2');
-$db->curMode = SQL_CUR_USE_ODBC;
-$db->Connect($dsn, $userid, $pwd);
-
-
-
-USING CLI INTERFACE
-===================
-
-I have had reports that the $host and $database params have to be reversed in 
-Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu:
-
-> The symptom is that if I change the database engine from postgres or any other to DB2 then the following
-> connection command becomes wrong despite being described this version to be correct in the docs. 
->
-> $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
->
-> In case of DB2 I had to swap the first and last arguments in order to connect properly. 
-
-
-System Error 5
-==============
-IF you get a System Error 5 when trying to Connect/Load, it could be a permission problem. Give the user connecting
-to DB2 full rights to the DB2 SQLLIB directory, and place the user in the DBUSERS group.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
-	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-if (!defined('ADODB_ODBC_DB2')){
-define('ADODB_ODBC_DB2',1);
-
-class ADODB_ODBC_DB2 extends ADODB_odbc {
-	var $databaseType = "db2";	
-	var $concat_operator = '||';
-	var $sysTime = 'CURRENT TIME';
-	var $sysDate = 'CURRENT DATE';
-	var $sysTimeStamp = 'CURRENT TIMESTAMP';
-	// The complete string representation of a timestamp has the form 
-	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
-	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
-	var $ansiOuter = true;
-	var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
-	var $_bindInputArray = true;
-	 var $hasInsertID = true;
-	var $rsPrefix = 'ADORecordset_odbc_';
-	
-	function ADODB_DB2()
-	{
-		if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
-		$this->ADODB_odbc();
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " COALESCE($field, $ifNull) "; // if DB2 UDB
-	}
-	
-	function ServerInfo()
-	{
-		//odbc_setoption($this->_connectionID,1,101 /*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/);
-		$vers = $this->GetOne('select versionnumber from sysibm.sysversions');
-		//odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/);
-		return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
-	}
-	
-	function _insertid()
-	{
-		return $this->GetOne($this->identitySQL);
-	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore')
-	{
-		if ($this->_autocommit) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID, "", $qschema, $qtable, "");
-		
-		$rs = new ADORecordSet_odbc($qid);
-		
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr =& $rs->GetArray();
-		//print_r($arr);
-		
-		$rs->Close();
-		$arr2 = array();
-		
-		if ($ttype) {
-			$isview = strncmp($ttype,'V',1) === 0;
-		}
-		for ($i=0; $i < sizeof($arr); $i++) {
-		
-			if (!$arr[$i][2]) continue;
-			if (strncmp($arr[$i][1],'SYS',3) === 0) continue;
-			
-			$type = $arr[$i][3];
-			
-			if ($showSchema) $arr[$i][2] = $arr[$i][1].'.'.$arr[$i][2];
-			
-			if ($ttype) { 
-				if ($isview) {
-					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
-				} else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
-			} else if (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
-		}
-		return $arr2;
-	}
-
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-		$false = false;
-		// get index details
-		$table = strtoupper($table);
-		$SQL="SELECT NAME, UNIQUERULE, COLNAMES FROM SYSIBM.SYSINDEXES WHERE TBNAME='$table'";
-        if ($primary) 
-			$SQL.= " AND UNIQUERULE='P'";
-		$rs = $this->Execute($SQL);
-        if (!is_object($rs)) {
-			if (isset($savem)) 
-				$this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-		$indexes = array ();
-        // parse index data into array
-        while ($row = $rs->FetchRow()) {
-			$indexes[$row[0]] = array(
-			   'unique' => ($row[1] == 'U' || $row[1] == 'P'),
-			   'columns' => array()
-			);
-			$cols = ltrim($row[2],'+');
-			$indexes[$row[0]]['columns'] = explode('+', $cols);
-        }
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-		}
-        return $indexes;
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-	// use right() and replace() ?
-		if (!$col) $col = $this->sysDate;
-		$s = '';
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '||';
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "char(year($col))";
-				break;
-			case 'M':
-				$s .= "substr(monthname($col),1,3)";
-				break;
-			case 'm':
-				$s .= "right(digits(month($col)),2)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "right(digits(day($col)),2)";
-				break;
-			case 'H':
-			case 'h':
-				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
-				else $s .= "''";
-				break;
-			case 'i':
-			case 'I':
-				if ($col != $this->sysDate)
-					$s .= "right(digits(minute($col)),2)";
-					else $s .= "''";
-				break;
-			case 'S':
-			case 's':
-				if ($col != $this->sysDate)
-					$s .= "right(digits(second($col)),2)";
-				else $s .= "''";
-				break;
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-			}
-		}
-		return $s;
-	} 
- 
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
-	{
-		$nrows = (integer) $nrows;
-		if ($offset <= 0) {
-		// could also use " OPTIMIZE FOR $nrows ROWS "
-			if ($nrows >= 0) $sql .=  " FETCH FIRST $nrows ROWS ONLY ";
-			$rs =& $this->Execute($sql,$inputArr);
-		} else {
-			if ($offset > 0 && $nrows < 0);
-			else {
-				$nrows += $offset;
-				$sql .=  " FETCH FIRST $nrows ROWS ONLY ";
-			}
-			$rs =& ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
-		}
-		
-		return $rs;
-	}
-	
-};
- 
-
-class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
-	
-	var $databaseType = "db2";		
-	
-	function ADORecordSet_db2($id,$mode=false)
-	{
-		$this->ADORecordSet_odbc($id,$mode);
-	}
-
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		switch (strtoupper($t)) {
-		case 'VARCHAR':
-		case 'CHAR':
-		case 'CHARACTER':
-		case 'C':
-			if ($len <= $this->blobSize) return 'C';
-		
-		case 'LONGCHAR':
-		case 'TEXT':
-		case 'CLOB':
-		case 'DBCLOB': // double-byte
-		case 'X':
-			return 'X';
-		
-		case 'BLOB':
-		case 'GRAPHIC':
-		case 'VARGRAPHIC':
-			return 'B';
-			
-		case 'DATE':
-		case 'D':
-			return 'D';
-		
-		case 'TIME':
-		case 'TIMESTAMP':
-		case 'T':
-			return 'T';
-		
-		//case 'BOOLEAN': 
-		//case 'BIT':
-		//	return 'L';
-			
-		//case 'COUNTER':
-		//	return 'R';
-			
-		case 'INT':
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'SMALLINT':
-		case 'I':
-			return 'I';
-			
-		default: return 'N';
-		}
-	}
-}
-
-} //define
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-mssqlpo.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-mssqlpo.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-mssqlpo.inc.php	(working copy)
@@ -1,62 +0,0 @@
-<?php
-/**
-* @version V4.94 23 Jan 2007 (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-* Released under both BSD license and Lesser GPL library license.
-* Whenever there is any discrepancy between the two licenses,
-* the BSD license will take precedence.
-*
-* Set tabs to 4 for best viewing.
-*
-* Latest version is available at http://php.weblogs.com
-*
-*  Portable MSSQL Driver that supports || instead of +
-*
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-
-/*
-	The big difference between mssqlpo and it's parent mssql is that mssqlpo supports
-	the more standard || string concatenation operator.
-*/
-	
-include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
-
-class ADODB_mssqlpo extends ADODB_mssql {
-	var $databaseType = "mssqlpo";
-	var $concat_operator = '||'; 
-	
-	function ADODB_mssqlpo()
-	{
-		ADODB_mssql::ADODB_mssql();
-	}
-
-	function PrepareSP($sql)
-	{
-		if (!$this->_has_mssql_init) {
-			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
-			return $sql;
-		}
-		if (is_string($sql)) $sql = str_replace('||','+',$sql);
-		$stmt = mssql_init($sql,$this->_connectionID);
-		if (!$stmt)  return $sql;
-		return array($sql,$stmt);
-	}
-	
-	function _query($sql,$inputarr)
-	{
-		if (is_string($sql)) $sql = str_replace('||','+',$sql);
-		return ADODB_mssql::_query($sql,$inputarr);
-	}
-}
-
-class ADORecordset_mssqlpo extends ADORecordset_mssql {
-	var $databaseType = "mssqlpo";
-	function ADORecordset_mssqlpo($id,$mode=false)
-	{
-		$this->ADORecordset_mssql($id,$mode);
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-sqlite.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-sqlite.inc.php	(working copy)
@@ -1,398 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-
-  Latest version is available at http://adodb.sourceforge.net
-  
-  SQLite info: http://www.hwaci.com/sw/sqlite/
-    
-  Install Instructions:
-  ====================
-  1. Place this in adodb/drivers
-  2. Rename the file, remove the .txt prefix.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB_sqlite extends ADOConnection {
-	var $databaseType = "sqlite";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $concat_operator='||';
-	var $_errorNo = 0;
-	var $hasLimit = true;	
-	var $hasInsertID = true; 		/// supports autoincrement ID?
-	var $hasAffectedRows = true; 	/// supports affected rows for update/delete?
-	var $metaTablesSQL = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
-	var $sysDate = "adodb_date('Y-m-d')";
-	var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	
-	function ADODB_sqlite() 
-	{
-	}
-	
-/*
-  function __get($name) 
-  {
-  	switch($name) {
-	case 'sysDate': return "'".date($this->fmtDate)."'";
-	case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
-	}
-  }*/
-	
-	function ServerInfo()
-	{
-		$arr['version'] = sqlite_libversion();
-		$arr['description'] = 'SQLite ';
-		$arr['encoding'] = sqlite_libencoding();
-		return $arr;
-	}
-	
-	function BeginTrans()
-	{	  
-		 if ($this->transOff) return true; 
-		 $ret = $this->Execute("BEGIN TRANSACTION");
-		 $this->transCnt += 1;
-		 return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		$ret = $this->Execute("COMMIT");
-		if ($this->transCnt>0)$this->transCnt -= 1;
-		return !empty($ret);
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		$ret = $this->Execute("ROLLBACK");
-		if ($this->transCnt>0)$this->transCnt -= 1;
-		return !empty($ret);
-	}
-	
-	// mark newnham
-	function &MetaColumns($tab)
-	{
-	  global $ADODB_FETCH_MODE;
-	  $false = false;
-	  $save = $ADODB_FETCH_MODE;
-	  $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-	  if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-	  $rs = $this->Execute("PRAGMA table_info('$tab')");
-	  if (isset($savem)) $this->SetFetchMode($savem);
-	  if (!$rs) {
-	    $ADODB_FETCH_MODE = $save; 
-	    return $false;
-	  }
-	  $arr = array();
-	  while ($r = $rs->FetchRow()) {
-	    $type = explode('(',$r['type']);
-	    $size = '';
-	    if (sizeof($type)==2)
-	    $size = trim($type[1],')');
-	    $fn = strtoupper($r['name']);
-	    $fld = new ADOFieldObject;
-	    $fld->name = $r['name'];
-	    $fld->type = $type[0];
-	    $fld->max_length = $size;
-	    $fld->not_null = $r['notnull'];
-	    $fld->default_value = $r['dflt_value'];
-	    $fld->scale = 0;
-	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
-	    else $arr[strtoupper($fld->name)] = $fld;
-	  }
-	  $rs->Close();
-	  $ADODB_FETCH_MODE = $save;
-	  return $arr;
-	}
-	
-	function _init($parentDriver)
-	{
-	
-		$parentDriver->hasTransactions = false;
-		$parentDriver->hasInsertID = true;
-	}
-
-	function _insertid()
-	{
-		return sqlite_last_insert_rowid($this->_connectionID);
-	}
-	
-	function _affectedrows()
-	{
-        return sqlite_changes($this->_connectionID);
-    }
-	
-	function ErrorMsg() 
- 	{
-		if ($this->_logsql) return $this->_errorMsg;
-		return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) : '';
-	}
- 
-	function ErrorNo() 
-	{
-		return $this->_errorNo;
-	}
-	
-	function SQLDate($fmt, $col=false)
-	{
-		$fmt = $this->qstr($fmt);
-		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
-	}
-	
-	
-	function _createFunctions()
-	{
-		@sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
-		@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
-	}
-	
-
-	// returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sqlite_open')) return null;
-		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
-		$this->_connectionID = sqlite_open($argHostname);
-		if ($this->_connectionID === false) return false;
-		$this->_createFunctions();
-		return true;
-	}
-	
-	// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('sqlite_open')) return null;
-		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
-		
-		$this->_connectionID = sqlite_popen($argHostname);
-		if ($this->_connectionID === false) return false;
-		$this->_createFunctions();
-		return true;
-	}
-
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr=false)
-	{
-		$rez = sqlite_query($sql,$this->_connectionID);
-		if (!$rez) {
-			$this->_errorNo = sqlite_last_error($this->_connectionID);
-		}
-		
-		return $rez;
-	}
-	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
-	{
-		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
-		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
-	  	if ($secs2cache)
-	   		$rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
-	  	else
-	   		$rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
-			
-		return $rs;
-	}
-	
-	/*
-		This algorithm is not very efficient, but works even if table locking
-		is not available.
-		
-		Will return false if unable to generate an ID after $MAXLOOPS attempts.
-	*/
-	var $_genSeqSQL = "create table %s (id integer)";
-	
-	function GenID($seq='adodbseq',$start=1)
-	{	
-		// if you have to modify the parameter below, your database is overloaded,
-		// or you need to implement generation of id's yourself!
-		$MAXLOOPS = 100;
-		//$this->debug=1;
-		while (--$MAXLOOPS>=0) {
-			@($num = $this->GetOne("select id from $seq"));
-			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
-				$start -= 1;
-				$num = '0';
-				$ok = $this->Execute("insert into $seq values($start)");
-				if (!$ok) return false;
-			} 
-			$this->Execute("update $seq set id=id+1 where id=$num");
-			
-			if ($this->affected_rows() > 0) {
-				$num += 1;
-				$this->genID = $num;
-				return $num;
-			}
-		}
-		if ($fn = $this->raiseErrorFn) {
-			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
-		}
-		return false;
-	}
-
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		$start -= 1;
-		return $this->Execute("insert into $seqname values($start)");
-	}
-	
-	var $_dropSeqSQL = 'drop table %s';
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		return @sqlite_close($this->_connectionID);
-	}
-
-	function &MetaIndexes($table, $primary = FALSE, $owner=false)
-	{
-		$false = false;
-		// save old fetch mode
-        global $ADODB_FETCH_MODE;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-		$SQL=sprintf("SELECT name,sql FROM sqlite_master WHERE type='index' AND tbl_name='%s'", strtolower($table));
-        $rs = $this->Execute($SQL);
-        if (!is_object($rs)) {
-			if (isset($savem)) 
-				$this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-
-		$indexes = array ();
-		while ($row = $rs->FetchRow()) {
-			if ($primary && preg_match("/primary/i",$row[1]) == 0) continue;
-            if (!isset($indexes[$row[0]])) {
-
-			$indexes[$row[0]] = array(
-				   'unique' => preg_match("/unique/i",$row[1]),
-				   'columns' => array());
-			}
-			/**
-			  * There must be a more elegant way of doing this,
-			  * the index elements appear in the SQL statement
-			  * in cols[1] between parentheses
-			  * e.g CREATE UNIQUE INDEX ware_0 ON warehouse (org,warehouse)
-			  */
-			$cols = explode("(",$row[1]);
-			$cols = explode(")",$cols[1]);
-			array_pop($cols);
-			$indexes[$row[0]]['columns'] = $cols;
-		}
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-		}
-        return $indexes;
-	}
-
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_sqlite extends ADORecordSet {
-
-	var $databaseType = "sqlite";
-	var $bind = false;
-
-	function ADORecordset_sqlite($queryID,$mode=false)
-	{
-		
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch($mode) {
-		case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
-		case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
-		default: $this->fetchMode = SQLITE_BOTH; break;
-		}
-		$this->adodbFetchMode = $mode;
-		
-		$this->_queryID = $queryID;
-	
-		$this->_inited = true;
-		$this->fields = array();
-		if ($queryID) {
-			$this->_currentRow = 0;
-			$this->EOF = !$this->_fetch();
-			@$this->_initrs();
-		} else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-		
-		return $this->_queryID;
-	}
-
-
-	function &FetchField($fieldOffset = -1)
-	{
-		$fld = new ADOFieldObject;
-		$fld->name = sqlite_field_name($this->_queryID, $fieldOffset);
-		$fld->type = 'VARCHAR';
-		$fld->max_length = -1;
-		return $fld;
-	}
-	
-   function _initrs()
-   {
-		$this->_numOfRows = @sqlite_num_rows($this->_queryID);
-		$this->_numOfFields = @sqlite_num_fields($this->_queryID);
-   }
-
-	function Fields($colname)
-	{
-		if ($this->fetchMode != SQLITE_NUM) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-   function _seek($row)
-   {
-   		return sqlite_seek($this->_queryID, $row);
-   }
-
-	function _fetch($ignore_fields=false) 
-	{
-		$this->fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
-		return !empty($this->fields);
-	}
-	
-	function _close() 
-	{
-	}
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-oci8.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-oci8.inc.php	(working copy)
@@ -1,1513 +0,0 @@
-<?php
-/*
-
-  version V4.94 23 Jan 2007 (c) 2000-2007 John Lim. All rights reserved.
-
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Code contributed by George Fourlanos <fou@infomap.gr>
-  
-  13 Nov 2000 jlim - removed all ora_* references.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-/*
-NLS_Date_Format
-Allows you to use a date format other than the Oracle Lite default. When a literal
-character string appears where a date value is expected, the Oracle Lite database
-tests the string to see if it matches the formats of Oracle, SQL-92, or the value
-specified for this parameter in the POLITE.INI file. Setting this parameter also
-defines the default format used in the TO_CHAR or TO_DATE functions when no
-other format string is supplied.
-
-For Oracle the default is dd-mon-yy or dd-mon-yyyy, and for SQL-92 the default is
-yy-mm-dd or yyyy-mm-dd.
-
-Using 'RR' in the format forces two-digit years less than or equal to 49 to be
-interpreted as years in the 21st century (2000�2049), and years over 50 as years in
-the 20th century (1950�1999). Setting the RR format as the default for all two-digit
-year entries allows you to become year-2000 compliant. For example:
-NLS_DATE_FORMAT='RR-MM-DD'
-
-You can also modify the date format using the ALTER SESSION command. 
-*/
-
-# define the LOB descriptor type for the given type
-# returns false if no LOB descriptor
-function oci_lob_desc($type) {
-	switch ($type) {
-		case OCI_B_BFILE: $result = OCI_D_FILE; break;
-		case OCI_B_CFILEE: $result = OCI_D_FILE; break;
-		case OCI_B_CLOB: $result = OCI_D_LOB; break;
-		case OCI_B_BLOB: $result = OCI_D_LOB; break;
-		case OCI_B_ROWID: $result = OCI_D_ROWID; break;
-		default: $result = false; break;
-	}
-	return $result;
-}
-
-class ADODB_oci8 extends ADOConnection {
-	var $databaseType = 'oci8';
-	var $dataProvider = 'oci8';
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $concat_operator='||';
-	var $sysDate = "TRUNC(SYSDATE)";
-	var $sysTimeStamp = 'SYSDATE';
-	var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
-	var $_stmt;
-	var $_commit = OCI_COMMIT_ON_SUCCESS;
-	var $_initdate = true; // init date to YYYY-MM-DD
-	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW') and table_name not like 'BIN\$%'"; // bin$ tables are recycle bin tables
-	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
-	var $_bindInputArray = true;
-	var $hasGenID = true;
-	var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
-	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s";
-	var $_dropSeqSQL = "DROP SEQUENCE %s";
-	var $hasAffectedRows = true;
-	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
-	var $noNullStrings = false;
-	var $connectSID = false;
-	var $_bind = false;
-	var $_nestedSQL = true;
-	var $_hasOCIFetchStatement = false;
-	var $_getarray = false; // currently not working
-	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
-	var $session_sharing_force_blob = false; // alter session on updateblob if set to true 
-	var $firstrows = true; // enable first rows optimization on SelectLimit()
-	var $selectOffsetAlg1 = 100; // when to use 1st algorithm of selectlimit.
-	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
-	var $dateformat = 'YYYY-MM-DD'; // for DBDate()
- 	var $useDBDateFormatForTextInput=false;
-	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
-	var $_refLOBs = array();
-	
-	// var $ansiOuter = true; // if oracle9
-    
-	function ADODB_oci8() 
-	{
-		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
-	}
-	
-	/*  Function &MetaColumns($table) added by smondino@users.sourceforge.net*/
-	function &MetaColumns($table) 
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
-		
-		if (isset($savem)) $this->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		if (!$rs) {
-			return $false;
-		}
-		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
-			$fld = new ADOFieldObject();
-	   		$fld->name = $rs->fields[0];
-	   		$fld->type = $rs->fields[1];
-	   		$fld->max_length = $rs->fields[2];
-			$fld->scale = $rs->fields[3];
-			if ($rs->fields[1] == 'NUMBER') {
-				if ($rs->fields[3] == 0) $fld->type = 'INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
-		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
-			$fld->binary = (strpos($fld->type,'BLOB') !== false);
-			$fld->default_value = $rs->fields[6];
-			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
-			$rs->MoveNext();
-		}
-		$rs->Close();
-		if (empty($retarr))
-			return  $false;
-		else 
-			return $retarr;
-	}
-	
-	function Time()
-	{
-		$rs =& $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
-		
-		return false;
-	}
- 
-/*
-
-  Multiple modes of connection are supported:
-  
-  a. Local Database
-    $conn->Connect(false,'scott','tiger');
-  
-  b. From tnsnames.ora
-    $conn->Connect(false,'scott','tiger',$tnsname); 
-    $conn->Connect($tnsname,'scott','tiger'); 
-  
-  c. Server + service name
-    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
-  
-  d. Server + SID
-  	$conn->connectSID = true;
-	$conn->Connect($serveraddress,'scott,'tiger',$SID);
-
-
-Example TNSName:
----------------
-NATSOFT.DOMAIN =
-  (DESCRIPTION =
-	(ADDRESS_LIST =
-	  (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
-	)
-	(CONNECT_DATA =
-	  (SERVICE_NAME = natsoft.domain)
-	)
-  )
-  
-  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
-	
-*/
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
-	{
-		if (!function_exists('OCIPLogon')) return null;
-		
-		
-        $this->_errorMsg = false;
-		$this->_errorCode = false;
-		
-		if($argHostname) { // added by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
-			if (empty($argDatabasename)) $argDatabasename = $argHostname;
-			else {
-				if(strpos($argHostname,":")) {
-					$argHostinfo=explode(":",$argHostname);
-				   	$argHostname=$argHostinfo[0];
-					$argHostport=$argHostinfo[1];
-			 	} else {
-					$argHostport = empty($this->port)?  "1521" : $this->port;
-	   			}
-				
-				if ($this->connectSID) {
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-				} else
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
-			}
-		}
-				
- 		//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
-		if ($mode==1) {
-			$this->_connectionID = ($this->charSet) ? 
-				OCIPLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				OCIPLogon($argUsername,$argPassword, $argDatabasename)
-				;
-			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
-		} else if ($mode==2) {
-			$this->_connectionID = ($this->charSet) ? 
-				OCINLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				OCINLogon($argUsername,$argPassword, $argDatabasename);
-				
-		} else {
-			$this->_connectionID = ($this->charSet) ? 
-				OCILogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
-				:
-				OCILogon($argUsername,$argPassword, $argDatabasename);
-		}
-		if (!$this->_connectionID) return false;
-		if ($this->_initdate) {
-			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
-		}
-		
-		// looks like: 
-		// Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production With the Partitioning option JServer Release 8.1.7.0.0 - Production
-		// $vers = OCIServerVersion($this->_connectionID);
-		// if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
-		return true;
-   	}
-	
-	function ServerInfo()
-	{
-		$arr['compat'] = $this->GetOne('select value from sys.database_compatible_level');
-		$arr['description'] = @OCIServerVersion($this->_connectionID);
-		$arr['version'] = ADOConnection::_findvers($arr['description']);
-		return $arr;
-	}
-		// returns true or false
-	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
-	}
-	
-	// returns true or false
-	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
-	}
-	
-	function _affectedrows()
-	{
-		if (is_resource($this->_stmt)) return @OCIRowCount($this->_stmt);
-		return 0;
-	}
-	
-	function IfNull( $field, $ifNull ) 
-	{
-		return " NVL($field, $ifNull) "; // if Oracle
-	}
-	
-	// format and return date string in database date format
-	function DBDate($d)
-	{
-		if (empty($d) && $d !== 0) return 'null';
-		
-		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->dateformat."')";
-	}
-
-	function BindDate($d)
-	{
-		$d = ADOConnection::DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	function BindTimeStamp($d)
-	{
-		$d = ADOConnection::DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
-	{
-		if (empty($ts) && $ts !== 0) return 'null';
-		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date("'Y-m-d H:i:s'",$ts).",'RRRR-MM-DD, HH24:MI:SS')";
-	}
-	
-	function RowLock($tables,$where,$flds='1 as ignore') 
-	{
-		if ($this->autoCommit) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
-	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{
-		if ($mask) {
-			$save = $this->metaTablesSQL;
-			$mask = $this->qstr(strtoupper($mask));
-			$this->metaTablesSQL .= " AND upper(table_name) like $mask";
-		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
-		if ($mask) {
-			$this->metaTablesSQL = $save;
-		}
-		return $ret;
-	}
-	
-	// Mark Newnham 
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
-	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-
-		// get index details
-		$table = strtoupper($table);
-
-		// get Primary index
-		$primary_key = '';
-
-		$false = false;
-		$rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
-		if ($row = $rs->FetchRow())
-		   $primary_key = $row[1]; //constraint_name
-
-		if ($primary==TRUE && $primary_key=='') {
-			 if (isset($savem)) 
-                $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			return $false; //There is no primary key
-		}
-
-        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
-
-		
-        if (!is_object($rs)) {
-			if (isset($savem)) 
-				$this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
-
-		$indexes = array ();
-        // parse index data into array
-
-        while ($row = $rs->FetchRow()) {
-			if ($primary && $row[0] != $primary_key) continue;
-            if (!isset($indexes[$row[0]])) {
-				$indexes[$row[0]] = array(
-				   'unique' => ($row[1] == 'UNIQUE'),
-				   'columns' => array()
-				);
-            }
-            $indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
-        }
-
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index ) {
-            ksort ($indexes[$index]['columns']);
-        }
-
-		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-		}
-        return $indexes;
-	}
-	
-	function BeginTrans()
-	{	
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-		$this->_commit = OCI_DEFAULT;
-		
-		if ($this->_transmode) $this->Execute("SET TRANSACTION ".$this->_transmode);
-		return true;
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIcommit($this->_connectionID);
-		$this->_commit = OCI_COMMIT_ON_SUCCESS;
-		$this->autoCommit = true;
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$ret = OCIrollback($this->_connectionID);
-		$this->_commit = OCI_COMMIT_ON_SUCCESS;
-		$this->autoCommit = true;
-		return $ret;
-	}
-	
-	
-	function SelectDB($dbName) 
-	{
-		return false;
-	}
-
-	function ErrorMsg() 
-	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-
-		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
-		if (empty($arr)) {
-			if (is_resource($this->_connectionID)) $arr = @OCIError($this->_connectionID);
-			else $arr = @OCIError();
-			if ($arr === false) return '';
-		}
-		$this->_errorMsg = $arr['message'];
-		$this->_errorCode = $arr['code'];
-		return $this->_errorMsg;
-	}
-
-	function ErrorNo() 
-	{
-		if ($this->_errorCode !== false) return $this->_errorCode;
-		
-		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
-		if (empty($arr)) {
-			$arr = @OCIError($this->_connectionID);
-			if ($arr == false) $arr = @OCIError();
-			if ($arr == false) return '';
-		}
-		
-		$this->_errorMsg = $arr['message'];
-		$this->_errorCode = $arr['code'];
-		
-		return $arr['code'];
-	}
-	
-	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
-		$s = 'TO_CHAR('.$col.",'";
-		
-		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			$ch = $fmt[$i];
-			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
-				
-			case 'M':
-				$s .= 'Mon';
-				break;
-				
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
-			
-			case 'H':
-				$s.= 'HH24';
-				break;
-				
-			case 'h':
-				$s .= 'HH';
-				break;
-				
-			case 'i':
-				$s .= 'MI';
-				break;
-			
-			case 's':
-				$s .= 'SS';
-				break;
-			
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
-				
-			case 'w':
-				$s .= 'D';
-				break;
-				
-			case 'l':
-				$s .= 'DAY';
-				break;
-				
-			 case 'W':
-				$s .= 'WW';
-				break;
-				
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
-				
-			}
-		}
-		return $s. "')";
-	}
-	
-	
-	/*
-	This algorithm makes use of
-	
-	a. FIRST_ROWS hint
-	The FIRST_ROWS hint explicitly chooses the approach to optimize response time, 
-	that is, minimum resource usage to return the first row. Results will be returned 
-	as soon as they are identified. 
-
-	b. Uses rownum tricks to obtain only the required rows from a given offset.
-	 As this uses complicated sql statements, we only use this if the $offset >= 100. 
-	 This idea by Tomas V V Cox.
-	 
-	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
-	 out this function then, and the slower SelectLimit() in the base class will be used.
-	*/
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		// seems that oracle only supports 1 hint comment in 8i
-		if ($this->firstrows) {
-			if (strpos($sql,'/*+') !== false)
-				$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-			else
-				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
-		}
-		
-		if ($offset < $this->selectOffsetAlg1) {
-			if ($nrows > 0) {	
-				if ($offset > 0) $nrows += $offset;
-				//$inputarr['adodb_rownum'] = $nrows;
-				if ($this->databaseType == 'oci8po') {
-					$sql = "select * from (".$sql.") where rownum <= ?";
-				} else {
-					$sql = "select * from (".$sql.") where rownum <= :adodb_offset";
-				} 
-				$inputarr['adodb_offset'] = $nrows;
-				$nrows = -1;
-			}
-			// note that $nrows = 0 still has to work ==> no rows returned
-
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-			return $rs;
-			
-		} else {
-			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
-			
-			 // Let Oracle return the name of the columns
-			$q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
-			 
-			$false = false;
-			if (! $stmt_arr = $this->Prepare($q_fields)) {
-				return $false;
-			}
-			$stmt = $stmt_arr[1];
-			 
-			 if (is_array($inputarr)) {
-			 	foreach($inputarr as $k => $v) {
-					if (is_array($v)) {
-						if (sizeof($v) == 2) // suggested by g.giunta@libero.
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-						else
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					} else {
-						$len = -1;
-						if ($v === ' ') $len = 1;
-						if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
-							$bindarr[$k] = $v;
-						} else { 				// dynamic sql, so rebind every time
-							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-						}
-					}
-				}
-			}
-			
-			 if (!OCIExecute($stmt, OCI_DEFAULT)) {
-				 OCIFreeStatement($stmt); 
-				 return $false;
-			 }
-			 
-			 $ncols = OCINumCols($stmt);
-			 for ( $i = 1; $i <= $ncols; $i++ ) {
-				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
-			 }
-			 $result = false;
-			
-			 OCIFreeStatement($stmt); 
-			 $fields = implode(',', $cols);
-			 $nrows += $offset;
-			 $offset += 1; // in Oracle rownum starts at 1
-			
-			if ($this->databaseType == 'oci8po') {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= ?".
-					  ") WHERE adodb_rownum >= ?";
-				} else {
-					 $sql = "SELECT $fields FROM".
-					  "(SELECT rownum as adodb_rownum, $fields FROM".
-					  " ($sql) WHERE rownum <= :adodb_nrows".
-					  ") WHERE adodb_rownum >= :adodb_offset";
-				} 
-				$inputarr['adodb_nrows'] = $nrows;
-				$inputarr['adodb_offset'] = $offset;
-				
-			if ($secs2cache>0) $rs =& $this->CacheExecute($secs2cache, $sql,$inputarr);
-			else $rs =& $this->Execute($sql,$inputarr);
-			return $rs;
-		}
-	
-	}
-	
-	/**
-	* Usage:
-	* Store BLOBs and CLOBs
-	*
-	* Example: to store $var in a blob
-	*
-	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
-	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
-	*
-	*  to get length of LOB:
-	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
-	*
-	* If you are using CURSOR_SHARING = force, it appears this will case a segfault
-	* under oracle 8.1.7.0. Run:
-	*	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-	* before UpdateBlob() then...
-	*/
-
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		
-		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
-		
-		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
-		}
-		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-		$commit = $this->autoCommit;
-		if ($commit) $this->BeginTrans();
-		$rs = $this->_Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->save($val);
-		$desc->free();
-		if ($commit) $this->CommitTrans();
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
-		
-		if ($rez) $rs->Close();
-		return $rez;
-	}
-	
-	/**
-	* Usage:  store file pointed to by $var in a blob
-	*/
-	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
-		}
-		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
-		
-		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
-		
-		$this->BeginTrans();
-		$rs = ADODB_oci8::Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->savefile($val);
-		$desc->free();
-		$this->CommitTrans();
-		
-		if ($rez) $rs->Close();
-		return $rez;
-	}
-
-		/**
-	 * Execute SQL 
-	 *
-	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
-	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
-	 * @return 		RecordSet or false
-	 */
-	function &Execute($sql,$inputarr=false) 
-	{
-		if ($this->fnExecute) {
-			$fn = $this->fnExecute;
-			$ret =& $fn($this,$sql,$inputarr);
-			if (isset($ret)) return $ret;
-		}
-		if ($inputarr) {
-			#if (!is_array($inputarr)) $inputarr = array($inputarr);
-			
-			$element0 = reset($inputarr);
-			
-			# is_object check because oci8 descriptors can be passed in
-			if (is_array($element0) && !is_object(reset($element0))) {
-				if (is_string($sql))
-					$stmt = $this->Prepare($sql);
-				else
-					$stmt = $sql;
-					
-				foreach($inputarr as $arr) {
-					$ret =& $this->_Execute($stmt,$arr);
-					if (!$ret) return $ret;
-				}
-			} else {
-				$ret =& $this->_Execute($sql,$inputarr);
-			}
-			
-		} else {
-			$ret =& $this->_Execute($sql,false);
-		}
-
-		return $ret;
-	}
-	
-	/*
-		Example of usage:
-		
-		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
-	*/
-	function Prepare($sql,$cursor=false)
-	{
-	static $BINDNUM = 0;
-	
-		$stmt = OCIParse($this->_connectionID,$sql);
-
-		if (!$stmt) {
-			$this->_errorMsg = false;
-			$this->_errorCode = false;
-			$arr = @OCIError($this->_connectionID);
-			if ($arr === false) return false;
-		
-			$this->_errorMsg = $arr['message'];
-			$this->_errorCode = $arr['code'];
-			return false;
-		}
-		
-		$BINDNUM += 1;
-		
-		$sttype = @OCIStatementType($stmt);
-		if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
-			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
-		}
-		return array($sql,$stmt,0,$BINDNUM);
-	}
-	
-	/*
-		Call an oracle stored procedure and returns a cursor variable as a recordset. 
-		Concept by Robert Tuttle robert@ud.com
-		
-		Example:
-			Note: we return a cursor variable in :RS2
-			$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); END;",'RS2');
-			
-			$rs = $db->ExecuteCursor(
-				"BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
-				'RS2',
-				array('VAR1' => 'Mr Bean'));
-			
-	*/
-	function &ExecuteCursor($sql,$cursorName='rs',$params=false)
-	{
-		if (is_array($sql)) $stmt = $sql;
-		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
-	
-		if (is_array($stmt) && sizeof($stmt) >= 5) {
-			$hasref = true;
-			$ignoreCur = false;
-			$this->Parameter($stmt, $ignoreCur, $cursorName, false, -1, OCI_B_CURSOR);
-			if ($params) {
-				foreach($params as $k => $v) {
-					$this->Parameter($stmt,$params[$k], $k);
-				}
-			}
-		} else
-			$hasref = false;
-			
-		$rs =& $this->Execute($stmt);
-		if ($rs) {
-			if ($rs->databaseType == 'array') OCIFreeCursor($stmt[4]);
-			else if ($hasref) $rs->_refcursor = $stmt[4];
-		}
-		return $rs;
-	}
-	
-	/*
-		Bind a variable -- very, very fast for executing repeated statements in oracle. 
-		Better than using
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", 
-					array($p1,$p2,$p3));
-			}
-		
-		Usage:
-			$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
-			$DB->Bind($stmt, $p1);
-			$DB->Bind($stmt, $p2);
-			$DB->Bind($stmt, $p3);
-			for ($i = 0; $i < $max; $i++) {	
-				$p1 = ?; $p2 = ?; $p3 = ?;
-				$DB->Execute($stmt);
-			}
-			
-		Some timings:		
-			** Test table has 3 cols, and 1 index. Test to insert 1000 records
-			Time 0.6081s (1644.60 inserts/sec) with direct OCIParse/OCIExecute
-			Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
-			Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
-			
-		Now if PHP only had batch/bulk updating like Java or PL/SQL...
-	
-		Note that the order of parameters differs from OCIBindByName,
-		because we default the names to :0, :1, :2
-	*/
-	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
-	{
-		
-		if (!is_array($stmt)) return false;
-        
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
-            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
-        }
-        
-		if ($name == false) {
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
-			$stmt[2] += 1;
-		} else if (oci_lob_desc($type)) {
-			if ($this->debug) {
-				ADOConnection::outp("<b>Bind</b>: name = $name");
-			}
-            //we have to create a new Descriptor here
-			$numlob = count($this->_refLOBs);
-        	$this->_refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
-			$this->_refLOBs[$numlob]['TYPE'] = $isOutput;
-			
-			$tmp = &$this->_refLOBs[$numlob]['LOB'];
-	        $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
-			if ($this->debug) {
-				ADOConnection::outp("<b>Bind</b>: descriptor has been allocated, var (".$name.") binded");
-			}
-			
-			// if type is input then write data to lob now
-			if ($isOutput == false) {
-				$var = $this->BlobEncode($var);
-				$tmp->WriteTemporary($var);
-				$this->_refLOBs[$numlob]['VAR'] = &$var;
-				if ($this->debug) {
-					ADOConnection::outp("<b>Bind</b>: LOB has been written to temp");
-				}
-			} else {
-				$this->_refLOBs[$numlob]['VAR'] = &$var;
-			}
-			$rez = $tmp;
-		} else {
-			if ($this->debug) 
-				ADOConnection::outp("<b>Bind</b>: name = $name");
-			
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
-		}
-		
-		return $rez;
-	}
-	
-	function Param($name,$type=false)
-	{
-		return ':'.$name;
-	}
-	
-	/* 
-	Usage:
-		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group');
-		$db->Execute($stmt);
-		
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-		
-		See OCIBindByName documentation at php.net.
-	*/
-	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
-	{
-			if  ($this->debug) {
-				$prefix = ($isOutput) ? 'Out' : 'In';
-				$ztype = (empty($type)) ? 'false' : $type;
-				ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
-			}
-			return $this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
-	}
-	
-	/*
-	returns query ID if successful, otherwise false
-	this version supports:
-	
-	   1. $db->execute('select * from table');
-	   
-	   2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->execute($prepared_statement, array(1,2,3));
-		  
-	   3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
-	   
-	   4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
-		  $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
-		  $db->execute($stmt);
-	*/ 
-	function _query($sql,$inputarr)
-	{
-		if (is_array($sql)) { // is prepared sql
-			$stmt = $sql[1];
-			
-			// we try to bind to permanent array, so that OCIBindByName is persistent
-			// and carried out once only - note that max array element size is 4000 chars
-			if (is_array($inputarr)) {
-				$bindpos = $sql[3];
-				if (isset($this->_bind[$bindpos])) {
-				// all tied up already
-					$bindarr = &$this->_bind[$bindpos];
-				} else {
-				// one statement to bind them all
-					$bindarr = array();
-					foreach($inputarr as $k => $v) {
-						$bindarr[$k] = $v;
-						OCIBindByName($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 4000);
-					}
-					$this->_bind[$bindpos] = &$bindarr;
-				}
-			}
-		} else {
-			$stmt=OCIParse($this->_connectionID,$sql);
-		}
-			
-		$this->_stmt = $stmt;
-		if (!$stmt) return false;
-	
-		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
-			
-		if (is_array($inputarr)) {
-			foreach($inputarr as $k => $v) {
-				if (is_array($v)) {
-					if (sizeof($v) == 2) // suggested by g.giunta@libero.
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-					else
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					
-					if ($this->debug==99) echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'<br>';
-				} else {
-					$len = -1;
-					if ($v === ' ') $len = 1;
-					if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
-						$bindarr[$k] = $v;
-					} else { 				// dynamic sql, so rebind every time
-						OCIBindByName($stmt,":$k",$inputarr[$k],$len);
-					}
-				}
-			}
-		}
-		
-        $this->_errorMsg = false;
-		$this->_errorCode = false;
-		if (OCIExecute($stmt,$this->_commit)) {
-//OCIInternalDebug(1);			
-			if (count($this -> _refLOBs) > 0) {
-		
-				foreach ($this -> _refLOBs as $key => $value) {
-					if ($this -> _refLOBs[$key]['TYPE'] == true) {
-						$tmp = $this -> _refLOBs[$key]['LOB'] -> load();
-						if ($this -> debug) {
-							ADOConnection::outp("<b>OUT LOB</b>: LOB has been loaded. <br>");
-						}
-						//$_GLOBALS[$this -> _refLOBs[$key]['VAR']] = $tmp;
-						$this -> _refLOBs[$key]['VAR'] = $tmp;
-					} else {
-                        $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
-						$this -> _refLOBs[$key]['LOB']->free();
-						unset($this -> _refLOBs[$key]);
-                        if ($this->debug) {
-							ADOConnection::outp("<b>IN LOB</b>: LOB has been saved. <br>");
-						}
-                    }					
-				}
-			}
-		
-            switch (@OCIStatementType($stmt)) {
-                case "SELECT":
-					return $stmt;
-				
-				case 'DECLARE':
-                case "BEGIN":
-                    if (is_array($sql) && !empty($sql[4])) {
-						$cursor = $sql[4];
-						if (is_resource($cursor)) {
-							$ok = OCIExecute($cursor);	
-	                        return $cursor;
-						}
-						return $stmt;
-                    } else {
-						if (is_resource($stmt)) {
-							OCIFreeStatement($stmt);
-							return true;
-						}
-                        return $stmt;
-                    }
-                    break;
-                default :
-					// ociclose -- no because it could be used in a LOB?
-                    return true;
-            }
-		}
-		return false;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		if (!$this->_connectionID) return;
-		
-		if (!$this->autoCommit) OCIRollback($this->_connectionID);
-		if (count($this->_refLOBs) > 0) {
-			foreach ($this ->_refLOBs as $key => $value) {
-				$this->_refLOBs[$key]['LOB']->free();
-				unset($this->_refLOBs[$key]);
-			}
-		}
-		OCILogoff($this->_connectionID);
-		
-		$this->_stmt = false;
-		$this->_connectionID = false;
-	}
-	
-	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
-	{
-		if ($internalKey) return array('ROWID');
-		
-	// tested with oracle 8.1.7
-		$table = strtoupper($table);
-		if ($owner) {
-			$owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER = UPPER('$owner')))";
-			$ptab = 'ALL_';
-		} else {
-			$owner_clause = '';
-			$ptab = 'USER_';
-		}
-		$sql = "
-SELECT /*+ RULE */ distinct b.column_name
-   FROM {$ptab}CONSTRAINTS a
-	  , {$ptab}CONS_COLUMNS b
-  WHERE ( UPPER(b.table_name) = ('$table'))
-	AND (UPPER(a.table_name) = ('$table') and a.constraint_type = 'P')
-	$owner_clause
-	AND (a.constraint_name = b.constraint_name)";
-
- 		$rs = $this->Execute($sql);
-		if ($rs && !$rs->EOF) {
-			$arr =& $rs->GetArray();
-			$a = array();
-			foreach($arr as $v) {
-				$a[] = reset($v);
-			}
-			return $a;
-		}
-		else return false;
-	}
-	
-	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
-	function MetaForeignKeys($table, $owner=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$table = $this->qstr(strtoupper($table));
-		if (!$owner) {
-			$owner = $this->user;
-			$tabp = 'user_';
-		} else
-			$tabp = 'all_';
-			
-		$owner = ' and owner='.$this->qstr(strtoupper($owner));
-		
-		$sql = 
-"select constraint_name,r_owner,r_constraint_name 
-	from {$tabp}constraints
-	where constraint_type = 'R' and table_name = $table $owner";
-		
-		$constraints =& $this->GetArray($sql);
-		$arr = false;
-		foreach($constraints as $constr) {
-			$cons = $this->qstr($constr[0]);
-			$rowner = $this->qstr($constr[1]);
-			$rcons = $this->qstr($constr[2]);
-			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
-			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
-			
-			if ($cols && $tabcol) 
-				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
-					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
-				}
-		}
-		$ADODB_FETCH_MODE = $save;
-		
-		return $arr;
-	}
-
-	
-	function CharMax()
-	{
-		return 4000;
-	}
-	
-	function TextMax()
-	{
-		return 4000;
-	}
-	
-	/**
-	 * Quotes a string.
-	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
-	 * 
-	 * @param s			the string to quote
-	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
-	 *				This undoes the stupidity of magic quotes for GPC.
-	 *
-	 * @return  quoted string to be sent back to database
-	 */
-	function qstr($s,$magic_quotes=false)
-	{	
-		//$nofixquotes=false;
-	
-		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
-		if (!$magic_quotes) {	
-			if ($this->replaceQuote[0] == '\\'){
-				$s = str_replace('\\','\\\\',$s);
-			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
-		}
-		
-		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
-		
-		$s = str_replace('\\\\','\\',$s);
-		return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
-		
-	}
-	
-}
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oci8 extends ADORecordSet {
-
-	var $databaseType = 'oci8';
-	var $bind=false;
-	var $_fieldobjs;
-	
-	//var $_arr = false;
-		
-	function ADORecordset_oci8($queryID,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default:
-		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		}
-		
-		$this->adodbFetchMode = $mode;
-		$this->_queryID = $queryID;
-	}
-
-
-	function Init()
-	{
-		if ($this->_inited) return;
-		
-		$this->_inited = true;
-		if ($this->_queryID) {
-			
-			$this->_currentRow = 0;
-			@$this->_initrs();
-			$this->EOF = !$this->_fetch();
-			
-			/*
-			// based on idea by Gaetano Giunta to detect unusual oracle errors
-			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
-			$err = OCIError($this->_queryID);
-			if ($err && $this->connection->debug) ADOConnection::outp($err);
-			*/
-			
-			if (!is_array($this->fields)) {
-				$this->_numOfRows = 0;
-				$this->fields = array();
-			}
-		} else {
-			$this->fields = array();
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-	}
-	
-	function _initrs()
-	{
-		$this->_numOfRows = -1;
-		$this->_numOfFields = OCInumcols($this->_queryID);
-		if ($this->_numOfFields>0) {
-			$this->_fieldobjs = array();
-			$max = $this->_numOfFields;
-			for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
-		}
-	}
-
-	  /*		Returns: an object containing field information.
-			  Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			  fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			  fetchField() is retrieved.		*/
-
-	function &_FetchField($fieldOffset = -1)
-	{
-		$fld = new ADOFieldObject;
-		$fieldOffset += 1;
-		$fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
-		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
-		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-	 	if ($fld->type == 'NUMBER') {
-	 		$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
-			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-			if ($p != 0 && $sc == 0) $fld->type = 'INT';
-			//echo " $this->name ($p.$sc) ";
-	 	}
-		return $fld;
-	}
-	
-	/* For some reason, OCIcolumnname fails when called after _initrs() so we cache it */
-	function &FetchField($fieldOffset = -1)
-	{
-		return $this->_fieldobjs[$fieldOffset];
-	}
-	
-	
-	/*
-	// 10% speedup to move MoveNext to child class
-	function _MoveNext() 
-	{
-	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
-		
-		if ($this->EOF) return false;
-		
-		$this->_currentRow++;
-		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
-			return true;
-		$this->EOF = true;
-		
-		return false;
-	}	*/
-	
-	
-	function MoveNext()
-	{
-		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
-			$this->_currentRow += 1;
-			return true;
-		}
-		if (!$this->EOF) {
-			$this->_currentRow += 1;
-			$this->EOF = true;
-		}
-		return false;
-	}
-	
-	/*
-	# does not work as first record is retrieved in _initrs(), so is not included in GetArray()
-	function &GetArray($nRows = -1) 
-	{
-	global $ADODB_OCI8_GETARRAY;
-	
-		if (true ||  !empty($ADODB_OCI8_GETARRAY)) {
-			# does not support $ADODB_ANSI_PADDING_OFF
-	
-			//OCI_RETURN_NULLS and OCI_RETURN_LOBS is set by OCIfetchstatement
-			switch($this->adodbFetchMode) {
-			case ADODB_FETCH_NUM:
-			
-				$ncols = @OCIfetchstatement($this->_queryID, $results, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW+OCI_NUM);
-				$results = array_merge(array($this->fields),$results);
-				return $results;
-				
-			case ADODB_FETCH_ASSOC: 
-				if (ADODB_ASSOC_CASE != 2 || $this->databaseType != 'oci8') break;
-				
-				$ncols = @OCIfetchstatement($this->_queryID, $assoc, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW);
-				$results =& array_merge(array($this->fields),$assoc);
-				return $results;
-			
-			default:
-				break;
-			}
-		}
-			
-		$results =& ADORecordSet::GetArray($nRows);
-		return $results;
-		
-	} */
-	
-	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$arr =& $this->GetArray($nrows);
-			return $arr;
-		}
-		$arr = array();
-		for ($i=1; $i < $offset; $i++) 
-			if (!@OCIFetch($this->_queryID)) return $arr;
-			
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return $arr;;
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-
-
-	function _seek($row)
-	{
-		return false;
-	}
-
-	function _fetch() 
-	{
-		return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
-	}
-
-	/*		close() only needs to be called if you are worried about using too much memory while your script
-			is running. All associated result memory for the specified result identifier will automatically be freed.		*/
-
-	function _close() 
-	{
-		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
-		if (!empty($this->_refcursor)) {
-			OCIFreeCursor($this->_refcursor);
-			$this->_refcursor = false;
-		}
-		@OCIFreeStatement($this->_queryID);
- 		$this->_queryID = false;
-		
-	}
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		switch (strtoupper($t)) {
-	 	case 'VARCHAR':
-	 	case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-		case 'NCHAR':
-		case 'NVARCHAR':
-		case 'NVARCHAR2':
-				 if (isset($this) && $len <= $this->blobSize) return 'C';
-		
-		case 'NCLOB':
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
-		
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-			return 'B';
-		
-		case 'DATE': 
-			return  ($this->connection->datetime) ? 'T' : 'D';
-		
-		
-		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': 
-			return 'I';
-			
-		default: return 'N';
-		}
-	}
-}
-
-class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
-	function ADORecordSet_ext_oci8($queryID,$mode=false) 
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		switch ($mode)
-		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		}
-		$this->adodbFetchMode = $mode;
-		$this->_queryID = $queryID;
-	}
-	
-	function MoveNext()
-	{
-		return adodb_movenext($this);
-	}
-}
-?>
Index: admin/include/lib/adodb/drivers/adodb-sqlanywhere.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-sqlanywhere.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-sqlanywhere.inc.php	(working copy)
@@ -1,169 +0,0 @@
-<?php
-/* 
-version V4.94 23 Jan 2007 (c) 2000-2007  John Lim (jlim#natsoft.com.my).  All rights
-reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-
-  Latest version is available at http://adodb.sourceforge.net
-
-  21.02.2002 - Wade Johnson wade@wadejohnson.de
-			   Extended ODBC class for Sybase SQLAnywhere.
-   1) Added support to retrieve the last row insert ID on tables with
-	  primary key column using autoincrement function.
-
-   2) Added blob support.  Usage:
-		 a) create blob variable on db server:
-
-		$dbconn->create_blobvar($blobVarName);
-
-	  b) load blob var from file.  $filename must be complete path
-
-	  $dbcon->load_blobvar_from_file($blobVarName, $filename);
-
-	  c) Use the $blobVarName in SQL insert or update statement in the values
-	  clause:
-
-		$recordSet = $dbconn->Execute('INSERT INTO tabname (idcol, blobcol) '
-		.
-	   'VALUES (\'test\', ' . $blobVarName . ')');
-
-	 instead of loading blob from a file, you can also load from 
-	  an unformatted (raw) blob variable:
-	  $dbcon->load_blobvar_from_var($blobVarName, $varName);
-
-	  d) drop blob variable on db server to free up resources:
-	  $dbconn->drop_blobvar($blobVarName);
-
-  Sybase_SQLAnywhere data driver. Requires ODBC.
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('_ADODB_ODBC_LAYER')) {
- include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
-}
-
-if (!defined('ADODB_SYBASE_SQLANYWHERE')){
-
- define('ADODB_SYBASE_SQLANYWHERE',1);
-
- class ADODB_sqlanywhere extends ADODB_odbc {
-  	var $databaseType = "sqlanywhere";	
-	var $hasInsertID = true;
-	
-	function ADODB_sqlanywhere()
-	{
-		$this->ADODB_odbc();
-	}
-
-	 function _insertid() {
-  	   return $this->GetOne('select @@identity');
-	 }
-
-  function create_blobvar($blobVarName) {
-   $this->Execute("create variable $blobVarName long binary");
-   return;
-  }
-
-  function drop_blobvar($blobVarName) {
-   $this->Execute("drop variable $blobVarName");
-   return;
-  }
-
-  function load_blobvar_from_file($blobVarName, $filename) {
-   $chunk_size = 1000;
-
-   $fd = fopen ($filename, "rb");
-
-   $integer_chunks = (integer)filesize($filename) / $chunk_size;
-   $modulus = filesize($filename) % $chunk_size;
-   if ($modulus != 0){
-	$integer_chunks += 1;
-   }
-
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-	$contents = fread ($fd, $chunk_size);
-	$contents = bin2hex($contents);
-
-	$hexstring = '';
-
-	for($loop2=0;$loop2<strlen($contents);$loop2+=2){
-	 $hexstring .= '\x' . substr($contents,$loop2,2);
-	 }
-
-	$hexstring = $this->qstr($hexstring);
-
-	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
-   }
-
-   fclose ($fd);
-   return;
-  }
-
-  function load_blobvar_from_var($blobVarName, &$varName) {
-   $chunk_size = 1000;
-
-   $integer_chunks = (integer)strlen($varName) / $chunk_size;
-   $modulus = strlen($varName) % $chunk_size;
-   if ($modulus != 0){
-	$integer_chunks += 1;
-   }
-
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-	$contents = substr ($varName, (($loop - 1) * $chunk_size), $chunk_size);
-	$contents = bin2hex($contents);
-
-	$hexstring = '';
-
-	for($loop2=0;$loop2<strlen($contents);$loop2+=2){
-	 $hexstring .= '\x' . substr($contents,$loop2,2);
-	 }
-
-	$hexstring = $this->qstr($hexstring);
-
-	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
-   }
-
-   return;
-  }
-
- /*
-  Insert a null into the blob field of the table first.
-  Then use UpdateBlob to store the blob.
-
-  Usage:
-
-  $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-  $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
- */
-  function UpdateBlob($table,$column,&$val,$where,$blobtype='BLOB')
-  {
-   $blobVarName = 'hold_blob';
-   $this->create_blobvar($blobVarName);
-   $this->load_blobvar_from_var($blobVarName, $val);
-   $this->Execute("UPDATE $table SET $column=$blobVarName WHERE $where");
-   $this->drop_blobvar($blobVarName);
-   return true;
-  }
- }; //class
-
- class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {	
-
-  var $databaseType = "sqlanywhere";		
-
- function ADORecordSet_sqlanywhere($id,$mode=false)
- {
-  $this->ADORecordSet_odbc($id,$mode);
- }
-
-
- }; //class
-
-
-} //define
-?>
Index: admin/include/lib/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-informix72.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-informix72.inc.php	(working copy)
@@ -1,475 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim. All rights reserved.
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at http://adodb.sourceforge.net
-
-  Informix port by Mitchell T. Young (mitch@youngfamily.org)
-
-  Further mods by "Samuel CARRIERE" <samuel_carriere@hotmail.com>
-
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-if (!defined('IFX_SCROLL')) define('IFX_SCROLL',1);
-
-class ADODB_informix72 extends ADOConnection {
-	var $databaseType = "informix72";
-	var $dataProvider = "informix";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d H:i:s'";
-	var $hasInsertID = true;
-	var $hasAffectedRows = true;
-    var $substr = 'substr';
-	var $metaTablesSQL="select tabname,tabtype from systables where tabtype in ('T','V') and owner!='informix'"; //Don't get informix tables and pseudo-tables
-
-
-	var $metaColumnsSQL = 
-		"select c.colname, c.coltype, c.collength, d.default,c.colno
-		from syscolumns c, systables t,outer sysdefaults d
-		where c.tabid=t.tabid and d.tabid=t.tabid and d.colno=c.colno
-		and tabname='%s' order by c.colno";
-
-	var $metaPrimaryKeySQL =
-		"select part1,part2,part3,part4,part5,part6,part7,part8 from
-		systables t,sysconstraints s,sysindexes i where t.tabname='%s'
-		and s.tabid=t.tabid and s.constrtype='P'
-		and i.idxname=s.idxname";
-
-	var $concat_operator = '||';
-
-	var $lastQuery = false;
-	var $has_insertid = true;
-
-	var $_autocommit = true;
-	var $_bindInputArray = true;  // set to true if ADOConnection.Execute() permits binding of array parameters.
-	var $sysDate = 'TODAY';
-	var $sysTimeStamp = 'CURRENT';
-	var $cursorType = IFX_SCROLL; // IFX_SCROLL or IFX_HOLD or 0
-   
-	function ADODB_informix72()
-	{
-		// alternatively, use older method:
-		//putenv("DBDATE=Y4MD-");
-		
-		// force ISO date format
-		putenv('GL_DATE=%Y-%m-%d');
-		
-		if (function_exists('ifx_byteasvarchar')) {
-			ifx_byteasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
-        	ifx_textasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
-        	ifx_blobinfile_mode(0); // Mode "0" means save Byte-Blobs in memory, and mode "1" means save Byte-Blobs in a file.
-		}
-	}
-	
-	function ServerInfo()
-	{
-	    if (isset($this->version)) return $this->version;
-	
-	    $arr['description'] = $this->GetOne("select DBINFO('version','full') from systables where tabid = 1");
-	    $arr['version'] = $this->GetOne("select DBINFO('version','major') || DBINFO('version','minor') from systables where tabid = 1");
-	    $this->version = $arr;
-	    return $arr;
-	}
-
-
-
-	function _insertid()
-	{
-		$sqlca =ifx_getsqlca($this->lastQuery);
-		return @$sqlca["sqlerrd1"];
-	}
-
-	function _affectedrows()
-	{
-		if ($this->lastQuery) {
-		   return @ifx_affected_rows ($this->lastQuery);
-		}
-		return 0;
-	}
-
-	function BeginTrans()
-	{
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->Execute('BEGIN');
-		$this->_autocommit = false;
-		return true;
-	}
-
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('COMMIT');
-		$this->_autocommit = true;
-		return true;
-	}
-
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->Execute('ROLLBACK');
-		$this->_autocommit = true;
-		return true;
-	}
-
-	function RowLock($tables,$where,$flds='1 as ignore')
-	{
-		if ($this->_autocommit) $this->BeginTrans();
-		return $this->GetOne("select $flds from $tables where $where for update");
-	}
-
-	/*	Returns: the last error message from previous database operation
-		Note: This function is NOT available for Microsoft SQL Server.	*/
-
-	function ErrorMsg() 
-	{
-		if (!empty($this->_logsql)) return $this->_errorMsg;
-		$this->_errorMsg = ifx_errormsg();
-		return $this->_errorMsg;
-	}
-
-	function ErrorNo()
-	{
-		preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse);
-		if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; 
-		return 0;
-	}
-
-   
-    function &MetaColumns($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		if (!empty($this->metaColumnsSQL)) {
-			$save = $ADODB_FETCH_MODE;
-			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-          		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-			if (isset($savem)) $this->SetFetchMode($savem);
-			$ADODB_FETCH_MODE = $save;
-			if ($rs === false) return $false;
-			$rspkey = $this->Execute(sprintf($this->metaPrimaryKeySQL,$table)); //Added to get primary key colno items
-
-			$retarr = array();
-			while (!$rs->EOF) { //print_r($rs->fields);
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[0];
-/*  //!eos.
-						$rs->fields[1] is not the correct adodb type
-						$rs->fields[2] is not correct max_length, because can include not-null bit
-
-				$fld->type = $rs->fields[1];
-				$fld->primary_key=$rspkey->fields && array_search($rs->fields[4],$rspkey->fields); //Added to set primary key flag
-				$fld->max_length = $rs->fields[2];*/
-				$pr=ifx_props($rs->fields[1],$rs->fields[2]); //!eos
-				$fld->type = $pr[0] ;//!eos
-				$fld->primary_key=$rspkey->fields && array_search($rs->fields[4],$rspkey->fields);
-				$fld->max_length = $pr[1]; //!eos
-				$fld->precision = $pr[2] ;//!eos
-				$fld->not_null = $pr[3]=="N"; //!eos
-
-				if (trim($rs->fields[3]) != "AAAAAA 0") {
-	                    		$fld->has_default = 1;
-	                    		$fld->default_value = $rs->fields[3];
-				} else {
-					$fld->has_default = 0;
-				}
-
-                $retarr[strtolower($fld->name)] = $fld;	
-				$rs->MoveNext();
-			}
-
-			$rs->Close();
-			$rspkey->Close(); //!eos
-			return $retarr;	
-		}
-
-		return $false;
-	}
-	
-   function &xMetaColumns($table)
-   {
-		return ADOConnection::MetaColumns($table,false);
-   }
-
-	 function MetaForeignKeys($table, $owner=false, $upper=false) //!Eos
-	{
-		$sql = "
-			select tr.tabname,updrule,delrule,
-			i.part1 o1,i2.part1 d1,i.part2 o2,i2.part2 d2,i.part3 o3,i2.part3 d3,i.part4 o4,i2.part4 d4,
-			i.part5 o5,i2.part5 d5,i.part6 o6,i2.part6 d6,i.part7 o7,i2.part7 d7,i.part8 o8,i2.part8 d8
-			from systables t,sysconstraints s,sysindexes i,
-			sysreferences r,systables tr,sysconstraints s2,sysindexes i2
-			where t.tabname='$table'
-			and s.tabid=t.tabid and s.constrtype='R' and r.constrid=s.constrid
-			and i.idxname=s.idxname and tr.tabid=r.ptabid
-			and s2.constrid=r.primary and i2.idxname=s2.idxname";
-
-		$rs = $this->Execute($sql);
-		if (!$rs || $rs->EOF)  return false;
-		$arr =& $rs->GetArray();
-		$a = array();
-		foreach($arr as $v) {
-			$coldest=$this->metaColumnNames($v["tabname"]);
-			$colorig=$this->metaColumnNames($table);
-			$colnames=array();
-			for($i=1;$i<=8 && $v["o$i"] ;$i++) {
-				$colnames[]=$coldest[$v["d$i"]-1]."=".$colorig[$v["o$i"]-1];
-			}
-			if($upper)
-				$a[strtoupper($v["tabname"])] =  $colnames;
-			else
-				$a[$v["tabname"]] =  $colnames;
-		}
-		return $a;
-	 }
-
-   function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
-   {
-   		$type = ($blobtype == 'TEXT') ? 1 : 0;
-		$blobid = ifx_create_blob($type,0,$val);
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blobid));
-   }
-
-   function BlobDecode($blobid)
-   {
-   		return function_exists('ifx_byteasvarchar') ? $blobid : @ifx_get_blob($blobid);
-   }
-   
-	// returns true or false
-   function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('ifx_connect')) return null;
-		
-		$dbs = $argDatabasename . "@" . $argHostname;
-		if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); 
-		putenv("INFORMIXSERVER=".trim($argHostname)); 
-		$this->_connectionID = ifx_connect($dbs,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;
-	}
-
-	// returns true or false
-   function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-	{
-		if (!function_exists('ifx_connect')) return null;
-		
-		$dbs = $argDatabasename . "@" . $argHostname;
-		putenv("INFORMIXSERVER=".trim($argHostname)); 
-		$this->_connectionID = ifx_pconnect($dbs,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;
-	}
-/*
-	// ifx_do does not accept bind parameters - weird ???
-	function Prepare($sql)
-	{
-		$stmt = ifx_prepare($sql);
-		if (!$stmt) return $sql;
-		else return array($sql,$stmt);
-	}
-*/
-	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
-	{
-	global $ADODB_COUNTRECS;
-	
-	  // String parameters have to be converted using ifx_create_char
-	  if ($inputarr) {
-		 foreach($inputarr as $v) {
-			if (gettype($v) == 'string') {
-			   $tab[] = ifx_create_char($v);
-			}
-			else {
-			   $tab[] = $v;
-			}
-		 }
-	  }
-
-	  // In case of select statement, we use a scroll cursor in order
-	  // to be able to call "move", or "movefirst" statements
-	  if (!$ADODB_COUNTRECS && preg_match("/^\s*select/is", $sql)) {
-		 if ($inputarr) {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType, $tab);
-		 }
-		 else {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType);
-		 }
-	  }
-	  else {
-		 if ($inputarr) {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID, $tab);
-		 }
-		 else {
-			$this->lastQuery = ifx_query($sql,$this->_connectionID);
-		 }
-	  }
-
-	  // Following line have been commented because autocommit mode is
-	  // not supported by informix SE 7.2
-
-	  //if ($this->_autocommit) ifx_query('COMMIT',$this->_connectionID);
-
-		return $this->lastQuery;
-	}
-
-	// returns true or false
-	function _close()
-	{
-		$this->lastQuery = false;
-		return ifx_close($this->_connectionID);
-	}
-}
-
-
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_informix72 extends ADORecordSet {
-
-	var $databaseType = "informix72";
-	var $canSeek = true;
-	var $_fieldprops = false;
-
-	function ADORecordset_informix72($id,$mode=false)
-	{
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id);
-	}
-
-
-
-	/*	Returns: an object containing field information.
-		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-		fetchField() is retrieved.	*/
-	function &FetchField($fieldOffset = -1)
-	{
-		if (empty($this->_fieldprops)) {
-			$fp = ifx_fieldproperties($this->_queryID);
-			foreach($fp as $k => $v) {
-				$o = new ADOFieldObject;
-				$o->name = $k;
-				$arr = split(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
-				$o->type = $arr[0];
-				$o->max_length = $arr[1];
-				$this->_fieldprops[] = $o;
-				$o->not_null = $arr[4]=="N";
-			}
-		}
-		$ret = $this->_fieldprops[$fieldOffset];
-		return $ret;
-	}
-
-	function _initrs()
-	{
-		$this->_numOfRows = -1; // ifx_affected_rows not reliable, only returns estimate -- ($ADODB_COUNTRECS)? ifx_affected_rows($this->_queryID):-1;
-		$this->_numOfFields = ifx_num_fields($this->_queryID);
-	}
-
-	function _seek($row)
-	{
-		return @ifx_fetch_row($this->_queryID, (int) $row);
-	}
-
-   function MoveLast()
-   {
-	  $this->fields = @ifx_fetch_row($this->_queryID, "LAST");
-	  if ($this->fields) $this->EOF = false;
-	  $this->_currentRow = -1;
-
-	  if ($this->fetchMode == ADODB_FETCH_NUM) {
-		 foreach($this->fields as $v) {
-			$arr[] = $v;
-		 }
-		 $this->fields = $arr;
-	  }
-
-	  return true;
-   }
-
-   function MoveFirst()
-	{
-	  $this->fields = @ifx_fetch_row($this->_queryID, "FIRST");
-	  if ($this->fields) $this->EOF = false;
-	  $this->_currentRow = 0;
-
-	  if ($this->fetchMode == ADODB_FETCH_NUM) {
-		 foreach($this->fields as $v) {
-			$arr[] = $v;
-		 }
-		 $this->fields = $arr;
-	  }
-
-	  return true;
-   }
-
-   function _fetch($ignore_fields=false)
-   {
-
-		$this->fields = @ifx_fetch_row($this->_queryID);
-
-		if (!is_array($this->fields)) return false;
-
-		if ($this->fetchMode == ADODB_FETCH_NUM) {
-			foreach($this->fields as $v) {
-				$arr[] = $v;
-			}
-			$this->fields = $arr;
-		}
-		return true;
-	}
-
-	/*	close() only needs to be called if you are worried about using too much memory while your script
-		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
-	function _close()
-	{
-		return ifx_free_result($this->_queryID);
-	}
-
-}
-/** !Eos
-* Auxiliar function to Parse coltype,collength. Used by Metacolumns
-* return: array ($mtype,$length,$precision,$nullable) (similar to ifx_fieldpropierties)
-*/
-function ifx_props($coltype,$collength){
-	$itype=fmod($coltype+1,256);
-	$nullable=floor(($coltype+1) /256) ?"N":"Y";
-	$mtype=substr(" CIIFFNNDN TBXCC     ",$itype,1);
-	switch ($itype){
-		case 2:
-			$length=4;
-		case 6:
-		case 9:
-		case 14:
-			$length=floor($collength/256);
-			$precision=fmod($collength,256);
-			break;
-		default:
-			$precision=0;
-			$length=$collength;
-	}
-	return array($mtype,$length,$precision,$nullable);
-}
-
-
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-oracle.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-oracle.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-oracle.inc.php	(working copy)
@@ -1,338 +0,0 @@
-<?php
-/*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Oracle data driver. Requires Oracle client. Works on Windows and Unix and Oracle 7.
-  
-  If you are using Oracle 8 or later, use the oci8 driver which is much better and more reliable.
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB_oracle extends ADOConnection {
-	var $databaseType = "oracle";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $concat_operator='||';
-	var $_curs;
-	var $_initdate = true; // init date to YYYY-MM-DD
-	var $metaTablesSQL = 'select table_name from cat';	
-	var $metaColumnsSQL = "select cname,coltype,width from col where tname='%s' order by colno";
-	var $sysDate = "TO_DATE(TO_CHAR(SYSDATE,'YYYY-MM-DD'),'YYYY-MM-DD')";
-	var $sysTimeStamp = 'SYSDATE';
-	var $connectSID = true;
-	
-	function ADODB_oracle() 
-	{
-	}
-
-	// format and return date string in database date format
-	function DBDate($d)
-	{
-		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		return 'TO_DATE('.adodb_date($this->fmtDate,$d).",'YYYY-MM-DD')";
-	}
-	
-	// format and return date string in database timestamp format
-	function DBTimeStamp($ts)
-	{
-
-		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
-	}
-	
-	
-	function BindDate($d)
-	{
-		$d = ADOConnection::DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-	function BindTimeStamp($d)
-	{
-		$d = ADOConnection::DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
-		
-		return substr($d,1,strlen($d)-2);
-	}
-	
-
-	
-	function BeginTrans()
-	{	  
-		 $this->autoCommit = false;
-		 ora_commitoff($this->_connectionID);
-		 return true;
-	}
-
-	
-	function CommitTrans($ok=true) 
-	{ 
-		   if (!$ok) return $this->RollbackTrans();
-		   $ret = ora_commit($this->_connectionID);
-		   ora_commiton($this->_connectionID);
-		   return $ret;
-	}
-
-	
-	function RollbackTrans()
-	{
-		$ret = ora_rollback($this->_connectionID);
-		ora_commiton($this->_connectionID);
-		return $ret;
-	}
-
-
-	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
-	function ErrorMsg() 
- 	{   
-        if ($this->_errorMsg !== false) return $this->_errorMsg;
-
-        if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
- 		if (empty($this->_errorMsg)) $this->_errorMsg = @ora_error($this->_connectionID);
-		return $this->_errorMsg;
-	}
-
- 
-	function ErrorNo() 
-	{
-		if ($this->_errorCode !== false) return $this->_errorCode;
-
-		if (is_resource($this->_curs)) $this->_errorCode = @ora_errorcode($this->_curs);
-		if (empty($this->_errorCode)) $this->_errorCode = @ora_errorcode($this->_connectionID);
-        return $this->_errorCode;
-	}
-
-	
-
-		// returns true or false
-		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
-		{
-			if (!function_exists('ora_plogon')) return null;
-				
-            // <G. Giunta 2003/03/03/> Reset error messages before connecting
-            $this->_errorMsg = false;
-		    $this->_errorCode = false;
-        
-            // G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
-            // the oracle home to the host name of remote DB?
-//			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
-
-			if($argHostname) { // code copied from version submitted for oci8 by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
-				if (empty($argDatabasename)) $argDatabasename = $argHostname;
-				else {
-					if(strpos($argHostname,":")) {
-						$argHostinfo=explode(":",$argHostname);
-						$argHostname=$argHostinfo[0];
-						$argHostport=$argHostinfo[1];
-					} else {
-						$argHostport="1521";
-					}
-
-
-					if ($this->connectSID) {
-						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-						.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-					} else
-						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
-						.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
-				}
-
-			}
-
-			if ($argDatabasename) $argUsername .= "@$argDatabasename";
-
-		//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
-			if ($mode == 1)
-				$this->_connectionID = ora_plogon($argUsername,$argPassword);
-			else
-				$this->_connectionID = ora_logon($argUsername,$argPassword);
-			if ($this->_connectionID === false) return false;
-			if ($this->autoCommit) ora_commiton($this->_connectionID);
-			if ($this->_initdate) {
-				$rs = $this->_query("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
-				if ($rs) ora_close($rs);
-			}
-
-			return true;
-		}
-
-
-		// returns true or false
-		function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
-		{
-			return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 1);
-		}
-
-
-		// returns query ID if successful, otherwise false
-		function _query($sql,$inputarr=false)
-		{
-            // <G. Giunta 2003/03/03/> Reset error messages before executing
-            $this->_errorMsg = false;
-		    $this->_errorCode = false;
-
-			$curs = ora_open($this->_connectionID);
-		 
-		 	if ($curs === false) return false;
-			$this->_curs = $curs;
-			if (!ora_parse($curs,$sql)) return false;
-			if (ora_exec($curs)) return $curs;
-            // <G. Giunta 2004/03/03> before we close the cursor, we have to store the error message
-            // that we can obtain ONLY from the cursor (and not from the connection)
-            $this->_errorCode = @ora_errorcode($curs);
-            $this->_errorMsg = @ora_error($curs);
-            // </G. Giunta 2004/03/03>            
-		 	@ora_close($curs);
-			return false;
-		}
-
-
-		// returns true or false
-		function _close()
-		{
-			return @ora_logoff($this->_connectionID);
-		}
-
-
-
-}
-
-
-/*--------------------------------------------------------------------------------------
-		 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordset_oracle extends ADORecordSet {
-
-	var $databaseType = "oracle";
-	var $bind = false;
-
-	function ADORecordset_oracle($queryID,$mode=false)
-	{
-		
-		if ($mode === false) { 
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $queryID;
-	
-		$this->_inited = true;
-		$this->fields = array();
-		if ($queryID) {
-			$this->_currentRow = 0;
-			$this->EOF = !$this->_fetch();
-			@$this->_initrs();
-		} else {
-			$this->_numOfRows = 0;
-			$this->_numOfFields = 0;
-			$this->EOF = true;
-		}
-		
-		return $this->_queryID;
-	}
-
-
-
-	   /*		Returns: an object containing field information.
-			   Get column information in the Recordset object. fetchField() can be used in order to obtain information about
-			   fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
-			   fetchField() is retrieved.		*/
-
-	   function &FetchField($fieldOffset = -1)
-	   {
-			$fld = new ADOFieldObject;
-			$fld->name = ora_columnname($this->_queryID, $fieldOffset);
-			$fld->type = ora_columntype($this->_queryID, $fieldOffset);
-			$fld->max_length = ora_columnsize($this->_queryID, $fieldOffset);
-			return $fld;
-	   }
-
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-		
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-   function _initrs()
-   {
-		   $this->_numOfRows = -1;
-		   $this->_numOfFields = @ora_numcols($this->_queryID);
-   }
-
-
-   function _seek($row)
-   {
-		   return false;
-   }
-
-   function _fetch($ignore_fields=false) {
-// should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
-		if ($this->fetchMode & ADODB_FETCH_ASSOC)
-			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
-   		else 
-			return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS);
-   }
-
-   /*		close() only needs to be called if you are worried about using too much memory while your script
-		   is running. All associated result memory for the specified result identifier will automatically be freed.		*/
-
-   function _close() 
-{
-		   return @ora_close($this->_queryID);
-   }
-
-	function MetaType($t,$len=-1)
-	{
-		if (is_object($t)) {
-			$fieldobj = $t;
-			$t = $fieldobj->type;
-			$len = $fieldobj->max_length;
-		}
-		
-		switch (strtoupper($t)) {
-		case 'VARCHAR':
-		case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-				if ($len <= $this->blobSize) return 'C';
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-				return 'B';
-		
-		case 'DATE': return 'D';
-		
-		//case 'T': return 'T';
-		
-		case 'BIT': return 'L';
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
-		}
-	}
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-odbc.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-odbc.inc.php	(working copy)
@@ -1,738 +0,0 @@
-<?php
-/* 
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
-Set tabs to 4 for best viewing.
-  
-  Latest version is available at http://adodb.sourceforge.net
-  
-  Requires ODBC. Works on Windows and Unix.
-*/
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-  define("_ADODB_ODBC_LAYER", 2 );
-	 
-/*--------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------*/
-
-
-class ADODB_odbc extends ADOConnection {
-	var $databaseType = "odbc";	
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $dataProvider = "odbc";
-	var $hasAffectedRows = true;
-	var $binmode = ODBC_BINMODE_RETURN;
-	var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive
-								// breaking backward-compat
-	//var $longreadlen = 8000; // default number of chars to return for a Blob/Long field
-	var $_bindInputArray = false;	
-	var $curmode = SQL_CUR_USE_DRIVER; // See sqlext.h, SQL_CUR_DEFAULT == SQL_CUR_USE_DRIVER == 2L
-	var $_genSeqSQL = "create table %s (id integer)";
-	var $_autocommit = true;
-	var $_haserrorfunctions = true;
-	var $_has_stupid_odbc_fetch_api_change = true;
-	var $_lastAffectedRows = 0;
-	var $uCaseTables = true; // for meta* functions, uppercase table names
-	
-	function ADODB_odbc() 
-	{ 	
-		$this->_haserrorfunctions = ADODB_PHPVER >= 0x4050;
-		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}
-	
-		// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-		
-		if (!function_exists('odbc_connect')) return null;
-		
-		if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') {
-			ADOConnection::outp("For odbc Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
-		}
-		if (isset($php_errormsg)) $php_errormsg = '';
-		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
-		else $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		return $this->_connectionID != false;
-	}
-	
-	// returns true or false
-	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
-	{
-	global $php_errormsg;
-	
-		if (!function_exists('odbc_connect')) return null;
-		
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		if ($this->debug && $argDatabasename) {
-			ADOConnection::outp("For odbc PConnect(), $argDatabasename is not used. Place dsn in 1st parameter.");
-		}
-	//	print "dsn=$argDSN u=$argUsername p=$argPassword<br>"; flush();
-		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
-		else $this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
-		
-		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		if ($this->_connectionID && $this->autoRollback) @odbc_rollback($this->_connectionID);
-		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
-		
-		return $this->_connectionID != false;
-	}
-
-	
-	function ServerInfo()
-	{
-	
-		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
-			$dsn = strtoupper($this->host);
-			$first = true;
-			$found = false;
-			
-			if (!function_exists('odbc_data_source')) return false;
-			
-			while(true) {
-				
-				$rez = @odbc_data_source($this->_connectionID,
-					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
-				$first = false;
-				if (!is_array($rez)) break;
-				if (strtoupper($rez['server']) == $dsn) {
-					$found = true;
-					break;
-				}
-			} 
-			if (!$found) return ADOConnection::ServerInfo();
-			if (!isset($rez['version'])) $rez['version'] = '';
-			return $rez;
-		} else {
-			return ADOConnection::ServerInfo();
-		}
-	}
-
-	
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		if (empty($this->_genSeqSQL)) return false;
-		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
-		if (!$ok) return false;
-		$start -= 1;
-		return $this->Execute("insert into $seqname values($start)");
-	}
-	
-	var $_dropSeqSQL = 'drop table %s';
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-	
-	/*
-		This algorithm is not very efficient, but works even if table locking
-		is not available.
-		
-		Will return false if unable to generate an ID after $MAXLOOPS attempts.
-	*/
-	function GenID($seq='adodbseq',$start=1)
-	{	
-		// if you have to modify the parameter below, your database is overloaded,
-		// or you need to implement generation of id's yourself!
-		$MAXLOOPS = 100;
-		//$this->debug=1;
-		while (--$MAXLOOPS>=0) {
-			$num = $this->GetOne("select id from $seq");
-			if ($num === false) {
-				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
-				$start -= 1;
-				$num = '0';
-				$ok = $this->Execute("insert into $seq values($start)");
-				if (!$ok) return false;
-			} 
-			$this->Execute("update $seq set id=id+1 where id=$num");
-			
-			if ($this->affected_rows() > 0) {
-				$num += 1;
-				$this->genID = $num;
-				return $num;
-			}
-		}
-		if ($fn = $this->raiseErrorFn) {
-			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
-		}
-		return false;
-	}
-
-
-	function ErrorMsg()
-	{
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorMsg !== false) return $this->_errorMsg;
-			if (empty($this->_connectionID)) return @odbc_errormsg();
-			return @odbc_errormsg($this->_connectionID);
-		} else return ADOConnection::ErrorMsg();
-	}
-	
-	function ErrorNo()
-	{
-		
-		if ($this->_haserrorfunctions) {
-			if ($this->_errorCode !== false) {
-				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
-			}
-
-			if (empty($this->_connectionID)) $e = @odbc_error(); 
-			else $e = @odbc_error($this->_connectionID);
-			
-			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
-			 // so we check and patch
-			if (strlen($e)<=2) return 0;
-			return $e;
-		} else return ADOConnection::ErrorNo();
-	}
-	
-	
-
-	function BeginTrans()
-	{	
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		$this->transCnt += 1;
-		$this->_autocommit = false;
-		return odbc_autocommit($this->_connectionID,false);
-	}
-	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = odbc_commit($this->_connectionID);
-		odbc_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->_autocommit = true;
-		$ret = odbc_rollback($this->_connectionID);
-		odbc_autocommit($this->_connectionID,true);
-		return $ret;
-	}
-	
-	function MetaPrimaryKeys($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = @odbc_primarykeys($this->_connectionID,'',$schema,$table);
-		
-		if (!$qid) {
-			$ADODB_FETCH_MODE = $savem;
-			return false;
-		}
-		$rs = new ADORecordSet_odbc($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return false;
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr =& $rs->GetArray();
-		$rs->Close();
-		//print_r($arr);
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
-		}
-		return $arr2;
-	}
-	
-	
-	
-	function &MetaTables($ttype=false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$qid = odbc_tables($this->_connectionID);
-		
-		$rs = new ADORecordSet_odbc($qid);
-		
-		$ADODB_FETCH_MODE = $savem;
-		if (!$rs) {
-			$false = false;
-			return $false;
-		}
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		
-		$arr =& $rs->GetArray();
-		//print_r($arr);
-		
-		$rs->Close();
-		$arr2 = array();
-		
-		if ($ttype) {
-			$isview = strncmp($ttype,'V',1) === 0;
-		}
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if (!$arr[$i][2]) continue;
-			$type = $arr[$i][3];
-			if ($ttype) { 
-				if ($isview) {
-					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
-				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
-			} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
-		}
-		return $arr2;
-	}
-	
-/*
-See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
-/ SQL data type codes /
-#define	SQL_UNKNOWN_TYPE	0
-#define SQL_CHAR			1
-#define SQL_NUMERIC		 2
-#define SQL_DECIMAL		 3
-#define SQL_INTEGER		 4
-#define SQL_SMALLINT		5
-#define SQL_FLOAT		   6
-#define SQL_REAL			7
-#define SQL_DOUBLE		  8
-#if (ODBCVER >= 0x0300)
-#define SQL_DATETIME		9
-#endif
-#define SQL_VARCHAR		12
-
-
-/ One-parameter shortcuts for date/time data types /
-#if (ODBCVER >= 0x0300)
-#define SQL_TYPE_DATE	  91
-#define SQL_TYPE_TIME	  92
-#define SQL_TYPE_TIMESTAMP 93
-
-#define SQL_UNICODE                             (-95)
-#define SQL_UNICODE_VARCHAR                     (-96)
-#define SQL_UNICODE_LONGVARCHAR                 (-97)
-*/
-	function ODBCTypes($t)
-	{
-		switch ((integer)$t) {
-		case 1:	
-		case 12:
-		case 0:
-		case -95:
-		case -96:
-			return 'C';
-		case -97:
-		case -1: //text
-			return 'X';
-		case -4: //image
-			return 'B';
-				
-		case 9:	
-		case 91:
-			return 'D';
-		
-		case 10:
-		case 11:
-		case 92:
-		case 93:
-			return 'T';
-			
-		case 4:
-		case 5:
-		case -6:
-			return 'I';
-			
-		case -11: // uniqidentifier
-			return 'R';
-		case -7: //bit
-			return 'L';
-		
-		default:
-			return 'N';
-		}
-	}
-	
-	function &MetaColumns($table)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$false = false;
-		if ($this->uCaseTables) $table = strtoupper($table);
-		$schema = '';
-		$this->_findschema($table,$schema);
-		
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-		/*if (false) { // after testing, confirmed that the following does not work becoz of a bug
-			$qid2 = odbc_tables($this->_connectionID);
-			$rs = new ADORecordSet_odbc($qid2);		
-			$ADODB_FETCH_MODE = $savem;
-			if (!$rs) return false;
-			$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-			$rs->_fetch();
-			
-			while (!$rs->EOF) {
-				if ($table == strtoupper($rs->fields[2])) {
-					$q = $rs->fields[0];
-					$o = $rs->fields[1];
-					break;
-				}
-				$rs->MoveNext();
-			}
-			$rs->Close();
-			
-			$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
-		} */
-		
-		switch ($this->databaseType) {
-		case 'access':
-		case 'vfp':
-			$qid = odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
-			break;
-		
-		
-		case 'db2':
-            $colname = "%";
-            $qid = odbc_columns($this->_connectionID, "", $schema, $table, $colname);
-            break;
-			
-		default:
-			$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
-			if (empty($qid)) $qid = odbc_columns($this->_connectionID);
-			break;
-		}
-		if (empty($qid)) return $false;
-		
-		$rs =& new ADORecordSet_odbc($qid);
-		$ADODB_FETCH_MODE = $savem;
-		
-		if (!$rs) return $false;
-		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
-		$rs->_fetch();
-		
-		$retarr = array();
-		
-		/*
-		$rs->fields indices
-		0 TABLE_QUALIFIER
-		1 TABLE_SCHEM
-		2 TABLE_NAME
-		3 COLUMN_NAME
-		4 DATA_TYPE
-		5 TYPE_NAME
-		6 PRECISION
-		7 LENGTH
-		8 SCALE
-		9 RADIX
-		10 NULLABLE
-		11 REMARKS
-		*/
-		while (!$rs->EOF) {
-		//	adodb_pr($rs->fields);
-			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[3];
-				$fld->type = $this->ODBCTypes($rs->fields[4]);
-				
-				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
-				// access uses precision to store length for char/varchar
-				if ($fld->type == 'C' or $fld->type == 'X') {
-					if ($this->databaseType == 'access') 
-						$fld->max_length = $rs->fields[6];
-					else if ($rs->fields[4] <= -95) // UNICODE
-						$fld->max_length = $rs->fields[7]/2;
-					else
-						$fld->max_length = $rs->fields[7];
-				} else 
-					$fld->max_length = $rs->fields[7];
-				$fld->not_null = !empty($rs->fields[10]);
-				$fld->scale = $rs->fields[8];
-				$retarr[strtoupper($fld->name)] = $fld;	
-			} else if (sizeof($retarr)>0)
-				break;
-			$rs->MoveNext();
-		}
-		$rs->Close(); //-- crashes 4.03pl1 -- why?
-		
-		if (empty($retarr)) $retarr = false;
-		return $retarr;
-	}
-	
-	function Prepare($sql)
-	{
-		if (! $this->_bindInputArray) return $sql; // no binding
-		$stmt = odbc_prepare($this->_connectionID,$sql);
-		if (!$stmt) {
-			// we don't know whether odbc driver is parsing prepared stmts, so just return sql
-			return $sql;
-		}
-		return array($sql,$stmt,false);
-	}
-
-	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
-	{
-	GLOBAL $php_errormsg;
-		if (isset($php_errormsg)) $php_errormsg = '';
-		$this->_error = '';
-		
-		if ($inputarr) {
-			if (is_array($sql)) {
-				$stmtid = $sql[1];
-			} else {
-				$stmtid = odbc_prepare($this->_connectionID,$sql);
-	
-				if ($stmtid == false) {
-					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-					return false;
-				}
-			}
-			
-			if (! odbc_execute($stmtid,$inputarr)) {
-				//@odbc_free_result($stmtid);
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = odbc_errormsg();
-					$this->_errorCode = odbc_error();
-				}
-				return false;
-			}
-		
-		} else if (is_array($sql)) {
-			$stmtid = $sql[1];
-			if (!odbc_execute($stmtid)) {
-				//@odbc_free_result($stmtid);
-				if ($this->_haserrorfunctions) {
-					$this->_errorMsg = odbc_errormsg();
-					$this->_errorCode = odbc_error();
-				}
-				return false;
-			}
-		} else
-			$stmtid = odbc_exec($this->_connectionID,$sql);
-		
-		$this->_lastAffectedRows = 0;
-		if ($stmtid) {
-			if (@odbc_num_fields($stmtid) == 0) {
-				$this->_lastAffectedRows = odbc_num_rows($stmtid);
-				$stmtid = true;
-			} else {
-				$this->_lastAffectedRows = 0;
-				odbc_binmode($stmtid,$this->binmode);
-				odbc_longreadlen($stmtid,$this->maxblobsize);
-			}
-			
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = '';
-				$this->_errorCode = 0;
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		} else {
-			if ($this->_haserrorfunctions) {
-				$this->_errorMsg = odbc_errormsg();
-				$this->_errorCode = odbc_error();
-			} else
-				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
-		}
-		return $stmtid;
-	}
-
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-		
-		Usage:
-		 
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
-	{
-		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
-	}
-	
-	// returns true or false
-	function _close()
-	{
-		$ret = @odbc_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $ret;
-	}
-
-	function _affectedrows()
-	{
-		return $this->_lastAffectedRows;
-	}
-	
-}
-	
-/*--------------------------------------------------------------------------------------
-	 Class Name: Recordset
---------------------------------------------------------------------------------------*/
-
-class ADORecordSet_odbc extends ADORecordSet {	
-	
-	var $bind = false;
-	var $databaseType = "odbc";		
-	var $dataProvider = "odbc";
-	var $useFetchArray;
-	var $_has_stupid_odbc_fetch_api_change;
-	
-	function ADORecordSet_odbc($id,$mode=false)
-	{
-		if ($mode === false) {  
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		
-		$this->_queryID = $id;
-		
-		// the following is required for mysql odbc driver in 4.3.1 -- why?
-		$this->EOF = false;
-		$this->_currentRow = -1;
-		//$this->ADORecordSet($id);
-	}
-
-
-	// returns the field object
-	function &FetchField($fieldOffset = -1) 
-	{
-		
-		$off=$fieldOffset+1; // offsets begin at 1
-		
-		$o= new ADOFieldObject();
-		$o->name = @odbc_field_name($this->_queryID,$off);
-		$o->type = @odbc_field_type($this->_queryID,$off);
-		$o->max_length = @odbc_field_len($this->_queryID,$off);
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-		return $o;
-	}
-	
-	/* Use associative array to get fields array */
-	function Fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$o = $this->FetchField($i);
-				$this->bind[strtoupper($o->name)] = $i;
-			}
-		}
-
-		 return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-	
-		
-	function _initrs()
-	{
-	global $ADODB_COUNTRECS;
-		$this->_numOfRows = ($ADODB_COUNTRECS) ? @odbc_num_rows($this->_queryID) : -1;
-		$this->_numOfFields = @odbc_num_fields($this->_queryID);
-		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
-		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
-		//$this->useFetchArray = $this->connection->useFetchArray;
-		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
-	}	
-	
-	function _seek($row)
-	{
-		return false;
-	}
-	
-	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-	function &GetArrayLimit($nrows,$offset=-1) 
-	{
-		if ($offset <= 0) {
-			$rs =& $this->GetArray($nrows);
-			return $rs;
-		}
-		$savem = $this->fetchMode;
-		$this->fetchMode = ADODB_FETCH_NUM;
-		$this->Move($offset);
-		$this->fetchMode = $savem;
-		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-		}
-		
-		$results = array();
-		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
-			$results[$cnt++] = $this->fields;
-			$this->MoveNext();
-		}
-		
-		return $results;
-	}
-	
-	
-	function MoveNext() 
-	{
-		if ($this->_numOfRows != 0 && !$this->EOF) {		
-			$this->_currentRow++;
-			
-			if ($this->_has_stupid_odbc_fetch_api_change)
-				$rez = @odbc_fetch_into($this->_queryID,$this->fields);
-			else {
-				$row = 0;
-				$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
-			}
-			if ($rez) {
-				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-					$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-				}
-				return true;
-			}
-		}
-		$this->fields = false;
-		$this->EOF = true;
-		return false;
-	}	
-	
-	function _fetch()
-	{
-
-		if ($this->_has_stupid_odbc_fetch_api_change)
-			$rez = @odbc_fetch_into($this->_queryID,$this->fields);
-		else {
-			$row = 0;
-			$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
-		}
-		if ($rez) {
-			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-				$this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
-			}
-			return true;
-		}
-		$this->fields = false;
-		return false;
-	}
-	
-	function _close() 
-	{
-		return @odbc_free_result($this->_queryID);		
-	}
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- admin/include/lib/adodb/drivers/adodb-odbtp.inc.php	(revision 6370)
+++ admin/include/lib/adodb/drivers/adodb-odbtp.inc.php	(working copy)
@@ -1,743 +0,0 @@
-<?php
-/*
-  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-  Latest version is available at http://adodb.sourceforge.net
-*/
-// Code contributed by "stefan bogdan" <sbogdan#rsb.ro>
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-define("_ADODB_ODBTP_LAYER", 2 );
-
-class ADODB_odbtp extends ADOConnection{
-	var $databaseType = "odbtp";
-	var $dataProvider = "odbtp";
-	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
-	var $replaceQuote = "''"; // string to use to replace quotes
-	var $odbc_driver = 0;
-	var $hasAffectedRows = true;
-	var $hasInsertID = false;
-	var $hasGenID = true;
-	var $hasMoveFirst = true;
-
-	var $_genSeqSQL = "create table %s (seq_name char(30) not null unique , seq_value integer not null)";
-	var $_dropSeqSQL = "delete from adodb_seq where seq_name = '%s'";
-	var $_bindInputArray = false;
-	var $_useUnicodeSQL = false;
-	var $_canPrepareSP = false;
-	var $_dontPoolDBC = true;
-
-	function ADODB_odbtp()
-	{
-	}
-
-	function ServerInfo()
-	{
-		return array('description' => @odbtp_get_attr( ODB_ATTR_DBMSNAME, $this->_connectionID),
-		             'version' => @odbtp_get_attr( ODB_ATTR_DBMSVER, $this->_connectionID));
-	}
-
-	function ErrorMsg()
-	{
-		if (empty($this->_connectionID)) return @odbtp_last_error();
-		return @odbtp_last_error($this->_connectionID);
-	}
-
-	function ErrorNo()
-	{
-		if (empty($this->_connectionID)) return @odbtp_last_error_state();
-			return @odbtp_last_error_state($this->_connectionID);
-	}
-
-	function _insertid()
-	{
-	// SCOPE_IDENTITY()
-	// Returns the last IDENTITY value inserted into an IDENTITY column in
-	// the same scope. A scope is a module -- a stored procedure, trigger,
-	// function, or batch. Thus, two statements are in the same scope if
-	// they are in the same stored procedure, function, or batch.
-			return $this->GetOne($this->identitySQL);
-	}
-
-	function _affectedrows()
-	{
-		if ($this->_queryID) {
-			return @odbtp_affected_rows ($this->_queryID);
-	   } else
-		return 0;
-	}
-
-	function CreateSequence($seqname='adodbseq',$start=1)
-	{
-		//verify existence
-		$num = $this->GetOne("select seq_value from adodb_seq");
-		$seqtab='adodb_seq';
-		if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
-			$path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, $this->_connectionID );
-			//if using vfp dbc file
-			if( !strcasecmp(strrchr($path, '.'), '.dbc') )
-                $path = substr($path,0,strrpos($path,'\/'));
-           	$seqtab = $path . '/' . $seqtab;
-        }
-		if($num == false) {
-			if (empty($this->_genSeqSQL)) return false;
-			$ok = $this->Execute(sprintf($this->_genSeqSQL ,$seqtab));
-		}
-		$num = $this->GetOne("select seq_value from adodb_seq where seq_name='$seqname'");
-		if ($num) {
-			return false;
-		}
-		$start -= 1;
-		return $this->Execute("insert into adodb_seq values('$seqname',$start)");
-	}
-
-	function DropSequence($seqname)
-	{
-		if (empty($this->_dropSeqSQL)) return false;
-		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
-	}
-
-	function GenID($seq='adodbseq',$start=1)
-	{
-		$seqtab='adodb_seq';
-		if( $this->odbc_driver == ODB_DRIVER_FOXPRO) {
-			$path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, $this->_connectionID );
-			//if using vfp dbc file
-			if( !strcasecmp(strrchr($path, '.'), '.dbc') )
-                $path = substr($path,0,strrpos($path,'\/'));
-           	$seqtab = $path . '/' . $seqtab;
-        }
-		$MAXLOOPS = 100;
-		while (--$MAXLOOPS>=0) {
-			$num = $this->GetOne("select seq_value from adodb_seq where seq_name='$seq'");
-			if ($num === false) {
-				//verify if abodb_seq table exist
-				$ok = $this->GetOne("select seq_value from adodb_seq ");
-				if(!$ok) {
-					//creating the sequence table adodb_seq
-					$this->Execute(sprintf($this->_genSeqSQL ,$seqtab));
-				}
-				$start -= 1;
-				$num = '0';
-				$ok = $this->Execute("insert into adodb_seq values('$seq',$start)");
-				if (!$ok) return false;
-			}
-			$ok = $this->Execute("update adodb_seq set seq_value=seq_value+1 where seq_name='$seq'");
-			if($ok) {
-				$num += 1;
-				$this->genID = $num;
-				return $num;
-			}
-		}
-	if ($fn = $this->raiseErrorFn) {
-		$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
-	}
-		return false;
-	}
-
-	//example for $UserOrDSN
-	//for visual fox : DRIVER={Microsoft Visual FoxPro Driver};SOURCETYPE=DBF;SOURCEDB=c:\YourDbfFileDir;EXCLUSIVE=NO;
-	//for visual fox dbc: DRIVER={Microsoft Visual FoxPro Driver};SOURCETYPE=DBC;SOURCEDB=c:\YourDbcFileDir\mydb.dbc;EXCLUSIVE=NO;
-	//for access : DRIVER={Microsoft Access Driver (*.mdb)};DBQ=c:\path_to_access_db\base_test.mdb;UID=root;PWD=;
-	//for mssql : DRIVER={SQL Server};SERVER=myserver;UID=myuid;PWD=mypwd;DATABASE=OdbtpTest;
-	//if uid & pwd can be separate
-    function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
-	{
-		$this->_connectionID = odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
-		if ($this->_connectionID === false) {
-			$this->_errorMsg = $this->ErrorMsg() ;
-			return false;
-		}
-		
-		odbtp_convert_datetime($this->_connectionID,true);
-		
-		if ($this->_dontPoolDBC) {
-			if (function_exists('odbtp_dont_pool_dbc'))
-				@odbtp_dont_pool_dbc($this->_connectionID);
-		}
-		else {
-			$this->_dontPoolDBC = true;
-		}
-		$this->odbc_driver = @odbtp_get_attr(ODB_ATTR_DRIVER, $this->_connectionID);
-		$dbms = strtolower(@odbtp_get_attr(ODB_ATTR_DBMSNAME, $this->_connectionID));
-		$this->odbc_name = $dbms;
-		
-		// Account for inconsistent DBMS names
-		if( $this->odbc_driver == ODB_DRIVER_ORACLE )
-			$dbms = 'oracle';
-		else if( $this->odbc_driver == ODB_DRIVER_SYBASE )
-			$dbms = 'sybase';
-
-		// Set DBMS specific attributes
-		switch( $dbms ) {
-			case 'microsoft sql server':
-				$this->databaseType = 'odbtp_mssql';
-				$this->fmtDate = "'Y-m-d'";
-				$this->fmtTimeStamp = "'Y-m-d h:i:sA'";
-				$this->sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
-				$this->sysTimeStamp = 'GetDate()';
-				$this->ansiOuter = true;
-				$this->leftOuter = '*=';
-				$this->rightOuter = '=*';
-                $this->hasTop = 'top';
-				$this->hasInsertID = true;
-				$this->hasTransactions = true;
-				$this->_bindInputArray = true;
-				$this->_canSelectDb = true;
-				$this->substr = "substring";
-				$this->length = 'len';
-				$this->identitySQL = 'select @@IDENTITY';
-				$this->metaDatabasesSQL = "select name from master..sysdatabases where name <> 'master'";
-				$this->_canPrepareSP = true;
-				break;
-			case 'access':
-				$this->databaseType = 'odbtp_access';
-				$this->fmtDate = "#Y-m-d#";
-				$this->fmtTimeStamp = "#Y-m-d h:i:sA#";
-				$this->sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
-				$this->sysTimeStamp = 'NOW';
-                $this->hasTop = 'top';
-				$this->hasTransactions = false;
-				$this->_canPrepareSP = true;  // For MS Access only.
-				break;
-			case 'visual foxpro':
-				$this->databaseType = 'odbtp_vfp';
-				$this->fmtDate = "{^Y-m-d}";
-				$this->fmtTimeStamp = "{^Y-m-d, h:i:sA}";
-				$this->sysDate = 'date()';
-				$this->sysTimeStamp = 'datetime()';
-				$this->ansiOuter = true;
-                $this->hasTop = 'top';
-				$this->hasTransactions = false;
-				$this->replaceQuote = "'+chr(39)+'";
-				$this->true = '.T.';
-				$this->false = '.F.';
-
-				break;
-			case 'oracle':
-				$this->databaseType = 'odbtp_oci8';
-				$this->fmtDate = "'Y-m-d 00:00:00'";
-				$this->fmtTimeStamp = "'Y-m-d h:i:sA'";
-				$this->sysDate = 'TRUNC(SYSDATE)';
-				$this->sysTimeStamp = 'SYSDATE';
-				$this->hasTransactions = true;
-				$this->_bindInputArray = true;
-				$this->concat_operator = '||';
-				break;
-			case 'sybase':
-				$this->databaseType = 'odbtp_sybase';
-				$this->fmtDate = "'Y-m-d'";
-				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
-				$this->sysDate = 'GetDate()';
-				$this->sysTimeStamp = 'GetDate()';
-				$this->leftOuter = '*=';
-				$this->rightOuter = '=*';
-				$this->hasInsertID = true;
-				$this->hasTransactions = true;
-				$this->identitySQL = 'select @@IDENTITY';
-				break;
-			default:
-				$this->databaseType = 'odbtp';
-				if( @odbtp_get_attr(ODB_ATTR_TXNCAPABLE, $this->_connectionID) )
-					$this->hasTransactions = true;
-				else
-					$this->hasTransactions = false;
-		}
-        @odbtp_set_attr(ODB_ATTR_FULLCOLINFO, TRUE, $this->_connectionID );
-
-		if ($this->_useUnicodeSQL )
-			@odbtp_set_attr(ODB_ATTR_UNICODESQL, TRUE, $this->_connectionID);
-
-        return true;
-	}
-
-	function _pconnect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
-	{
-		$this->_dontPoolDBC = false;
-  		return $this->_connect($HostOrInterface, $UserOrDSN, $argPassword, $argDatabase);
-	}
-
-	function SelectDB($dbName)
-	{
-		if (!@odbtp_select_db($dbName, $this->_connectionID)) {
-			return false;
-		}
-		$this->database = $dbName;
-		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
-		return true;
-	}
-	
-	function &MetaTables($ttype='',$showSchema=false,$mask=false)
-	{
-	global $ADODB_FETCH_MODE;
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
-		$arr =& $this->GetArray("||SQLTables||||$ttype");
-		
-		if (isset($savefm)) $this->SetFetchMode($savefm);
-		$ADODB_FETCH_MODE = $savem;
-
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][3] == 'SYSTEM TABLE' )	continue;
-			if ($arr[$i][2])
-				$arr2[] = $showSchema && $arr[$i][1]? $arr[$i][1].'.'.$arr[$i][2] : $arr[$i][2];
-		}
-		return $arr2;
-	}
-	
-	function &MetaColumns($table,$upper=true)
-	{
-	global $ADODB_FETCH_MODE;
-
-		$schema = false;
-		$this->_findschema($table,$schema);
-		if ($upper) $table = strtoupper($table);
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
-		
-		$rs = $this->Execute( "||SQLColumns||$schema|$table" );
-		
-		if (isset($savefm)) $this->SetFetchMode($savefm);
-		$ADODB_FETCH_MODE = $savem;
-
-		if (!$rs || $rs->EOF) {
-			$false = false;
-			return $false;
-		}
-		$retarr = array();
-		while (!$rs->EOF) {
-			//print_r($rs->fields);
-			if (strtoupper($rs->fields[2]) == $table) {
-				$fld = new ADOFieldObject();
-				$fld->name = $rs->fields[3];
-				$fld->type = $rs->fields[5];
-				$fld->max_length = $rs->fields[6];
-    			$fld->not_null = !empty($rs->fields[9]);
- 				$fld->scale = $rs->fields[7];
-				if (isset($rs->fields[12])) // vfp does not have field 12
-	 				if (!is_null($rs->fields[12])) {
-	 					$fld->has_default = true;
-	 					$fld->default_value = $rs->fields[12];
-					}
-				$retarr[strtoupper($fld->name)] = $fld;
-			} else if (!empty($retarr))
-				break;
-			$rs->MoveNext();
-		}
-		$rs->Close();
-
-		return $retarr;
-	}
-
-	function &MetaPrimaryKeys($table, $owner='')
-	{
-	global $ADODB_FETCH_MODE;
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$arr =& $this->GetArray("||SQLPrimaryKeys||$owner|$table");
-		$ADODB_FETCH_MODE = $savem;
-
-		//print_r($arr);
-		$arr2 = array();
-		for ($i=0; $i < sizeof($arr); $i++) {
-			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
-		}
-		return $arr2;
-	}
-
-	function &MetaForeignKeys($table, $owner='', $upper=false)
-	{
-	global $ADODB_FETCH_MODE;
-
-		$savem = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		$constraints =& $this->GetArray("||SQLForeignKeys|||||$owner|$table");
-		$ADODB_FETCH_MODE = $savem;
-
-		$arr = false;
-		foreach($constraints as $constr) {
-			//print_r($constr);
-			$arr[$constr[11]][$constr[2]][] = $constr[7].'='.$constr[3];
-		}
-		if (!$arr) {
-			$false = false;
-			return $false;
-		}
-		
-		$arr2 = array();
-
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
-				$arr2[$a] = $b;
-			}
-		}
-		return $arr2;
-	}
-
-	function BeginTrans()
-	{
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true;
-		$this->transCnt += 1;
-		$this->autoCommit = false;
-		if (defined('ODB_TXN_DEFAULT'))
-			$txn = ODB_TXN_DEFAULT;
-		else
-			$txn = ODB_TXN_READUNCOMMITTED;
-		$rs = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS,$txn,$this->_connectionID);
-		if(!$rs) return false;
-		return true;
-	}
-
-	function CommitTrans($ok=true)
-	{
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->autoCommit = true;
-		if( ($ret = @odbtp_commit($this->_connectionID)) )
-			$ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, ODB_TXN_NONE, $this->_connectionID);//set transaction off
-		return $ret;
-	}
-
-	function RollbackTrans()
-	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
-		$this->autoCommit = true;
-		if( ($ret = @odbtp_rollback($this->_connectionID)) )
-			$ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, ODB_TXN_NONE, $this->_connectionID);//set transaction off
-		return $ret;
-	}
-
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
-	{
-		// TOP requires ORDER BY for Visual FoxPro
-		if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
-			if (!preg_match('/ORDER[ \t\r\n]+BY/is',$sql)) $sql .= ' ORDER BY 1';
-		}
-		$ret =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
-		return $ret;
-	}
-
-	function Prepare($sql)
-	{
-		if (! $this->_bindInputArray) return $sql; // no binding
-		$stmt = @odbtp_prepare($sql,$this->_connectionID);
-		if (!$stmt) {
-		//	print "Prepare Error for ($sql) ".$this->ErrorMsg()."<br>";
-			return $sql;
-		}
-		return array($sql,$stmt,false);
-	}
-
-	function PrepareSP($sql)
-	{
-		if (!$this->_canPrepareSP) return $sql; // Can't prepare procedures
-
-		$stmt = @odbtp_prepare_proc($sql,$this->_connectionID);
-		if (!$stmt) return false;
-		return array($sql,$stmt);
-	}
-
-	/*
-	Usage:
-		$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
-
-		# note that the parameter does not have @ in front!
-		$db->Parameter($stmt,$id,'myid');
-		$db->Parameter($stmt,$group,'group',false,64);
-		$db->Parameter($stmt,$group,'photo',false,100000,ODB_BINARY);
-		$db->Execute($stmt);
-
-		@param $stmt Statement returned by Prepare() or PrepareSP().
-		@param $var PHP variable to bind to. Can set to null (for isNull support).
-		@param $name Name of stored procedure variable name to bind to.
-		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in odbtp.
-		@param [$maxLen] Holds an maximum length of the variable.
-		@param [$type] The data type of $var. Legal values depend on driver.
-
-		See odbtp_attach_param documentation at http://odbtp.sourceforge.net.
-	*/
-	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=0, $type=0)
-	{
-		if ( $this->odbc_driver == ODB_DRIVER_JET ) {
-			$name = '['.$name.']';
-			if( !$type && $this->_useUnicodeSQL
-				&& @odbtp_param_bindtype($stmt[1], $name) == ODB_CHAR )
-			{
-				$type = ODB_WCHAR;
-			}
-		}
-		else {
-			$name = '@'.$name;
-		}
-		return @odbtp_attach_param($stmt[1], $name, $var, $type, $maxLen);
-	}
-
-	/*
-		Insert a null into the blob field of the table first.
-		Then use UpdateBlob to store the blob.
-
-		Usage:
-
-		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
-
-	function UpdateBlob($table,$column,$val,$where,$blobtype='image')
-	{
-		$sql = "UPDATE $table SET $column = ? WHERE $where";
-		if( !($stmt = @odbtp_prepare($sql, $this->_connectionID)) )
-			return false;
-		if( !@odbtp_input( $stmt, 1, ODB_BINARY, 1000000, $blobtype ) )
-			return false;
-		if( !@odbtp_set( $stmt, 1, $val ) )
-			return false;
-		return @odbtp_execute( $stmt ) != false;
-	}
-
-	function IfNull( $field, $ifNull )
-	{
-		switch( $this->odbc_driver ) {
-			case ODB_DRIVER_MSSQL:
-				return " ISNULL($field, $ifNull) ";
-			case ODB_DRIVER_JET:
-				return " IIF(IsNull($field), $ifNull, $field) ";
-		}
-		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
-	}
-
-	function _query($sql,$inputarr=false)
-	{
-	global $php_errormsg;
-	
- 		if ($inputarr) {
-			if (is_array($sql)) {
-				$stmtid = $sql[1];
-			} else {
-				$stmtid = @odbtp_prepare($sql,$this->_connectionID);
-				if ($stmtid == false) {
-					$this->_errorMsg = $php_errormsg;
-					return false;
-				}
-			}
-			$num_params = @odbtp_num_params( $stmtid );
-			for( $param = 1; $param <= $num_params; $param++ ) {
-				@odbtp_input( $stmtid, $param );
-				@odbtp_set( $stmtid, $param, $inputarr[$param-1] );
-			}
-			if (!@odbtp_execute($stmtid) ) {
-				return false;
-			}
-		} else if (is_array($sql)) {
-			$stmtid = $sql[1];
-			if (!@odbtp_execute($stmtid)) {
-				return false;
-			}
-		} else {
-			$stmtid = odbtp_query($sql,$this->_connectionID);
-   		}
-		$this->_lastAffectedRows = 0;
-		if ($stmtid) {
-				$this->_lastAffectedRows = @odbtp_affected_rows($stmtid);
-		}
-        return $stmtid;
-	}
-
-	function _close()
-	{
-		$ret = @odbtp_close($this->_connectionID);
-		$this->_connectionID = false;
-		return $ret;
-	}
-}
-
-class ADORecordSet_odbtp extends ADORecordSet {
-
-	var $databaseType = 'odbtp';
-	var $canSeek = true;
-
-	function ADORecordSet_odbtp($queryID,$mode=false)
-	{
-		if ($mode === false) {
-			global $ADODB_FETCH_MODE;
-			$mode = $ADODB_FETCH_MODE;
-		}
-		$this->fetchMode = $mode;
-		$this->ADORecordSet($queryID);
-	}
-
-	function _initrs()
-	{
-		$this->_numOfFields = @odbtp_num_fields($this->_queryID);
-		if (!($this->_numOfRows = @odbtp_num_rows($this->_queryID)))
-			$this->_numOfRows = -1;
-
-		if (!$this->connection->_useUnicodeSQL) return;
-
-		if ($this->connection->odbc_driver == ODB_DRIVER_JET) {
-			if (!@odbtp_get_attr(ODB_ATTR_MAPCHARTOWCHAR,
-			                     $this->connection->_connectionID))
-			{
-				for ($f = 0; $f < $this->_numOfFields; $f++) {
-					if (@odbtp_field_bindtype($this->_queryID, $f) == ODB_CHAR)
-						@odbtp_bind_field($this->_queryID, $f, ODB_WCHAR);
-				}
-			}
-		}
-	}
-
-	function &FetchField($fieldOffset = 0)
-	{
-		$off=$fieldOffset; // offsets begin at 0
-		$o= new ADOFieldObject();
-		$o->name = @odbtp_field_name($this->_queryID,$off);
-		$o->type = @odbtp_field_type($this->_queryID,$off);
-        $o->max_length = @odbtp_field_length($this->_queryID,$off);
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
-		return $o;
-	}
-
-	function _seek($row)
-	{
-		return @odbtp_data_seek($this->_queryID, $row);
-	}
-
-	function fields($colname)
-	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-
-		if (!$this->bind) {
-			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
-				$name = @odbtp_field_name( $this->_queryID, $i );
-				$this->bind[strtoupper($name)] = $i;
-			}
-		}
-		return $this->fields[$this->bind[strtoupper($colname)]];
-	}
-
-	function _fetch_odbtp($type=0)
-	{
-		switch ($this->fetchMode) {
-			case ADODB_FETCH_NUM:
-				$this->fields = @odbtp_fetch_row($this->_queryID, $type);
-				break;
-			case ADODB_FETCH_ASSOC:
-				$this->fields = @odbtp_fetch_assoc($this->_queryID, $type);
-				break;
-            default:
-				$this->fields = @odbtp_fetch_array($this->_queryID, $type);
-		}
-		if ($this->databaseType = 'odbtp_vfp') {
-			if ($this->fields)
-			foreach($this->fields as $k => $v) {
-				if (strncmp($v,'1899-12-30',10) == 0) $this->fields[$k] = '';
-			}
-		}
-		return is_array($this->fields);
-	}
-
-	function _fetch()
-	{
-		return $this->_fetch_odbtp();
-	}
-
-	function MoveFirst()
-	{
-		if (!$this->_fetch_odbtp(ODB_FETCH_FIRST)) return false;
-		$this->EOF = false;
-		$this->_currentRow = 0;
-		return true;
-    }
-
-	function MoveLast()
-	{
-		if (!$this->_fetch_odbtp(ODB_FETCH_LAST)) return false;
-		$this->EOF = false;
-		$this->_currentRow = $this->_numOfRows - 1;
-		return true;
-	}
-
-	function NextRecordSet()
-	{
-		if (!@odbtp_next_result($this->_queryID)) return false;
-		$this->_inited = false;
-		$this->bind = false;
-		$this->_currentRow = -1;
-		$this->Init();
-		return true;
-	}
-
-	function _close()
-	{
-		return @odbtp_free_query($this->_queryID);
-	}
-}
-
-class ADORecordSet_odbtp_mssql extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_mssql';
-
-	function ADORecordSet_odbtp_mssql($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-
-class ADORecordSet_odbtp_access extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_access';
-
-	function ADORecordSet_odbtp_access($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-
-class ADORecordSet_odbtp_vfp extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_vfp';
-
-	function ADORecordSet_odbtp_vfp($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-
-class ADORecordSet_odbtp_oci8 extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_oci8';
-
-	function ADORecordSet_odbtp_oci8($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-
-class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp {
-
-	var $databaseType = 'odbtp_sybase';
-
-	function ADORecordSet_odbtp_sybase($id,$mode=false)
-	{
-		return $this->ADORecordSet_odbtp($id,$mode);
-	}
-}
-?>
Index: admin/include/lib/esphtml.forms.inc
===================================================================
--- admin/include/lib/esphtml.forms.inc	(revision 6370)
+++ admin/include/lib/esphtml.forms.inc	(working copy)
@@ -1,222 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: esphtml.forms.inc,v 1.19 2007/12/10 12:15:55 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-// string	mkwarn(char *warning);
-// string	mkerror(char *error);
-
-// string	mkradio(char *name, char *value);
-// string	mkcheckbox(char *name, char *value);
-// string	mktext(char *name);
-// string   mkhidden(char *name, char *$value)
-// string	mktextarea(char *name, int rows, int cols, char *wordwrap);
-// string	mkselect(char *name, char *options[]);
-// string	mkfile(char *name);
-
-/* {{{ proto string mkwarn(string message)
-   Returns HTML format for an warning message. */
-function mkwarn ($msg) {
-	return("<span class=\"warn\">${msg}</span>\n");
-}
-/* }}} */
-
-/* {{{ proto string mkerror(string message)
-   Returns HTML format for an error message. */
-function mkerror ($msg) {
-	return("<span class=\"error\">[ ${msg} ]</span>\n");
-}
-/* }}} */
-
-	
-/* {{{ proto string mkradio(string name, string value)
-   Returns HTML format for a radio button. */
-function mkradio ($_name, $value, $varr = null) {
-    	if ($varr == null)
-        	$varr =& $_POST;
-	$str = '<input type="radio" name="' . htmlspecialchars($_name) .'" value="' . htmlspecialchars($value) .'"';
-	if ( isset($varr[$_name]) && $varr[$_name] == $value )
-		$str .= " checked=\"checked\"";
-	$str .= ' />';
-	return($str);
-}
-/* }}} */
-	
-/* {{{ proto string mkcheckbox(string name, string value)
-   Returns HTML format for a check box. */
-function mkcheckbox ($_name, $value, $varr = null) {
-    	if ($varr == null)
-        	$varr =& $_POST;
-	$str = '<input type="checkbox" name="' . htmlspecialchars($_name) .'[]" value="' . htmlspecialchars($value) .'"';
-	if (isset($varr) && is_array($varr) && in_array($value, $varr))
-		$str .= " checked=\"checked\"";
-	$str .= ' />';
-	return($str);
-}
-/* }}} */
-
-/* {{{ proto string mktext(string name, int size)
-   Returns HTML format for a text entry line. */
-function mktext ($_name, $size = 20, $max = 0, $varr = null) {
-        if ($varr == null)
-            $varr =& $_POST;
-	$size = intval($size);
-	$max  = intval($max);
-	$str = "size=\"$size\"";
-	if ($max)	$str .= " maxlength=\"$max\"";
-	if (isset($varr[$_name]))
-		return('<input type="text" '. $str .' name="'. htmlspecialchars($_name) .'" value="'. _stripslashes(htmlspecialchars($varr[$_name])) .'" />');
-	return('<input type="text" '. $str .' name="'. htmlspecialchars($_name) .'" />');
-}
-/* }}} */
-
-/* {{{ proto string mkpass(string name)
-   Returns HTML format for a password entry line. */
-function mkpass ($_name) {
-	return('<input type="password" name="'. htmlspecialchars($_name) .'" />');
-}
-/* }}} */
-
-/* {{{ proto string mkhidden(string name)
-   Returns HTML format for a hidden form field. */
-function mkhidden ($_name, $varr = null) {
-    	if ($varr == null)
-        	$varr =& $_POST;
-	if (isset($varr[$_name]))
-		return('<input type="hidden" name="'. htmlspecialchars($_name) .'" value="'. _stripslashes(htmlspecialchars($varr[$_name])) .'" />');
-	return('<input type="hidden" name="'. htmlspecialchars($_name) .'" />');
-}
-/* }}} */
-
-/* {{{ proto string mktextarea(string name, int rows, int cols, string wrap_type)
-   Returns HTML format for a text entry box. */
-function mktextarea ($_name, $rows, $cols, $wrap, $varr = null) {
-    	if ($varr == null)
-        	$varr =& $_POST;
-	$str = '<textarea name="' . htmlspecialchars($_name) .'"';
-	if($rows > 0)
-		$str .= ' rows="' . $rows . '"';
-	if($cols > 0)
-		$str .= ' cols="' . $cols . '"';
-	//if($wrap != '')
-	//	$str .= ' wrap="' . strtolower($wrap) . '"';
-	$str .= '>';
-	if (isset($varr[$_name]))
-		 $str .= _stripslashes(htmlspecialchars($varr[$_name]));
-	$str .= '</textarea>';
-	return($str);
-}
-/* }}} */
-
-/* {{{ proto string mkselect(string name, array options)
-   Returns HTML format for a select box (dropdown). */
-function mkselect ($_name, $options, $varr = null,$onclick = null) {
-    	if ($varr == null)
-        	$varr =& $_POST;
-	$str  = "<select name=\"${_name}\"";
-	if ($onclick != null && $onclick != '')
-		$str .= " onChange=\"${onclick}(this);\" ";
-	$str .= ">\n";
-	$str .= "<option></option>\n";
-	while(list($cid, $content) = each($options)) {
-		$checked = '';
-		if (isset($varr[$_name]) && $varr[$_name] == $cid)
-			$checked = " selected=\"selected\"";
-		$str .= "<option value=\"${cid}\"${checked}>${content}</option>\n";
-	}
-	$str .= "</select>\n";
-	return($str);
-}
-/* }}} */
-
-/* {{{ proto string mkfile(string name)
-   Returns HTML format for a file selection button. */
-function mkfile ($_name) {
-	return('<input type="file" name="'.htmlspecialchars($_name) .'" />');
-}
-/* }}} */
-
-/* {{{ proto string mksubmit(string name, string value)
-   Returns HTML format for a submit button. */
-function mksubmit($_name, $_value = null) {
-    if ($_value == null)
-        $_value = _('Submit');
-    if (!empty($_value))
-        $_value = ' value="'.htmlspecialchars($_value).'"';
-    return '<input type="submit" name="'.htmlspecialchars($_name).'"'.$_value.' />';
-}
-/* }}} */
-
-/* {{{ proto string show_login(string surveyname, string message, string css, string title)
-    Returns HTML login form */
-function show_login($_surveyname = null, $_message = null, $_css = null, $_title = "Survey Login") {
-    $str = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">";
-    $str .="<head>\n<title>OpenVULab</title>\n";
-    if (empty($_css)) {
-        $_css = "default.css";
-    }
-    $str .= '<link rel="stylesheet" href="'. $GLOBALS['ESPCONFIG']['css_url'].$_css .'" type="text/css">';
-    $str .=  "\n</head>\n<body id=\"auth\">\n";
-    
-    $str .= '<div class="headerGraphic"></div>';
-    $str .= '<div class="login">';
-    if ($_title) {
-        $str .= "<h1>OpenVULab</h1>\n";
-    }
-    if ($_message) {
-        $str .= mkerror($_message);
-    }
-
-    $str .= '<form name="loginform" id="loginform"  method="post">';
-    $str .= "\n<fieldset><legend>Login</legend>\n";
-    $str .= '<div class="row">';
-    $str .= '<label for="username">';
-    $str .= "Username:";
-    $str .= '</label>';
-    $str .= mktext("username");
-    $str .= "\n".'</div><div class="row">'."\n";
-    $str .= '<label for="password">';
-    $str .= "Password:";
-    $str .= '</label>';
-    $str .= mkpass("password");
-    $str .= "\n".'</div><div class="row">'."\n";
-//    # if the variable $lang is set, we assume we don't need to ask for the language
-//    if (!isset($_REQUEST['lang']) && !isset($lang)) {
-//       $str .= "Language:";
-//       $_languages=array();
-//       foreach (esp_getlocales() as $_lang) {
-//	   $_languages[$_lang]=$_lang;
-//       }
-//       $str .= mkselect("lang",$_languages);
-//       $str .= "\n".'</div><div class="row">'."\n";
-//    }
-    $str .= mksubmit("Login");
-    $str .= "<br/><a href='signup.php'>Sign up for account</a> | <a href='lostpassword.php'>Lost Password</a> | <a href='changepassword.php'>Change my Password</a>";
-    if ($_surveyname != "") {
-        $str .= '<input type="hidden" name="'."$_surveyname".'"';
-    }
-    $str .= "\n</div></fieldset>\n</form>\n";
-    $str .= "</div>";
-    $str .= "\n</body>\n</html>";
-
-    return $str;
-}
-/* }}} */
-?>
Index: admin/include/lib/espcross.inc
===================================================================
--- admin/include/lib/espcross.inc	(revision 6370)
+++ admin/include/lib/espcross.inc	(working copy)
@@ -1,77 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: espcross.inc,v 1.4 2004/04/29 17:27:34 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by Kon Angelopoulos
-// <angekproductions@iprimus.com.au>
-
-/* {{{ proto void mkcrossformat (array weights, integer qid)
-   Builds HTML to allow for cross tabulation/analysis reporting.
- */
-function mkcrossformat($counts, $qid, $tid) {
-    $cids = array();
-    $cidCount = 0;
-
-    // let's grab the cid values for each of the questions
-    // that we allow cross analysis on.
-    if ($tid == 1) {
-        $cids = array('Y', 'N');
-    } else {
-        $sql = "SELECT id FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']."
-                WHERE question_id = $qid
-                ORDER BY id";
-        $result = execute_sql($sql);
-        while ($cid = fetch_row($result)) {
-            $result->MoveNext();
-            array_push($cids, $cid[0]);
-        }
-        db_close($result);
-    }
-
-    $bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-
-?>
-<table width="90%" border="0">
-<tbody>
-<?php
-
-    while(list($content,$num) = each($counts)) {
-        if($bg != $GLOBALS['ESPCONFIG']['bgalt_color1'])
-            $bg = $GLOBALS['ESPCONFIG']['bgalt_color1'];
-        else
-            $bg = $GLOBALS['ESPCONFIG']['bgalt_color2'];
-
-        if ($cidCount >= count($cids))
-            $cidCount = count($cids) - 1;
-
-?>
-<tr bgcolor="<?php echo $bg; ?>">
-<td width="34" height="23" align="left" valign="top" bgcolor="#0099FF">
-  <div align="center">
-    <input type="checkbox" name="cids[]" value="<?php echo $cids[$cidCount++]; ?>" />
-  </div>
-</td>
-<td width="506" align="left"><?php echo $content; ?></td>
-</tr>
-<?php
-    }
-?>
-</tbody></table>
-<?php
-}
-/* }}} */
-?>
Index: admin/include/lib/vulab.projects.function.php
===================================================================
--- admin/include/lib/vulab.projects.function.php	(revision 6370)
+++ admin/include/lib/vulab.projects.function.php	(working copy)
@@ -1,325 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-//Gets Projects based on an userid and a status
-//- Returns: array of found project objects.
-function get_projects_access($userid,$status='3',$sort=NULL) {
-	$sql = "SELECT * FROM `userprojectrel` WHERE `userid` ='$userid'";
-	$res = execute_sql($sql);
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	$return = array();
-
-	while (!$res->EOF) {
-
-		list ($p['id'],$p['userid'],$p['projectid'],$p['admin']) = $res->fields;
-		$return[] = array_reverse($p);
-		$res->MoveNext();		
-	}
-	return $return;
-}
-function get_projects_by($userid,$status='ALL',$sort=NULL) {
-	if (!is_numeric($status)) { 
-		if (strtolower($status) == 'draft' OR strtolower($status) == 'drafts' OR strtolower($status) == 'd') { $status = 1; }
-		if (strtolower($status) == 'active' OR strtolower($status) == 'a') { $status = 2; }
-		if (strtolower($status) == 'complete' OR strtolower($status) == 'completed' OR strtolower($status) == 'c') { $status = 3; }
-	}
-	$getSQL = "
-	SELECT `project`.id
-	FROM userprojectrel, project
-	WHERE
-		`userprojectrel`.projectid = `project`.`id`
-		AND `userprojectrel`.`userid` = '$userid'
-	";
-	if ($status != 'ALL') { $getSQL .= "AND `project`.`status` = '$status'"; }
-	if ($sort) { $getSQL .= "ORDER BY $sort"; }
-	//echo $getSQL;
-	
-	$proj_result = execute_sql($getSQL);
-	while (!$proj_result->EOF AND $count < 30) {
-		
-		++$count;
-		list(	$p['id'],
-				$p['name'],
-				$p['pre_id'],
-				$p['post_id'],
-				$p['intro'],
-				$p['outro'],
-				$p['url'],
-				$p['start'],
-				$p['end'],
-				$p['status'],
-				$p['createstamp'],
-				$p['editstamp'],
-				$p['activestamp'],
-				$p['completestamp']) = $proj_result->fields;	
-		$p = array_reverse($p);
-
-		unset($newproj);
-		$newproj = new Project;
-		$newproj->init($p['id']);
-		$projects[] = $newproj;
-		
-		$proj_result->MoveNext();
-	}
-	
-	return $projects;
-}
-function get_projects_byowner($ownerid,$options=null) {
-	
-	if (!isset($ownerid)) { return 0; }
-	if ($options['limit']) { $suffix = "LIMIT = '$options[limit]' "; }
-	$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['userprojectrel_table']." WHERE "."userid='$ownerid' ".$suffix;
-
-	$result = execute_sql($sql);
-	while (!$result->EOF) {
-		$result->MoveNext();
-		$p = array();
-		unset($p);
-		list(	$p['id'],
-				$p['userid'],
-				$p['projectid'],
-				$p['admin']) = $result->fields;
-				
-		if ($p['id']) { $projects[] = array_reverse($p); }
-	}
-	return $projects;
-}
-//Takes a list of projects and returns only those that are active.
-function filter_projects_bystatus($projects,$status,$operator) {
-/*	$active = array();
-
-			echo "</pre>";
-			
-	foreach ($projects as $p) {
-		if (isset($p['id'])) {	
-	
-			unset($project);
-			$project = new Project;
-			$project->init($p['id']);
-
-			if ($operator == '==') {
-				if ($project->details['status'] == $status)
-				{
-					$active[] = $project;
-				}
-			} elseif ($operator == '!=') {
-				if ($project->details['status'] != $status)
-				{
-					$active[] = $project;
-				}		
-			}
-		}
-	}
-	return $active;*/
-}
-//Takes a list of projects and returns only those that are active.
-//LEGACY!
-/*
-function filter_projects_bystatus($projects,$status,$operator) {
-	$active = array();
-	foreach ($projects as $p) {
-		if (isset($p['id'])) {	
-	
-			unset($project);
-			$project = new Project;
-			$project->init($p['id']);
-			if ($operator == '==') {
-				if ($project->pre_survey['status'] == $status OR $project->post_survey['status'] == $status)
-				{
-					$active[] = $project;
-				}
-			} elseif ($operator == '!=') {
-				if ($project->pre_survey['status'] != $status OR $project->post_survey['status'] != $status)
-				{
-					$active[] = $project;
-				}		
-			}
-		}
-	}
-	return $active;
-}*/
-
-function clean_cut_parray($projects) {
-	$i = 0;
-	while (count($cleaned_projects) <= 4)
-	{
-		if ($projects[$i]->details[id]) { $cleaned_projects[] = $projects[$i]; }
-		++$i;
-	}
-	return $cleaned_projects;
-}
-
-//- Takes array of Project Objects
-//- Returns HTML table of Project Fields
-function display_projects_table($fields,$projects,$options=null) {
-
-
-	if (!is_array($fields)) { return "no fields"; }
-	$HTML = '<table class="display">'."\n";
-	
-	if ($options['titles']) {
-		$HTML .= '	<tr>';
-		foreach ($fields as $field) {
-		
-			if ($field == 'activestamp') {
-				$field = 'Date Activated';
-			}
-			if ($field == 'completestamp') {
-				$field = 'Date Completed';
-			}
-			$HTML .= "<th>".ucwords($field)."</th>";
-		}
-		//if ($options['action_set']) { echo "<th>Actions</th>"; }
-		$HTML .= '</tr>'."\n";
-	}
-	foreach ($projects as $project) {
-		
-		
-		if ($project->details[id]) {
-			//Setup Links
-			if (strtolower($options['status']) == 'draft' OR $options['status'] == 1) {
-				unset($plink);
-				$plink = "?where=create&pid=".$project->details[id];
-			}
-			elseif (strtolower($options['status']) == 'active' OR $options['status'] == 2) {
-				unset($plink);
-				$plink = "?where=view&pid=".$project->details[id];
-			}
-			elseif (strtolower($options['status']) == 'complete' OR $options['status'] == 3) {
-				unset($plink);
-				$plink = "?where=view&pid=".$project->details[id];
-			}
-			else {
-				unset($plink);
-				$plink = "?where=create&pid=".$project->details[id];
-			}
-			if ($options['link']) {
-				$plink = str_replace('<pid>',$project->details[id],$options['link']);
-			}
-			//echo "<pre>";
-			//print_r($project);
-			//echo "</pre>";
-			
-			$HTML .= '<tr>';
-			foreach ($fields as $key=>$field) {
-				unset($field_data);
-				$field_data = $project->details[$field];
-				if (is_numeric(strpos($field,'stamp'))) {
-					$field_data = date("F j, Y, g:i a",$field_data);
-				}
-				$HTML .= "<td><a href='$plink' $options[link_attrib]>".$field_data."</a></td>";
-			}
-			if ($options['action_set']) { $HTML .= "<td>".render_actions_html($options['action_set'],$project->details[id])."</td>"; }
-			$HTML .= '</tr>'."\n";
-		}
-	}
-	$HTML .= '</table>'."\n";
-	return $HTML;
-}
-function render_actions_html($type,$pid) {
-switch($type) {
-case 'draft_small':
-	return "<a href='#'>edit</a>";
-break;
-case 'active_small':
-	return "<a href='#'>publish</a>";
-break;
-case 'draft':
-	return "<a href='?where=create&pid=$pid'>Activate</a> | <a href='?where=create&pid=$pid'>Edit</a>";
-break;
-case 'active':
-	return /*"<a href='?where=create&pid=$pid&step=1'>Change End Date</a> | <a href='?where=create&pid=$pid&step=complete'>Complete</a> | "*/"<a href='?where=view&pid=$pid'>Results</a>";
-break;
-
-}
-
-
-
-function create_legacy($data,$option=null) {
-	require ESP_BASE.'admin/sanitize.php';
-/*
-		echo "<pre>";
-		print_r($_POST);
-		echo "</pre>";
-*/
-	$pname = sanitize($data['pname']);
-	$ppre = sanitize($data['ppre']);
-	$ppost = sanitize($data['ppost']);
-	$pintro = sanitize($data['pintro']);
-	$pthanks = sanitize($data['pthanks']);
-	$purl = sanitize($data['purl']);
-	$pstart = sanitize($data['pend']);
-	$pend = sanitize($data['pstart']);
-	$sql = execute_sql("SELECT * FROM `$ESPCONFIG[project_table]` WHERE `name` = '".$project_name."'");
-	if ($sql->RecordCount() > 0)
-	{
-		// Project already exists
-		echo("<h2>$project_name already exists.</h2>");
-	}
-	// Check the validity of the URL
-/*	elseif (!validLink($actionurl))
-	{
-		// url is invalid
-		echo("<h2>Invalid URL</h2>");
-	}
-	elseif ($presurvey == $postsurvey && ($presurvey!= -1))
-	{
-		echo("<h2>Postsurvey can not equal Presurvey</h2>");
-	}*/
-	else
-	{
-	$sqlins = 'insert into '.$ESPCONFIG[project_table].
-	 ' (name,presurvey,postsurvey,action_intro_msg,action_outro_msg,action_url) values ( ' .
-	"'$pname', ".
-	"'$ppre', ".
-	"'$ppost', ".
-	"'$pintro', ".
-	"'$pthanks', ".
-	"'$purl') ";
-	
-	$result = execute_sql($sqlins);
-	echo ErrorMsg();
-	
-/*	$sqlresults = "select * from $ESPCONFIG[project_table] WHERE name = '".$project_name."'";
-	$result = execute_sql($sqlresults);
-	$projectid = $result->fields[0];*///Replaced by mysql_insert_id();
-	$projectid = mysql_insert_id();
-	echo $projectid;
-	// Insert into userprojectrel table
-	$sqlins = "insert into userprojectrel values ('','".$_SESSION['acl']['userid']."','".$projectid."','Y')";
-	
-	$result = execute_sql($sqlins);
-	echo ErrorMsg();
-	
-	// Insert the root user record
-	$sqlins = "insert into userprojectrel values ('','6','".$projectid."','Y')";
-	
-	$result = execute_sql($sqlins);
-	echo ErrorMsg();
-	
-	if ($ppre) { 
-		$sql = "UPDATE `survey` SET `status` = '1' WHERE `id` = '$presurvey'";
-		execute_sql($sql);
-	}
-	if ($ppost) {
-		$sql = "UPDATE `survey` SET `status` = '1' WHERE `id` = '$postsurvey'";
-		execute_sql($sql);
-	}
-
-	}// ELSE END
-
-}
-
-}
-?>
\ No newline at end of file
Index: admin/include/lib/vulab.permissions.class.php
===================================================================
--- admin/include/lib/vulab.permissions.class.php	(revision 6370)
+++ admin/include/lib/vulab.permissions.class.php	(working copy)
@@ -1,92 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-
-/*
-File: 		vulab.permissions.class.php \\v 1.0
-Info:		- manage permissions Class
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-class Perm {
-
-function __construct($type,$id) { 
-	$this->type = $type;
-	$this->id = $id;
-	$this->table = 'userprojectrel';
-	if ($this->type == 'project') {
-		$p = new Project;
-		$p->init($this->id);
-		$this->project = $p;
-	}
-	if ($this->type == 'user') {
-		//$this->user = new User($this->id);
-	}
-	if ($this->type == 'survey') {
-		//$this->survey = new Survey($this->id);
-	}
-}
-function checkUser($pid) {
-	$uid = $this->id;
-	$dsql = "SELECT * FROM $this->table WHERE userid='$uid' AND projectid='$pid'";
-	$dresult = execute_sql($dsql);
-	if ($dresult->RecordCount() > 0) {
-		return true;
-	} else {
-		return false;
-	}
-}
-function assignUser($pid,$perm='N') {
-	$uid = $this->id;
-	$dsql = "SELECT * FROM $this->table WHERE userid='$uid' AND projectid='$pid' AND admin='$perm'";
-	$dresult = execute_sql($dsql);
-	if (ErrorMsg()) $err[] = ErrorMsg();
-	if ($err) return $err;
-	
-	if ($dresult->RecordCount() > 0) {
-		return array("Error: The UserID:$uid has already been added to ProjectID:$pid with Admin: $perm");
-	} else {
-		$sql = "INSERT INTO $this->table (id, userid, projectid, admin) VALUES ('','$uid','$pid','$perm')";
-		$result = execute_sql($sql);
-		if (ErrorMsg()) $err[] = ErrorMsg();
-		if ($err) return $err;
-		if (!$result) {
-			return array('Error Adding User to Project ID:'.$pid);
-		} else {
-			return "Successfully Added UserID:$this->id to ProjectID:$pid with Admin: $perm";
-		}
-	}
-}
-/*
-function removeUser($uid,$pid) {
-	$sql = 'DELETE FROM $this->table WHERE userid=$uid AND projectid=$pid';
-	$result = execute_sql($sql);
-	if (!$result) {
-		return $err[] = 'Error Removing User from Project ID:'.$pid;
-	} else {
-		return "Successfully REmoved UserID:$uid to ProjectID:$pid";
-	}
-}
-
-function updateUser($uid,$pid,$perm) {
-	$sql = "UPDATE $this->table SET admin = $perm WHERE userid=$uid AND projectid=$pid";
-	$result = execute_sql($sql);
-	if (!$result) {
-		return $err[] = 'Error Updating User to '.$perm.' for Admin on Project ID:'.$pid;
-	} else {
-		return "Successfully Updated UserID:$uid to Admin: $perm on ProjectID:$pid";
-	}
-}
-*/
-}//Class END
-?>
\ No newline at end of file
Index: admin/include/lib/espresponse.inc
===================================================================
--- admin/include/lib/espresponse.inc	(revision 6370)
+++ admin/include/lib/espresponse.inc	(working copy)
@@ -1,955 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-    /* $Id: espresponse.inc,v 1.49 2007/12/18 15:28:23 liedekef Exp $ */
-
-    /* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-    // Written by James Flemer
-    // <jflemer@alum.rpi.edu>
-    /* {{{ proto string response_check_answers(int survey_id, int section)
-    Reads current form variables from HTTP_POST_VARS.
-    Returns an empty string if all required fields are
-    completed, else returns a message string indicating which
-    questions need to be completed. It also checks numerical fields for only
-    numerical values */
-    function response_check_answers($sid, $section) {
-        //angek: may need to keep for backwards compatability
-        //global $_POST;
-        $sql = "SELECT id,type_id,content,required FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-        ". survey_select_section_sql($sid,$section) ." AND
-        deleted='N' AND type_id < 98
-        ORDER BY position";
-
-        $result = execute_sql($sql);
-        if(record_count($result) < 1) {
-            // no rows returned, so no need to continue
-            db_close($result);
-            return('');
-        }
-
-        $missing = array();	// array of missing questions
-	$not_numeric = array(); // array of numerical questions that are non-numeric
-
-        while(list($qid,$tid,$content,$required) = fetch_row($result)) {
-            $result->MoveNext();
-            if($required=='Y' && $tid == 8) { // Rank
-               $sql = "SELECT id FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE question_id=$qid";
-               $cid_result = execute_sql($sql);
-               while(list($cid) = fetch_row($cid_result)) {
-                   $cid_result->MoveNext();
-                   if(!isset($_POST["${qid}_${cid}"])) {
-                       $missing[$qid] = $content;
-                       break;
-                   }
-               }
-               db_close($cid_result);
-               continue;
-            }
-            if ($required=='Y' && $tid == 10 && $_POST[$qid] === '0') { // Numeric
-               continue;
-            } elseif ($tid == 10 && !empty($_POST[$qid]) && !is_numeric($_POST[$qid])) {
-		$not_numeric[$qid] = $content;
-	    }
-            if (!isset($_POST[$qid])) {
-                $_POST[$qid] = '';
-            }
-            if($required=='Y' && empty($_POST[$qid]) && $_POST[$qid] != '0') {
-		$missing[$qid] = $content;
-	    }
-        }
-        db_close($result);
-
-	$message = '';
-        if(count($missing) > 0) {
-            // missing required variables
-            $message .= _('You are missing the following required questions:') ."<br>\n";
-            while(list($qid,$content)=each($missing)) {
-                if($GLOBALS['ESPCONFIG']['DEBUG'])
-                   $message .= "<!-- ${qid} -->";
-                $message .= "==> ${content}<br>\n";
-            }
-        }
-        if(count($not_numeric) > 0) {
-            // missing required variables
-            $message .= _('Please only use numbers for the following questions:') ."<br>\n";
-            while(list($qid,$content)=each($not_numeric)) {
-                if($GLOBALS['ESPCONFIG']['DEBUG'])
-                   $message .= "<!-- ${qid} -->";
-                $message .= "==> ${content}<br>\n";
-            }
-        }
-
-        return($message);
-    }
-    /* }}} */
-
-    /* {{{ proto void response_delete(int survey_id, int section, int response_id)
-    Deletes values for the response. */
-    function response_delete($sid, $rid, $sec = null) {
-        if (empty($rid))
-        return;
-
-        if ($sec != null) {
-            if ($sec < 1)
-            return;
-
-            /* get question_id's in this section */
-            $qids = survey_get_sections($sid);
-            if (!isset($qids[$sec - 1]))
-            return;
-            $qids = 'AND question_id '. array_to_insql($qids[$sec - 1]);
-        } else {
-            /* delete all */
-            $qids = '';
-        }
-
-        /* delete values */
-        foreach (array('bool', 'single', 'multiple', 'rank', 'text', 'other', 'date') as $tbl) {
-            $sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['response_'.$tbl.'_table']." WHERE response_id = $rid $qids";
-            $res = execute_sql($sql);
-        }
-    }
-    /* }}} */
-
-    /* {{{ proto void response_delete_all(int survey_id)
-    Deletes all responses from survey. */
-    function response_delete_all($sid) {
-        $sec = survey_get_sections($sid);
-        $qids = array();
-        foreach ($sec as $s)
-        $qids = array_merge($qids, $s);
-        $qids = array_to_insql($qids);
-
-        /* delete values */
-        foreach (array('bool', 'single', 'multiple', 'rank', 'text', 'other', 'date') as $tbl) {
-            $sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['response_'.$tbl.'_table']." WHERE question_id $qids";
-            $res = execute_sql($sql);
-        }
-        /* ensure responses from testing status are also deleted */
-        $sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['response_table']." WHERE survey_id=${sid}";
-        execute_sql($sql);
-    }
-    /* }}} */
-
-    /* {{{ proto int response_insert(int survey_id, int section, int response_id)
-    Reads current form variables from HTTP_POST_VARS.
-    Returns the ID for the response. */
-    function response_insert($sid,$section,$rid) {
-        //angek may need to keep this for backwards compatability
-        global $_POST;
-        if ($GLOBALS['ESPCONFIG']['auth_mode'] == 'basic') {
-            $userid = isset($_SERVER['PHP_AUTH_USER']) ?  $_SERVER['PHP_AUTH_USER'] : '';
-        }
-        elseif ($GLOBALS['ESPCONFIG']['auth_mode'] == 'form') {
-            if (isset($_SESSION['espuser'])) {
-                $userid = $_SESSION['espuser'];
-            }
-        }
-	$ip="";
-	if (isset($_SERVER['REMOTE_ADDR'])) $ip=$_SERVER['REMOTE_ADDR'];
-	if (isset($_SERVER['HTTP_CLIENT_IP'])) $ip="$ip (".$_SERVER['HTTP_CLIENT_IP'].")";
-	elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) $ip="$ip (".$_SERVER['HTTP_X_FORWARDED_FOR'].")";
-           $userid = $_SESSION['acl']['userid'];
-        if (empty($userid))
-           $userid = $_POST['userid'];
-           $userid = $_SESSION['acl']['userid'];
-
-        $userid = _addslashes($userid);
-
-        if(empty($rid)) {
-            // create a uniqe id for this response
-            $sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['response_table']." (survey_id,submitted,username,ip) VALUES ( ${sid},".sys_time_stamp().",${userid},'${ip}')";
-            $result = execute_sql($sql);
-    	    if (!$result) {
-		$msg = '<font color="red">'. _('Request failed, please contact the administrator.') .'</font>';
-		if ($GLOBALS['ESPCONFIG']['DEBUG'])
-		   $msg .= mkerror(ErrorNo() . ': ' . ErrorMsg());
-		print $msg;
-		exit;
-	    }
-
-            $rid = insert_id("response_id_seq");
-        }
-        $sql = "
-        SELECT Q.id, Q.type_id, Q.length, Q.precise, T.response_table
-        FROM ".$GLOBALS['ESPCONFIG']['question_table']." Q, ".$GLOBALS['ESPCONFIG']['question_type_table']." T
-        ". survey_select_section_sql($sid,$section,'Q') ." AND
-        Q.survey_id=${sid} AND
-        Q.deleted='N' AND Q.type_id < 50 AND
-        Q.type_id=T.id";
-        $q_result = execute_sql($sql);
-        while(list($qid, $tid, $length, $prec, $table) = fetch_row($q_result)) {
-            $q_result->MoveNext();
-            if (isset($_POST[$qid])) {
-                if (is_array($_POST[$qid]))
-                $bareval = array_map('_stripslashes', $_POST[$qid]);
-                else
-                $bareval = _stripslashes($_POST[$qid]);
-            }
-            else
-            $bareval = '';
-
-            if (is_string($bareval))
-            $val = _addslashes($bareval);
-            else
-            $val = '';
-
-	    // don't allow >1 responses for the same response ID and the same question ID
-	    $sql  = "SELECT COUNT(*) from ".$GLOBALS['ESPCONFIG'][$table.'_table']." WHERE response_id=${rid} AND question_id=${qid}";
-	    $count = get_one($sql);
-            if ($count > 0) {
-		return $rid;
-	    }
-
-
-            switch($table) {
-                case 'response_bool':
-                    $sql  = "INSERT INTO ".$GLOBALS['ESPCONFIG'][$table.'_table']." ( response_id,question_id,choice_id ) VALUES ( ${rid},${qid},${val} )";
-                    if (!empty($val))
-                    $result = execute_sql($sql);
-                    break;
-                case 'response_text':
-                    // only insert if non-empty content
-                    if($tid == 10) { // numeric
-			#$bareval = ereg_replace("[^0-9.\-]*(-?[0-9]*\.?[0-9]*).*", '\1', $bareval);
-			# replace "," by "."
-			if (ereg (",",$bareval)) {
-				$bareval = ereg_replace(",",".",$bareval);
-			}
-			# if float, check length and precision
-			if (ereg ("\.",$bareval)) {
-				$bareval = ereg_replace("[^0-9.\-]*(-?[0-9]{1,$length}\.[0-9]{1,$prec}).*", '\1', $bareval);
-			} else {
-				# else check only length
-				$bareval = ereg_replace("[^0-9.\-]*(-?[0-9]{1,$length}).*", '\1', $bareval);
-			}
-                    }
-                    if(ereg("[^ \t\n]",$bareval)) {
-                        $val = _addslashes($bareval);
-                        $sql  = "INSERT INTO ".$GLOBALS['ESPCONFIG'][$table.'_table']." ( response_id,question_id,response ) VALUES ( ${rid},${qid},${val} )";
-                        $result = execute_sql($sql);
-                    }
-                    break;
-                case 'response_date':
-                    // only insert if non-empty content
-                    //if(($bareval = ereg_replace("[^0-9]*([0-9]+)/([0-9]+)/([0-9]+).*", '\3-\1-\2', $bareval))) {
-                    if(function_exists("strptime")) {
-			if ($bareval=strptime($bareval,$GLOBALS['ESPCONFIG']['date_format'])) {
-                           $bareval['tm_year']+=1900;
-                           $bareval['tm_mon']+=1;
-                           $val = $bareval['tm_year']."-".
-                               $bareval['tm_mon']."-".
-                               $bareval['tm_mday'];
-                           $val = _addslashes($val);
-                           $sql  = "INSERT INTO ".$GLOBALS['ESPCONFIG'][$table.'_table']." ( response_id,question_id,response ) VALUES ( ${rid},${qid},${val} )";
-                           $result = execute_sql($sql);
-			}
-		    } elseif ($val = ereg_replace("[^0-9]*([0-9]+)/([0-9]+)/([0-9]+).*", '\3-\2-\1', $bareval)) {
-                        $val = _addslashes($val);
-                        $sql  = "INSERT INTO ".$GLOBALS['ESPCONFIG'][$table.'_table']." ( response_id,question_id,response ) VALUES ( ${rid},${qid},${val} )";
-                        $result = execute_sql($sql);
-                    }
-                    break;
-                case 'response_single':
-                    if(empty($bareval)) {
-                        $sql = "SELECT id FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE question_id=${qid} AND content LIKE '!other%' ORDER BY id";
-                        $c_result = execute_sql($sql);
-                        while(!$c_result) {
-                            $c_result->MoveNext();
-                            list($cid) = fetch_row($c_result);
-                            if (!isset($_POST["${qid}_${cid}"])) {
-                                continue;
-                            }
-                            $other = _addslashes($_POST["${qid}_${cid}"]);
-                            if(ereg("[^ \t\n]",$other)) {
-                                $sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['response_other_table']." ( response_id,question_id,choice_id,response ) VALUES ( ${rid},${qid},${cid},${other} )";
-                                $result = execute_sql($sql);
-                                $val = $cid;
-                                break;
-                            }
-                        }
-                        db_close($c_result);
-                    }
-                    if(ereg("other_([0-9]+)", $bareval, $regs)) {
-                        $cid=$regs[1];
-                        if (!isset($_POST["${qid}_${cid}"]))
-                        break; // out of the case
-                        $other = _addslashes($_POST["${qid}_${cid}"]);
-                        if(ereg("[^ \t\n]",$other)) {
-                            $sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['response_other_table']." ( response_id,question_id,choice_id,response ) VALUES ( ${rid},${qid},${cid},${other} )";
-                            $result = execute_sql($sql);
-                            $val=$cid;
-                        }
-                    }
-                    $sql  = "INSERT INTO ".$GLOBALS['ESPCONFIG'][$table.'_table']." ( response_id,question_id,choice_id ) VALUES ( ${rid},${qid},${val} )";
-                    $result = execute_sql($sql);
-                    break;
-                case 'response_multiple':
-                    $sql = "SELECT id FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE question_id=${qid} AND content LIKE '!other%'";
-                    $c_result = execute_sql($sql);
-                    while(!$c_result->EOF) {
-                        list($cid) = fetch_row($c_result);
-                        $c_result->MoveNext();
-                        if (!isset($_POST["${qid}_${cid}"]) || empty($_POST["${qid}_${cid}"])) {
-                            continue;
-                        }
-                        if (!isset($_POST[$qid]))
-                        $_POST[$qid] = array($cid);
-                        else
-                        array_push($_POST[$qid], $cid);
-                        $other = _addslashes($_POST["${qid}_${cid}"]);
-                        if(ereg("[^ \t\n]",$other)) {
-                            $sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['response_other_table']." ( response_id,question_id,choice_id,response ) VALUES ( ${rid},${qid},${cid},${other} )";
-                            $result = execute_sql($sql);
-                        }
-                    }
-                    db_close($c_result);
-                    #if(!isset($_POST[$qid]) || count($_POST[$qid]) < 1)
-                    if(!isset($_POST[$qid]) || !is_array($_POST[$qid]))
-			break;
-                    foreach($_POST[$qid] as $cid) {
-                        $cid = _addslashes($cid);
-                        if(ereg("other_[0-9]+", $cid))
-                        continue;
-                        $sql  = "INSERT INTO ".$GLOBALS['ESPCONFIG'][$table.'_table']." ( response_id,question_id,choice_id ) VALUES ( ${rid},${qid},${cid} )";
-                        $result = execute_sql($sql);
-                    }
-                    break;
-                case 'response_rank':
-                    if($tid == 8) { // Rank
-                    $sql = "SELECT id FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE question_id=${qid}";
-                    $cid_result = execute_sql($sql);
-                    while(!$cid_result->EOF) {
-                        list($cid) = fetch_row($cid_result);
-                        $cid_result->MoveNext();
-                        if (!isset($_POST["${qid}_${cid}"]))
-                        continue;
-                        $val = $_POST["${qid}_${cid}"];
-                        if(strtolower($val) == "n/a")
-                        $rank = -1;
-                        else
-                        $rank = intval($val);
-                        $rank = _addslashes($rank);
-                        $sql  = "INSERT INTO ".$GLOBALS['ESPCONFIG'][$table.'_table']." ( response_id,question_id,choice_id,rank ) ";
-                        $sql .= "VALUES ( ${rid},${qid},${cid},${rank} )";
-                        $result=execute_sql($sql);
-                    }
-                    db_close($cid_result);
-                    break;
-                    }
-                    if(strtolower($bareval) == "n/a")
-                    $rank = -1;
-                    else
-                    $rank = intval($bareval);
-                    $sql  = "INSERT INTO ".$GLOBALS['ESPCONFIG'][$table.'_table']." ( response_id,question_id,rank ) VALUES ( ${rid},${qid},${rank} )";
-                    $result = execute_sql($sql);
-                    break;
-            }
-        }
-        db_close($q_result);
-        return($rid);
-    }
-    /* }}} */
-
-    /* {{{ proto bool response_commit(int response_id)
-    Marks a response as completed.  Returns true on success.
-    */
-    function response_commit($rid) {
-	$ip="";
-	if (isset($_SERVER['REMOTE_ADDR'])) $ip=$_SERVER['REMOTE_ADDR'];
-	if (isset($_SERVER['HTTP_CLIENT_IP'])) $ip="$ip (".$_SERVER['HTTP_CLIENT_IP'].")";
-	elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) $ip="$ip (".$_SERVER['HTTP_X_FORWARDED_FOR'].")";
-
-        $sql = "UPDATE ".$GLOBALS['ESPCONFIG']['response_table']." SET complete='Y', submitted =".sys_time_stamp().",ip='$ip' WHERE id=${rid}";
-        if(execute_sql($sql))
-        return(true);
-        return(false);
-    }
-    /* }}} */
-
-    /* {{{ proto int response_key_cmp(mixed left, mixed right)
-    Key comparator for response keys (to handle numeric, and strings
-    composed of QID_CID).
-    */
-    function response_key_cmp($l, $r) {
-        $lx = explode('_', $l);
-        $rx = explode('_', $r);
-        $lc = intval($lx[0]);
-        $rc = intval($rx[0]);
-        if ($lc == $rc) {
-            if (count($lx) > 1 && count($rx) > 1) {
-                $lc = intval($lx[1]);
-                $rc = intval($rx[1]);
-            } else if (count($lx) > 1) {
-                $lc++;
-            } else if (count($rx) > 1) {
-                $rc++;
-            }
-        }
-        if ($lc == $rc)
-        return 0;
-        return ($lc > $rc) ? 1 : -1;
-    }
-    /* }}} */
-
-    /* {{{ proto array response_select(int survey_id, int response_id, array columns, array question_ids)
-    Returns the values from the specific response in a sorted
-    (associative) array indexed by question_id.
-
-    The key in the associative array is the Question ID, or in the case
-    of "!other", or rank questions the Question ID concatenated with the
-    Choice ID ("${qid}_${cid").  The value for all types is an array. 
-    This array contains any columns requested by the parameter $col as
-    the first elements.  The last two elements are the response content,
-    and the content ID respectively.  (For multiple answer questions,
-    the value is an array of these arrays.)
-
-    For example, for a boolean type question (ID #42) and a check box
-    type (ID #44), you might get something like:
-
-    $response_select = array(
-        '42' => array(_('No'), 'N'),
-        '44' => array(
-            array('Blue', 102),
-            array('Green', 104)
-        )
-    );
-
-    When in doubt, consult var_dump() as to the format of the returned
-    array.
-    */
-    function response_select($sid, $rid, $col = null, $qids = null) {
-        $values = array();
-
-        if ($col == null) {
-            $col = '';
-        }
-        if (!is_array($col) && !empty($col)) {
-            $col = explode(',', preg_replace("/\s/",'', $col));
-        }
-        if (is_array($col) && count($col) > 0) {
-            $col = ',' . implode(',', array_map(create_function('$a','return "q.$a";'), $col));
-        }
-
-        if ($qids == null) {
-            $qids = '';
-        } elseif (is_array($qids)) {
-            $qids = 'AND a.question_id ' . array_to_insql($qids);
-        } elseif (intval($qids) > 0) {
-            $qids = 'AND a.question_id = ' . intval($qids);
-        } else {
-            $qids = '';
-        }
-
-        // --------------------- response_bool ---------------------
-        $sql = "SELECT q.id $col,a.choice_id
-        FROM ".$GLOBALS['ESPCONFIG']['response_bool_table']." a, ".$GLOBALS['ESPCONFIG']['question_table']." q
-        WHERE a.response_id=${rid} AND a.question_id=q.id $qids";
-        $result = execute_sql($sql);
-        while(!$result->EOF) {
-            $row = fetch_row($result);
-            $qid = array_shift($row);
-            $val = array_pop($row);
-            $values[$qid] = $row;
-
-            $ivalue = '';
-	        if ($val == 'Y') {
-		       $ivalue = _('Yes');
-	        } elseif ($val == 'N') {
-		       $ivalue =  _('No');
-	        }
-	        array_push($values["$qid"], $ivalue, $val);
-            $result->MoveNext();
-        }
-        db_close($result);
-
-        // --------------------- response_single ---------------------
-        $sql = "SELECT q.id $col,c.content,c.id
-        FROM ".$GLOBALS['ESPCONFIG']['response_single_table']." a, ".$GLOBALS['ESPCONFIG']['question_table']." q, ".$GLOBALS['ESPCONFIG']['question_choice_table']." c
-        WHERE a.response_id=${rid} AND a.question_id=q.id AND a.choice_id=c.id $qids";
-        $result = execute_sql($sql);
-        while(!$result->EOF) {
-            $row = fetch_row($result);
-            $qid = array_shift($row);
-            $c = count($row);
-            $val = $row[$c - 2];
-            if (ereg('^!other', $val))
-            $row[$c - 1] = 'other_' . $row[$c - 1];
-            else
-            settype($row[$c - 1], 'integer');
-            $values[$qid] = $row;
-            $result->MoveNext();
-        }
-        db_close($result);
-
-        // --------------------- response_multiple ---------------------
-        $sql = "SELECT q.id $col,c.content,c.id
-        FROM ".$GLOBALS['ESPCONFIG']['response_multiple_table']." a, ".$GLOBALS['ESPCONFIG']['question_table']." q, ".$GLOBALS['ESPCONFIG']['question_choice_table']." c
-        WHERE a.response_id=${rid} AND a.question_id=q.id AND a.choice_id=c.id $qids
-        ORDER BY a.question_id,c.id";
-        $result = execute_sql($sql);
-        $arr = array();
-        $tmp = null;
-        while(!$result->EOF) {
-            $row = fetch_row($result);
-
-            $qid = array_shift($row);
-            $c = count($row);
-            $val = $row[$c - 2];
-            if (ereg('^!other', $val))
-            $row[$c - 1] = 'other_' . $row[$c - 1];
-            else
-            settype($row[$c - 1], 'integer');
-            if($tmp == $qid) {
-                $arr[] = $row;
-                $result->MoveNext();
-                continue;
-            }
-            if($tmp != null)
-            $values["$tmp"]=$arr;
-            $tmp = $qid;
-            $arr = array($row);
-            $result->MoveNext();
-        }
-        if($tmp != null)
-        $values["$tmp"]=$arr;
-        db_close($result);
-        unset($arr);
-        unset($tmp);
-        unset($row);
-
-        // --------------------- response_other ---------------------
-        $sql = "SELECT q.id,c.id $col,a.response
-        FROM ".$GLOBALS['ESPCONFIG']['response_other_table']." a, ".$GLOBALS['ESPCONFIG']['question_table']." q, ".$GLOBALS['ESPCONFIG']['question_choice_table']." c
-        WHERE a.response_id=${rid} AND a.question_id=q.id AND a.choice_id=c.id $qids
-        ORDER BY a.question_id,c.id";
-        $result = execute_sql($sql);
-        while(!$result->EOF) {
-            $row = fetch_row($result);
-            $qid = array_shift($row);
-            $cid = array_shift($row);
-            array_push($row, $row[count($row) - 1]);
-            $values["${qid}_${cid}"] = $row;
-            $result->MoveNext();
-        }
-        db_close($result);
-
-        // --------------------- response_rank ---------------------
-        $sql = "SELECT (". $GLOBALS['ESPCONFIG']['adodb_conn']->Concat("q.id","'_'","c.id") .") AS id $col,c.content,a.rank
-        FROM ".$GLOBALS['ESPCONFIG']['response_rank_table']." a, ".$GLOBALS['ESPCONFIG']['question_table']." q, ".$GLOBALS['ESPCONFIG']['question_choice_table']." c
-        WHERE a.response_id=${rid} AND a.question_id=q.id AND a.choice_id=c.id $qids
-        ORDER BY a.question_id,c.id";
-        $result = execute_sql($sql);
-        while(!$result->EOF) {
-            $row = fetch_row($result);
-            $qid = array_shift($row);
-            settype($row[count($row) - 1], 'integer');
-            if (isset($row[3])) {
-                if($row[3]>=0) {
-                    $row[3]++;
-                }
-            }
-            $values[$qid] = $row;
-            $result->MoveNext();
-        }
-        db_close($result);
-
-        // --------------------- response_text ---------------------
-        $sql = "SELECT q.id $col,a.response
-        FROM ".$GLOBALS['ESPCONFIG']['response_text_table']." a, ".$GLOBALS['ESPCONFIG']['question_table']." q
-        WHERE a.response_id=${rid} AND a.question_id=q.id $qids";
-        $result = execute_sql($sql);
-        while(!$result->EOF) {
-            $row = fetch_row($result);
-            $qid = array_shift($row);
-            $values["$qid"]=$row;
-            $val = array_pop($values["$qid"]);
-            array_push($values["$qid"], $val, $val);
-            $result->MoveNext();
-        }
-        db_close($result);
-
-        // --------------------- response_date ---------------------
-        $sql = "SELECT q.id $col,a.response
-        FROM ".$GLOBALS['ESPCONFIG']['response_date_table']." a, ".$GLOBALS['ESPCONFIG']['question_table']." q
-        WHERE a.response_id=${rid} AND a.question_id=q.id $qids";
-        $result = execute_sql($sql);
-        while(!$result->EOF) {
-            $row = fetch_row($result);
-            $qid = array_shift($row);
-            $values["$qid"]=$row;
-            $val = array_pop($values["$qid"]);
-            array_push($values["$qid"], $val, $val);
-            $result->MoveNext();
-        }
-        db_close($result);
-
-        // --------------------- return ---------------------
-        uksort($values, 'response_key_cmp');
-        return($values);
-    }
-    /* }}} */
-
-    /* {{{ proto array response_select_human(int survey_id, int response_id, array question_ids)
-    A wrapper around response_select(), that returns an array of
-    key/value pairs more suitable for humans.
-    */
-    function response_select_human($sid, $rid, $qids = null) {
-        $res = response_select($sid, $rid, 'type_id,content', $qids);
-        $hmn = array();
-        reset($res);
-        $tmpk = null;
-        $tmpv = array();
-        while(list($qid, $arr) = each($res)) {
-            $key = null;
-            $val = null;
-            if (strstr($qid, '_')) {
-                // rank or other
-                list($qid, $sub) = explode('_', $qid);
-                if ($arr[0] != 8)
-                continue; // other
-
-                // rank
-                $key = $arr[1];
-                if ($arr[3] < 0) {
-                    $arr[3] = 'n/a';
-                }
-//                else {
-//                    $arr[3]++;
-//                }
-                $val = $arr[2] . ' = ' . $arr[3];
-                if ($tmpk != $key) {
-                    if (!empty($tmpk) || count($tmpv))
-                    array_push($hmn, array($tmpk, $tmpv));
-                    $tmpk = null;
-                    $tmpv = array();
-                }
-                $tmpk = $key;
-                array_push($tmpv, $val);
-                continue;
-            }
-            if (!empty($tmpk) || count($tmpv))
-            array_push($hmn, array($tmpk, $tmpv));
-            if (is_array($arr[0])) {
-                // mutiple
-                $key = $arr[0][1];
-                $val = array();
-                foreach ($arr as $subarr) {
-                    if (ereg("^!other", $subarr[2])) {
-                        $tmpv = preg_replace(array("/^!other=/","/^!other/"),
-                        array('', 'Other'), $subarr[2]);
-                        $tmp = preg_replace("/^other/", $qid, $subarr[3]);
-                        if (isset($res[$tmp]))
-                        $tmpv .= ': '. $res[$tmp][2];
-                        array_push($val, $tmpv);
-                    } else {
-                        array_push($val, $subarr[2]);
-                    }
-                }
-            } else {
-                $key = $arr[1];
-                if (ereg("^!other", $arr[2])) {
-                    $val = preg_replace(array("/^!other=/","/^!other/"),
-                    array('', 'Other'), $arr[2]);
-                    $tmp = preg_replace("/^other/", $qid, $arr[3]);
-                    if (isset($res[$tmp]))
-                    $val .= ': '. $res[$tmp][2];
-                } else {
-                    $val = $arr[2];
-                }
-            }
-            $tmpk = null;
-            $tmpv = array();
-            $hmn[] = array($key, $val);
-        }
-        if (!empty($tmpk) || count($tmpv)) {
-            array_push($hmn, array($tmpk, $tmpv));
-            $tmpk = null;
-            $tmpv = array();
-	}
-        return $hmn;
-    }
-    /* }}} */
-
-    /* {{{ proto array response_select_compact(int survey_id, int response_id, array question_ids)
-    A wrapper around response_select(), that returns an array of
-    key/value pairs more suitable for computer parsing.
-    */
-    function response_select_compact($sid, $rid, $qids = null) {
-        $res = response_select($sid, $rid, 'type_id', $qids);
-        $cpq = array();
-        reset($res);
-        while(list($qid, $arr) = each($res)) {
-            if (strstr($qid, '_')) {
-                // rank or other
-                if ($arr[0] == 8) {
-                    // rank
-                    $cpq[] = array($qid, $arr[2]+1, array($arr[1]));
-                } else {
-                    // other
-                    $cpq[] = array($qid, $arr[1]);
-                }
-            } elseif (is_array($arr[0])) {
-                // multiple
-                $cpq[] = array($qid,
-                array_map(create_function('$a', 'return $a[2];'), $arr),
-                array_map(create_function('$b', 'return $b[1];'), $arr));
-            } else {
-                if ($arr[0] == 4 || $arr[0] == 6)
-                $cpq[] = array($qid, $arr[2], array($arr[1]));
-                else
-                $cpq[] = array($qid, $arr[2]);
-            }
-        }
-        return $cpq;
-    }
-    /* }}} */
-
-    /* {{{ proto array response_select_name(int survey_id, int response_id, array question_ids)
-    A wrapper around response_select(), that returns an array of
-    key/value pairs using the field name as the key.
-    */
-    function response_select_name($sid, $rid, $qids = null) {
-        $res = response_select($sid, $rid, 'type_id,name', $qids);
-        $nam = array();
-        reset($res);
-        while(list($qid, $arr) = each($res)) {
-            $key = null;
-            $val = null;
-            $index = $qid;
-            if (strstr($qid, '_')) {
-                // rank or other
-                list($qid, $sub) = explode('_', $qid);
-                if ($arr[0] != 8)
-                continue; // other
-
-                // rank
-                $str1 = $arr[2];
-                do {
-                    $str2 = $str1;
-                    $str1 = eregi_replace(
-                        "(^| )(what|which|why|how|who|where|how|is|are|were|the|a|it|of|do|you|your|please|enter)[ ?]",
-                        " ", $str2);
-                } while ($str1 != $str2);
-                $str1 = trim(strtoupper(eregi_replace(
-                    "[^A-Z0-9]+", " ", $str1)));
-                    $str1 = ereg_replace(' +','_',$str1);
-                    $arr[1] = strtoupper($arr[1]);
-                    $arr[1] .= "_$str1";
-                    $nam[$index] = array($arr[1]=>$arr[3]);
-                    continue;
-            }
-            if (is_array($arr[0])) {
-                // mutiple
-                $key = $arr[0][1];
-                $val = array();
-                foreach ($arr as $subarr) {
-                    if (ereg("^!other", $subarr[2])) {
-                        $tmpv = preg_replace(array("/^!other=/","/^!other/"),
-                        array('', 'Other'), $subarr[2]);
-                        $tmp = preg_replace("/^other/", $qid, $subarr[3]);
-                        if (isset($res[$tmp]))
-                        $tmpv .= ': '. $res[$tmp][2];
-                        array_push($val, $tmpv);
-                    } else {
-                        array_push($val, $subarr[2]);
-                    }
-                }
-            } else {
-                $key = $arr[1];
-                if (ereg("^!other", $arr[2])) {
-                    $val = preg_replace(array("/^!other=/","/^!other/"),
-                    array('', 'Other'), $arr[2]);
-                    $tmp = preg_replace("/^other/", $qid, $arr[3]);
-                    if (isset($res[$tmp]))
-                    $val .= ': '. $res[$tmp][2];
-                } else {
-                    $val = $arr[2];
-                }
-            }
-            $nam[$index] = array($key=>$val);
-        }
-        return $nam;
-    }
-    /* }}} */
-
-    /* {{{ proto bool response_send_email(int survey_id, int response_id)
-    Retrieves the response from the database and sends an email with the
-    values.  Returns true if mail sent.
-    */
-    function response_send_email($sid, $rid) {
-        if (!$GLOBALS['ESPCONFIG']['allow_email']) {
-            return true;
-        }
-
-        $sql = "SELECT name, email, public FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${sid}";
-        $result = execute_sql($sql);
-        list($name, $email, $survey_public) = fetch_row($result);
-        db_close($result);
-
-        if(empty($email))
-        return(false);
-
-        //lets check to see if user wants human readable email
-        if ($GLOBALS['ESPCONFIG']['human_email']) {
-            $answers = response_select_human($sid, $rid);
-            $qsep = "\n\t";
-            $isep = "\n\t";
-            $end = "\n\n";
-        } else {
-            $answers = response_select_compact($sid, $rid);
-            $qsep = ' : ';
-            $isep = ',';
-            $end = "\n";
-        }
-
-        $user = array(
-            'survey.id' => $sid,
-            'survey.name' => $name,
-            'survey.response' => $rid,
-        );
-        if ($survey_public=="N") {
-            if ($GLOBALS['ESPCONFIG']['auth_mode'] == 'basic' &&
-		isset($_SERVER['PHP_AUTH_USER'])) {
-                $userid = $_SERVER['PHP_AUTH_USER'];
-            }
-            elseif ($GLOBALS['ESPCONFIG']['auth_mode'] == 'form') {
-                $userid = $_SESSION['espuser'];
-            }
-
-	    $user['user.username'] = $userid;
-            $sql = "SELECT fname,lname,email FROM ".$GLOBALS['ESPCONFIG']['respondent_table']." WHERE username = " . _addslashes($userid);
-            $result = execute_sql($sql);
-            if ($result && record_count($result)) {
-		list ($user_fname, $user_lname, $user_email) = fetch_row($result);
-                db_close($result);
-                if (!empty($user_fname)) $user["user.firstname"] = $user_fname;
-                if (!empty($user_lname)) $user["user.lastname"] = $user_lname;
-                if (!empty($user_email)) $user["user.email"] = $user_email;
-            }
-        } else {
-            //$user['user.username'] = $_POST['userid'];
-            $user['user.username'] = "anonymous";
-        }
-
-        $subject = _('Response from survey:') ." $name [$rid]";
-        $body = '';
-        reset($user);
-        while (list($k, $v) = each($user))
-        $body .= $k . $qsep . $v . $end;
-
-        if (isset($GLOBALS['ESPCONFIG']['email_from_name']) &&
-            isset($GLOBALS['ESPCONFIG']['email_from_address']) && 
-            isset($GLOBALS['ESPCONFIG']['email_return_path'])) {
-            $headers = "From: ".addslashes($GLOBALS['ESPCONFIG']['email_from_name']).
-                        "<".addslashes($GLOBALS['ESPCONFIG']['email_from_address']).">\n";
-            $headers .= "Return-Path: <". addslashes($GLOBALS['ESPCONFIG']['email_return_path']).">\n";
-        } else {
-           $headers = "From: \"phpESP ".
-           addslashes($GLOBALS['ESPCONFIG']['version']) .
-           "\" <phpesp@". $_SERVER['SERVER_NAME'] .">\n";
-           $headers .= "Return-Path: <". $_SERVER['SERVER_ADMIN'] ."@".
-                       $_SERVER['SERVER_NAME'] . ">\n";
-           $headers .= "X-Sender: <phpesp@". $_SERVER['SERVER_NAME'] .">\n";
-        }
-        $headers .= "X-Mailer: phpESP\n";
-
-        reset($answers);
-        while($arr = array_shift($answers)) {
-            unset($x);
-            if (count($arr) > 2)
-            list($k, $v, $x) = $arr;
-            else
-            list($k, $v) = $arr;
-            if (is_array($v))
-            $v = implode($isep, $v);
-            if (isset($x)) {
-                if (is_array($x))
-                $v .= ' (' . implode($isep, $x) . ')';
-                else
-                $v .= ' = ' . $x;
-            }
-            $body .= $k . $qsep . $v . $end;
-        }
-
-        return(mail($email,$subject,$body,$headers));
-    }
-    /* }}} */
-
-    /* {{{ proto int response_select_max_pos(int survey_id, int response_id)
-    Returns the position of the last answered question in a response.
-    */
-    function response_select_max_pos($sid, $rid) {
-        $max = 0;
-
-        foreach (array('bool', 'single', 'multiple', 'rank', 'text', 'other', 'date') as $tbl) {
-            $sql = "SELECT MAX(q.position) FROM ".$GLOBALS['ESPCONFIG']['response_'.$tbl.'_table']." a, ".$GLOBALS['ESPCONFIG']['question_table']." q
-            WHERE a.response_id = $rid AND
-            q.id = a.question_id AND
-            q.survey_id = $sid AND
-            q.deleted = 'N'";
-            #$res = execute_sql($sql);
-            #if ($num = get_one($res) > $max)
-            if ($num = get_one($sql) > $max)
-            $max = $num;
-        }
-        return $max;
-    }
-    /* }}} */
-
-    /* {{{ proto int response_select_max_pos(int survey_id, int response_id)
-    Returns the number of the section in which questions have been
-    answered in a response.
-    */
-    function response_select_max_sec($sid, $rid) {
-        $pos = response_select_max_pos($sid, $rid);
-        $sql = "SELECT COUNT(*)+1 FROM ".$GLOBALS['ESPCONFIG']['question_table']." q
-        WHERE q.survey_id = $sid AND
-        q.type_id = 99 AND
-        q.position < $pos AND
-        q.deleted = 'N'";
-        #$res = execute_sql($sql);
-        #$max = get_one($res);
-        $max = get_one($sql);
-        return $max;
-    }
-    /* }}} */
-
-    /* {{{ proto void response_import_sec(int survey_id, int response_id, int section, &array destination)
-    Populates the destination array with the answers from a given
-    section of a given response.
-    */
-    function response_import_sec($sid, $rid, $sec, $varr = null) {
-        if ($varr == null)
-        $varr =& $_POST;
-
-        $ids = survey_get_sections($sid);
-        if ($sec < 1 || !isset($ids[$sec - 1]))
-        return;
-        $vals = response_select($sid, $rid, 'content', $ids[$sec - 1]);
-
-        reset($vals);
-        foreach ($vals as $id => $arr) {
-            if (isset($arr[0]) && is_array($arr[0])) {
-                // multiple
-                $varr[$id] = array_map('array_pop', $arr);
-            } else {
-                $varr[$id] = array_pop($arr);
-            }
-        }    
-    }
-    /* }}} */
-
-?>
Index: admin/include/tab/conditions.inc
===================================================================
--- admin/include/tab/conditions.inc	(revision 6370)
+++ admin/include/tab/conditions.inc	(working copy)
@@ -1,149 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: conditions.inc,v 1.5 2007/12/07 15:15:04 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-?>
-
-<input type="hidden" name="conditions" value="" />
-
-<?php
-$sid = $_SESSION['survey_id'];
-
-$conditions[0]=_('equals');
-$conditions[1]=_('is different from');
-$conditions[2]=_('smaller than');
-$conditions[3]=_('bigger than');
-
-$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['condition_table']." WHERE survey_id=$sid ORDER BY id";
-$result = execute_sql($sql);
-if (record_count($result)) {
-   echo(_('Current conditions defined:'));
-   print "<br /><table>";
-
-   $print_or=0;
-   while( list($id, $tmp_sid, $qid1, $qid2, $cond, $cond_val) = fetch_row($result)) {
-	   if ($print_or==1) {
-	      print "<tr><td>"._('OR')."</td></tr>";
-	   } else {
-	      $print_or=1;
-	   }
-	   print "<tr><td>";
-	   echo(_('Only show question '));
-	   $sql2 = "SELECT content FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE id=$qid1"; 
-	   $result2=execute_sql($sql2);
-	   list($content)=fetch_row($result2);
-	   $content=strip_tags($content);
-	   $dots = "";
-	   if (strlen($content) > 30) $dots = "...";
-	   print "'".substr($content,0, 30).$dots."' ";
-	   echo(_('if answer to question '));
-	   $sql2 = "SELECT content FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE id=$qid2"; 
-	   $result2=execute_sql($sql2);
-	   list($content)=fetch_row($result2);
-	   $content=strip_tags($content);
-	   $dots = "";
-	   if (strlen($content) > 30) $dots = "...";
-	   print "'".substr($content,0, 30).$dots."' ";
-	   echo $conditions[$cond]." '".$cond_val."'";
-	   $result->MoveNext();
-	   print " <input type=\"submit\" name=\"deletecondition[$id]\" size=5 value=\"delete\" />";
-	   print "</td></tr>";
-   }
-   print "</table><hr>";
-}
-
-$sql = "SELECT id,type_id,position,content FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-WHERE survey_id=$sid AND deleted='N'
-ORDER BY position";
-$result = execute_sql($sql);
-$max = record_count($result);
-?>
-<div align=left>
-<?php
-   echo(_('All conditions are "OR" conditions, so if one conditions is fullfilled, the question is shown.<br />
-A question that has a condition must be an optional question. So, if you define a condition on a question, the "Required" parameter is set to "No".<br />
-A question that has a condition must be on the next page than the question/value that is used to compare it with. Use the "Order tab" to insert a section break where wanted (this is <b>NOT</b> done automatically).<br />
-A Yes/No question can only be compared using the values "Yes or "No".'));
-?>
-</div>
-<hr>
-<?php
-   echo(_('Add conditions to a question.'));
-?>
-<hr>
-<?php
-if ($max > 20) {
-	$max = 20;
-}
-?>
-
-<?php echo(_('Only show question ')); ?>
-<select name="q1_id" id="q1_id" size="<?php echo($max)?>">
-<?php
-$i = 1;
-while( list($qid, $tid, $pos, $content) = fetch_row($result)) {
-	$result->MoveNext();
-	$dots = "";
-	$content = strip_tags($content);
-	if($tid != 99) {
-		if (strlen($content) > 30) {
-			$dots = "...";
-		}
-		echo('<option value="'.$qid.'">'.$i++.'. '.substr($content,0, 30).$dots.'</option>');
-	}
-	else {
-		//++$sec;
-		echo('<option value="'.$qid.'"><strong>'._('----- Section Break -----').'</strong></option>\n');
-	}
-}
-?>
-</select>
-
-<?php echo(_('if answer to question ')); ?>
-<select name="q2_id" id="q2_id" size="<?php echo($max)?>">
-<?php
-$i = 1;
-$result->MoveFirst();
-while( list($qid, $tid, $pos, $content) = fetch_row($result)) {
-	$result->MoveNext();
-	$dots = "";
-	$content = strip_tags($content);
-	if($tid != 99) {
-		if (strlen($content) > 30) {
-			$dots = "...";
-		}
-		echo('<option value="'.$qid.'">'.$i++.'. '.substr($content,0, 30).$dots.'</option>');
-	}
-	else {
-		//++$sec;
-		echo('<option value="'.$qid.'"><strong>'._('----- Section Break -----').'</strong></option>\n');
-	}
-}
-db_close($result);
-?>
-</select>
-
-<select name="cond" id="cond">
-<option value="0"><?php echo $conditions[0]; ?></option>
-<option value="1"><?php echo $conditions[1]; ?></option>
-<option value="2"><?php echo $conditions[2]; ?></option>
-<option value="3"><?php echo $conditions[3]; ?></option>
-</select>
-<input type="text" name="cond_value" id="cond_value" size=5 value="NONE">
-<input type="submit" name="addcondition" size=5 value="go" />
-<hr />
-<br /><br />
Index: admin/include/tab/questions.inc
===================================================================
--- admin/include/tab/questions.inc	(revision 6370)
+++ admin/include/tab/questions.inc	(working copy)
@@ -1,181 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: questions.inc,v 1.31 2007/12/10 08:24:47 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-        if(empty($_POST['id']))
-        	$_POST['id'] = 0;
-
-	$curr_q =& $_SESSION['curr_q'];
-	$sid =& $_SESSION['survey_id'];
-   	$id = intval($_POST['id']);
-
-	if (isset($_POST['type_id']))
-		$_POST['type_id'] = intval($_POST['type_id']) ?  $_POST['type_id'] : '';
-	else
-        	$_POST['type_id'] = '';
-
-	// update failed, stay on same question
-	if(!$updated || isset($_POST['extra_choices'])) {
-		$curr_q = $id;
-	} else {
-		if(isset($_POST['new_question']))
-			$curr_q = 0;
-		if(isset($_POST['edit_question']))
-			$curr_q = $_POST['q_id'];
-		if($curr_q<0)
-			$curr_q = 1;
-	}
-
-	$fields = array('name','type_id','length','precise','required','content','position');
-	if($updated && $curr_q) {
-		// survey questions exist already
-		// load values from DB
-		$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE id=${curr_q} AND deleted='N' ORDER BY position";
-		$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-		$question = fetch_row($result);
-		db_close($result);
-		foreach($fields as $f) {
-			$_POST[$f] =& $question[$f];
-		}
-	} else if ($updated) {
-		// adding a new question (possibly because there are no questions yet)
-		$curr_q = 0;
-		foreach(array('name','length','precise','content','position') as $f) {
-			$_POST[$f] = '';
-		}
-	} else {
-		foreach($fields as $f) {
-			if(!empty($_POST[$f]))
-			    $_POST[$f] = _stripslashes($_POST[$f]);
-			else
-			    $_POST[$f] = '';
-		}
-	}
-?>
-	<input type="hidden" name="id" value="<?php echo($curr_q); ?>" />
-	<?php 
-	   echo(_('Edit this question, or click the number of the question you would like to edit:'));
-	?>
-	</p>
-
-	<select name="q_id" id="q_id">
-<?php
-	$i = 1;
-	// build array of question IDs
-	$sql = "SELECT id,type_id,position,content FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-	WHERE survey_id=$sid AND deleted='N' AND type_id != 99
-	ORDER BY position";
-	$result = execute_sql($sql);
-	while( list($qid, $tid, $pos, $content) = fetch_row($result)) {
-           $result->MoveNext();
-           $dots = "";
-           $content = strip_tags($content);
-           if (strlen($content) > 30) {
-              $dots = "...";
-           }
-	   if ($qid==$curr_q) {
-              echo('<option selected value="'.$qid.'">'.$i++.'. '.substr($content,0, 30).$dots.'</option>');
-	   } else {
-              echo('<option value="'.$qid.'">'.$i++.'. '.substr($content,0, 30).$dots.'</option>');
-	   }
-	}
-	db_close($result);
-?>
-	</select>
-	
-	
-	<script type="text/javascript" src="/js/jquery-latest.js"></script>
-	<script type="text/javascript">
-	function doProcessSelectBox(box)
-	{
-		var id = box.value;
-		if (!(id == 4 || id == 5 || id == 6))
-			$('#multichoice').hide();
-		else
-			$('#multichoice').show();
-		
-	}
-	</script>
-
-	<input type="submit" name="edit_question" value="<?php echo(_('Edit Question')); ?>" />
-	<input type="submit" name="new_question" value="<?php echo(_('New Question')); ?>" />
-	<hr /> 
-	<strong><?php
-		if(!$curr_q) {
-			echo('<span class="red">'._('New Question').'</span>');
-		} ?>
-	</strong>
-	<table>
-		<tr>
-			<th>&nbsp;</th>
-			<th><?php echo(_('Question Name')); ?></th>
-			<th><?php echo(_('Type')); ?></th>
-			<th><?php echo(_('Length')); ?></th>
-			<th><?php echo(_('Precision')); ?></th>
-			<th><?php echo(_('Required')); ?>?</th>
-		</tr><tr>
-			<td>&nbsp;</td>
-			<td><?php echo(mktext('name',12)); ?></td>
-			<td><?php
-				if($updated && empty($_POST['type_id'])) $_POST['type_id'] = 2;
-				$sql = 'SELECT id, type FROM '.$GLOBALS['ESPCONFIG']['question_type_table'].' WHERE id != 99';
-				$result = execute_sql($sql);
-				$arr = array();
-				while(list($key, $val) = fetch_row($result)) {
-                    			$result->MoveNext();
-					$arr["$key"] = _($val);
-				}
-				echo(mkselect('type_id',$arr,null,'doProcessSelectBox'));
-			?></td>
-			<td><?php
-				if(empty($_POST['length'])) $_POST['length'] = 0;
-				echo(mktext("length",6));
-			?></td>
-			<td><?php
-				if(empty($_POST['precise'])) $_POST['precise'] = 0;
-				echo(mktext("precise",6));
-			?></td>
-			<td><?php
-				if(empty($_POST['required'])) $_POST['required'] = 'N';
-				echo(mkselect("required",array(
-					"Y" => _('Yes') . '               ',
-					"N" => _('No')
-				))); ?></td>
-		</tr>
-		<tr>
-			<th>Text</th>
-			<td colspan="5"><?php
-				echo(mktextarea("content",4,60,"VIRTUAL"));
-			?></td>
-		</tr>
-	</table>
-<?php
-	// has answer options ... so show that part of the form
-    $sql = "SELECT has_choices
-					FROM ".$GLOBALS['ESPCONFIG']['question_type_table']."
-        WHERE id=" . $_POST['type_id'];
-    $choices = get_one($sql);
-	if($curr_q == 0 ||
-            empty($_POST['type_id']) || $choices =='Y') {
-		include($GLOBALS['ESPCONFIG']['include_path']."/tab/questions_options".$GLOBALS['ESPCONFIG']['extension']);
-	}
-?>
-	<hr />
Index: admin/include/tab/order.inc
===================================================================
--- admin/include/tab/order.inc	(revision 6370)
+++ admin/include/tab/order.inc	(working copy)
@@ -1,110 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-/* $Id: order.inc,v 1.24 2007/11/29 11:43:39 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-$sid = $_SESSION['survey_id'];
-$sql = "SELECT id,type_id,position,content FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-WHERE survey_id=$sid AND deleted='N'
-ORDER BY position";
-$result = execute_sql($sql);
-$max = record_count($result);
-?>
-<?php echo(_('Change the order that questions are
-presented by selecting a question from the list, then use the up/down 
-buttons to change its position.')); ?>
-<hr>
-<script type="text/javascript">
-<!-- // comment
-function move(f,bDir,sName) {
-    var el = f.elements[sName]
-    var idx = el.selectedIndex
-    if (idx==-1) 
-        alert("You must first select the item to reorder.")
-    else {
-        var nxidx = idx+( bDir? -1 : 1)
-        if (nxidx<0) nxidx=el.length-1
-        if (nxidx>=el.length) nxidx=0
-        var oldVal = el[idx].value
-        var oldText = el[idx].text
-        el[idx].value = el[nxidx].value
-        el[idx].text = el[nxidx].text
-        el[nxidx].value = oldVal
-        el[nxidx].text = oldText
-        el.selectedIndex = nxidx
-   }
-}
-
-function validate() {
-    var tabs = document.getElementById('tabs');
-    var orderList = "";
-    for (var i=0; i < tabs.questions.length; i++){
-        orderList = orderList + tabs.questions.options[i].value;
-        if (i + 1 != tabs.questions.length){
-            orderList = orderList + "|";
-        }
-    }
-    tabs.questions_order.value = orderList;
-}
-
-function removeItem() {
-    var el = document.getElementById('questions');
-    var idx = el.selectedIndex;
-    var tabs = document.getElementById('tabs');
-    if (idx == -1) {
-        alert("You must first select an item to delete");
-        return false;
-    } else {
-        tabs.removeit.value = 1;
-        tabs.submit();
-    }
-}
-// comment -->
-</script>
-<input type="hidden" name="removeit" value="" />
-<input type="hidden" name="questions_order" value="" />
-        <?php
-            if ($max > 20) {
-                $max = 20;
-            }
-        ?>
-    <select name="questions" id="questions" size="<?php echo($max)?>">
-        <?php
-        $i = 1;
-        while( list($qid, $tid, $pos, $content) = fetch_row($result)) {
-            $result->MoveNext();
-            $dots = "";
-            $content = strip_tags($content);
-            if($tid != 99) {
-                if (strlen($content) > 100) {
-                   $dots = "...";
-                }
-                echo('<option value="'.$qid.'">'.$i++.'. '.substr($content,0, 100).$dots.'</option>');
-            }
-            else {
-                //++$sec;
-                echo('<option value="'.$qid.'"><strong>'._('----- Section Break -----').'</strong></option>\n');
-			}
-        }
-		db_close($result);
-        ?>
-        </select>
-<hr />
-<input type="button" value="Up" onclick="javascript:move(this.form,true,'questions')" /> | <input type="button" value="Down" onclick="javascript:move(this.form, false, 'questions')"> | <input type="submit" name="addbreak" value="<?php echo(_('Add Section Break')); ?>"> | <input type="button" value="Remove" name="remove" onclick="javascript:removeItem()" />
-    <br /><br />
Index: admin/include/tab/general.inc
===================================================================
--- admin/include/tab/general.inc	(revision 6370)
+++ admin/include/tab/general.inc	(working copy)
@@ -1,166 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-/* $Id: general.inc,v 1.26 2007/07/09 12:58:17 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	//Find context is available.
-	
-	unset($sid);
-	
-	$sid = $_SESSION['survey_id'];
-	if ($_GET[fromID] && !$sid) { 
-		$sid = $_GET[fromID];
-	}
-	// load current values from DB if $sid exists (in session)
-	$survey = array();
-	if(!empty($sid) && $updated) {
-		$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${sid}";
-		$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-		$survey = fetch_row($result);
-		db_close($result);
-	} else {
-		$fields = array('name','realm','title','subtitle','email','theme','thanks_page','thank_head','thank_body','info','public','auto_num');
-	   	foreach ($fields as $f) {
-            if(!empty($_POST[$f]))
-	    	    $survey[$f] = _stripslashes($_POST[$f]);
-            else
-                $survey[$f] = '';
-        }
-	}
-	
-	//Survey Filenames have been taken out and replaced with a generation and project reference naming schema
-	// EX. 31_rel_12342341_gen
-	//     - project id: 31, timestamp = 12342341
-	// EX. 31_rel_12342341_gen35_rel_55523423_gen
-	//     - project id: 35, initial project id: 31
-	
-	
-	//Set Default Surveyname	
-	$key = '_generation_pid_'.$_SESSION['pid'].'_';
-	if ($_GET['makenew']) {
-		if (strpos($survey['name'],$key) === false) {
-			$_SESSION['dupeQuestions'] = '';
-			$_SESSION['dupeQuestions'] = $sid;
-			if (!$_SESSION['dupeQuestions']) {
-				$_SESSION['dupeQuestions'] = $_SESSION['survey_id'];
-			}
-			unset($_SESSION['survey_id']);
-			unset($sid);
-			unset($_GET[fromID]);
-			$sname = $survey['name'].time().$key;
-		}
-	} else {
-		$sname = $survey['name'];
-	}
-	if (empty($sname)) {
-		$sname = time().$key;
-	}
-	/*if (!empty($survey['name'])) {
-		//
-		if (strpos($survey['name'],$_SESSION['pid']."_rel_") === false) {
-			$sname = $survey['name'].$_SESSION['pid']."_rel_".time().$gkey;
-		} else {
-			$sname = $survey['name'];
-		}
-		
-	}*/
-?>
-<?php echo(_('The information on this tab applies to the whole survey.
-Fill out this page then go to the <strong>Fields</strong> tab to
-edit individual fields.')); ?>
-<script type="text/javascript">
-<!--
-function validate() {
-    return true;
-}
--->
-</script>
-<hr />
-<table cellspacing="0" cellpadding="0">
-	<tr style="vertical-align: top;display:none;">
-		<td class="right"><strong><?php echo(_('Name')); ?></strong></td>
-		<td class="left">
-		
-		<? /*	<?php echo mktext('name', 20, 64, $survey); ?>
-			<span class="red"><em><?php echo _('Required'); ?></em></span><br />
-			<?php echo(
-			_('Survey filename.') .' '.
-			_('This is used for all further access to this survey.')
-			.' ('. _('no spaces') .', '. _('alpha-numeric only') .')'); ?></td>
-			<!-- hardcoded, groups to be managed in other ways -->
-			*/ ?>
-			
-			<input type="hidden" name="name" value="<?=$sname?>" />
-			<input type="hidden" name="realm" value="auto" />
-	</tr>
-	
-	
-	
-	
-	
-	<tr><td colspan="2"><hr class="line1" /></td></tr>
-	<tr style="vertical-align: top">
-		<td class="right"><strong><?php echo(_('Title')); ?></strong></td>
-		<td class="left">
-			<?php echo mktext('title', 60, 60, $survey); ?>
-			<span class="red"><em><?php echo _('Required'); ?></em></span><br />
-			<?php echo(_('Title of this survey.') .' '.
-			_('This appears at the top of every page of this survey.')
-			.' ('. _('free-form, including spaces') .')'); ?>
-		</td>
-	</tr>
-	<tr><td colspan="2"><hr class="line1" /></td></tr>
-	<tr style="vertical-align: top">
-		<td class="right"><strong><?php echo(_('Subtitle')); ?></strong></td>
-		<td class="left">
-			<?php echo mktext('subtitle', 60, 128, $survey); ?><br />
-			<?php echo(_('Subtitle of this survey.') .' '.
-			_('Appears below the title.') .' ('. _('free-form, including spaces'). ')'); ?>
-		</td>
-	</tr>
-	<tr><td colspan="2"><hr class="line1" /></td></tr>
-	<tr style="vertical-align: top">
-		<td class="right"><strong><?php echo(_('Additional Info')); ?></strong></td>
-		<td class="left">
-			<?php echo mktextarea('info', 5, 60, 'virtual', $survey); ?><br />
-			<?php echo(_('Text to be displayed on this survey before any fields.
-(i.e. instructions, background info, etc.)')); ?>
-		</td>
-	</tr>
-	
-	
-	
-	<tr><td colspan="2"><hr class="line1" /></td></tr>
-	<tr style="vertical-align: top;display:none;">
-		<td class="right"><strong><?php echo(_('Email')); ?></strong></td>
-		<td class="left">
-            <?php echo mktext('email', 30, 0, $survey); ?><br />
-			<?php echo(_('Sends a copy of each submission to address (or leave blank for no email backup).')); ?></td>
-	
-	<!-- some gluecode for phpesp compatibility -->
-	<input type="hidden" name="auto_num" value="Yes" />
-		<input type="hidden" name="theme" value="" />
-		<input type="hidden" name="thank_head" value="" />
-		<input type="hidden" name="thank_body" value="" />
-		<input type="hidden" name="thanks_page" value="" />
-	
-	</tr>   
-      
-</table>
-<br/>
Index: admin/include/tab/finish.inc
===================================================================
--- admin/include/tab/finish.inc	(revision 6370)
+++ admin/include/tab/finish.inc	(working copy)
@@ -1,44 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-/* $Id: finish.inc,v 1.15 2005/08/01 16:12:54 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	$_SESSION['new_survey'] = false;
-	$survey_name = "";
-    $sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id = ". $_SESSION['survey_id'];
-    if ($result = execute_sql($sql)) {
-	    if (record_count($result) > 0)
-		    $survey_name = $result->fields[0];
-		db_close($result);
-	}
-
-?>
-<script type="text/javascript">
-function validate() {
-    return true;
-}
-</script>
-<br />
-<strong><?php echo(_('Survey Design Completed')); ?></strong>
-
-	<p><?php echo(_('You have completed this survey design.')); ?></p>
-
-
-
-<?php// echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/tab/preview.inc
===================================================================
--- admin/include/tab/preview.inc	(revision 6370)
+++ admin/include/tab/preview.inc	(working copy)
@@ -1,98 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: preview.inc,v 1.17 2007/11/27 10:24:34 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	$sid = _addslashes($_SESSION['survey_id']);
-
-	$sql = "SELECT COUNT(*) FROM ".$GLOBALS['ESPCONFIG']['question_table']." WHERE survey_id=${sid}
-	AND deleted='N' AND type_id='99'";
-	$result = execute_sql($sql);
-	$num_sections = 1 + $result->fields[0];
-	db_close($result);
-
-	if(empty($_POST['section']))
-		$_POST['section']=1;
-?>
-<script type="text/javascript">
-<!-- // Begin <?php // This should really go into <head> tag ?>
-
-function other_check(name)
-{
-  other = name.split("_");
-  var f = document.phpesp;
-  for (var i=0; i<=f.elements.length; i++) {
-    if (f.elements[i].value == "other_"+other[1]) {
-      f.elements[i].checked=true;
-      break;
-    }
-  }
-}
-function validate() {
-    return true;
-}
-
-
-// End -->
-</script>
-<?php echo(_('This is a preview of how this survey will look.
-The survey will use the background
-color of the document in which it is embedded. If you have no
-further changes click <b>Finish</b> at the bottom of
-this page.')); ?>
-<?php	if($num_sections > 1) { ?>
-<br /><strong><?php echo(_('Section')); ?>:</strong>
-<?php		for($i=0;$i<$num_sections;$i++) {	?>
-<input type="submit" name="section" value="<?php echo($i+1); ?>" />
-<?php		}
-	} ?>
-<input type="hidden" name="where" value="tab" />
-<input type="hidden" name="old_tab" value="preview" />
-<hr />
-<?php // lets make the css style available during the preview.
-      // this should really go into the head section.....but should still work
-        $sql = "SELECT theme FROM ".$GLOBALS['ESPCONFIG']['survey_table']." where id = ${sid}";
-        if ($result = execute_sql($sql)) {
-                if (record_count($result) > 0) {
-                        list($css_file) = fetch_row($result);
-                        db_close($result);
-                        echo("<link rel=\"stylesheet\" href=\"".$GLOBALS['ESPCONFIG']['css_url'].$css_file."\"  type=\"text/css\">\n");                }
-        }
-?>
-<table style="border: 1px solid black;" cellpadding="2">
-	<tr>
-		<td>
-<?php
-	survey_render($sid,$_POST['section']);
-#	if ($ESPCONFIG['auth_response']) {
-#		if ($_POST['section'] > 1) {
-#        	echo('<input type="button" value="' . _('Previous Page'). '" /> ');
-#        }
-#	    echo ('<input type="button" value="'. _('Save') .'" /> ');
-#	}
-#	if($_POST['section'] != $num_sections) {
-#		echo('<input type="button" value="'. _('Next Page') .'" /> ');
-#	} else {
-#		echo('<input type="button" value="'. _('Submit Survey') .'" />');
-#	}
-?>
-		</td>
-	</tr>
-</table>
Index: admin/include/tab/questions_options.inc
===================================================================
--- admin/include/tab/questions_options.inc	(revision 6370)
+++ admin/include/tab/questions_options.inc	(working copy)
@@ -1,86 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: questions_options.inc,v 1.18 2007/11/26 16:03:56 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-// New Interface Design by Kon Angelopoulos
-// for the phpESP project.
-// <angekproductions@iprimus.com.au>
-
-	// do not need to import session vars here
-	// it is done by questions.inc before this code executes
-
-	// this type of question has answer options
-	if ($updated && $curr_q) {
-		$sql = "SELECT id,content FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']." WHERE question_id=${curr_q} ORDER BY id";
-		$result = execute_sql($sql);
-		$c = record_count($result);
-	} else {
-		if ($curr_q && isset($_POST['num_choices']))
-			$c = intval($_POST['num_choices']);
-		else
-			$c = $GLOBALS['ESPCONFIG']['default_num_choices'];
-	}
-	if(isset($_POST['extra_choices']))
-		$num_choices = max($c, $_POST['num_choices']) + 1;
-	else
-		$num_choices = $c;
-?>
-<span id="multichoice">
-<table id="answerlines" cellspacing="0">
-	<tr><td colspan="2"><hr /></td></tr>
-	<tr>
-		<td colspan="2">
-			<?php printf(_('Enter the possible answers (if applicable). Enter
-%s on an line by itself to create a
-fill-in-the-blank answer at the end of this question.
-Any blank lines will be suppressed.'), '<tt>!other</tt>'); ?>
-			<input type="hidden" id="num_choices" name="num_choices" value="<?php echo($num_choices); ?>" />
-		</td>
-	</tr>
-<?php
-	for($i=1; $i<$num_choices+1; ++$i) {
-		if ($updated && $curr_q) {
-			list($choice_id, $choice_content) = fetch_row($result);
-			$result->MoveNext();
-		} else {
-			if ($curr_q) {
-			   $choice_id = intval($_POST["choice_id_$i"]);
-			   if(isset($_POST["choice_content_$i"]))
-			      $choice_content = _stripslashes($_POST["choice_content_$i"]);
-			}
-		}
-?>
-	   <tr>
-		<td class="numbered"><?php echo($i); ?>.</td>
-		<td class="left">
-			<input type="hidden" name="choice_id_<?php echo($i); ?>"
-				value="<?php if(isset($choice_id)) echo($choice_id); ?>" />
-			<input type="text" size="60" name="choice_content_<?php echo($i); ?>"
-				value="<?php if(isset($choice_content)) echo(htmlspecialchars($choice_content)); ?>" />
-		</td>
-	   </tr>
-<?php	} ?>
-	<tr>
-		<td>&nbsp;</td>
-		<td class="left"><input type="button" name="extra_choices" onclick="addAnswerLine()" value="<?php echo(_('Add another answer line')); ?>" /> <input type="button" name="clear" value="Clear all answer lines" onclick="clearTextInputs()" /></td>
-	</tr>
-</table>
-</span>
\ No newline at end of file
Index: admin/include/funcs.inc
===================================================================
--- admin/include/funcs.inc	(revision 6370)
+++ admin/include/funcs.inc	(working copy)
@@ -1,233 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: funcs.inc,v 1.37 2007/11/26 11:36:17 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-    //if (!defined('STATUS_ACTIVE')) {
-        define('STATUS_ACTIVE',  0x01);
-        define('STATUS_DONE',    0x02);
-        define('STATUS_DELETED', 0x04);
-        define('STATUS_TEST',    0x08);
-   // }
-
-    if(get_magic_quotes_gpc()) {
-        function _addslashes($a)    { return(db_qstr(stripslashes($a))); }
-        function _stripslashes($a)  { return(stripslashes($a)); }
-    } else {
-        function _addslashes($a)    { return(db_qstr($a)); }
-        function _stripslashes($a)  { return($a); }
-    }
-    set_magic_quotes_runtime(0);
-
-    function esp_where($where = null)
-    {
-        $cfg =& $GLOBALS['ESPCONFIG'];
-        if(empty($where))
-        {
-            $where = 'index';
-        }
-        $where = strtolower(ereg_replace(' +','_',$where));
-        if(!ereg('^[A-Za-z0-9_]+$',$where))    // Valid chars are [A-Za-z0-9_]
-            $where = 'index';
-        if(!file_exists($cfg['include_path'].'/where/'.$where.$cfg['extension']))
-            $where = 'index';
-        if(!file_exists($cfg['include_path'].'/where/'.$where.$cfg['extension'])) {
-            echo('<b>'. _('Unable to open include file. Check INI settings. Aborting.'). '</b>');
-            exit;
-        }
-        return($cfg['include_path'].'/where/'.$where.$cfg['extension']);
-    }
-
-    function esp_init_adodb() {
-        $cfg =& $GLOBALS['ESPCONFIG'];
-        if(!file_exists($cfg['adodb_path'].'adodb.inc.php')) {
-            echo('<b>'. _('Unable to open ADODB include file. Check INI settings. Aborting.'). '</b>');
-            exit;
-        }
-        else {
-            include($cfg['adodb_path'].'adodb.inc.php');
-        }
-        if (isset($cfg['adodb_conn'])) {
-            return;
-        }
-        $cfg['adodb_conn'] = &ADONewConnection($cfg['adodb_database_type']);
-
-
-        //$cfg['adodb_conn']->debug=1;
-        if ($cfg['adodb_database_type'] == "sqlite") {
-            $dbconnected = $cfg['adodb_conn']->Connect($cfg['adodb_pathto_db']);
-        }
-        else {
-            if (!isset($cfg['adodbi_persist']) or !empty($cfg['adodb_persist'])) {
-                // Use persistent connection (default)
-                $dbconnected = $cfg['adodb_conn']->PConnect($cfg['db_host'], $cfg['db_user'], $cfg['db_pass'], $cfg['db_name']);
-            } else {
-                // Use single connection
-                $dbconnected = $cfg['adodb_conn']->Connect($cfg['db_host'], $cfg['db_user'], $cfg['db_pass'], $cfg['db_name']);
-            }
-        }
-        if (!$dbconnected) {
-            header('HTTP/1.0 503 '. _('Service Unavailable'));
-            echo('<html><head><title>HTTP 503 '. _('Service Unavailable') .'</title></head>');
-            echo('<body><h1>HTTP 503 '. _('Service Unavailable') .'</h1>');
-            if ($cfg['debug_mode'] == 1)
-            	echo(mkerror(_("Connection to database failed with credentials mysql://$cfg[db_user]:$cfg[db_pass]@$cfg[db_host]/$cfg[db_name]. Please check configuration.")));
-            else
-            	echo(mkerror(_("Connection to database failed. Please check configuration.")));
-            if ($cfg['DEBUG']) {
-                echo("<br>\n". mkerror(ErrorNo().": ".ErrorMsg()));
-            }
-            echo('</body></html>');
-            exit;
-        }
-    }
-    
-    function goto_action_url($pid)
-    {
-    	$url = "/public/gluebox.php?project=$pid";
-		if(!headers_sent()) {
-                header("Location: $url");
-                exit;
-        }
-        ?>
-<script type="text/javascript">
-<!--
-window.location="<?php echo($url); ?>"
-    //-->
-</script>
-<noscript>
-<h2 class="thankhead">Thank You for completing this survey.</h2>
-<blockquote class="thankbody">Please click
-<a class="returnlink" href="<?php echo($url); ?>">here</a> to continue.</blockquote>
-</noscript>
-<?php
-       exit;
-    }
-    
-    // redirect to thank you page for survey ID 'sid'
-    // exits PHP!
-    function goto_thankyou($sid,$referer) {
-        $cfg =& $GLOBALS['ESPCONFIG'];
-
-        $sql = "SELECT thanks_page,thank_head,thank_body FROM ".$cfg['survey_table']." WHERE id=${sid}";
-        $result = execute_sql($sql);
-        list($thank_url,$thank_head,$thank_body) = fetch_row($result);
-        db_close($result);
-        $thank_url = str_replace("\r", '', $thank_url);
-        $thank_url = str_replace("%0d", '', $thank_url);
-        $thank_url = str_replace("\n", '', $thank_url);
-        $thank_url = str_replace("%0a", '', $thank_url);
-        $thank_url = str_replace("\t", '', $thank_url);
-        $thank_url = str_replace("\0", '', $thank_url);
-        if(!empty($thank_url)) {
-            if(!headers_sent()) {
-                header("Location: $thank_url");
-                exit;
-            }
-        ?>
-<script type="text/javascript">
-<!--
-window.location="<?php echo($thank_url); ?>"
-    //-->
-</script>
-<noscript>
-<h2 class="thankhead">Thank You for completing this survey.</h2>
-<blockquote class="thankbody">Please click
-<a class="returnlink" href="<?php echo($thank_url); ?>">here</a> to continue.</blockquote>
-</noscript>
-<?php
-           exit;
-        }
-
-
-        if(empty($thank_body) && empty($thank_head)) {
-            $thank_body = $GLOBALS['ESPCONFIG']['thank_body'];
-            $thank_head = $GLOBALS['ESPCONFIG']['thank_head'];
-        }
-
-        echo "<h2 class=\"thankhead\"> $thank_head </h2>";
-        echo "<blockquote class=\"thankbody\"> $thank_body </blockquote>";
-
-        if (isset($_GET['where']) && $_GET['where'] == 'test'){
-           if ($GLOBALS['ESPCONFIG']['limit_double_postings']==0) {
-              $ref = "<a class=\"returnlink\" href=\"". $referer."\">Return</a><br />";
-	   } else {
-	      $ref = "";
-	   }
-        }
-        else {
-           $ref = check_referer($referer);
-        }
-        echo $ref;
-        return;
-    }
-    function check_referer($referer) {
-        $pos = strpos($referer, $GLOBALS['ESPCONFIG']['autopub_url']);
-        if ($pos === false) {
-            if (!empty($_REQUEST['direct']) && $_REQUEST['direct'] === '1') {
-                $retstr = "";
-            } else {
-                if ($GLOBALS['ESPCONFIG']['limit_double_postings']==0) {
-                   $retstr = "<a class=\"returnlink\" href=\"". $referer."\">Return</a>";
-		} else {
-		   $retstr = "";
-		}
-            }
-        } else {
-            $retstr = "";
-        }
-        return $retstr;
-    }
-
-    function goto_saved($url) {
-?>
-<blockquote class="thankbody">
-<?php echo
-_('Your progress has been saved.  You may return at any
-time to complete this survey.  To do so, simply bookmark
-the link below.  You may be prompted for your username
-and password to complete the survey.') ?></blockquote>
-<a class="returnlink" href="<?php echo $url; ?>"><?php echo _('Resume survey'); ?></a>
-<?php
-        return;
-    }
-
-    require_once($ESPCONFIG['include_path']."/lib/espcross".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/lib/espauth".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/lib/esphtml.forms".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/lib/esphtml.results".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/lib/espmerge".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/lib/espresponse".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/lib/espsql".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/lib/espdatalib".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/survey_copy".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/survey_merge".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/survey_purge".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/survey_render".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/survey_report".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/survey_results".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/survey_update".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/survey_export_csv".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/account_upload".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/response_purge".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/question_render".$ESPCONFIG['extension']);
-    require_once($ESPCONFIG['include_path']."/function/question_conditioncheck".$ESPCONFIG['extension']);
-
-?>
Index: admin/include/head.inc
===================================================================
--- admin/include/head.inc	(revision 6370)
+++ admin/include/head.inc	(working copy)
@@ -1,67 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-/* $Id: head.inc,v 1.9 2005/04/14 17:51:16 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-$base = $CONFIG['url']['base'].$_SERVER['PHP_SELF'];
-?>
-<div id="main">
-  <div id="header">
-	<div align="center"><a href="?where=manage"><img style="margin:10px;" src="<?php echo($CONFIG['url']['logo']); ?>" /></a><br/><strong/><?php echo $SITE['slogan']; ?></strong></div>
-<div style="width: 100%; text-align: center">
-<div style="margin: auto; width: 780px">
-
-<div class="usergreeting" align="right">
-<h3 class="right pad" style="padding-right:0px;"><? echo ('Welcome '. $_SESSION['acl']['username']); ?> </h3>
-<div class="clear"></div>
-&nbsp;&nbsp;
-<a href="<?php echo("${base}?where=manage");  ?>"><?php echo(_('Home')); ?></a>
-<? /*&nbsp;&nbsp;
-<a href="<?php echo("${base}?where=account");  ?>"><?php echo(_('My Account')); ?></a>*/ ?>
-&nbsp;&nbsp;
-<a href="http://wiki.fluidproject.org/display/fluid/VULab+Help" target='_blank'><?php echo(_('VULab Help')); ?></a>
-&nbsp;&nbsp;
-<a href="<?php echo("${base}?where=help");  ?>"><?php echo(_('Survey Help')); ?></a>
-	<?php if($GLOBALS['ESPCONFIG']['auth_design']) { ?>
-			&nbsp;&nbsp;
-			        
-                           <a href="<?php echo("${base}?where=logout");  ?>"><?php echo(_('Sign Out')); ?></a>
-   
-    <? } ?>
-    
-<?php if ($_SESSION[acl]['superuser'] == 'Y') { ?>
-	<?php if (!$_SESSION[debug]) { ?>
-	&nbsp;&nbsp;
-	<a href="<?php echo("${base}?debug=true");  ?>"><?php echo(_('Turn on Debugging')); ?></a>
-	<?php } else {?>	
-	&nbsp;&nbsp;
-	<a href="<?php echo("${base}?debug=off");  ?>"><?php echo(_('Turn off Debugging')); ?></a>
-	<?php } ?>	
-<?php } ?>
-<?php /*<br />
-Something Broken? Bug? Check The <a href="http://wiki.fluidproject.org/display/fluid/VULab+WEB+-+Live+Development+Status" target="_blank"><?php echo(_('Development Status')); ?></a>*/ ?>
-</div>
-</div>
-</div>
-
-
-	
-  
-  </div> <!-- end header div -->
-  
-  <div id="body">
-      <div class="contents">
-      <br/>
-      <form method="post" id="containerform" name="containerform" action="<?php echo($base); ?>">
-	<div>
Index: admin/include/where/viewcompleted.inc
===================================================================
--- admin/include/where/viewcompleted.inc	(revision 6370)
+++ admin/include/where/viewcompleted.inc	(working copy)
@@ -1,189 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-/*
-File: 		create.inc \\v 1.0
-Info:		- File designed to handle all project creation/editing and survey (iframed) creation.
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-<?php
-session_start();
-
-/* $Id: create.inc,v 1.32 2007/12/03 13:08:13 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-//Some Legacy
-$base =& $GLOBALS['ESPCONFIG']['ME'];
-$bg = '';
-////////////////
-
-
-//Manage Modes
-if ($_GET[where] == 'create') {
-	$_SESSION['mode'] = 'create';
-	unset($_SESSION[pid]);
-	unset($_SESSION[renamed]);
-	unset($_SESSION[last_tab]);
-	unset($_SESSION[curr_q]);
-	unset($_SESSION[survey_id]);
-	unset($_SESSION[new_survey]);
-}
-if ($_GET['pid']) {
-	$_SESSION['mode'] = 'manage';
-	$_SESSION['pid'] = $_GET['pid'];
-}
-//Popoulate edit mode
-if ($_SESSION['mode'] == 'manage' AND $_SESSION['pid']) {
-	$project = new Project;
-	$project->init($_SESSION[pid]);
-}
-
-//Lets Figure out our Navigation Vars
-$step = $_POST[step];
-if ($_GET[step]) { $step = $_GET[step]; }
-if ($_POST[go]) { $step = $_POST[go]; }
-
-if ($_POST[where_sub] OR $_GET[where_sub]) {
-	if ($_POST[where_sub]) {
-		$step = $_POST[where_sub];
-	} else {
-		$step = $_GET[where_sub];
-	}
-}
-
-
-if (!$step OR strtolower($step)== 'first' OR strtolower($step) == 'start') { $step = 5; }
-$from = $_POST[from];
-
-
-//If there has been a step change, lets process!
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	include(esp_where("step_process_$from"));
-}
-
-$stepswitch[$step] = 'on';
-	if ($_SESSION[debug]) {
-/*		if (@$project) {
-			echo "<script type='text/javascript'>\n";
-			echo "alert('asdfsf');\n";
-			echo "$('.debug').append('";
-			echo '<strong>project</strong>';
-			print_r($project);
-			echo "');\n";
-			echo "</script>";		
-		}*/
-	
-	}
-if ($project->details['status'] == '2') {
-
-}
-
-	
-	$postid = $project->post_survey['id'];
-    $ridSQL = "SELECT * FROM `response` WHERE `survey_id` = '$postid'";
-    $ridResult = execute_sql($ridSQL);
-    $ridCount = 0;
-    while ($ridRow = fetch_row($ridResult)) {
-    	if ($ridCount > 0) {
-    		break;
-    	}
-    	$ridResult->MoveNext();
-    	$firstPostRid = $ridRow[0];
-    	++$ridCount;
-    }
-    
-	$preid = $project->pre_survey['id'];
-    $ridSQL = "SELECT * FROM `response` WHERE `survey_id` = '$preid'";
-    $ridResult = execute_sql($ridSQL);
-    $ridCount = 0;
-    while ($ridRow = fetch_row($ridResult)) {
-    	if ($ridCount > 0) {
-    		break;
-    	}
-    	$ridResult->MoveNext();
-    	$firstPreRid = $ridRow[0];
-    	++$ridCount;
-    }
-    
-?>
-
-<div id="project_container">
-<div id="project_topnav">
-<div class="right"><a href="?where=deleteproject&lay=ajax&id=<?=$project->id;?>&KeepThis=true&TB_iframe=true&height=200&width=450" class="thickbox" title="Are you sure you want to delete this project?"><img src="../images/delete.png" alt="Delete" />Delete Project</a><a href="?where=deactivateproject&lay=ajax&id=<?=$project->id;?>&KeepThis=true&TB_iframe=true&height=200&width=450" class="thickbox deactivatebutton" title="Are you sure you want to deactivate this project?"><img src="../images/world_delete.png" alt="Deactivate" />Deactivate Project</a><a href="?where=manage"><img src="../images/exit.png" alt="Exit"/>Exit</a></div>
-<h2>Project: <?php echo ($project->details[name] ? $project->details[name] : "Untitled"); ?> <small class="green">(active)</small></h2>
-</div>
-<div id="steps">
-<div style="float:left;padding:5px;">
-<h3>
-Results:</h3>
-<div style="margin-left:20px;text-align:left;font-size:13px;">
-	<strong>
-	<? if ($project->pre_survey['id']) { echo '<a href="?where=results&pid='.$project->id.'&sid='.$project->pre_survey['id'].'">Pre-Survey Totals</a>'; }?>
-	<? if ($project->pre_survey['id'] AND $project->post_survey['id']) { echo ' - '; }?>
-	<? if ($project->post_survey['id']) { echo '<a href="?where=results&pid='.$project->id.'&sid='.$project->post_survey['id'].'">Post-Survey Totals</a>'; } ?>
-	- <a href="?where=results&pid=<?=$project->id?>&sid=<?=$project->post_survey['id']?>&rid=<?=$firstPostRid?>">Browse Videos</a>
-	</strong>
-	<br />
-	<a href="?where=results&pid=<?=$project->id?>&sid=<?=$project->pre_survey['id']?>&rid=<?=$firstPreRid?>">Browse Pre-Survey Responses</a>
-	 - <a href="?where=results&pid=<?=$project->id?>&sid=<?=$project->post_survey['id']?>&rid=<?=$firstPostRid?>">Browse Post-Survey Responses & Videos</a>
-</div>
-
-</div>
-</div>
-<div style="clear:both;"></div>
-<?
-if ($err) { 
-	echo "<div id='errors'>";
-	foreach ($err as $msg) {
-		if (is_array($msg)) {
-			foreach ($msg as $m) { echo "<div>$m</div>"; }
-		} else {
-			echo "<div>$msg</div>";
-		}
-	}
-	echo "</div>";
-}
-if ($note) { 
-	echo "<div id='notes'>";
-	foreach ($note as $msg) {
-		echo "<div>$msg</div>";
-	}
-	echo "</div>";
-}
-if ($good) { 
-	echo "<div id='goods'>";
-	foreach ($good as $msg) {
-		echo "<div>$msg</div>";
-	}
-	echo "</div>";
-}
-?>
-<div class="clear"></div>
-</div>
-
-<?php
-if (!empty($_POST)) {
-	echo "<div id='postdata'>";
-	foreach($_POST as $name=>$value) {
-		echo "$name=$value&";
-	}
-	echo "</div>";
-}
-?>
\ No newline at end of file
Index: admin/include/where/download.inc
===================================================================
--- admin/include/where/download.inc	(revision 6370)
+++ admin/include/where/download.inc	(working copy)
@@ -1,125 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: download.inc,v 1.13 2006/03/27 23:10:41 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Download patch submitted by Matthew Gregg
-// <greggmc@musc.edu>
-// Modified by James Flemer
-// <jflemer@alum.rpi.edu>
-
-	$sid = -1;
-	if (!empty($_GET['sid']))
-		$sid = intval($_GET['sid']);
-	else if(!empty($_POST['sid']))
-		$sid = intval($_POST['sid']);
-
-	$sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id = $sid";
-	$result = execute_sql($sql);
-	if (record_count($result) < 1) {
-		db_close($result);
-		echo mkerror(_('Invalid survey ID.'));
-		return;
-	}
-	$name = $result->fields[0];
-    db_close($result);
-
-	/* check ACLs for permissions */
-	$srealm = auth_get_survey_realm($sid);
-	if (isset($_GET['test'])) {
-		/* check ACL to see if user is allowed to test
-		 * _this_ survey */
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				!auth_is_owner($sid, $_SESSION['acl']['username']) &&
-				!in_array($srealm, array_intersect(
-						$_SESSION['acl']['pdesign'],
-						$_SESSION['acl']['pall'])) &&
-				!auth_no_access(_('to access this survey'))) {
-			return;
-		}
-	} else {
-		/* check ACL to see if user is allowed to export
-		 * _this_ survey */
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				!auth_is_owner($sid, $_SESSION['acl']['username']) &&
-				!in_array($srealm, array_intersect(
-						$_SESSION['acl']['pdata'],
-						$_SESSION['acl']['pall'])) &&
-				!auth_no_access(_('to access this survey'))) {
-			return;
-		}
-	}
-
-    function printCommonHeaders() {
-        header("Pragma: public");
-        header("Expires: 0");
-        header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-        header("Cache-Control: private",false);
-        header("Content-Transfer-Encoding: ascii");
-    }
-
-	$type = isset($_GET['type']) ? $_GET['type'] : 'csv_full_header';
-	
-	// default to csv_full_header
-    switch($type) {
-        case 'spss':
-            //NOT FULLY IMPLEMENT YET
-            header("Content-Transfer-Encoding: ascii");
-            printCommonHeaders();
-            header("Content-Type: text/comma-separated-values");
-            header("Content-Disposition: attachment; filename={$name}.csv");
-            header("Content-Type: application/txt");
-            $output = survey_generate_results($type, $sid);
-            //Do something with output
-            foreach ($output as $row ) {
-                echo(implode(',', $row) . "\r\n");
-            }
-            break;
-
-        case 'xml':
-            //NOT FULLY IMPLEMENT YET
-            header("Content-Transfer-Encoding: ascii");
-            printCommonHeaders();
-            header("Content-Disposition: attachment; filename=$name.xml");
-            header("Content-Type: text/xml");
-            $output = survey_generate_results($type, $sid);
-            //Do something with output
-            break;
-
-        case 'tab':
-            // TAB
-            header("Content-Transfer-Encoding: ascii");
-            printCommonHeaders();
-            header("Content-Disposition: attachment; filename=$name.txt");
-            header("Content-Type: text/tab-separated-values");
-            $output = survey_generate_results($type, $sid);
-            foreach ($output as $row ) {
-                echo(implode(chr(9), $row) . "\r\n");
-            }
-            break;
-            
-        default:	
-            // CSV, csv_full_header old method, csv_short_header new method
-            header("Content-Transfer-Encoding: ascii");
-            printCommonHeaders();
-            header("Content-Disposition: attachment; filename=$name.csv");
-            header("Content-Type: text/comma-separated-values");
-            $output = survey_generate_results($type, $sid);
-            foreach ($output as $row ) {
-                echo(implode(',', $row) . "\r\n");
-            }
-    }
-	return;
-?>
Index: admin/include/where/view.inc
===================================================================
--- admin/include/where/view.inc	(revision 6370)
+++ admin/include/where/view.inc	(working copy)
@@ -1,194 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-/*
-File: 		create.inc \\v 1.0
-Info:		- File designed to handle all project creation/editing and survey (iframed) creation.
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-<?php
-session_start();
-
-/* $Id: create.inc,v 1.32 2007/12/03 13:08:13 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-//Some Legacy
-$base =& $GLOBALS['ESPCONFIG']['ME'];
-$bg = '';
-////////////////
-
-
-//Manage Modes
-if ($_GET[where] == 'create') {
-	$_SESSION['mode'] = 'create';
-	unset($_SESSION[pid]);
-	unset($_SESSION[renamed]);
-	unset($_SESSION[last_tab]);
-	unset($_SESSION[curr_q]);
-	unset($_SESSION[survey_id]);
-	unset($_SESSION[new_survey]);
-}
-if ($_GET['pid']) {
-	$_SESSION['mode'] = 'manage';
-	$_SESSION['pid'] = $_GET['pid'];
-}
-//Popoulate edit mode
-if ($_SESSION['mode'] == 'manage' AND $_SESSION['pid']) {
-	$project = new Project;
-	$project->init($_SESSION[pid]);
-}
-
-//Lets Figure out our Navigation Vars
-$step = $_POST[step];
-if ($_GET[step]) { $step = $_GET[step]; }
-if ($_POST[go]) { $step = $_POST[go]; }
-
-if ($_POST[where_sub] OR $_GET[where_sub]) {
-	if ($_POST[where_sub]) {
-		$step = $_POST[where_sub];
-	} else {
-		$step = $_GET[where_sub];
-	}
-}
-
-
-if (!$step OR strtolower($step)== 'first' OR strtolower($step) == 'start') { $step = 5; }
-$from = $_POST[from];
-
-
-//If there has been a step change, lets process!
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	include(esp_where("step_process_$from"));
-}
-
-$stepswitch[$step] = 'on';
-	if ($_SESSION[debug]) {
-/*		if (@$project) {
-			echo "<script type='text/javascript'>\n";
-			echo "alert('asdfsf');\n";
-			echo "$('.debug').append('";
-			echo '<strong>project</strong>';
-			print_r($project);
-			echo "');\n";
-			echo "</script>";		
-		}*/
-	
-	}
-if ($project->details['status'] == '2') {
-
-}
-
-	
-	$postid = $project->post_survey['id'];
-    $ridSQL = "SELECT * FROM `response` WHERE `survey_id` = '$postid'";
-    $ridResult = execute_sql($ridSQL);
-    $ridCount = 0;
-    while ($ridRow = fetch_row($ridResult)) {
-    	if ($ridCount > 0) {
-    		break;
-    	}
-    	$ridResult->MoveNext();
-    	$firstPostRid = $ridRow[0];
-    	++$ridCount;
-    }
-    
-	$preid = $project->pre_survey['id'];
-    $ridSQL = "SELECT * FROM `response` WHERE `survey_id` = '$preid'";
-    $ridResult = execute_sql($ridSQL);
-    $ridCount = 0;
-    while ($ridRow = fetch_row($ridResult)) {
-    	if ($ridCount > 0) {
-    		break;
-    	}
-    	$ridResult->MoveNext();
-    	$firstPreRid = $ridRow[0];
-    	++$ridCount;
-    }
-    
-?>
-
-<div id="project_container">
-<div id="project_topnav">
-<div class="right"><a href="?where=deleteproject&lay=ajax&id=<?=$project->id;?>&KeepThis=true&TB_iframe=true&height=200&width=450" class="thickbox" title="Are you sure you want to delete this project?"><img src="../images/delete.png" alt="Delete" />Delete Project</a><a href="?where=deactivateproject&lay=ajax&id=<?=$project->id;?>&KeepThis=true&TB_iframe=true&height=200&width=450" class="thickbox deactivatebutton" title="Are you sure you want to deactivate this project?"><img src="../images/world_delete.png" alt="Deactivate" />Deactivate Project</a><a href="?where=manage"><img src="../images/exit.png" alt="Exit"/>Exit</a></div>
-<h2>Project: <?php echo ($project->details[name] ? $project->details[name] : "Untitled"); ?> <small class="green">(active)</small></h2>
-</div>
-<div id="steps">
-<div style="float:left;padding:5px;">
-<h3>
-Results:</h3>
-<div style="margin-left:20px;text-align:left;font-size:13px;">
-	<strong>
-	<? if ($project->pre_survey['id']) { echo '<a href="?where=results&pid='.$project->id.'&sid='.$project->pre_survey['id'].'">Pre-Survey Totals</a>'; }?>
-	<? if ($project->pre_survey['id'] AND $project->post_survey['id']) { echo ' - '; }?>
-	<? if ($project->post_survey['id']) { echo '<a href="?where=results&pid='.$project->id.'&sid='.$project->post_survey['id'].'">Post-Survey Totals</a>'; } ?>
-	- <a href="?where=results&pid=<?=$project->id?>&sid=<?=$project->post_survey['id']?>&rid=<?=$firstPostRid?>">Browse Videos</a>
-	</strong>
-	<br />
-	<a href="?where=results&pid=<?=$project->id?>&sid=<?=$project->pre_survey['id']?>&rid=<?=$firstPreRid?>">Browse Pre-Survey Responses</a>
-	 - <a href="?where=results&pid=<?=$project->id?>&sid=<?=$project->post_survey['id']?>&rid=<?=$firstPostRid?>">Browse Post-Survey Responses & Videos</a>
-</div>
-
-</div>
-</div>
-<div style="clear:both;"></div>
-<?
-if ($err) { 
-	echo "<div id='errors'>";
-	foreach ($err as $msg) {
-		if (is_array($msg)) {
-			foreach ($msg as $m) { echo "<div>$m</div>"; }
-		} else {
-			echo "<div>$msg</div>";
-		}
-	}
-	echo "</div>";
-}
-if ($note) { 
-	echo "<div id='notes'>";
-	foreach ($note as $msg) {
-		echo "<div>$msg</div>";
-	}
-	echo "</div>";
-}
-if ($good) { 
-	echo "<div id='goods'>";
-	foreach ($good as $msg) {
-		echo "<div>$msg</div>";
-	}
-	echo "</div>";
-}
-?>
-<div style="padding-left:5px;">
-<?php
-		include(esp_where("viewstep_html_$step"));
-?>
-</div>
-<div class="clear"></div>
-</div>
-
-<?php
-if (!empty($_POST)) {
-	echo "<div id='postdata'>";
-	foreach($_POST as $name=>$value) {
-		echo "$name=$value&";
-	}
-	echo "</div>";
-}
-?>
\ No newline at end of file
Index: admin/include/where/report.inc
===================================================================
--- admin/include/where/report.inc	(revision 6370)
+++ admin/include/where/report.inc	(working copy)
@@ -1,108 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: report.inc,v 1.15 2005/08/01 16:12:55 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-	// see if a survey has been selected
-	if(!empty($_GET['sid'])) {
-		$sid = intval($_GET['sid']);
-		if(empty($_GET['details']))
-			$_GET['details'] = 1; // by default, show details in report
-
-		/* check ACL to see if user is allowed to view
-		 * _this_ survey */
-		$srealm = auth_get_survey_realm($sid);
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				!auth_is_owner($sid, $_SESSION['acl']['username']) &&
-				!in_array($srealm, array_intersect(
-						$_SESSION['acl']['pdesign'],
-						$_SESSION['acl']['pall'])) &&
-				!auth_no_access(_('to access this form'))) {
-			return;
-		}
-?>
-<table cellspacing="0" cellpadding="4">
-<tr><td>
-<?php
-		$ret = survey_report($sid, $_GET['details']);
-		if($ret != '')
-			echo(mkerror($ret));
-?>
-</td></tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=report\">" . _('Go back to Report Menu') . "</a>\n"); ?><br>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<?php
-		return;
-	}
-
-// No SurveyId specified, so build a table of
-// surveys to choose from ...
-
-	$statusbad = (STATUS_DELETED);
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = "SELECT id,name,title,owner,realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']."
-			WHERE NOT (status & $statusbad)
-			ORDER BY id DESC";
-	} else {
-		$realms = array_to_insql(
-			array_intersect(
-				$_SESSION['acl']['pall'],
-				$_SESSION['acl']['pdesign']));
-		$sql = "SELECT id,name,title,owner,realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE (owner=".
-			_addslashes($_SESSION['acl']['username']) ." ||
-			realm $realms)
-			AND NOT (status & $statusbad)
-			ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-
-?>
-<h2><?php echo(_('View Form Report')); ?></h2>
-<?php echo(_('Pick Form to View')); ?>
-<table cellspacing="0" cellpadding="4">
-	<tr class="header">
-		<th><?php echo(_('ID')); ?></th>
-		<th><?php echo(_('Name')); ?></th>
-		<th><?php echo(_('Title')); ?></th>
-		<th><?php echo(_('Owner')); ?></th>
-		<th><?php echo(_('Group')); ?></th>
-	</tr>
-<?php
-    $bg = '';
-	while(list($sid, $name, $title, $owner, $realm) = fetch_row($result)) {
-        $result->MoveNext();
-		if($bg != $ESPCONFIG['bgalt_color1'])
-			$bg = $ESPCONFIG['bgalt_color1'];
-		else
-			$bg = $ESPCONFIG['bgalt_color2'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td><?php echo($sid); ?></td>
-		<td><a href="<?php echo("". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=report&sid=${sid}")); ?>">
-			<?php echo($name); ?></a>
-		</td>
-		<td><?php echo($title); ?></td>
-		<td><?php echo($owner); ?></td>
-		<td><?php echo($realm); ?></td>
-	</tr>
-<?php
-	}
-?>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/groups.inc
===================================================================
--- admin/include/where/groups.inc	(revision 6370)
+++ admin/include/where/groups.inc	(working copy)
@@ -1,107 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: groups.inc,v 1.10 2005/08/01 16:12:55 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-// <jflemer@acm.rpi.edu>
-
-	/* load only accounts available to _this_ user */
-	if($_SESSION['acl']['superuser'] != 'Y' &&
-			!auth_no_access(_('to access this form'))) {
-		return;
-	}
-	
-	$errstr = '';
-	if(!empty($_POST['r']) && !empty($_POST['t'])) {
-        $sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['realm_table']." (name, title, changed)
-        VALUES (". _addslashes($_POST['r']) .", ".
-        _addslashes($_POST['t']).", ". sys_time_stamp().")";
-		if(!execute_sql($sql))
-			$errstr = _('Error adding group.') . ' (' . ErrorMsg() .')';
-	}
-	if(!empty($_GET['del'])) {
-		if($_GET['del'] == 'superuser') {
-			$errstr = _('Error deleting group.');
-		} else {
-			$sql = "SELECT count(d.username) FROM ".$GLOBALS['ESPCONFIG']['designer_table']." d WHERE d.realm=". _addslashes($_GET['del']);
-			$count = get_one($sql);
-			if ($count > 0) {
-				$errstr = _('Group is not empty.');
-			} else {
-				$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['realm_table']." WHERE name=". _addslashes($_GET['del']);
-				if(!execute_sql($sql))
-					$errstr = _('Error deleting group.');
-			}
-		}
-	}
-	$sql = 'SELECT r.name, r.title, count(d.username) FROM '.$GLOBALS['ESPCONFIG']['realm_table'].' r LEFT JOIN '.$GLOBALS['ESPCONFIG']['designer_table'].' d ON r.name=d.realm GROUP BY r.name, r.title ORDER BY r.name';
-	$sql2 = 'SELECT count(d.username) FROM '.$GLOBALS['ESPCONFIG']['realm_table'].' r LEFT JOIN '.$GLOBALS['ESPCONFIG']['respondent_table'].' d ON r.name=d.realm GROUP BY r.name ORDER BY r.name';
-	$result = execute_sql($sql);
-	$result2 = execute_sql($sql2);
-	
-	$i = 0;
-	$bg = $ESPCONFIG['bgalt_color2'];
-?>
-<h2><?php echo(_('Manage Groups')); ?></h2>
-<?php if(!empty($errstr)) echo('<p>'. mkerror($errstr) ."</p>\n"); ?>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<input type="hidden" name="where" value="groups" />
-<table cellspacing="0" cellpadding="4" style="width: 550px;">
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<th><?php echo(_('Group')); ?></th>
-		<th><?php echo(_('Description')); ?></th>
-		<th><?php echo(_('Members')); ?></th>
-		<td>&nbsp;</td>
-	</tr>
-<?php
-	while(list($realm, $title, $count) = fetch_row($result)) {
-        $result->MoveNext();
-        $result2->Move($i++);
-		$count += $result2->fields[0];
-
-		if ($bg == $ESPCONFIG['bgalt_color1'])
-			$bg =& $ESPCONFIG['bgalt_color2'];
-		else
-			$bg =& $ESPCONFIG['bgalt_color1'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td class="left"><?php echo($realm);  ?></td>
-		<td class="left"><?php echo($title);  ?></td>
-		<td class="left"><?php echo($count);  ?></td>
-                <td class="left"><?php echo ($count ?
-                        "&nbsp;" :
-                        "<a href=\"". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=groups&del=$realm")."\">".
-_('Delete') ."</a>"); ?></td>
-	</tr>
-<?php
-	}
-	db_close($result);
-	db_close($result2);
-	
-	if ($bg == $ESPCONFIG['bgalt_color1'])
-		$bg =& $ESPCONFIG['bgalt_color2'];
-	else
-		$bg =& $ESPCONFIG['bgalt_color1'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td class="left"><input type="text" size="16" maxlength="16" name="r" /></td>
-		<td class="left"><input type="text" size="32" maxlength="64" name="t" /></td>
-		<td>&nbsp;</td>
-		<td class="left"><input type="submit" name="add" value="<?php echo(_('Add')); ?>"/></td>
-	</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/test.inc
===================================================================
--- admin/include/where/test.inc	(revision 6370)
+++ admin/include/where/test.inc	(working copy)
@@ -1,167 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: test.inc,v 1.26 2007/12/17 08:45:30 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	/* get the sid ... if any */
-	if(!empty($_REQUEST['sid']))
-		$sid = intval($_REQUEST['sid']);
-
-    $bg = '';
-
-	/* sid selected for testing */
-	if(!empty($sid)) {
-		$sql = "SELECT status,owner,realm,theme FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${sid}";
-		$result = execute_sql($sql);
-		list($status,$owner,$realm,$theme) = fetch_row($result);
-		db_close($result);
-
-		/* check ACL to see if user is allowed to test
-		 * _this_ survey */
-		$realms = array_intersect(
-				$_SESSION['acl']['pall'],
-				$_SESSION['acl']['pdesign']);
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				$owner != $_SESSION['acl']['username'] &&
-				!in_array($realm, $realms) &&
-				!auth_no_access(_('to access this survey'))) {
-			return;
-		}
-		if (($status & STATUS_TEST) &&
-			!($status & (STATUS_DONE | STATUS_DELETED | STATUS_ACTIVE))) {
-			/* cleared for testing ... was that enough tests? */
-?>
-</div>
-</form>
-<?php
-
-			/* make the css style available during the testing.
-			 * this should really go into the head section ...
-			 * but should still work */
-			if (!empty($theme))
-				echo('<link rel="stylesheet" href="' .
-						$GLOBALS['ESPCONFIG']['css_url'].$theme . '" type="text/css">');
-?>
-<b><?php echo(_('Testing Survey...')); ?></b> (<?php echo(_('SID')." = $sid"); ?>)
-<p>
-<?php
-			/* set things up for the handler to take over ... */
-			$test = true;
-			unset($_REQUEST['sid']);
-			$_POST['userid'] = 'test';
-			define('ESP-FIRST-INCLUDED', true);
-			define('ESP-AUTH-OK', true);
-			$_POST['sec'] = empty($_POST['sec']) ? 1 : intval($_POST['sec']);
-			$_POST['rid'] = empty($_POST['rid']) ? 0 : intval($_POST['rid']);
-			include($ESPCONFIG['handler']);
-?>
-<a href="<?php echo(htmlentities($ESPCONFIG['ME']."?where=results&sid=".$sid)) ?>&test=1"><?php echo(_('View Results')); ?></a><br>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<form><div>
-<?php
-			db_close($result);
-			return;
-		}
-	}
-
-	/* no survey selected ... show a menu to choose from */
-
-	/* check with ACL for allowed surveys */
-	/* load names and titles of all surveys available to
-	 * _this_ user */
-	$statusbad = (STATUS_DONE | STATUS_DELETED | STATUS_ACTIVE);
-	$statusok = STATUS_TEST;
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = "SELECT id,name,title,owner,realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']."
-		WHERE ".db_bin("status",$statusok) ." AND NOT ".db_bin("status", $statusbad)."
-		ORDER BY id DESC";
-	} else {
-		$realms = array_to_insql(
-			array_intersect(
-				$_SESSION['acl']['pall'],
-				$_SESSION['acl']['pdesign']));
-		$sql = "SELECT id,name,title,owner,realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']."
-			WHERE ".db_bin("status",$statusok) ."AND NOT ".db_bin("status",$statusbad) ."AND
-			(owner = ". _addslashes($_SESSION['acl']['username']) ." || realm $realms)
-			ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-
-?>
-</div>
-</form>
-<h2><?php echo(_('Test a Survey')); ?></h2>
-<?php echo(_('Pick Survey to Test')); ?>
-<table cellspacing="0" cellpadding="4">
-	<tr class="header">
-		<th><?php echo(_('ID')); ?></th>
-		<th><?php echo(_('Name')); ?></th>
-		<th><?php echo(_('Title')); ?></th>
-		<th><?php echo(_('Owner')); ?></th>
-		<th><?php echo(_('Group')); ?></th>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<th><?php echo(_('Export')); ?></th>
-	</tr>
-<?php
-	while(list($sid,$name,$title,$owner,$realm) = fetch_row($result)) {
-        $result->MoveNext();
-
-		if($bg != $ESPCONFIG['bgalt_color1'])
-			$bg = $ESPCONFIG['bgalt_color1'];
-		else
-			$bg = $ESPCONFIG['bgalt_color2'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td><?php echo($sid); ?></td>
-		<td><?php echo($name); ?></td>
-		<td><?php echo($title); ?></td>
-		<td><?php echo($owner); ?></td>
-		<td><?php echo($realm); ?></td>
-        <td><a href="<?php echo(htmlentities("". $GLOBALS['ESPCONFIG']['ME'] ."?where=test&sid=${sid}&test=1")); ?>"><?php echo(_('Test')); ?></a> (<a href="<?php echo (htmlentities("". $GLOBALS['ESPCONFIG']['autopub_url'] ."?name=${name}&test=1")); ?>"><?php echo(_('standalone')); ?>)</td>
-		<td><a href="<?php echo(htmlentities("". $GLOBALS['ESPCONFIG']['ME'] ."?where=results&test=1&sid=${sid}")); ?>"><?php echo(_('Results')); ?></a></td>
-		<td style="font-size: xx-small; vertical-align: top;">
-        <form id="export<?php echo($sid) ?>" action="<?php echo($GLOBALS['ESPCONFIG']['ME']) ?>">
-	<div>
-        <select name="type">
-            <option value="csv_full_header" selected="selected">CSV Full Headers</option>
-            <option value="csv_short_header">CSV Short Headers</option>
-            <option value="tab">Tab</option>
-        </select>
-        <input type="hidden" name="test" value="1" />
-        <input type="hidden" name="sid" value="<?php echo($sid) ?>" />
-        <input type="hidden" name="where" value="" />
-        <div class="exportsave">
-			<?php echo('<a href="javascript: exportSubmit(\'export\', document.getElementById(\'export'.$sid.'\'));" title="Save CSV Long Header (old method). Save the results for \''.$name.'\' to the survey in CSV Format (Comma Delimted File). Column Titles are based on question text.">' . _('Save On Server') . '</a>');
-            echo("\n");?>
-			| <?php
-			echo('<a href="javascript: exportSubmit(\'download\', document.getElementById(\'export'.$sid.'\'));" title="Download CSV Long Header (old method). Download the results for \''.$name.'\' to your computer in CSV Format (Comma Delimted File). Column Titles are based on the question text. Click this link and select \'Save\' when prompted by your browser.">' . _('Download') . '</a>'); ?>
-            </div>
-            </div></form>
-		</td>
-	</tr>
-<?php
-	}
-?>
-</table>
-
-<form method="post" action="" id="null">
-<div>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/reset.inc
===================================================================
--- admin/include/where/reset.inc	(revision 6370)
+++ admin/include/where/reset.inc	(working copy)
@@ -1,25 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: reset.inc,v 1.4 2003/03/28 03:42:47 jimmerman Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	@session_unregister('survey_id');
-	@session_destroy();
-	include(esp_where('index'));
-?>
Index: admin/include/where/surveyclass.inc
===================================================================
--- admin/include/where/surveyclass.inc	(revision 6370)
+++ admin/include/where/surveyclass.inc	(working copy)
@@ -1,119 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-ini_set('display_errors','1');
-error_reporting(E_ALL);
-	
-//session_register('new_survey');
-//session_register('last_tab');
-//session_register('curr_q');
-
-/* Use this hack to work around how PHP handles session vars.
- * When Register_Globals is on, the value of the global $foo
- * is saved, and $_SESSION['foo'] is ignored.
- * When Register_Globals is off, the global $foo is ignored
- * and $_SESSION['foo'] is saved.
- * By making $_SESSION['foo'] a copy of $foo
- * when reg_glob is on, we can use $_SESSION uniformly
- * from here on, regardless of the INI settings.
- */
-if(ini_get('register_globals')) {
-	//$_SESSION['project_name']  = $project_name;
-	//$_SESSION['new_survey'] = $new_survey;
-	//$_SESSION['last_tab']   = $last_tab;
-	//$_SESSION['curr_q']     = $curr_q;
-}
-
-
-require ESP_BASE.'admin/sanitize.php';
-
-
-?>
-<h2><?php echo(_('Survey Class Testing')); ?></h2>
-<h3>Create Survey</h3>
-<?php
-if ($_POST) {
-	$data = $_POST;
-	$id = 'new';
-	$survey = new Survey('new',$data);
-} else {
-?>
-<table cellspacing="0" cellpadding="0">
-	<tr style="vertical-align: top">
-		<td class="right"><strong><?php echo(_('Name')); ?></strong></td>
-		<td class="left">
-			<?php echo mktext('name', 20, 64, $survey); ?>
-			<span class="red"><em><?php echo _('Required'); ?></em></span><br />
-			<?php echo(
-			_('Survey filename.') .' '.
-			_('This is used for all further access to this survey.')
-			.' ('. _('no spaces') .', '. _('alpha-numeric only') .')'); ?></td>
-			<!-- hardcoded, groups to be managed in other ways -->
-			<input type="hidden" name="realm" value="auto" />
-	</tr>
-	
-	
-	
-	
-	
-	<tr><td colspan="2"><hr class="line1" /></td></tr>
-	<tr style="vertical-align: top">
-		<td class="right"><strong><?php echo(_('Title')); ?></strong></td>
-		<td class="left">
-			<?php echo mktext('title', 60, 60, $survey); ?>
-			<span class="red"><em><?php echo _('Required'); ?></em></span><br />
-			<?php echo(_('Title of this survey.') .' '.
-			_('This appears at the top of every page of this survey.')
-			.' ('. _('free-form, including spaces') .')'); ?>
-		</td>
-	</tr>
-	<tr><td colspan="2"><hr class="line1" /></td></tr>
-	<tr style="vertical-align: top">
-		<td class="right"><strong><?php echo(_('Subtitle')); ?></strong></td>
-		<td class="left">
-			<?php echo mktext('subtitle', 60, 128, $survey); ?><br />
-			<?php echo(_('Subtitle of this survey.') .' '.
-			_('Appears below the title.') .' ('. _('free-form, including spaces'). ')'); ?>
-		</td>
-	</tr>
-	<tr><td colspan="2"><hr class="line1" /></td></tr>
-	<tr style="vertical-align: top">
-		<td class="right"><strong><?php echo(_('Additional Info')); ?></strong></td>
-		<td class="left">
-			<?php echo mktextarea('info', 5, 60, 'virtual', $survey); ?><br />
-			<?php echo(_('Text to be displayed on this survey before any fields.
-(i.e. instructions, background info, etc.)')); ?>
-		</td>
-	</tr>
-	
-	
-	
-	<tr><td colspan="2"><hr class="line1" /></td></tr>
-	<tr style="vertical-align: top">
-		<td class="right"><strong><?php echo(_('Email')); ?></strong></td>
-		<td class="left">
-            <?php echo mktext('email', 30, 0, $survey); ?><br />
-			<?php echo(_('Sends a copy of each submission to address (or leave blank for no email backup).')); ?></td>
-	
-	<!-- some gluecode for phpesp compatibility -->
-	<input type="hidden" name="auto_num" value="Yes" />
-		<input type="hidden" name="theme" value="" />
-		<input type="hidden" name="thank_head" value="" />
-		<input type="hidden" name="thank_body" value="" />
-		<input type="hidden" name="thanks_page" value="" />
-	
-	</tr>   
-      
-</table>
-		<input type="hidden" name="where" value="surveyclass" />
-<input type="submit" />
-<?php } ?>
\ No newline at end of file
Index: admin/include/where/cancel.inc
===================================================================
--- admin/include/where/cancel.inc	(revision 6370)
+++ admin/include/where/cancel.inc	(working copy)
@@ -1,55 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: cancel.inc,v 1.10 2005/08/01 16:12:55 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	session_register('survey_id');
-	session_register('survey_realm');
-	if(ini_get('register_globals')) {
-		$_SESSION['survey_id']    = &$survey_id;
-		$_SESSION['survey_realm'] = &$survey_realm;
-	}
-
-	if(empty($_SESSION['survey_id'])) {
-		// no survey INSERTed yet, so just go back to management interface
-		$_SESSION['survey_id']    = '';
-		$_SESSION['survey_realm'] = '';
-		include(esp_where('index'));
-		return;
-	}
-
-	$sql = "SELECT status FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE	id=".$_SESSION['survey_id'];
-	$result = execute_sql($sql);
-	if(count($result) < 1) {
-		db_close($result);
-		$_SESSION['survey_id']    = '';
-		$_SESSION['survey_realm'] = '';
-		include(esp_where('index'));
-		return;
-	}
-	$status = $result->fields[0];
-	db_close($result);
-	$status |= STATUS_DELETED;
-	$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['survey_table']." SET status=${status} WHERE id=".$_SESSION['survey_id'];
-	execute_sql($sql);
-	$_SESSION['survey_id']    = '';
-	$_SESSION['survey_realm'] = '';
-	include(esp_where('index'));
-	return;
-?>
Index: admin/include/where/activateproject.inc
===================================================================
--- admin/include/where/activateproject.inc	(revision 6370)
+++ admin/include/where/activateproject.inc	(working copy)
@@ -1,86 +0,0 @@
-<?php
-if (!$_GET['id']) {
-	die('No Project ID Supplied!');
-}
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	include('../include_all.php');
-
-	if ($_POST['activating'] == 'yeahimdoingit') {
-		$project = new Project;
-		$pid = $_GET[id];
-		$project->init($pid);
-		
-		$preid = $project->details['pre_id'];
-		$postid = $project->details['post_id'];
-		if (is_numeric($pid) AND $pid > 0 AND $postid) {
-			$project->init($pid);
-			$data = array('status'=>'2');
-			$surveydata = array('status'=>'1');
-			if ($preid) {
-				$pre_survey = new Survey($preid);
-				$preresult = $pre_survey->update($surveydata);
-				if (!$preresult) {
-					$err[] = 'Error Updating Pre-Survey Status';
-				}
-			}
-			if ($postid) {
-				$post_survey = new Survey($postid);
-				$postresult = $post_survey->update($surveydata);
-				if (!$postresult) {
-					$err[] = 'Error Updating Post-Survey Status';
-				}
-			}
-		
-			$editresult = $project->update($data);
-			if (is_array($editresult)) {
-				$errors = $editresult;
-			} else {
-			
-				$onload = ' onLoad="self.parent.window.location=\'http://vulab.yorku.ca/admin/manage.php?success=activatedproject\';setTimeout(self.parent.tb_remove(),6000);" ';
-			}
-			
-		}
-		if (!$postid) {
-			$errors[] = '<h2><center>You must have a post-test survey assigned to this project to activate it!</center></h2>';
-			$errors[] = '<center><p><strong><a href="#post-survey" onClick="self.parent.window.location=\'http://vulab.yorku.ca/admin/manage.php?where=create&pid='.$pid.'&step=3\'">Continue to Post-Test Survey Creation</a></strong></p></center>';
-		}
-	}
-}
-?>
-<html>
-<head>
-<link href="http://vulab.yorku.ca/admin/style.css" rel="stylesheet" type="text/css" />
-</head>
-<body <?=$onload;?>>
-<div class="padded">
-<br/>
-<center>
-<?php
-if ($_SERVER['REQUEST_METHOD'] == 'POST') { 
-
-	if ($errors) { 
-		echo "<div class='errors'>";
-		foreach ($errors as $error) {
-			echo $error;
-		}
-		echo "</div>";
-	} else {
-		echo "<h1><center>Success!<br/>You have activated this project</center></h1>";
-	}
-
-} else { ?>
-
-<form action="/admin/manage.php?where=activateproject&lay=ajax&id=<?=$_GET[id]?>" method="post">
-<h2><center>Your project will be set to active!</center></h2>
-<p>Would you like to start gathering data with this project?</p>
-<p><em>Note</em>:You <strong>won't</strong> be able to modify any of the surveys you've associated with this project</p>
-<input type="hidden" name="pid" value="<?=$_GET[id]?>" />
-<input type="hidden" name="activating" value="yeahimdoingit" />
-<input type="submit" value="Yes, Activate This Project!" />
-<input type="button" value="Cancel" onClick="self.parent.tb_remove();"/>
-</form>
-<? }  ?>
-</center>
-</div>
-</body>
-</html>
\ No newline at end of file
Index: admin/include/where/manage.inc
===================================================================
--- admin/include/where/manage.inc	(revision 6370)
+++ admin/include/where/manage.inc	(working copy)
@@ -1,169 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-if ($where == 'manage') {
-
-//error_reporting(E_ALL);
-/* $Id: manage.inc,v 1.32 2007/12/03 13:08:13 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-$base =& $GLOBALS['ESPCONFIG']['ME'];
-$bg = '';
-//$drafts_array = filter_projects_bystatus(get_projects_byowner($_SESSION[acl]['userid']),1,'==');
-//$active_array = filter_projects_bystatus(get_projects_byowner($_SESSION[acl]['userid']),2,'==');
-//$complete_array = filter_projects_bystatus(get_projects_byowner($_SESSION[acl]['userid']),6,'==');
-
-
-$drafts_array = get_projects_by($_SESSION[acl]['userid'],1,'editstamp DESC');
-$active_array = get_projects_by($_SESSION[acl]['userid'],2);
-$complete_array = get_projects_by($_SESSION[acl]['userid'],3);
-
-?>
-<?php /*<h4>You have <?php echo  count($drafts_array); ?> draft projects</h4>*/ ?>
-<? /* <h4>You have <?php echo count($active_array); ?> active projects</h4>*/ ?>
-<br />
-<div id="container">
-<?php if ($_GET[success] == 'deletedproject') {
-	echo "<div id=\"goods\">You have successfully deleted the project!</div>";
-	echo '<script type="text/javascript">
-			$(document).ready(function() {
-				$("#goods").animate({opacity: 1.0}, 2500).fadeOut("slow")
-			});
-		</script>
-	';
-}
-?>
-<?php if ($_GET[success] == 'activatedproject') {
-	echo "<div id=\"goods\">You have successfully <strong>activated</strong> the project!</div>";
-	echo '<script type="text/javascript">
-			$(document).ready(function() {
-				$("#goods").animate({opacity: 1.0}, 2500).fadeOut("slow")
-			});
-		</script>
-	';
-}
-?>
-<?php if ($_GET[success] == 'deactivatedproject') {
-	echo "<div id=\"goods\">You have successfully <strong>deactivated</strong> the project!</div>";
-	echo '<script type="text/javascript">
-			$(document).ready(function() {
-				$("#goods").animate({opacity: 1.0}, 2500).fadeOut("slow")
-			});
-		</script>
-	';
-}
-?>
-<div class="titlebar">
-	<div class="left">
-		<h1><?php echo(_('My Projects')); ?></h1>
-	</div>
-	<div class="right">
-	<h3>
-		<img src="../images/add.png" class="icon"/><a href="?where=create">Create a New Project</a>
-	</h3>
-	</div>
-</div>
-<? /*<div id="col_left" class="column">*/ ?>
-<div class="clear"></div>
-<div class="column box width3 height3">
-<h2 style="text-align:left;"><?php echo(_('Draft(s)')); ?></h2>
-<h5>Projects I'm working on</h5><br />
-	<?php
-		$fields = array('name');
-		$options = array('titles'=>false,'status'=>'draft','sort'=>'editstamp');
-		if (count($drafts_array) > 0) {
-			echo display_projects_table($fields,$drafts_array,$options);
-			echo "<h5><a href='?where=viewall&type=draft' class='right'>View All Draft Projects</a></h5>";
-		} else {
-		
-		echo "<em>You don't have any draft projects yet</em><br /><br /><br /><br /><br /><br /><br />";
-		}
-	?>
-</div>
-<div class="column box width3 height3">
-	<h2><?php echo(_('Active')); ?></h2>
-	<h5>Projects gathering data</h5><br />
-	<?php
-		$fields = array('name');
-		$options = array('titles'=>false,'status'=>'active');
-		if (count($active_array) > 0) {
-			echo display_projects_table($fields,$active_array,$options);
-			echo "<h5><a href='?where=viewall&type=active' class='right'>View All Active Projects</a></h5>";
-		} else {
-		
-		echo "<em>You don't have any active projects yet</em><br /><br /><br /><br /><br /><br /><br/>";
-		}
-	?>
-</div>
-
-<div class="column box width3 height3">
-	<h2><?php echo(_('Completed')); ?></h2>
-	<h5>Projects finished collecting data</h5><br />
-	<?php
-		$fields = array('name');
-		$options = array('titles'=>false,'status'=>'complete','link'=>'?where=viewcompleted&pid=<pid>');
-		if (count($complete_array) > 0) {
-			echo display_projects_table($fields,$complete_array,$options);
-			echo "<h5><a href='?where=viewall&type=completed' class='right'>View All Completed Projects</a></h5>";
-		} else {
-		
-		echo "<em>You don't have any closed projects yet</em><br /><br /><br /><br /><br /><br /><br />";
-		}
-	?>
-</div>
-<div class="clear"></div>
-<?php 
-/* 
-######
-## Taken out until Implemented
-######
-<div class="titlebar topped">
-	<div class="left">
-		<h1><?php echo(_('My Survey Templates')); ?></h1>
-	</div>
-	
-	<div class="right">
-	<h3>
-		<img src="../images/add.png" class="icon"/><a href="?where=create">Create Survey Template</a>
-	</h3>
-	</div>
-</div>
-<div class="column clear">
-<div class="column box width3 height3">
-<h5>Generic Templates to be Reused</h5><br />
-	<?php
-		$fields = array('name');
-		$options = array('titles'=>false,'status'=>'draft','sort'=>'editstamp');
-		if (count($drafts_array) > 0) {
-			echo display_projects_table($fields,$drafts_array,$options);
-			echo "<h5><a href='?where=viewall&type=draft' class='right'>View All Draft Projects</a></h5>";
-		} else {
-		
-		echo "<em>You don't have any draft projects yet</em><br /><br /><br /><br /><br /><br /><br />";
-		}
-	?>
-</div>*/ ?>
-</div>
-<? /*</div>
-</div><!-- col_left -->
-<div id="col_right" class="column">
-</div>*/ ?>
-
-
-<?php } ?>
-</div>
\ No newline at end of file
Index: admin/include/where/help.inc
===================================================================
--- admin/include/where/help.inc	(revision 6370)
+++ admin/include/where/help.inc	(working copy)
@@ -1,551 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-# $Id: help.inc,v 1.21 2007/12/07 15:15:04 liedekef Exp $
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-//
-// Modified by Aaron Axelsen
-// <axelseaa@amadmax.com>
-?>
-
-<table class="help">
-  <tr>
-    <td colspan="2" style="border-bottom:1px dashed #000000"><h1 id="top">Survey Resource</h1></td>
-  </tr>
-  <tr>
-    <td style="vertical-align:top; width:125px; border-right:1px dashed #000000;"><div class="menu"> <a href="#new" style="text-decoration:none;">Create a Survey</a>
-        <ul>
-          <li><a href="#general_tab" style="text-decoration:none; font-size:80%;">General Tab</a></li>
-          <li><a href="#question_tab" style="text-decoration:none; font-size:80%;">Question Tab</a></li>
-          <li><a href="#order_tab" style="text-decoration:none; font-size:80%;">Order Tab</a></li>
-          <li><a href="#condition_tab" style="text-decoration:none; font-size:80%;">Condition Tab</a></li>
-          <li><a href="#preview_tab" style="text-decoration:none; font-size:80%;">Preview Tab</a></li>
-          <li><a href="#finish_tab" style="text-decoration:none; font-size:80%;">Finish Tab</a></li>
-        </ul>
-        <a href="#edit" style="text-decoration:none;">Edit a Survey</a><br />
-        <a href="#test" style="text-decoration:none;">Test a Survey</a><br />
-        <a href="#status" style="text-decoration:none;">Publishing a Survey</a><br />
-        <a href="#themes" style="text-decoration:none;">Themes</a><br />
-        <ul>
-          <li><a href="#create" style="text-decoration:none; font-size:80%;">Create</a></li>
-          <li><a href="#assign" style="text-decoration:none; font-size:80%;">Assign</a></li>
-        </ul>
-        <a href="#types" style="text-decoration:none;">Response Types/Uses</a>
-        <ul>
-          <li><a href="#yes_no" style="text-decoration:none; font-size:80%;">Yes/No</a></li>
-          <li><a href="#textbox" style="text-decoration:none; font-size:80%;">Textbox</a></li>
-          <li><a href="#essay" style="text-decoration:none; font-size:80%;">Essay</a></li>
-          <li><a href="#radio" style="text-decoration:none; font-size:80%;">Radio Buttons</a></li>
-          <li><a href="#check" style="text-decoration:none; font-size:80%;">Check Boxes</a></li>
-          <li><a href="#dropdown" style="text-decoration:none; font-size:80%;">Dropdown Box</a></li>
-          <li><a href="#rating" style="text-decoration:none; font-size:80%;">Rate</a></li>
-          <li><a href="#date" style="text-decoration:none; font-size:80%;">Date</a></li>
-          <li><a href="#numeric" style="text-decoration:none; font-size:80%;">Numeric</a></li>
-          <li><a href="#session_text" style="text-decoration:none; font-size:80%;">Session text</a></li>
-        </ul>
-	<p>
-        <a href="#types" style="text-decoration:none;">Response Types Examples</a>
-	</p>
-        <a href="#results" style="text-decoration:none;">Survey Results</a>
-        <ul>
-          <li><a href="#analysis" style="text-decoration:none; font-size:80%;">Cross Analysis</a></li>
-          <li><a href="#tabulation" style="text-decoration:none; font-size:80%;">Cross Tabulation</a></li>
-          <li><a href="#csv" style="text-decoration:none; font-size:80%;">Exporting to CSV</a></li>
-        </ul>
-        <a href="#admin" style="text-decoration:none;">Administration</a>
-        <ul>
-          <li><a href="#batch" style="text-decoration:none; font-size:80%;">Batch Account Creation</a></li>
-        </ul>
-      </div></td>
-    <td rowspan="2"><h2 id="new">Creating a Survey</h2>
-      <p style="padding-left:10px;">Click <strong><a href="manage.php?where=new" onclick="window.open(this.href,'_blank');return false;">Create a New Survey</a></strong> from the Management Interface.</p>
-      <h3 style="padding-left:10px;">General Tab:</h3>
-      <ul>
-        <li>
-          <p>Enter a name for the survey in the <strong>name</strong> field. Do not use spaces in this name, think of this as a filename. Underscore's are acceptable.</p>
-        </li>
-        <li>
-          <p>Choose a <strong>group</strong> to own this survey. Unless you are creating a survey as root, you will only be permitted to choose the group of which you are a member.</p>
-        </li>
-        <li>
-          <p>Fill out the <strong>title</strong>, <strong>subtitle</strong>, and <strong>info</strong> fields. These fields will be used in the creation of a header for the final survey.</p>
-        </li>
-        <li>
-          <p>If you would like to be emailed a copy of each submitted survey, enter a valid email address in the <strong>email</strong> field. Leave this BLANK, unless your data needs to be backed up.</p>
-        </li>
-        <li>
-          <p>If you would like to theme your survey select the appropriate theme from the dropdown list. This will establish a link to a specific css style sheet for your survey. To design a theme please refer to the section: <strong><a href="#themes">Themes</a></strong>.</p>
-        </li>
-        <li>
-          <p>The <strong>Confirmation Page</strong> is the page users will be shown after filling out the survey online. Fill in the <strong>heading</strong> and <strong>body text</strong> for the this page, or leave them blank to use the default.</p>
-        </li>
-        <li>
-          <p>Click continue, or click the <strong>Questions</strong> tab at the top to proceed to the questions section.</p>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;">Questions Tab:</h3>
-      <ul>
-        <li>
-          <p>Enter the text of your question (i.e. <em>What is your favorite color?</em>) in the <strong>question</strong> box. Optionally enter a <strong>field name</strong> for this question, if you leave it blank one will be generated for you.</p>
-          <p>If you would like to require the user to respond to this question, select <strong>yes</strong> in the <strong>required</strong> field.</p>
-          <p>Choose the <strong>type of response</strong> for this question.[<a href="#types">Click here to see Examples</a>.] Different types may have parameters to change how they behave, consult the chart below for the use of the <strong>length</strong> and <strong>precision</strong> fields.</p>
-          <table>
-            <tr>
-              <th align="left">Type</th>
-              <th align="left">Length</th>
-              <th align="left">Precision</th>
-            </tr>
-            <tr>
-              <td colspan="3"><hr /></td>
-            </tr>
-            <tr>
-              <td>Yes/No</td>
-              <td>n/a</td>
-              <td>n/a</td>
-            </tr>
-            <tr>
-              <td>Textbox</td>
-              <td>length of the box</td>
-              <td>max length of the text</td>
-            </tr>
-            <tr>
-              <td>Essay</td>
-              <td>columns</td>
-              <td>rows</td>
-            </tr>
-            <tr>
-              <td>Radio</td>
-              <td>n/a</td>
-              <td>n/a</td>
-            </tr>
-            <tr>
-              <td>Checkboxes</td>
-              <td>min #</td>
-              <td>max # <em>(not implemented yet)</em></td>
-            </tr>
-            <tr>
-              <td>Dropdown</td>
-              <td>n/a</td>
-              <td>n/a</td>
-            </tr>
-            <tr>
-              <td>Rate</td>
-              <td>1..N</td>
-              <td>Use "N/A"</td>
-            </tr>
-            <tr>
-              <td>Date</td>
-              <td>n/a</td>
-              <td>n/a</td>
-            </tr>
-            <tr>
-              <td>Numeric</td>
-              <td>length</td>
-              <td>precision</td>
-            </tr>
-          </table>
-          <p>If you chose a response type that has answer options, fill in one answer per line on the bottom half of the form. If you need more lines, click <strong>Add another answer line</strong>. [Question types with answer options are: Check Boxes, Dropdown Box, Radio Buttons, Rate.] For check boxes and radio buttons, you may enter <tt>&quot;!other&quot;</tt> on a line to create a fill in the blank option. An &quot;Other&quot; box defaults to using the prompt <em>Other: </em>, but is configurable by using the format: <br />
-          </p>
-          <div style="text-align: center"> <tt>!other=prompt text</tt> </div>
-          <p>Add more questions by clicking the <strong>New Question</strong> button. Edit/View existing questions by clicking the question numbers at the top of the form. </p>
-          <p> </p>
-          <p>Click continue, or click the <strong>Questions</strong> tab at the top to proceed to the questions section.</p>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;"><a id="order_tab">Order Tab:</a></h3>
-      <ul>
-        <li>
-          <p>On this tab, you can change the order of the questions, delete questions, and insert <strong>section</strong> breaks. A section break divides your survey into multiple pages (good for long surveys).</p>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;"><a id="condition_tab">Condition Tab:</a></h3>
-      <ul>
-        <li>
-          <p>On this tab, you can change define conditions on questions, so a question is only shown when a condition is met.<br />
-	     All conditions are "OR" conditions, so if one conditions is fullfilled, the question is shown.<br />
-	     A question that has a condition must be an optional question. So, if you define a condition on a question, the "Required" parameter is set to "No".<br />
-	     A question that has a condition must be on the next page than the question/value that is used to compare it with. Use the "Order tab" to insert a section break where wanted (this is NOT done automatically).<br />
-             A Yes/No question can only be compared using the values "Yes or "No".
-	</p>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;"><a id="preview_tab">Preview Tab:</a></h3>
-      <ul>
-        <li>
-          <p>Shows a preview of your survey. You can switch to this tab at any time to see what your survey will look like. If you would like to make changes, go back to the appropriate tab and make the changes. If you are satisfied with the survey, click the <strong>Finish</strong> tab or button at the bottom of the page.</p>
-          <p>NOTE: The <strong>Next Page</strong> and <strong>Submit Survey</strong> buttons are inactive in the preview mode.</p>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;"><a id="finish_tab">Finish Tab:</a></h3>
-      <ul>
-        <li>
-          <p>Shows you the block of PHP code that you need to paste into the HTML of your webpage to embed the survey.</p>
-          <p>Once a survey is finished, you may return to editing it by choosing <strong>Edit an Existing Survey</strong> from the Management Interface. When all final edits are done, you need to change the survey status from <strong>new</strong> to <strong>test</strong> or <strong>active</strong> mode. You can change the status by choosing <strong>Change the Status of an Existing Survey</strong> from the Management Interface.</p>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <hr style="width:100%;" />
-      <h2 id="edit">Editing a Survey</h2>
-      <ul>
-        <li>Editing a survey uses the same interface as creating a new survey, refer to the help for creating a new survey for more details.</li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <hr style="width:100%;" />
-      <h2 id="test">Testing a Survey</h2>
-      <ul>
-        <li>After you have created a survey you can put it into testing mode. This allows you to access a live copy of it from the Management Interface. You can fill out the survey, and view the results by choosing <strong>Test a Survey</strong>. In order to test a survey it must be set to <strong>test</strong> mode from the <strong>Status</strong> section.</li>
-        <li>NOTE: Once a survey is moved from <strong>new</strong> designation to <strong>test</strong> you can no longer make changes. If you just want to see how it will look, not test functionality, please use the <strong>preview</strong> option available in when <strong>editing</strong> or <strong>creating</strong> a survey.</li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <hr style="width:100%;" />
-      <h2 id="status">Publishing a Survey</h2>
-      <ul>
-        <li>Once you have created/edited a survey, and are ready to make it available online you must activate it. Go to the Management Interface, click <strong><a href="manage.php?where=status" onclick="window.open(this.href,'_blank');return false;">Change the Status of a Survey</a></strong>. Find the survey you want to activate. Make note of the survey ID(SID) and the name(SURVEYNAME). </li>
-        <li>NOTE: At this point you must <strong>activate</strong> the survey. This is a one way operation. After it has been activated, you can no longer edit or test this survey. All results gathered in testing mode (if any) will be cleared by activating it.</li>
-        <li>Click on the <strong>Activate</strong> link for your survey. At this point your survey is active.</li>
-        <li>To insert the survey into an existing page you must place a PHP tag in the HTML for the page.
-          <ul>
-            <li>NOTE: This code was also given to you on the <strong>Finish</strong> tab of the survey design.</li>
-            <li>To access an active survey, goto
-              <p><tt><?php echo($ESPCONFIG['autopub_url']."?name=SURVEYNAME"); ?></tt></p>
-            </li>
-            <li>To embed an active survey within another php document, add the following code:
-              <p><tt>&lt;?php $sid=<em>SID</em>; $results=1; include('<?php echo($GLOBALS['ESPCONFIG']['handler']); ?>'); ?&gt;</tt></p>
-            </li>
-          </ul>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <hr style="width:100%;" />
-      <h2 id="themes">Themes</h2>
-      <h3 style="padding-left:10px;"><a id="create">Creating Themes</a></h3>
-      <ul>
-        <li>To download a template to create your own css style sheet, click <a href="<?php echo($ESPCONFIG['base_url']);?>public/css/template.css" onclick="window.open(this.href,'_blank');return false;">here</a>.</li>
-        <li>An example page outlining where css classes are applied is available <a href="<?php echo($ESPCONFIG['base_url']);?>examples/classes.html" onclick="window.open(this.href,'_blank');return false;">here</a>.</li>
-      </ul>
-      <!--creating themes info
-		<li>All themes (css style sheets) are contained within the css
-		directory which is, by default, located in the public directory
-		of this package (and its path is definable in the phpESP.ini.php file).
-		Please ensure that all your css files are
-		contained within this directory. In this directory you will find
-		the <strong>template.css</strong>. To create a new theme simply copy the
-		the template.css file and edit the class definitions.<strong> Do not
-		    alter the class names</strong>. Greater style flexibility is assured
-		by not redefining html tags but rather by assigning classes to
-		these tags. <a href="../examples/classes.html" target="#themes">
-		    Click here</a> to see what these classes actually define.
-		Once you've saved your new theme it will become available for
-		selection from the dropdown list that is found on the <strong>general
-		    tab</strong> page.
-		</li></ul>
-		-->
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;"><a id="assign">Assigning Themes</a></h3>
-      <ul>
-        <li>Themes can be assigned either when you create a new survey, or when you edit an existing survey. Select the <strong><a href="#general_tab">General Tab</a></strong>, navigate to the drop down box near the bottom of the page, and select the appropiate theme you wish to use.</li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <hr style="width:100%;" />
-      <h2 id="types">Response Types</h2>
-      <h3 style="padding-left:10px;" id="yes_no">Yes/No</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use this for questions that will require a basic yes/no answer.</dd>
-          </dl>
-        </li>
-        <li>Example:
-          <dl>
-            <dd>
-              <input type="radio" name="bool" />
-              Yes</dd>
-            <dd>
-              <input type="radio" name="bool" />
-              No</dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="textbox">Text Box</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use this for questions that require a one line answer. Note: the size of the textbox can be set using the <strong>length</strong> field, he maximum length of the textbox can be set using the <strong>precision</strong> field.</dd>
-          </dl>
-        </li>
-        <li>Example:
-          <dl>
-            <dd>
-              <input type="text" size="30" />
-            </dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="essay">Essay</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use this for questions in requiring an answer in essay format. Note: The col and row width of the essay area can be set be using the <strong>length</strong> and <strong>precision</strong> fields.</dd>
-          </dl>
-        </li>
-        <li>Example:
-          <dl>
-            <dd>
-              <textarea cols="40" rows="4"></textarea>
-            </dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="radio">Radio Buttons</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use radio buttons for questions that have a set of possible answers, but only one can be selected.</dd>
-          </dl>
-        </li>
-        <li>Example:
-          <dl>
-            <dd>
-              <input type="radio" name="radio" />
-              Option 1</dd>
-            <dd>
-              <input type="radio" name="radio" />
-              Option 2</dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="check">Check Boxes</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use check boxes for questions that have a set of possible answers out of which multiple can be selected.</dd>
-          </dl>
-        </li>
-        <li>Example:
-          <dl>
-            <dd>
-              <input type="checkbox" />
-              Option 1</dd>
-            <dd>
-              <input type="checkbox" />
-              Option 2</dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="dropdown">Dropdown Box</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use this to drop down a list of possible selections. For example, what state are you from? The drop down menu would then produce the list of states.</dd>
-          </dl>
-        </li>
-        <li>Example:
-          <dl>
-            <dd>
-              <select>
-                <option></option>
-                <option>Option 1</option>
-                <option>Option 2</option>
-              </select>
-            </dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="rating">Rate (scale 1..N)</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use this for questions that require a rating. You can have a rating scale of 1 to N, set by the <strong>length</strong> field. Multiple options can also be added to the rating block as you see below. To show an extra column "N/A", set the <strong>precision</strong> field to 1.</dd>
-          </dl>
-        </li>
-        <li>Example:
-          <dl>
-            <dd>
-              <blockquote>
-                <table border="0" cellspacing="1" cellpadding="0">
-                  <tr>
-                    <td></td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;">1</td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;">2</td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;">3</td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;">4</td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;">5</td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;">N/A</td>
-                  </tr>
-                  <tr>
-                    <td>Option 1</td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;"><input type="radio" name="118_124" value="1" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;"><input type="radio" name="118_124" value="2" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;"><input type="radio" name="118_124" value="3" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;"><input type="radio" name="118_124" value="4" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;"><input type="radio" name="118_124" value="5" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;"><input type="radio" name="118_124" value="N/A" /></td>
-                  </tr>
-                  <tr>
-                    <td>Option 2</td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;"><input type="radio" name="118_125" value="1" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;"><input type="radio" name="118_125" value="2" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;"><input type="radio" name="118_125" value="3" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;"><input type="radio" name="118_125" value="4" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;"><input type="radio" name="118_125" value="5" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;"><input type="radio" name="118_125" value="N/A" /></td>
-                  </tr>
-                  <tr>
-                    <td>Option 3</td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;"><input type="radio" name="118_126" value="1" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;"><input type="radio" name="118_126" value="2" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;"><input type="radio" name="118_126" value="3" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;"><input type="radio" name="118_126" value="4" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#eeeeee;"><input type="radio" name="118_126" value="5" /></td>
-                    <td style="width: 40px; text-align: center; background-color:#dddddd;"><input type="radio" name="118_126" value="N/A" /></td>
-                  </tr>
-                </table>
-              </blockquote>
-            </dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="date">Date</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use this for responses that require uses to submit back a date. Configure the date format in the ini file.</dd>
-          </dl>
-        </li>
-        <li>Example:
-          <dl>
-            <dd>
-              <input type="text" name="date" size="10" />
-              <em>(e.g. <?php echo strftime ($GLOBALS['ESPCONFIG']['date_format'],strtotime("09/21/2003")) ;?>)</em></dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="numeric">Numeric</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use this for questions which you will only want a numeric answer. Note: All non-numeric responses are disgarded. The <strong>length</strong> determines the max number of digits that can be used, the <strong>precision</strong> field adds extra size for the numbers begind the comma. This is not very precise yet, so just use the <strong>length</strong> field for now.</dd>
-          </dl>
-        </li>
-        <li>Example
-          <dl>
-            <dd>
-              <input type="text" name="numeric" size="10" />
-            </dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="session_text">Session text</h3>
-      <ul>
-        <li>Explanation:
-          <dl>
-            <dd>Use this to add some text to you survey (like a disclaimer before sending on submit). This is in fact no question a user can answer to.</dd>
-          </dl>
-        </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <hr style="width:100%;" />
-      <h2 id="results">Survey Results</h2>
-      <h3 style="padding-left:10px;" id="analysis">Cross Analysis</h3>
-      <ul>
-        <li> To cross analyse results from a survey choose a question by selecting the appropriate radio button to the left of the question. You must then choose one or more of the question's choices by selecting the appropriate checkbox under the chosen question. This will display the entire results of this survey based on the criteria you have chosen. At present, Cross Analysis is limited to single questions.
-          <p><a href="<?php echo($ESPCONFIG['image_url']);?>cross_analysis.jpg" onclick="window.open(this.href,'_blank');return false;"> <img src="<?php echo($ESPCONFIG['image_url']);?>cross_analysis.jpg" style="width: 500;" alt="Cross Analysis" /></a><br />
-            <br />
-          </p>
-        </li>
-        <li> This will produce the following result:<br />
-          <br />
-          <a href="<?php echo($ESPCONFIG['image_url']);?>cross_analysis_result.jpg" onclick="window.open(this.href,'_blank');return false;"> <img src="<?php echo($ESPCONFIG['image_url']);?>cross_analysis_result.jpg" style="width: 500;" alt="Cross Analysis Result" /></a><br />
-          <br />
-          The resulting display shows all the responses where question 1 choice was &quot;Yes&quot;. </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="tabulation">Cross Tabulation</h3>
-      <ul>
-        <li> Cross tabulation returns a result set based on a two question selection. This is achieved by choosing which question's options will form the rows or columns for the cross tabulated result set. Selecting a radio button in the red box to the right of the question indicates the row selection and selecting a radio button in the blue box to the right of the question indicates the column selection.
-          <p> <a href="<?php echo($ESPCONFIG['image_url']);?>cross_tabulate.jpg" onclick="window.open(this.href,'_blank');return false;"> <img src="<?php echo($ESPCONFIG['image_url']);?>cross_tabulate.jpg" style="width: 500;" alt="Cross Tabulate" /></a></p>
-        </li>
-        <li>
-          <p>In the above example we have chosen to cross tabulate question1 and question 4 where question 1 is the row selection and question 4 is the column selection. This returns the following result set:<br />
-            <br />
-            <a href="<?php echo($ESPCONFIG['image_url']);?>cross_tabulate_result1.jpg" onclick="window.open(this.href,'_blank');return false;"> <img src="<?php echo($ESPCONFIG['image_url']);?>cross_tabulate_result1.jpg" style="width: 500;" alt="Cross Tabulate Result" /></a></p>
-        </li>
-        <li> Alternatively we can cross tabulate the same 2 questions but set question 4 as the row selection and question 1 as the column selection as shown below:<br />
-          <br />
-          <a href="<?php echo($ESPCONFIG['image_url']);?>cross_tabulate2.jpg" onclick="window.open(this.href,'_blank');return false;"> <img src="<?php echo($ESPCONFIG['image_url']);?>cross_tabulate2.jpg" style="width: 500;" alt="Cross Tabulate 2" /></a><br />
-          <br />
-        </li>
-        <li> This produces the following result set:<br />
-          <br />
-          <a href="<?php echo($ESPCONFIG['image_url']);?>cross_tabulate_result2.jpg" onclick="window.open(this.href,'_blank');return false;"> <img src="<?php echo($ESPCONFIG['image_url']);?>cross_tabulate_result2.jpg" style="width: 500;" alt="Cross Tabulate 2 Result" /></a> </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <h3 style="padding-left:10px;" id="csv">Exporting to CSV</h3>
-      <ul>
-        <li> By choosing to export to CSV, you are selected to dump all the survey result data into a text file seperate by comma's, which then has the ability to be opened with most spreadsheet programs. </li>
-        <li> From the Management Interface, select <strong><a href="manage.php?where=export" onclick="window.open(this.href,'_blank');return false;">Export Data to CSV</a></strong> to view all the active or archived surveys. Simply click the <strong>download</strong> link listed behind the desired survey to obtain the CSV file. </li>
-      </ul>
-      <p style="padding-left:10px;"><a href="#top">Back to Top</a></p>
-      <hr style="width:100%;" />
-      <h2 id="admin">Administration Tasks</h2>
-      <h3 style="padding-left:10px;" id="batch">Batch Account Creation</h3>
-      <ul>
-        <li>
-          <p>On either the Respondent or Designer Management Interfaces, click <strong>Bulk Upload</strong>. You will be presented with a form asking for <strong>File Type</strong> and <strong>File to Upload</strong>. From the <strong>File Type</strong> dropdown, select the file type you wish to upload. From the <strong>File to Upload</strong> browse your local filesystem to find the specific file you are uploading.</p>
-        </li>
-        <li><strong>Tab Delimited, Data File Format:</strong>
-          <p>The tab delimited file should contain rows of text, terminated by a newline character(\n), with each field in the rows delimited by the tab character(\t). Each of the examples below should be a single row.</p>
-          <ul>
-            <li><strong>Respondent Format:</strong>
-              <p>Username, Password and Group are required fields</p>
-              <strong>Field Order:</strong>
-              <p><tt>username\tpassword\tgroup\tfname\tlname\t email\texpiration\tdisabled\n</tt></p>
-              <strong>Example Row:</strong>
-              <p><tt>looser\tsecret\teditors\tJohn\tSmith\t smith@yahoo.com\t20011122\tN\n</tt></p>
-            </li>
-            <li><strong>Designer Format:</strong>
-              <p>Username, Password and Group are required fields</p>
-              <strong>Field Order:</strong>
-              <p><tt>username\tpassword\tgroup\tfname\tlname\temail\t design\tstatus\texport\tgroupedit\tgroupadmin\tgrouprespondents\t expiration\tdisabled</tt></p>
-              <strong>Example Row:</strong>
-              <p><tt>looser\tsecret\teditors\tJohn\tSmith\tsmith@yahoo.com\t Y\tN\tY\tN\Y\tN\t20031122\tY\n</tt></p>
-            </li>
-            <li><strong>CSV, Data File Format:</strong>
-              <p>Not Yet Implemented</p>
-            </li>
-            <li><strong>XML, Data File Format:</strong>
-              <p>Not Yet Implemented</p>
-            </li>
-          </ul>
-        </li>
-      </ul>
-      <p><a href="#top">Back to Top</a></p></td>
-  </tr>
-</table>
-
Index: admin/include/where/get_projects.inc
===================================================================
--- admin/include/where/get_projects.inc	(revision 6370)
+++ admin/include/where/get_projects.inc	(working copy)
@@ -1,64 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-//error_reporting(E_ALL);
-echo "asdfadF";
-echo "<pre>";
-print_r(get_projects_by('6','1'));
-echo "</pre>";
-
-
-function get_projects_by($ownerid,$status) {
-	if (!is_numeric($status)) { 
-		if (strtolower($status) == 'draft' OR strtolower($status) == 'drafts' OR strtolower($status) == 'd') { $status = 1; }
-		if (strtolower($status) == 'active' OR strtolower($status) == 'a') { $status = 2; }
-		if (strtolower($status) == 'complete' OR strtolower($status) == 'completed' OR strtolower($status) == 'c') { $status = 3; }
-	}
-	$getSQL = "
-	SELECT `project`.*
-	FROM userprojectrel, project
-	WHERE
-		`userprojectrel`.projectid = `project`.`id`
-		AND `userprojectrel`.`userid` = '$ownerid'
-		AND `project`.`status` = '$status'
-	";
-	
-	$proj_result = execute_sql($getSQL);
-	while (!$proj_result->EOF) {
-		
-		
-		list(	$p['id'],
-				$p['name'],
-				$p['pre_id'],
-				$p['post_id'],
-				$p['intro'],
-				$p['outro'],
-				$p['url'],
-				$p['start'],
-				$p['end'],
-				$p['status'],
-				$p['createstamp'],
-				$p['editstamp'],
-				$p['activestamp'],
-				$p['completestamp']) = $proj_result->fields;	
-		$p = array_reverse($p);
-		print_r($p);
-		$project = new Project;
-		print_r($project->init($p['id']));
-		
-		$proj_result->MoveNext();
-	}
-	
-	return $projects;
-}
-
-?>
\ No newline at end of file
Index: admin/include/where/deleteproject.inc
===================================================================
--- admin/include/where/deleteproject.inc	(revision 6370)
+++ admin/include/where/deleteproject.inc	(working copy)
@@ -1,60 +0,0 @@
-<?php
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	include('../lib/vulab.projects.class.php');
-	if ($_POST['deleting'] == 'yeahimdoingit') {
-		$project = new Project;
-		$pid = $_POST[pid];
-		if (is_numeric($pid) AND $pid > 0) {
-			$project->init($pid);
-			$deleteresult = $project->delete();
-			if (is_array($deleteresult)) {
-				$errors = $deleteresult;
-			} else {
-			
-				$onload = ' onLoad="self.parent.window.location=\'http://vulab.yorku.ca/admin/manage.php?success=deletedproject\';setTimeout(self.parent.tb_remove(),6000);" ';
-			}
-			
-		}
-	}
-}
-?>
-<html>
-<head>
-<link href="http://vulab.yorku.ca/admin/style.css" rel="stylesheet" type="text/css" />
-</head>
-<body <?=$onload;?>>
-<div class="padded">
-<br/>
-<center>
-<?php
-if ($_SERVER['REQUEST_METHOD'] == 'POST') { 
-
-	if ($errors) { 
-		echo "<div class='errors'>";
-		foreach ($errors as $error) {
-			echo $error;
-		}
-		echo "</div>";
-	} else {
-		echo "<h1><center>Success!<br/>You have deleted this project</center></h1>";
-	}
-
-} else { ?>
-
-<form action="/admin/manage.php?where=deleteproject&lay=ajax&id=<?=$_GET[id]?>" method="post">
-<h2><center>Your project will be deleted, forever!</center></h2>
-<?php
-/*<div>yes <input type="radio" name="keepsurvey" vaue="true"/> no <input type="radio" name="keepsurvey" value="false"/></div>*/
-?>
-<div><em>Note:</em><strong>deleting this project will not delete any surveys in other projects</strong></div>
-<br /><br/>
-<input type="hidden" name="pid" value="<?=$_GET[id]?>" />
-<input type="hidden" name="deleting" value="yeahimdoingit" />
-<input type="submit" value="Yes, Delete This Project!" />
-<input type="button" value="Cancel" onClick="self.parent.tb_remove();"/>
-</form>
-<? }  ?>
-</center>
-</div>
-</body>
-</html>
\ No newline at end of file
Index: admin/include/where/step_process_1.inc
===================================================================
--- admin/include/where/step_process_1.inc	(revision 6370)
+++ admin/include/where/step_process_1.inc	(working copy)
@@ -1,57 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-//File to Save Changes and Manage the PHP of Step 1
-if ($_SESSION['mode'] == 'create') {
-
-	$newproj = new Project;
-
-	$createresult = $newproj->create_project($_POST);
-	if (is_array($createresult)) {
-		//set errors
-		$err = $createresult;
-	} else { //Set Success
-		$_SESSION[mode] = 'edit';
-		unset($project);
-		$project = new Project;
-		$project->init($_SESSION[pid]);
-	}
-}
-elseif ($_SESSION['mode'] == 'edit') {
-	//Make markers to remove emptied fields
-	
-	if (!$_POST['pre']) { $_POST['pre'] = 'delete'; }
-	if (!$_POST['post']) { $_POST['post'] = 'delete'; }
-	if (!$_POST['pintro']) { $_POST['pintro'] = 'delete'; }
-	if (!$_POST['poutro']) { $_POST['poutro'] = 'delete'; }
-	if (!$_POST['pgoal']) { $_POST['pgoal'] = 'delete'; }
-	if (!$_POST['purl']) { $_POST['purl'] = 'delete'; }
-	if (!$_POST['pstart']) { $_POST['pstart'] = 'delete'; }
-	if (!$_POST['pend']) { $_POST['pend'] = 'delete'; }
-	
-	
-	$editresult = $project->update($_POST);
-	if (is_array($editresult)) {
-		//set errors
-		$err = $editresult;
-	} else { //Set Success
-		unset($project);
-		$project = new Project;
-		$project->init($_SESSION[pid]);
-	}
-}
-if (is_array($err)) {
-	$step = $from;
-}
-
-
-?>
Index: admin/include/where/new.inc
===================================================================
--- admin/include/where/new.inc	(revision 6370)
+++ admin/include/where/new.inc	(working copy)
@@ -1,23 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: new.inc,v 1.5 2003/03/28 03:42:47 jimmerman Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	include(esp_where('survey_tool'));
-?>
Index: admin/include/where/survey_tool.inc
===================================================================
--- admin/include/where/survey_tool.inc	(revision 6370)
+++ admin/include/where/survey_tool.inc	(working copy)
@@ -1,121 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-//error_reporting(E_ALL);
-/* $Id: tab.inc,v 1.22 2007/12/03 13:40:55 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	if (!@$survey_processed) {
-	include(esp_where("survey_process"));
-	}
-
-
-//Serialize $_GET
-$get_string = implode_get();
-$get_string = '?';
-if ($_GET[lay]) { $get_string .= '&lay='.$_GET[lay]; }
-if ($_GET[where]) { $get_string .= '&where='.$_GET[where]; }
-
-if ($_POST['where']) { $where = $_POST['where']; }
-if ($_GET['where']) { $where =  $_GET['where']; }
-if (!$where) { $where = 'survey_tool'; }
-//Include Just Html?
-if (@$_GET[lay] == 'form' OR $_GET['lay'] == 'full') {
-?>
-
-
-</div>
-</form>
-<?php
-if ($_SESSION['survey_id']) {
-?>
-<script type="text/javascript">
-parent.$('#surveynote').html('Survey Changes will be saved.');
-parent.$('#surveynote').css({color: 'green'});
-parent.$('#surveytool').css({border: '2px solid green'});
-</script>
-<?
-}
-?>
-<script type="text/javascript">
-if (parent.$('#surveytool').css('display') != 'none') {
-	parent.$('#surveynote').css({display: 'block'});
-}
-</script>
-<form method="post" id="tabs" onsubmit="validate();" action="<?php echo($ESPCONFIG['ME']); echo $get_string;?>">
-<?php } //ajax ?>
-
-
-<div>
-<?php if(!empty($errstr)) echo(mkerror($errstr)."<br />\n"); ?>
-      <input type="hidden" name="where" value="<?php echo $where; ?>" id="where"/>
-      <?php if ($where != 'survey_tool') { ?>
-      	<input type="hidden" name="where_sub" value="2" id="where_sub"/>
-	    <input type="hidden" name="where_context" value="<?=@$where_context?>" id="where_context"/>
-	  <?php } ?>  
-      
-<div id="tabmenu">
-<input type="submit" name="tab" value="General" />
-<input type="submit" name="tab" value="Questions" />
-<input type="submit" name="tab" value="Order" />
-<input type="submit" name="tab" value="Conditions" />
-<input type="submit" name="tab" value="Preview" />
-<input type="submit" name="tab" value="Finish" />
-</div>
-<table>
-  <tr>
-    <td>
-<?php include($ESPCONFIG['include_path'].'/tab/'.$tab.$ESPCONFIG['extension']); $_SESSION['last_tab'] = $tab; ?>
-    </td>
-  </tr>
-</table>
-<?php if($tab=='finish') {echo('&nbsp;'); return;} ?>
-<?php if($_SESSION['new_survey']) { ?>
-<?php if (@$_GET[lay] == 'full') { ?>
-<?php echo(_('Click cancel to cancel this survey, or click continue to proceed to the next tab.')); ?><br />
-<input type="submit" name="where" value="Cancel" onclick='return cancelConfirm()' />
-<?php if($tab=='preview') { ?>
-	<input type="submit" name="tab" value="Finish" />
-<?php 	return; } ?>
-<input type="submit" name="tab" value="Continue &gt;" />
-<?php } //not ajax ?>
-<?php return; } ?>
-<?php /*echo(_('The survey title and other general fields are on the <strong>General</strong> tab.
-Individual survey questions are added and modified on the <strong>Questions</strong> tab.
-Questions may be re-ordered or deleted from the <strong>Order</strong> tab.
-You may see a preview of your survey at any time, by going to the <strong>Preview</strong>
-tab. If you have no further changes click <strong>Finish</strong> to go back to the
-Management Interface.')); */?><br />
-<? /*
-<input type="submit" name="tab" value="General" />
-<input type="submit" name="tab" value="Questions" />
-<input type="submit" name="tab" value="Order" />
-<input type="submit" name="tab" value="Conditions" />
-<input type="submit" name="tab" value="Preview" />
-<input type="submit" name="tab" value="Finish" />
-*/ ?>
-<?php if (@$_GET[lay] == 'full') { ?>
-</form>
-<?php } else { //if it IS ajax?>
-<input type="submit" value="Save Survey"/>
-<?php } //ajax else ?>
-
-
-<?php if (strpos($where_context,'copy')) {
-	unset($_SESSION['survey_id']);
-}
-?>
\ No newline at end of file
Index: admin/include/where/step_process_2.inc
===================================================================
--- admin/include/where/step_process_2.inc	(revision 6370)
+++ admin/include/where/step_process_2.inc	(working copy)
@@ -1,62 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-//File to Save Changes and Manage the PHP of Step 1
-if ($_SESSION['mode'] == 'edit') {
-
-	
-	if ($_POST['pre_choose'] == 'none') {
-		$data = array('ppre'=>'delete','pre_source'=>'delete');
-		unset($_SESSION['pre_settings']['version']);
-		$go = 3;
-		$from = 2; 
-		//echo "none";
-	}
-	elseif ($_POST['pre_choose'] == 'copy') {
-	//	include(esp_where("survey_process"));
-		$survey_processed = true;
-		$sid = $_SESSION['survey_id'];
-		$data = array('ppre'=>$sid,'pre_source'=>$_POST['copysurvey']);			
-		$go = 3;
-		$from = 2;
-		//echo "copy";
-	}
-	elseif ($_POST['pre_choose'] == 'new') {
-		//include(esp_where("survey_process"));
-		if ($_POST['tab'] == 'General') {
-			$_SESSION['pre_settings']['version'] = 'new';
-//			$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE `name`='".$_POST['name']."'";
-	//		$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-		//	$survey = fetch_row($result);
-			
-		}
-			$survey_processed = true;
-			$sid = $_SESSION['survey_id'];
-			$data = array('ppre'=>$sid,'pre_source'=>'new');
-		//echo "else";
-	}
-	//print_r($data);
-	$editresult = $project->update($data);
-	if (is_array($editresult)) {
-		//set errors
-		$err = $editresult;
-	} else { //Set Success
-		unset($project);
-		$project = new Project;
-		$project->init($_SESSION[pid]);
-	}
-}
-	
-if (is_array($err)) {
-		$step = $from;
-}
-?>
Index: admin/include/where/survey_process.inc
===================================================================
--- admin/include/where/survey_process.inc	(revision 6370)
+++ admin/include/where/survey_process.inc	(working copy)
@@ -1,133 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-	session_register('survey_id');
-	session_register('new_survey');
-	session_register('last_tab');
-	session_register('curr_q');
-	if (!@$_POST['where_context']) { @$_POST['where_context'] = ''; } else { @$where_context = @$_POST['where_context']; }
-	if (!@$_GET['where_context']) { @$_GET['where_context'] = ''; } else { @$where_context = @$_GET['where_context']; }
-	
-	/* Use this hack to work around how PHP handles session vars.
-	 * When Register_Globals is on, the value of the global $foo
-	 * is saved, and $_SESSION['foo'] is ignored.
-	 * When Register_Globals is off, the global $foo is ignored
-	 * and $_SESSION['foo'] is saved.
-	 * By making $_SESSION['foo'] a copy of $foo
-	 * when reg_glob is on, we can use $_SESSION uniformly
-	 * from here on, regardless of the INI settings.
-	 */
-	if(ini_get('register_globals')) {
-		$_SESSION['survey_id']  = intval($survey_id);
-		$_SESSION['new_survey'] = $new_survey;
-		$_SESSION['last_tab']   = $last_tab;
-		$_SESSION['curr_q']     = $curr_q;
-	}
-	
-	global $errstr;
-	$tab="";
-	
-	if(@$_GET['where'] == 'new' OR @$_GET['new']) {
-		$_SESSION['survey_id']  = '';
-		$_SESSION['new_survey'] = '';
-		$_SESSION['last_tab']   = '';
-		$_SESSION['curr_q']     = '';
-	}		
-	
-	if(!empty($_GET['newid'])) {
-		$_SESSION['survey_id']  = intval($_GET['newid']);
-		$tab="general";
-		$_SESSION['last_tab']   = '';
-		$_SESSION['new_survey'] = false;
-	}
-
-	if(empty($_SESSION['survey_id'])) {
-		$_SESSION['survey_id']  = '';
-		$_SESSION['new_survey'] = true;
-	}
-
-	if(empty($_SESSION['new_survey']))
-		$_SESSION['new_survey'] = empty($_SESSION['survey_id']);
-	
-	/* check ACL to see if user is allowed to design
-	 * _this_ survey */
-	 $sql = "SELECT * FROM `user` WHERE `userid` = '".$_SESSION['acl']['userid']."'";
-		$result = execute_sql($sql);
-	if(!empty($_SESSION['survey_id'])) {
-		/*$srealm = auth_get_survey_realm($_SESSION['survey_id']);
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				!auth_is_owner($_SESSION['survey_id'], $_SESSION['acl']['username']) &&
-				!in_array($srealm, array_intersect(
-						$_SESSION['acl']['pdesign'],
-						$_SESSION['acl']['pall'])) &&
-				!auth_no_access(_('to access this form'))) {
-			return;
-		}*/
-		if ($_SESSION['acl']['superuser'] != 'Y' &&
-			$result->fields[6] != 'Y')
-				auth_no_access(_('to access this form'));
-		//else
-		//	return;
-		
-	}
-
-	/* check user's ACL to see if they have rights to
-	 * edit/create _any_ survey */
-	if($_SESSION['acl']['superuser'] != 'Y' &&
-			$result->fields[6] != 'Y' &&
-			!auth_no_access(_('to access this form'))) {
-		return;
-	}
-		
-	if (isset($_POST['tab'])) {
-		$tab=$_POST['tab'];
-	}
-	if ($tab=="") {
-		$tab = $_SESSION['last_tab'];
-	}
-	$tab = strtolower(ereg_replace(' +','_',$tab));
-
-/* XXX I18n do not translate */
-	if(stristr($tab,'continue')) {
-		switch($_SESSION['last_tab']) {
-			case 'general':
-				$tab='questions';
-				break;
-			case 'questions':
-				$tab='order';
-				break;
-			case 'order':
-				$tab='conditions';
-				break;
-			case 'conditions':
-				$tab='preview';
-				break;
-			default:
-				$tab='general';
-		}
-	}
-
-/* XXX I18n do not translate */
-		
-	if(!ereg('^[A-Za-z0-9_]+$',$tab))	// Valid chars are [A-Za-z0-9_]
-		$tab = 'general';
-	if(!file_exists($ESPCONFIG['include_path'].'/tab/'.$tab.$ESPCONFIG['extension']))
-		$tab = 'general';
-	if(!file_exists($ESPCONFIG['include_path'].'/tab/'.$tab.$ESPCONFIG['extension'])) {
-		echo('<b>'. _('Unable to open include file. Check INI settings. Aborting.'). '</b>');
-		exit;
-	}
-	
-	$errstr = '';
-	$updated = survey_update($_SESSION['survey_id'],$tab,$_SESSION['last_tab']);
-	
-?>
\ No newline at end of file
Index: admin/include/where/step_process_3.inc
===================================================================
--- admin/include/where/step_process_3.inc	(revision 6370)
+++ admin/include/where/step_process_3.inc	(working copy)
@@ -1,64 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-//File to Save Changes and Manage the PHP of Step 1
-if ($_SESSION['mode'] == 'edit') {
-
-	
-	if ($_POST['post_choose'] == 'none') {
-		$data = array('ppost'=>'delete','post_source'=>'delete');
-		unset($_SESSION['post_settings']['version']);
-		$go = 4;
-		$from = 3; 
-		//echo "none";
-	}
-	elseif ($_POST['post_choose'] == 'copy') {
-	//	include(esp_where("survey_process"));
-		$survey_processed = true;
-		$sid = $_SESSION['survey_id'];
-		$data = array('ppost'=>$sid,'post_source'=>$_POST['copysurvey']);			
-		$go = 4;
-		$from = 3;
-		//echo "copy";
-	}
-	elseif ($_POST['post_choose'] == 'new') {
-		//include(esp_where("survey_process"));
-		if ($_POST['tab'] == 'General') {
-			$_SESSION['post_settings']['version'] = 'new';
-//			$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE `name`='".$_POST['name']."'";
-	//		$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-		//	$survey = fetch_row($result);
-			
-		}
-			$survey_processed = true;
-			$sid = $_SESSION['survey_id'];
-			$data = array('ppost'=>$sid,'post_source'=>'new');
-		//echo "else";
-	}
-//	print_r($data);
-//	print_r($project);
-	$editresult = $project->update($data);
-	if (is_array($editresult)) {
-		//set errors
-		$err = $editresult;
-	} else { //Set Success
-		unset($project);
-		$project = new Project;
-		$project->init($_SESSION[pid]);
-	}
-}
-	
-if (is_array($err)) {
-		$step = $from;
-}
-?>
Index: admin/include/where/step_process_4.inc
===================================================================
--- admin/include/where/step_process_4.inc	(revision 6370)
+++ admin/include/where/step_process_4.inc	(working copy)
@@ -1,54 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-if ($_SESSION['mode'] == 'edit') {
-	//Make markers to remove emptied fields
-	
-
-	
-	if ($_POST['activate'] == 'true') {
-		$data = array('status'=>'2');
-		$editresult = $project->update($data);
-		$preid = $project->pre_survey['id'];
-		$postid = $project->post_survey['id'];
-		
-		$surveydata = array('status'=>'1');
-		if ($preid) {
-			$pre_survey = new Survey($preid);
-			$preresult = $pre_survey->update($surveydata);
-			if (!$preresult) {
-				$err[] = 'Error Updating Pre-Survey Status';
-			}
-		}
-		if ($postid) {
-			$post_survey = new Survey($postid);
-			$postresult = $post_survey->update($surveydata);
-			if (!$postresult) {
-				$err[] = 'Error Updating Post-Survey Status';
-			}
-		}
-		if (is_array($editresult)) {
-			//set errors
-			$err = $editresult;
-		} else { //Set Success
-			unset($project);
-			$project = new Project;
-			$project->init($_SESSION[pid]);
-		}
-	}
-}
-if (is_array($err)) {
-	$step = $from;
-}
-
-
-?>
Index: admin/include/where/step_process_5.inc
===================================================================
--- admin/include/where/step_process_5.inc	(revision 6370)
+++ admin/include/where/step_process_5.inc	(working copy)
@@ -1,59 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-/*
-File: 		step_process_5.inc \\v 1.0
-Info:		- to be used with ?where=create&step=5 - Process data from the 5th step (inviting users)
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-<?php
-
-$userids_select = $_POST[users];
-
-$subject = "You've Been Invited! - Participation in Survey";
-$message = 
-"Welcome <user-fname> <user-lname>, \n
-You've been invited to participate in the following usability project survey! \n
-
-<project-name> \n
-<project-intro>\n
-\n
-Participate in <project-name>!\n
-at http://vulab.yorku.ca/public/project.php?id=<project-id>
-";
-foreach ($userids_select as $userid) {
-	$user = new User($userid);
-	$options = array('pid'=>$_SESSION[pid]);
-	$mailresults = $user->email($subject,$message,$options);
-	if ($mailresults) {
-		$good[] = 'Invitations Successfully Sent!';
-		$addUser = new Perm('user',$userid);
-		$assignResult = $addUser->assignUser($_SESSION[pid]);
-		if (is_array($assignResult)) {
-			$err[] = $assignResult;
-		} else { 
-			$good[] = $assignResult;
-		}
-	} else {
-		$err[] = "Sorry! Invitations cannot be sent at this time.";
-	}
-}
-if (is_array($err)) {
-	$step = $from;
-}
-
-
-?>
Index: admin/include/where/viewall.inc
===================================================================
--- admin/include/where/viewall.inc	(revision 6370)
+++ admin/include/where/viewall.inc	(working copy)
@@ -1,63 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-//error_reporting(E_ALL);
-/* $Id: manage.inc,v 1.32 2007/12/03 13:08:13 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-$base =& $GLOBALS['ESPCONFIG']['ME'];
-$bg = '';
-if (!$_GET[type]) { $_GET[type] = 'draft'; }
-if ($_GET[type] == 'draft') { 
-	$projects_array = get_projects_by($_SESSION[acl]['userid'],1);
-	$statusid = 1;
-	$fields = array('select','name','url');
-	//$projects_array = filter_projects_bystatus(get_projects_byowner($_SESSION[acl]['userid']),1,'==');
-}
-elseif ($_GET[type] == 'active') {
-	$projects_array = get_projects_by($_SESSION[acl]['userid'],2);
-	$fields = array('select','name','url','activestamp');
-	$statusid = 2;
-}
-elseif ($_GET[type] == 'completed') {
-	$projects_array = get_projects_by($_SESSION[acl]['userid'],3);
-	$fields = array('select','name','url','completestamp');
-	$statusid = 3;
-}
-?>
-<br />
-<div class="titlebar">
-	<div class="left">
-		<h1><?php echo(_('View My '.ucwords($_GET[type]).' Projects')); ?></h1>
-	</div>
-	<div class="right">
-		View Project Type: <a href="?where=viewall&type=draft">Drafts</a> | <a href="?where=viewall&type=active">Active</a> | <a href="?where=viewall&type=completed">Completed</a>
-	</div>
-</div>
-<div class="clear"></div>
-<div class="padded">
-	<?php
-		$options = array('titles'=>true,'action_set'=>$_GET[type],'status'=>$statusid);
-		if (count($projects_array) > 0) {
-			echo display_projects_table($fields,array_reverse($projects_array),$options);
-		} else {
-		
-		echo "<em>You don't have any $_GET[type] projects yet</em>";
-		}
-	?>
-</div>
\ No newline at end of file
Index: admin/include/where/create.inc
===================================================================
--- admin/include/where/create.inc	(revision 6370)
+++ admin/include/where/create.inc	(working copy)
@@ -1,173 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-/*
-File: 		create.inc \\v 1.0
-Info:		- File designed to handle all project creation/editing and survey (iframed) creation.
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-<?php
-session_start();
-
-/* $Id: create.inc,v 1.32 2007/12/03 13:08:13 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-//Some Legacy
-$base =& $GLOBALS['ESPCONFIG']['ME'];
-$bg = '';
-////////////////
-
-
-//Manage Modes
-if ($_GET[where] == 'create') {
-	$_SESSION['mode'] = 'create';
-	unset($_SESSION[pid]);
-	unset($_SESSION[renamed]);
-	unset($_SESSION[last_tab]);
-	unset($_SESSION[curr_q]);
-	unset($_SESSION[survey_id]);
-	unset($_SESSION[new_survey]);
-}
-if ($_GET['pid']) {
-	$_SESSION['mode'] = 'edit';
-	$_SESSION['pid'] = $_GET['pid'];
-}
-//Popoulate edit mode
-if ($_SESSION['mode'] == 'edit' AND $_SESSION['pid']) {
-	$project = new Project;
-	$project->init($_SESSION[pid]);
-}
-
-//Lets Figure out our Navigation Vars
-$step = $_POST[step];
-if ($_GET[step]) { $step = $_GET[step]; }
-if ($_POST[go]) { $step = $_POST[go]; }
-
-if ($_POST[where_sub] OR $_GET[where_sub]) {
-	if ($_POST[where_sub]) {
-		$step = $_POST[where_sub];
-	} else {
-		$step = $_GET[where_sub];
-	}
-}
-
-
-if (!$step OR strtolower($step)== 'first' OR strtolower($step) == 'start') { $step = 1; }
-$from = $_POST[from];
-
-
-//If there has been a step change, lets process!
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	include(esp_where("step_process_$from"));
-}
-
-$stepswitch[$step] = 'on';
-	if ($_SESSION[debug]) {
-/*		if (@$project) {
-			echo "<script type='text/javascript'>\n";
-			echo "alert('asdfsf');\n";
-			echo "$('.debug').append('";
-			echo '<strong>project</strong>';
-			print_r($project);
-			echo "');\n";
-			echo "</script>";		
-		}*/
-	
-	}
-if ($project->details['status'] == '2') {
-
-}
-?>
-
-<div id="project_container">
-<div id="project_topnav">
-<div class="right"><a href="#save"><img src="../images/save.png" alt="Save" />Save Project</a><a href="?where=deleteproject&lay=ajax&id=<?=$project->id;?>&KeepThis=true&TB_iframe=true&height=200&width=450" class="thickbox" title="Are you sure you want to delete this project?"><img src="../images/delete.png" alt="Delete" />Delete Project</a><a href="?where=manage"><img src="../images/exit.png" alt="Exit" />Exit Project</a><a href="?where=activateproject&lay=ajax&id=<?=$project->id;?>&KeepThis=true&TB_iframe=true&height=200&width=450" class="thickbox activatebutton" title="Are you sure you want to activate this project?"><img src="../images/world_go.png" alt="Delete" />Activate Project</a></div>
-<h2>Project: <?php echo ($project->details[name] ? $project->details[name] : "Untitled"); ?> <small>(draft)</small></h2>
-</div>
-<div id="steps">
-<input type="image" src="../images/steps1_<?=$stepswitch[1]?>.png" value="1" onclick="getElementById('go').value='1';getElementById('where_sub').value=''"/>
-<input type="image" src="../images/steps2_<?=$stepswitch[2]?>.png" value="2" onclick="getElementById('go').value='2';getElementById('where_sub').value=''"/>
-<input type="image" src="../images/steps3_<?=$stepswitch[3]?>.png" value="3" onclick="getElementById('go').value='3';getElementById('where_sub').value=''"/>
-<?php /*<input type="image" src="../images/steps4_<?=$stepswitch[4]?>.png" value="4" onclick="getElementById('go').value='4';getElementById('where_sub').value=''"/>*/ ?>
-<input type="image" src="../images/steps5_<?=$stepswitch[5]?>.png" value="5" onclick="getElementById('go').value='5';getElementById('where_sub').value=''"/>
-</div>
-<?
-if ($err) { 
-	echo "<div id='errors'>";
-	foreach ($err as $msg) {
-		if (is_array($msg)) {
-			foreach ($msg as $m) { echo "<div>$m</div>"; }
-		} else {
-			echo "<div>$msg</div>";
-		}
-	}
-	echo "</div>";
-}
-if ($note) { 
-	echo "<div id='notes'>";
-	foreach ($note as $msg) {
-		echo "<div>$msg</div>";
-	}
-	echo "</div>";
-}
-if ($good) { 
-	echo "<div id='goods'>";
-	foreach ($good as $msg) {
-		echo "<div>$msg</div>";
-	}
-	echo "</div>";
-}
-?>
-<?php
-	if ($step == '1') { 
-
-		include(esp_where("step_html_$step"));
-
- 	}
- 	if ($step == '2') { 
- 	
-		include(esp_where("step_html_$step"));
-	
-	}
-	if ($step == '3') {
-	
-		include(esp_where("step_html_$step"));
-	}
-	if ($step == '4') { 
-	
-		include(esp_where("step_html_$step"));
-	}
-	if ($step == '5') {
-	
-		include(esp_where("step_html_$step"));
-	}
-?>
-<div class="clear"></div>
-</div>
-
-<?php
-if (!empty($_POST)) {
-	echo "<div id='postdata'>";
-	foreach($_POST as $name=>$value) {
-		echo "$name=$value&";
-	}
-	echo "</div>";
-}
-?>
\ No newline at end of file
Index: admin/include/where/admrespondent.inc
===================================================================
--- admin/include/where/admrespondent.inc	(revision 6370)
+++ admin/include/where/admrespondent.inc	(working copy)
@@ -1,278 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: admrespondent.inc,v 1.18 2007/11/27 13:43:56 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-// <jflemer@acm.rpi.edu>
-
-    /* SuperUser or Designers with "Administer Respondents(puser)" permissions only*/
-    if($_SESSION['acl']['superuser'] != 'Y' &&
-        count($_SESSION['acl']['puser']) == 0 &&
-        !auth_no_access(_('to access this form'))) {
-        return;
-    }
-
-	$bg1 =& $ESPCONFIG['bgalt_color1'];
-	$bg2 =& $ESPCONFIG['bgalt_color2'];
-
-	$errstr = '';
-	$u = '';
-	$r = '';
-
-	/* abort */
-	if(isset($_POST['cancel'])) {
-		unset($_POST['submit']);
-		unset($_POST['delete']);
-		include(esp_where('respondents'));
-		return;
-	}
-
-	/* delete user */
-	if(isset($_POST['delete'])) {
-		unset($_POST['submit']);
-		$u = _addslashes($_POST['u']);
-		$r = _addslashes($_POST['r']);
-		/* check acl */
-		if($_SESSION['acl']['superuser'] == 'Y' ||
-			in_array($r, $_SESSION['acl']['puser']) ||
-			auth_no_access(_('to access this group'))) {
-			$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['respondent_table']." WHERE username=$u AND realm=$r";
-			if(!execute_sql($sql) || affected_rows() < 1) {
-				/* unsucessfull -- abort */
-				$errstr .= mkerror(_('Cannot delete account.') .' ('.
-					ErrorMsg() .')');
-			}
-		}
-		if(empty($errstr)) {
-			include(esp_where('respondents'));
-			return;
-		}
-	}
-	/* submitted */
-	if(isset($_POST['submit'])) {
-		$u           = _addslashes($_POST['u']);
-		$r           = _addslashes($_POST['r']);
-		$u_password  = _addslashes($_POST['password']);
-		$u_fname     = _addslashes($_POST['fname']);
-		$u_lname     = _addslashes($_POST['lname']);
-		$u_email     = _addslashes($_POST['email']);
-		$u_disabled  = _addslashes($_POST['disabled']);
-
-		if(!empty($_POST['ex_year']) ||
-				!empty($_POST['ex_month']) ||
-				!empty($_POST['ex_day'])) {
-			if(empty($_POST['ex_day'])) {
-				$u_ex_day = 1;
-			} else {
-				$u_ex_day = intval($_POST['ex_day']);
-			}
-			if(empty($_POST['ex_month'])) {
-				$u_ex_month = 1;
-			} else {
-				$u_ex_month = intval($_POST['ex_month']);
-			}
-			if(empty($_POST['ex_year'])) {
-				$now = getdate(time());
-				$u_ex_year = $now['year'];
-			} else {
-				$u_ex_year = intval($_POST['ex_year']);
-				if($u_ex_year < 2000)
-					$u_ex_year += 2000;
-			}
-
-			$u_expiration = sprintf("%04d%02d%02d%06d",
-				$u_ex_year,$u_ex_month,$u_ex_day,0);
-		} else {
-			$u_expiration = "00000000000000"; #YYYYMMDDHHmmss
-			$u_ex_year    = '';
-			$u_ex_month   = '';
-			$u_ex_day     = '';
-		}
-
-		/* new user */
-        /* check acl */
-        if($_SESSION['acl']['superuser'] == 'Y' ||
-            in_array($r, $_SESSION['acl']['puser']) ||
-            auth_no_access(_('to access this group'))) {
-            $sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['respondent_table']." WHERE username=$u AND realm=$r";
-            $result = execute_sql($sql);
-            if(record_count($result) < 1) {
-            	if(empty($u) || empty($r) || empty($u_password)) {
-            		$errstr .= mkerror(_('Username, Password, and Group are required.'));
-            	} else {
-            		$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['respondent_table']."
-            			(username,realm,password,changed)
-            			VALUES ($u,$r,".db_crypt($u_password).", ".sys_time_stamp().")";
-            		if(!execute_sql($sql)) {
-            			$u = '';
-            			$r = '';
-            			$errstr .= mkerror(_('Error adding account.') .' ('.
-            				ErrorMsg() .')');
-            		}
-            	}
-            }
-            db_close($result);
-            /* change user data */
-            if(!empty($u) && !empty($r)) {
-            	if(empty($u_disabled))
-            		$u_disabled = 'N';
-            	if (!empty($u_password))
-            		$u_password = "password=".db_crypt($u_password).",";
-            	$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['respondent_table']." SET
-            		$u_password
-            		fname=$u_fname,
-            		lname=$u_lname,
-            		email=$u_email,
-            		disabled=$u_disabled,
-            		changed=".sys_time_stamp().",
-            		expiration=$u_expiration WHERE username=$u AND realm=$r";
-            	if(!execute_sql($sql)) {
-            		/* unsucessfull -- abort */
-            		$errstr .= mkerror(_('Cannot change account data.') .' ('.
-            			ErrorMsg() .')');
-            	}
-            }
-        }
-        if(empty($errstr)) {
-            include(esp_where('respondents'));
-            return;
-        }
-	} else if(isset($_GET['u']) && isset($_GET['r'])) {
-		$u = _addslashes($_GET['u']);
-		$r = _addslashes($_GET['r']);
-	} else {
-		$u = '';
-		$r = '';
-		$u_expiration = '';
-		$u_disabled = 'N';
-	}
-
-	/* load ACL */
-	if(!empty($u) && !empty($r)) {
-		$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['respondent_table']." WHERE username=$u AND realm=$r";
-		$result = execute_sql($sql,"","ADODB_FETCH_ASSOC");
-		if($arr = fetch_row($result)) {
-			#foreach(array(
-			#	'username', 'fname', 'lname', 'email',
-			#	'realm', 'disabled', 'expiration') as $col)
-			#	{ $$col = $arr[$col]; }
-			#$u =& $username;
-			#$r =& $realm;
-			#if(intval($expiration) > 0) {
-			$arr['u'] =$arr['username'];
-			$arr['r'] =$arr['realm'];
-			if(intval($arr['expiration']) > 0) {
-				$arr['ex_year']  = substr($arr['expiration'],0,4);
-				$arr['ex_month'] = substr($arr['expiration'],5,2);
-				$arr['ex_day']   = substr($arr['expiration'],8,2);
-			} else {
-				$arr['ex_year']  = '';
-				$arr['ex_month'] = '';
-				$arr['ex_day']   = '';
-			}
-		} else {
-			$errstr .= mkerror(_('Account not found.') .' ('.
-				ErrorMsg() .')');
-		}
-        db_close($result);
-	}
-
-?>
-<h2><?php echo(_('Respondent Account Administration')); ?></h2>
-<?php if(!empty($errstr)) echo("<p>$errstr</p>\n"); ?>
-<input type="hidden" name="where" value="admrespondent" />
-<table cellspacing="0" cellpadding="4" style="width: 350px">
-	<tr>
-<?php
-	echo("<th class=\"right\">". _('Username') ."</th>\n");
-	if(empty($u))
-		$u_u = mktext('u', 16, 16, $arr);
-	else
-		$u_u = mkhidden('u', $arr) . "<tt>$u</tt>";
-	echo("<td class=\"left\">$u_u</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Password') ."</th>\n");
-	echo("<td class=\"left\">". mkpass('password') ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Group') ."</th>\n");
-	if(empty($r)) {
-		$u_r = '<select name="r"><option></option>';
-		$groups = array();
-		if($_SESSION['acl']['superuser'] == 'Y') {
-			$sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['realm_table'];
-			$result = execute_sql($sql);
-			while( list($g) = fetch_row($result)) {
-				array_push($groups, $g);
-                $result->MoveNext();
-			}
-			db_close($result);
-		} else {
-			$groups =& $_SESSION['acl']['puser'];
-		}
-		foreach($groups as $g) {
-			$u_r .= "<option value=\"$g\">$g</option>";
-		}
-		$u_r .= '</select>';
-	} else {
-		$u_r = mkhidden('r', $arr) . "<tt>$r</tt>";
-	}
-	echo("<td class=\"left\">$u_r</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('First Name') ."</th>\n");
-	echo("<td class=\"left\">". mktext('fname', 16, 16, $arr) ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Last Name') ."</th>\n");
-	echo("<td class=\"left\">". mktext('lname', 24, 24, $arr) ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Email') ."</th>\n");
-	echo("<td class=\"left\">". mktext('email', 24, 64, $arr) ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Expiration') ."</th>\n");
-	echo("<td class=\"left\">".
-		mktext('ex_year', 4, 0, $arr) .' '.
-		mktext('ex_month', 2, 0, $arr) .' '.
-		mktext('ex_day', 2, 0, $arr) .' ('.
-			_('year') .' '.
-			_('month') .' '.
-			_('day'). ")</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Disabled') ."</th>\n");
-	echo("<td class=\"left\">". mkselect('disabled',array('Y' => _('Yes'), 'N' => _('No')), $arr) ."</td>\n");
-?>
-	</tr><tr>
-		<th colspan="2" class="center">
-			<input type="submit" name="submit" value="<?php echo(_('Update')); ?>"/>&nbsp;
-			<input type="submit" name="cancel" value="<?php echo(_('Cancel')); ?>"/>&nbsp;
-			<input type="submit" name="delete" value="<?php echo(_('Delete')); ?>"/>
-		</th>
-	</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/todo.inc
===================================================================
--- admin/include/where/todo.inc	(revision 6370)
+++ admin/include/where/todo.inc	(working copy)
@@ -1,30 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: todo.inc,v 1.5 2005/04/14 17:51:22 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-?>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<?php if (file_exists($ESPCONFIG['include_path']."/../../TODO")) { ?>
-<table><tr><td><pre>
-<?php include($ESPCONFIG['include_path']."/../../TODO"); ?>
-</pre></td></tr></table>
-<?php
-	} else {
-		echo('<p>' . mkwarn(_('Todo list not found.')) . "</p>\n");
-	}
-?>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-?>
Index: admin/include/where/index.inc
===================================================================
--- admin/include/where/index.inc	(revision 6370)
+++ admin/include/where/index.inc	(working copy)
@@ -1,12 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php include(esp_where('manage')); ?>
Index: admin/include/where/editproject.inc
===================================================================
--- admin/include/where/editproject.inc	(revision 6370)
+++ admin/include/where/editproject.inc	(working copy)
@@ -1,212 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-session_register('project_name');
-
-	//error_reporting(E_ALL);
-	
-//session_register('new_survey');
-//session_register('last_tab');
-//session_register('curr_q');
-
-/* Use this hack to work around how PHP handles session vars.
- * When Register_Globals is on, the value of the global $foo
- * is saved, and $_SESSION['foo'] is ignored.
- * When Register_Globals is off, the global $foo is ignored
- * and $_SESSION['foo'] is saved.
- * By making $_SESSION['foo'] a copy of $foo
- * when reg_glob is on, we can use $_SESSION uniformly
- * from here on, regardless of the INI settings.
- */
-if(ini_get('register_globals')) {
-	$_SESSION['project_name']  = $project_name;
-	//$_SESSION['new_survey'] = $new_survey;
-	//$_SESSION['last_tab']   = $last_tab;
-	//$_SESSION['curr_q']     = $curr_q;
-}
-
-
-require ESP_BASE.'admin/sanitize.php';
-
-
-?>
-
-</div>
-</form>
-<?
-function validLink($link) {
-    if(preg_match("/http:\/\//", $link)) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-if(isset($_POST['submit'])) {
-	unset($_POST['submit']);
-	/*$project_name = $_POST['project_name'];
-	$presurvey = $_POST['presurvey'];
-	$postsurvey = $_POST['postsurvey'];
-	$preactiontext = $_POST['preactiontext'];
-	$postactiontext = $_POST['postactiontext'];
-	$actionurl = $_POST['actionurl'];*/
-	$project_name = sanitize($_POST['project_name']);
-	$presurvey = sanitize($_POST['presurvey']);
-	$postsurvey = sanitize($_POST['postsurvey']);
-	$preactiontext = sanitize($_POST['preactiontext']);
-	$postactiontext = sanitize($_POST['postactiontext']);
-	$actionurl = sanitize($_POST['actionurl']);
-
-	// Check the validity of the URL
-	if (!validLink($actionurl))
-	{
-		// url is invalid
-		echo("<h2>Invalid URL</h2>");
-	}
-//	elseif ($presurvey == $postsurvey)
-//	{
-//		echo("<h2>Postsurvey can not equal Presurvey</h2>");
-//	}
-	else
-	{
-	$sqlins = 'update project set' .
-	"`name` = '$project_name', ".
-	"`presurvey` = $presurvey, ".
-	"`postsurvey` = $postsurvey, ".
-	"`action_intro_msg` = '$preactiontext', ".
-	"`action_outro_msg` = '$postactiontext', ".
-	"`action_url` = '$actionurl' WHERE `id` = '$_GET[id]'";
-	
-	$result = execute_sql($sqlins);
-	//echo $sqlins;
-	echo ErrorMsg();
-	
-	$sql = "UPDATE `survey` SET `status` = '1' WHERE `id` = '$presurvey'";
-	execute_sql($sql);
-	$sql = "UPDATE `survey` SET `status` = '1' WHERE `id` = '$postsurvey'";
-	execute_sql($sql);
-	
-	
-	
-	echo "<h2> $project_name edited. </h2>";
-	}
-		
-} else {
-	$id = sanitize($_GET['id']);
-	$userid = sanitize($_SESSION['acl']['userid']);
-	if ($_SESSION['acl']['superuser'] != 'Y')
-	{
-		$sql = "SELECT * FROM `userprojectrel` WHERE `userid` = '$userid' AND `projectid` = '$id' AND `admin` = 'Y'";
-		
-		//echo $sql."<br />";
-		
-		$result = execute_sql($sql);
-		if ($result->RecordCount() <= 0)
-		{
-			die();
-		}
-	}
-	$sql = "SELECT * FROM `project` WHERE `id` = '$id'";
-	
-		//echo $sql."<br />";
-	
-	$result = execute_sql($sql);
-	
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s ORDER BY s.id DESC";
-			
-	} else {
-		$realms = array_to_insql(
-		array_intersect(
-		$_SESSION['acl']['pall'],
-		$_SESSION['acl']['pdesign']));
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-				FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE (s.owner = ".
-		_addslashes($_SESSION['acl']['username']) ." || s.realm $realms) ORDER BY id DESC";
-	}
-	
-			//echo $sql."<br />";
-	
-	$result2 = execute_sql($sql);
-
-	$survey_opts_pre = "";
-	$survey_opts_post = "";
-	while(list($sid,$name,$title,$owner,$realm) = fetch_row($result2)) {
-		$result2->MoveNext();
-		$survey_opts_pre .= '"<option value="' . $sid .'" ';
-		if ($sid == $result->fields[2])
-			$survey_opts_pre .= "SELECTED";
-		$survey_opts_pre .= '>' . $title . '</option>';
-		
-		$survey_opts_post .= '"<option value="' . $sid .'" ';
-		if ($sid == $result->fields[3])
-			$survey_opts_post .= "SELECTED";
-		$survey_opts_post .= '>' . $title . '</option>';
-	}
-?>
-<h2><?php echo(_('Edit Project')); ?></h2>
-<form method="post" name="editprojectform"
-	action="<?php echo($ESPCONFIG['ME'])."?where=editproject&id=$id"; ?>">
-<div align="center">
-<table>
-	<tr>
-		<td align="right">Project Name:</td>
-		<td align="left"><input type="text" id="project_name"
-			name="project_name" value="<?=$result->fields[1];?>" maxlength="40" /></td>
-	</tr>
-	<tr>
-		<td align="right">Pre-Survey:</td>
-		<td align="left"><select name="presurvey">
-			<option value="-1">none</option>
-			<?
-			echo $survey_opts_pre;
-			?>
-		</select>
-		<a href="<?php echo($ESPCONFIG['ME'])."?where=new"; ?>">create a new survey</a>
-		</td>
-	</tr>
-	<tr>
-		<td align="right">Post-Survey:</td>
-		<td align="left"><select name="postsurvey">
-			<option value="-1">none</option>
-			<?
-			echo $survey_opts_post;
-			?>
-		</select>
-		<a href="<?php echo($ESPCONFIG['ME'])."?where=new"; ?>">create a new survey</a>
-		</td>
-	</tr>
-	<tr>
-		<!--
-		<td align="right">Pre-Action Text:</td>
-		<td align="left"><textarea rows="4" cols="40" name="preactiontext"><?=$result->fields[4];?></textarea>
-		</td>
-		
-	</tr>
-	<tr>
-		<td align="right">Post-Action Text:</td>
-		<td align="left"><textarea rows="4" cols="40" name="postactiontext"><?=$result->fields[5];?></textarea>
-		</td>
-		-->
-	</tr>
-	<tr>
-		<td align="right">URL of Action:</td>
-		<td align="left"><input type="text" value="<?=$result->fields[6];?>" name="actionurl" />
-		</td>
-	</tr>
-
-</table>
-<input type="reset" value="Reset"> <input type="submit" name="submit"
-	value="Save"></div>
-</form>
-			<? } ?>
Index: admin/include/where/testersproject.inc
===================================================================
--- admin/include/where/testersproject.inc	(revision 6370)
+++ admin/include/where/testersproject.inc	(working copy)
@@ -1,85 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-//print_r($_SESSION);
-error_reporting(E_ALL);
-require ESP_BASE.'admin/sanitize.php';
-if (!isset($_GET['project']))
-{
-	echo "<h2>My Projects</h2>";
-	$sql = "SELECT * FROM `userprojectrel` WHERE `userid` = '".$_SESSION['acl']['userid']."' AND `admin` = 'Y'";
-	$result = execute_sql($sql);
-	$project_id = $result->fields[2];
-
-	$sql = "SELECT * FROM `project` WHERE `id` = '$project_id'";
-
-	$result = execute_sql($sql);
-
-	$projects = array();
-	while (!$result->EOF) {
-		$projects[] = array($result->fields[1],$result->fields[0]);
-		$result->MoveNext();
-	}
-	foreach ($projects as $project)
-	{
-		echo "<br /><a href='?where=testersproject&project=".$project[1]."'>".$project[0]."</a></li></ul>"; 
-	}
-}
-else
-{
-	$sql = "SELECT * FROM `userprojectrel` WHERE `userid` = '".$_SESSION['acl']['userid']."' AND `admin` = 'Y' AND `projectid` = '".sanitize($_GET['project'])."'";
-	$result = execute_sql($sql);
-	if ($result->RecordCount() == 0)
-		die("You are not authorized to view this project!");
-	displayTheForm();
-}
-function displayTheForm()
-{
-?>
-</form>
-<h2>Add Tester to a Project</h2>
-<form method="post" name="tpsaveform" action="<?=$GLOBALS['ESPCONFIG']['ME'];?>?where=tpsave">
-<input type="hidden" name="project" value="<?=$_GET['project'];?>" />
-<div align="center">
-<table>
-	<tr>
-		<td align="right">Tester Name:</td>
-		<td align="left">
-			<select name="tester">
-<?php
-$sql = "SELECT * FROM `user` WHERE `isresearcher` = 'N'";
-$result = execute_sql($sql);
-$users = array();
-while (!$result->EOF) {
-		$users[] = array($result->fields[1],$result->fields[0]);
-		$result->MoveNext();
-}
-foreach ($users as $user)
-	echo "<option value='$user[1]'>$user[0]</option>";
-?>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td align="right">Administrator?</td>
-		<td align="left">
-			<input type="radio" name="admin" value="1" />Yes<br />
-			<input type="radio" name="admin" value="0" checked="checked" />No
-		</td>
-	</tr>
-</table>
-<input type="reset" value="Reset"> <input type="submit" name="submit"
-	value="Add Tester"></div>
-</form>
-<?
-}
-?>
Index: admin/include/where/status.inc
===================================================================
--- admin/include/where/status.inc	(revision 6370)
+++ admin/include/where/status.inc	(working copy)
@@ -1,253 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: status.inc,v 1.26 2007/11/27 13:16:22 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	if(!empty($_GET['sid']))
-		$sid = intval($_GET['sid']);
-
-	$bg = '';
-
-	/* operation selected ... */
-	if(!empty($_GET['op'])) {
-		$sql = "SELECT status,owner,realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${sid}";
-		$result = execute_sql($sql);
-		if((list($old_status, $owner, $realm) = fetch_row($result))) {
-			$result->MoveNext();
-			$access = false;
-			$err = false;
-			$status = $old_status;
-			// trying to perform some operation
-			switch(strtolower($_GET['op'])) {
-				case 'c':	// Clear
-					/* only _superuser_s can do this */
-					if($_SESSION['acl']['superuser'] == 'Y') {
-						$access = true;
-					} else {
-						$access = false;
-					}
-					$status = 0;
-					break;
-				case 't':	// test
-					/* only the owner or a group editor+design */
-					if($owner == $_SESSION['acl']['username'] ||
-						in_array($realm, array_intersect(
-							$_SESSION['acl']['pall'],
-							$_SESSION['acl']['pdesign']))) {
-						$access = true;
-					}
-					$status = $old_status | STATUS_TEST;
-					if($old_status & ( STATUS_TEST | STATUS_DELETED | STATUS_DONE | STATUS_ACTIVE ) )
-						$err = true;
-					break;
-				case 'm':	// Edit
-					/* only the owner or a group editor+design */
-					if($owner == $_SESSION['acl']['username'] ||
-						in_array($realm, array_intersect(
-							$_SESSION['acl']['pall'],
-							$_SESSION['acl']['pdesign']))) {
-						$access = true;
-					}
-					$status = $old_status & ~STATUS_TEST;
-					if($old_status & ( STATUS_DELETED | STATUS_DONE | STATUS_ACTIVE ) )
-						$err = true;
-					else
-						response_delete_all($sid);
-					break;
-				case 'a':	// activate
-					/* only the owner+stauts or a group editor+status */
-					if(in_array($realm, $_SESSION['acl']['pstatus']) &&
-						($owner == $_SESSION['acl']['username'] ||
-						in_array($realm, $_SESSION['acl']['pall']))) {
-						$access = true;
-					}
-					$status = $old_status | STATUS_ACTIVE;
-					if($old_status & ( STATUS_ACTIVE | STATUS_DELETED | STATUS_DONE ) )
-						$err = true;
-					else
-						response_delete_all($sid);
-					break;
-				case 'e':	// End
-					/* only the owner+stauts or a group editor+status */
-					if(in_array($realm, $_SESSION['acl']['pstatus']) &&
-						($owner == $_SESSION['acl']['username'] ||
-						in_array($realm, $_SESSION['acl']['pall']))) {
-						$access = true;
-					}
-					$status = $old_status | STATUS_DONE;
-					if($old_status & (STATUS_DONE | STATUS_DELETED) )
-						$err = true;
-					break;
-				case 'd':	// Delete
-					/* only the owner+stauts or a group editor+status */
-					if(in_array($realm, $_SESSION['acl']['pstatus']) &&
-						($owner == $_SESSION['acl']['username'] ||
-						in_array($realm, $_SESSION['acl']['pall']))) {
-						$access = true;
-					}
-					$status = $old_status | STATUS_DELETED;
-					if($old_status & STATUS_DELETED)
-						$err = true;
-					break;
-			}
-			/* superuser overrides all */
-			if($_SESSION['acl']['superuser'] == 'Y')
-				$access = true;
-			if($access || auth_no_access(_('to access this survey'))) {
-				if(!$err) {
-					$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['survey_table']." SET status=$status WHERE id=${sid}";
-					execute_sql($sql);
-				} else {
-					print mkwarn(_('Can not set survey status.'));
-					print mkerror(_('Status') .': '. $old_status);
-				}
-			}
-		}
-	}
-?>
-<h2><?php echo(_('Survey Status')); ?></h2>
-<div style="text-align: left">
-
-<ul>
-<li><?php echo(_('<b>Test</b> transitions a survey into testing mode. At which point you may
-perform a live test by taking the survey, and viewing the results. The survey may be switched 
-back into <b>Edit</b> mode if additional edits are needed.')); ?></li>
-
-<li><?php echo(_('<b>Activate</b> transitions a survey into active mode. In this mode the
-survey is open for production use, and may be put online. This will clear any
-results from testing mode (if any). No further editing of survey is
-allowed.')); ?></li>
-
-<li><?php echo(_('<b>End</b> transitions a survey into ended mode. In this mode, no edits are
-possible, no users may take the survey (it is inactive), but results are still
-viewable from the results menu.')); ?></li>
-
-<li><?php echo(_('<b>Archive</b> removes this survey. It is still stored in the database, but
-no further interaction is allowed. You may <b>not</b> view the results of an
-archived survey.')); ?></li>
-</ul>
-
-</div>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<table cellspacing="0" cellpadding="4">
-	<tr class="header">
-		<th><?php echo(_('ID')); ?></th>
-		<th><?php echo(_('Name')); ?></th>
-		<th><?php echo(_('Title')); ?></th>
-		<th><?php echo(_('Owner')); ?></th>
-		<th><?php echo(_('Group')); ?></th>
-		<th><?php echo(_('Status')); ?></th>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	</tr>
-<?php
-	/* load names and titles of all surveys available to
-	 * _this_ user */
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = 'SELECT id,name,title,status,owner,realm FROM '.$GLOBALS['ESPCONFIG']['survey_table'].' ORDER BY id DESC';
-	} else {
-		$realms = array_to_insql(
-			array_intersect(
-				$_SESSION['acl']['pall'],
-				array_merge(
-					$_SESSION['acl']['pall'],
-					$_SESSION['acl']['pdesign'])));
-		$sql = "SELECT id,name,title,status,owner,realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE (owner = ".
-			_addslashes($_SESSION['acl']['username']) ." || realm $realms) ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-
-	$realms = array_intersect(
-			$_SESSION['acl']['pstatus'],
-			array_merge(
-				$_SESSION['acl']['pall'],
-				$_SESSION['acl']['pstatus']));
-
-	while(list($sid,$name,$title,$status,$owner,$realm) = fetch_row($result)) {
-        $result->MoveNext();
-		$stat = _('Editing');
-		$test = "<a href=\"". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=status&op=t&sid=${sid}")."\">". _('Test') ."</a>";
-		$act  = "<a href=\"". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=status&op=a&sid=${sid}")."\" onclick='return activateConfirm()'>". _('Activate') ."</a>";
-		$done = "<a href=\"". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=status&op=e&sid=${sid}")."\">". _('End') ."</a>";
-		$del  = "<a href=\"". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=status&op=d&sid=${sid}")."\">". _('Archive') ."</a>";
-
-		if($status & STATUS_DELETED) {
-			$stat = _('Archived');
-			$test = $act = $done = $del = '&nbsp;';
-			continue;
-		} elseif($status & STATUS_DONE) {
-			$stat = _('Ended');
-			$test = $act = $done = '&nbsp;';
-		} elseif($status & STATUS_ACTIVE) {
-			$stat = _('Active');
-			$test = $act = '&nbsp;';
-		} elseif($status & STATUS_TEST) {
-			$stat = _('Testing');
-			$done = '&nbsp;';
-			$test = "<a href=\"". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=status&op=m&sid=${sid}")."\">". _('Edit') ."</a>";
-		} else {
-			$done = '&nbsp;';
-		}
-
-		/* whack things back to permissions set by ACL
-		 * for everyone _not_ superuser */
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				!in_array($realm, $realms)) {
-			$act  = '&nbsp;';
-			$done = '&nbsp;';
-			$del  = '&nbsp;';
-		}
-
-		if($bg != $ESPCONFIG['bgalt_color1'])
-			$bg = $ESPCONFIG['bgalt_color1'];
-		else
-			$bg = $ESPCONFIG['bgalt_color2'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td><?php echo($sid); ?></td>
-        <?php 
-        if ($stat == 'Active') {?>
-            <td><a href="<?php print $ESPCONFIG['autopub_url']."?name=".$name; ?>"><?php echo($name); ?></a></td>
-        <?php
-	} elseif ($stat == 'Testing') { ?>
-	   <td><a href="<?php print $ESPCONFIG['autopub_url']."?name=".$name."&test=1"; ?>"><?php echo($name); ?></a></td>
-        <?php
-	} elseif ($stat == 'Editing') { ?>
-	   <td><a href="<?php print $ESPCONFIG['ME'].htmlentities("?where=tab&newid=${sid}"); ?>"><?php echo($name); ?></a></td>
-	<?php
-        } else { ?>
-		<td><?php echo($name); ?></td>
-        <?php } ?>
-		<td><?php echo($title); ?></td>
-		<td><?php echo($owner); ?></td>
-		<td><?php echo($realm); ?></td>
-		<td><?php echo($stat); ?></td>
-		<td><?php echo($test); ?></td>
-		<td><?php echo($act); ?></td>
-		<td><?php echo($done); ?></td>
-		<td><?php echo($del); ?></td>
-	</tr>
-<?php
-	}
-?>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/upload.inc
===================================================================
--- admin/include/where/upload.inc	(revision 6370)
+++ admin/include/where/upload.inc	(working copy)
@@ -1,156 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: upload.inc,v 1.15 2007/07/09 12:58:18 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-// upload.inc written by Matthew Gregg
-// <greggmc@musc.edu>
-// Bulk upload from text files
-
-    /* SuperUser or Designers with "Administer Group Members(pgroup)" permissions only*/
-    if(($_SESSION['acl']['superuser'] != 'Y' &&
-        (count($_SESSION['acl']['pgroup']) == 0 &&
-        count($_SESSION['acl']['puser']) == 0)) &&
-        !auth_no_access(_('to access this form'))) {
-        return;
-    }
-
-	$bg1 =& $ESPCONFIG['bgalt_color1'];
-	$bg2 =& $ESPCONFIG['bgalt_color2'];
-    if(isset($_GET['account_type'])) {
-            $account_type = htmlspecialchars($_GET['account_type']);
-    }
-    else {
-        $account_type = "respondents";
-    }
-	$errstr = '';
-
-// End the included form so we can do a multipart/form-data form
-?>
-</div>
-</form>
-<?php
-	if(isset($_POST['submit'])) {
-		unset($_POST['submit']);
-		if(isset($_POST['account_type'])) {
-			$account_type = htmlspecialchars($_POST['account_type']);
-        }
-		else {
-			$account_type = "respondents";
-        }
-
-        $upload_type = $_POST['upload_type'];
-        if (isset($_FILES['upload_file']['tmp_name'])) {
-            $upload_file = $_FILES['upload_file']['tmp_name'];
-        }
-        else {
-            $upload_file = "";
-        }
-		$group_acl	= array();
-
-
-		if($_SESSION['acl']['superuser'] == 'Y') {
-			$sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['realm_table'];
-			$result = execute_sql($sql);
-			while (list($row) = fetch_row($result)) {
-                $result->MoveNext();
-				array_push($group_acl, $row);
-			}
-			db_close($result);
-		} elseif(count($_SESSION['acl']['pgroup']) > 0) {
-			$group_acl =& $_SESSION['acl']['pgroup'];
-		} else {
-            $group_acl =& $_SESSION['acl']['puser'];
-		}
-		if(!empty($upload_type) && !empty($account_type) && is_uploaded_file($upload_file)) {
-			$file = file($upload_file);
-			$exceptions = array();
-			$success = account_upload($exceptions, $upload_type, $account_type, $group_acl, $file);
-			if($success) {
-				unset($_POST['account_type']);
-				unset($_POST['submit']);
-				include(esp_where("$account_type"));
-                       		return;
-			}
-			elseif(count($exceptions) > 1) {
-				$errstr .= mkerror(_('An error occurred during upload.  Rows that failed are listed below.'));
-				$exception_table = ("<table width=\"95%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\" align=\"center\" \">\n");
-				$bg = $ESPCONFIG['bgalt_color2'];
-	 			$exception_table .= "<tr bgcolor=\"$bg\">\n";
-				/* Build  exception rows */
-				/* Header row*/
-				while (list(, $col) = each ($exceptions[0])) {
-					$exception_table .= "<th align=\"left\">$col</th>\n";
-				}
-				$exception_table .= "</tr>\n";
-				/* Data rows*/
-				next($exceptions);
-				while (list(, $row) = each ($exceptions)) {
-					if ($bg == $ESPCONFIG['bgalt_color1'])
-	       	       	         		$bg =& $ESPCONFIG['bgalt_color2'];
-        		        	else
-                       				$bg =& $ESPCONFIG['bgalt_color1'];
-					$exception_table .= "<tr valign=\"top\" bgcolor=\"$bg\">\n";
-					foreach($row as $col) {
-						$exception_table .= "<td>$col</td>\n";
-
-					}
-				}
-				$exception_table .= "</tr>\n</table>";
-			}
-			else {
-				$errstr .= mkerror(_('An error occurred during upload.  Please check the format of your text file.'));
-			}
-		}
-		else {
-				$errstr .= mkerror(_('An error occurred during upload.  Please complete all form fields.'));
-		}
-	}
-?>
-<h2><?php echo(_('Upload Account Information')); ?></h2>
-<p><?php echo(_('All fields are required')) ?></p>
-<?php if(!empty($errstr)) echo("<p>$errstr</p>\n"); ?>
-<span class="large">
-<a href="<?php echo($GLOBALS['ESPCONFIG']['ME'] ."?where=help#batch"); ?>" onclick="window.open(this.href,'_blank');return false;"><?php echo(_('Help')); ?></a>
-</span>
-<form enctype="multipart/form-data" method="post" action="<?php echo ($GLOBALS['ESPCONFIG']['ME']); ?>?where=upload">
-<table cellspacing="0" cellpadding="4" style="width: 350px;">
-<?php
-		echo("<tr>\n<td class=\"right\">"._('File Type')."</td>\n");
-		echo("<td class=\"left\">\n".mkselect('upload_type',array('tab' => _('Tab Delimited')))."</td>\n</tr>");
-		echo("<tr>\n<td class=\"right\">"._('File to upload')."</td>\n");
-		echo("<td class=\"left\">\n".mkfile('upload_file')."\n"."</td>\n</tr>");
-?>
-<tr>
-<td colspan="2" class="center">
-<input type="hidden" name="where" value="upload" />
-<input type="hidden" name="account_type" value="<?php echo($account_type); ?>" />
-<input type="submit" value="Upload" name="submit" />
-</td>
-</tr>
- </table>
-</form>
-<?php if(!empty($exception_table)) echo("<p>$exception_table</p>\n"); ?>
-<form method="post" action="" id="null">
-<div>
-
-<?php
-echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n");
-?>
-
Index: admin/include/where/viewstep_process_4.inc
===================================================================
--- admin/include/where/viewstep_process_4.inc	(revision 6370)
+++ admin/include/where/viewstep_process_4.inc	(working copy)
@@ -1,54 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-if ($_SESSION['mode'] == 'manage') {
-	//Make markers to remove emptied fields
-	
-
-	
-	if ($_POST['activate'] == 'true') {
-		$data = array('status'=>'2');
-		$editresult = $project->update($data);
-		$preid = $project->pre_survey['id'];
-		$postid = $project->post_survey['id'];
-		
-		$surveydata = array('status'=>'1');
-		if ($preid) {
-			$pre_survey = new Survey($preid);
-			$preresult = $pre_survey->update($surveydata);
-			if (!$preresult) {
-				$err[] = 'Error Updating Pre-Survey Status';
-			}
-		}
-		if ($postid) {
-			$post_survey = new Survey($postid);
-			$postresult = $post_survey->update($surveydata);
-			if (!$postresult) {
-				$err[] = 'Error Updating Post-Survey Status';
-			}
-		}
-		if (is_array($editresult)) {
-			//set errors
-			$err = $editresult;
-		} else { //Set Success
-			unset($project);
-			$project = new Project;
-			$project->init($_SESSION[pid]);
-		}
-	}
-}
-if (is_array($err)) {
-	$step = $from;
-}
-
-
-?>
Index: admin/include/where/viewstep_process_5.inc
===================================================================
--- admin/include/where/viewstep_process_5.inc	(revision 6370)
+++ admin/include/where/viewstep_process_5.inc	(working copy)
@@ -1,55 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-/*
-File: 		step_process_5.inc \\v 1.0
-Info:		- to be used with ?where=create&step=5 - Process data from the 5th step (inviting users)
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-<?php
-
-$userids_select = $_POST[users];
-
-$subject = "You've Been Invited! - Participation in Survey";
-$message = 
-"Welcome <user-fname> <user-lname>, \n
-You've been invited to participate in the following usability project survey! \n
-\n
-<project-name> \n
-";
-foreach ($userids_select as $userid) {
-	$user = new User($userid);
-	$options = array('pid'=>$_SESSION[pid],'from'=>'invite@vulab.electblake.com');
-	$mailresults = $user->email($subject,$message,$options);
-	if ($mailresults) {
-		$good[] = 'Invitations Successfully Sent!';
-		$addUser = new Perm('user',$userid);
-		$assignResult = $addUser->assignUser($_SESSION[pid]);
-		if (is_array($assignResult)) {
-			$err[] = $assignResult;
-		} else { 
-			$good[] = $assignResult;
-		}
-	} else {
-		$err[] = "Sorry! Invitations cannot be sent at this time.";
-	}
-}
-if (is_array($err)) {
-	$step = $from;
-}
-
-
-?>
Index: admin/include/where/viewresults.inc
===================================================================
--- admin/include/where/viewresults.inc	(revision 6370)
+++ admin/include/where/viewresults.inc	(working copy)
@@ -1,25 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-
-if ($_GET['pid']) {
-	$project = new Project;
-	$project->init($_GET['pid']);
-	$presurvey = $project->details['pre_id'];
-	$postsurvey = $project->details['post_id'];
-	echo "<h2>View Results</h2>";
-	echo "<a href='".$GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=results&sid=${presurvey}")."'>View Pre-Survey Results</a><br />";
-	echo "<a href='".$GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=results&sid=${postsurvey}")."'>View Post-Survey Results</a><br />";
-} else {
-
-	echo "<div id='errors'>You didn't select a project! <ul><li><a href='javascript:history.go(-1)'>Go back...</a></li></ul></div>";
-}
-?>
\ No newline at end of file
Index: admin/include/where/deactivateproject.inc
===================================================================
--- admin/include/where/deactivateproject.inc	(revision 6370)
+++ admin/include/where/deactivateproject.inc	(working copy)
@@ -1,57 +0,0 @@
-<?php
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	include('../lib/vulab.projects.class.php');
-	if ($_POST['deactivating'] == 'yeahimdoingit') {
-		$project = new Project;
-		$pid = $_POST[pid];
-		if (is_numeric($pid) AND $pid > 0) {
-			$project->init($pid);
-			$data = array('status'=>'3');
-			$editresult = $project->update($data);
-			if (is_array($editresult)) {
-				$errors = $editresult;
-			} else {
-			
-				$onload = ' onLoad="self.parent.window.location=\'http://vulab.yorku.ca/admin/manage.php?success=deactivatedproject\';setTimeout(self.parent.tb_remove(),6000);" ';
-			}
-			
-		}
-	}
-}
-?>
-<html>
-<head>
-<link href="http://vulab.yorku.ca/admin/style.css" rel="stylesheet" type="text/css" />
-</head>
-<body <?=$onload;?>>
-<div class="padded">
-<br/>
-<center>
-<?php
-if ($_SERVER['REQUEST_METHOD'] == 'POST') { 
-
-	if ($errors) { 
-		echo "<div class='errors'>";
-		foreach ($errors as $error) {
-			echo $error;
-		}
-		echo "</div>";
-	} else {
-		echo "<h1><center>Success!<br/>You have deactivated this project</center></h1>";
-	}
-
-} else { ?>
-
-<form action="/admin/manage.php?where=deactivateproject&lay=ajax&id=<?=$_GET[id]?>" method="post">
-<h2><center>You are deactivating your project!</center></h2>
-<p>This will close your project to testers and will set your project as "completed"</p
-<input type="hidden" name="pid" value="<?=$_GET[id]?>" />
-<input type="hidden" name="deactivating" value="yeahimdoingit" />
-<input type="submit" value="Yes, Deactivate This Project!" />
-<input type="button" value="Cancel" onClick="self.parent.tb_remove();"/>
-</form>
-<? }  ?>
-</center>
-</div>
-</body>
-</html>
\ No newline at end of file
Index: admin/include/where/viewproject.inc
===================================================================
--- admin/include/where/viewproject.inc	(revision 6370)
+++ admin/include/where/viewproject.inc	(working copy)
@@ -1,16 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-$project = new Project;
-$projec->init($_GET[pid]);
-?>
-
Index: admin/include/where/results.inc
===================================================================
--- admin/include/where/results.inc	(revision 6370)
+++ admin/include/where/results.inc	(working copy)
@@ -1,298 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-    /* $Id: results.inc,v 1.34 2007/07/09 12:58:18 liedekef Exp $ */
-
-    /* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-    // Written by James Flemer
-    // For eGrad2000.com
-    // <jflemer@alum.rpi.edu>
-
-    $bg = '';
-    require ($ESPCONFIG['include_path']."where/crosstab.inc");
-    // see if a survey has been selected
-    $sid = '';
-    if (!empty($_POST['sid']))
-    $sid = intval($_POST['sid']);
-    elseif (!empty($_GET['sid']))
-    $sid = intval($_GET['sid']);
-    $pid = $_GET[pid];
-    if (!$pid) { $pid = $_POST[pid]; }
-    
-    if (!empty($sid)) {
-        $srealm = auth_get_survey_realm(_addslashes($sid));
-        if(!empty($_GET['test'])) {
-            /* check ACL to see if user is allowed to test
-            * _this_ survey */
-            if($_SESSION['acl']['superuser'] != 'Y' &&
-            !auth_is_owner($sid, $_SESSION['acl']['username']) &&
-            !in_array($srealm, array_intersect(
-                $_SESSION['acl']['pdesign'],
-                $_SESSION['acl']['pall'])) &&
-                !auth_no_access(_('to access this survey'))) {
-                    return;
-                }
-                echo("<p><b>". _('Testing Survey...') ."</b> (". _('SID') ." = $sid)</p>\n");
-        } else {
-            /* check ACL to see if user is allowed to get results to
-            * _this_ survey */
-            if($_SESSION['acl']['superuser'] != 'Y' &&
-            !auth_is_owner($sid, $_SESSION['acl']['username']) &&
-            !in_array($srealm, array_intersect(
-                $_SESSION['acl']['pdata'],
-                $_SESSION['acl']['pall'])) &&
-                !auth_no_access(_('to access this survey'))) {
-                    return;
-                }
-        }
-        if (isset($_GET['type'])) {
-            if ($_GET['type'] == "cross") {
-                echo('<h2>'. _('Cross Tabulation') ."</h2>\n");
-            }
-        }
-    ?>
-    <font size="+2">
-<? /*<a href="<?php echo($GLOBALS['ESPCONFIG']['ME']."?where=help"); ?>" target="_blank">Help</a>*/ ?>
-
-    </font>
-    <br /><br />
-    <style type="text/css">
-    	.results {
-	    	padding:10px;
-    	}
-    </style>
-    <?php
-    $project = new Project;
-    $project->init($pid);
-    if ($project->id AND !$_GET['rid']) {
-    
-    	
-    	echo "<h2 style='padding:10px;text-align:center;'><a href='?where=view&pid=$project->id'>Back to Project</a>";
-    	
-    	$postid = $project->post_survey['id'];
-    	$ridSQL = "SELECT * FROM `response` WHERE `survey_id` = '$postid'";
-	    $ridResult = execute_sql($ridSQL);
-    	$ridCount = 0;
-	    while ($ridRow = fetch_row($ridResult)) {
-    		if ($ridCount > 0) {
-    			break;
-    		}
-	    	$ridResult->MoveNext();
-    		$firstRid = $ridRow[0];
-    		++$ridCount;
-	    }
-	    if ($_GET['sid'] == $project->post_survey['id']) {
-		    echo " - <a href='?where=results&sid=$postid&rid=$firstRid'>Browse Responses (and Videos)</a>";
-		} else {
-		    echo " - <a href='?where=results&sid=$postid&rid=$firstRid'>Browse Responses</a>";			
-		}
-	    echo "</h2>";
-	    
-    }
-    
-    ?>
-<table class="results" cellpadding="4" cellspacing="0">
-    <tr><td>
-    <?php
-        $precision = '';
-        if (!empty($_GET['precision']))
-           $precision = intval($_GET['precision']);
-        $totals = '';
-        if (!empty($_GET['totals']))
-           $totals = intval($_GET['totals']);
-        $qid = '';
-        $cids = '';
-        $rid = '';
-        $qidc = '';
-        $qidr = '';
-        $guicross = '';
-        if (!empty($_GET['qid']))
-           $qid = intval($_GET['qid']);
-        if (!empty($_GET['cids']))
-           $cids = _addslashes($_GET['cids']);
-        if (!empty($_POST['cids']))
-            $cids = $_POST['cids'];     
-        if (!empty($_POST['qid']))
-           $qid = intval($_POST['qid']);
-        if (!empty($_POST['qidc']))
-           $qidc = intval($_POST['qidc']);
-        if (!empty($_POST['qidr']))
-           $qidr = intval($_POST['qidr']);
-        if (!empty($_POST['rid']))
-           $rid = intval($_POST['rid']);
-        elseif (!empty($_GET['rid']))
-           $rid = intval($_GET['rid']);
-        if (!empty($_GET['type']))
-           $guicross = $_GET['type'];
-        if (!empty($rid)) {
-            $ret = survey_results($sid, $precision, 0, '', '', $rid);
-        } else if (!empty($guicross)){
-            $ret = survey_results($sid, $precision, $totals, '','','', $guicross);
-        } else if (!empty($qidc) || !empty($qidr)){
-            cross_tabulation($sid, $qidc, $qidr, $qid, $cids);
-        } else {
-            $ret = survey_results($sid, $precision, $totals, $qid, $cids);
-			
-        }
-        if(!empty($ret))
-           echo("<font color=\"". $ESPCONFIG['error_color'] ."\">$ret</font>\n");
-    ?>
-    <?php
-        if(!empty($_GET['test'])) {
-            echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=test&test=1&sid=". $_GET['sid']) ."\">". _('Test Survey') ."</a><br>\n");
-        }
-
-
-        if (!empty($_GET['type'])) {
-        ?>
-        </td></tr>
-        <tr><td align="center">
-    <input type="reset" value="<?php echo _('Reset'); ?>" />
-    <?php #echo mksubmit('cross', _('Cross Tabulate')); ?>
-        <br />
-        <?php
-        }
-    ?>
-    </td></tr></table>
-<?php #echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<br>
-    <?php
-        return;
-    }
-
-    // No SurveyId specified, so build a table of
-    // surveys to choose from ...
-
-    /* load names and titles of all surveys available to
-    * _this_ user */
-    $statusok = (STATUS_ACTIVE | STATUS_DONE);
-    $statusno = STATUS_DELETED;
-    if ($_SESSION['acl']['superuser'] == 'Y') {
-        $sql = "SELECT id,name,title,owner,realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']."
-        WHERE NOT ".db_bin("status", $statusno)." AND ".db_bin("status", $statusok)." ORDER BY id DESC";
-    } else {
-        $realms = array_to_insql(
-            array_intersect(
-                $_SESSION['acl']['pall'],
-                $_SESSION['acl']['pdata']));
-                $sql = "SELECT id,name,title,owner,realm
-                FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE NOT ".db_bin("status", $statusno)." AND ".db_bin("status", $statusok)." AND (owner = ".
-                _addslashes($_SESSION['acl']['username']) ." || realm $realms) ORDER BY id DESC";
-    }
-    $result = execute_sql($sql);
-
-    if (empty($_GET['type'])) {
-    ?>
-<h2><?php echo(_('View Survey Results')); ?></h2>
-<?php echo(_('Pick Survey to View')); ?>
-
-    <input type="hidden" name="rid" value="" />
-    <input type="hidden" name="sid" value="" />
-    <input type="hidden" name="where" value="results" />
-    <input type="hidden" name="pid" value="<?=$pid?>" />
-    <?php
-    } else {
-        echo('<h2>'. _('Cross Tabulation') ."</h2>\n");
-        echo(_('Pick Survey to Cross Tabulate'));
-    }
-?>
-<table cellspacing="0" cellpadding="4">
-    <tr class="header">
-<th><?php echo(_('ID')); ?></th>
-<?php if (empty($_GET['type'])) { ?>
-<th><?php echo(_('Respondent')); ?></th>
-    <?php }
-    else { ?>
-    <th></th>
-<?php }?>
-<th><?php echo(_('Name')); ?></th>
-<th><?php echo(_('Title')); ?></th>
-<th><?php echo(_('Owner')); ?></th>
-<th><?php echo(_('Group')); ?></th>
-<th><?php echo(_('Resp')); ?></th>
-    </tr>
-    <?php
-        $count = 0;
-        while(list($sid,$name,$title,$owner,$realm) = fetch_row($result)) {	
-            $result->MoveNext();
-            //let's see how many respondents we have for each survey.
-            //angek: let's not include incomplete surveys in the count.
-            // this occurs for multipage surveys as each page completed
-            // is submitted and stored.
-            $sql2 = "SELECT count(*) FROM ".$GLOBALS['ESPCONFIG']['response_table']." WHERE survey_id = $sid AND complete = 'Y'";
-            $result2 = execute_sql($sql2);
-            list($resp) = fetch_row($result2);
-            db_close($result2);
-            if($bg != $ESPCONFIG['bgalt_color1'])
-            $bg = $ESPCONFIG['bgalt_color1'];
-            else
-            $bg = $ESPCONFIG['bgalt_color2'];
-        ?>
-    <tr style="background-color: <?php echo($bg); ?>;">
-    <td><?php echo($sid); ?></td>
-        <?php
-            if (empty($_GET['type'])) {
-                // grab all the rid values for the particular survey
-                $sql = "SELECT R.id FROM ".$GLOBALS['ESPCONFIG']['response_table']." R ".
-                "WHERE R.survey_id = ${sid} AND R.complete = 'Y' ".
-                "ORDER BY R.id";
-                $rid_result = execute_sql($sql);
-                $count++;
-            }
-        ?>
-        <td>
-        <?php 
-            if (empty($_GET['type'])) {
-            ?>
-        <select name="rid<?php echo $count; ?>" onchange="javascript:this.form.rid.value=this.form.rid<?php echo $count; ?>.options[this.form.rid<?php echo $count; ?>.selectedIndex].value; this.form.sid.value=<?php echo $sid; ?>; this.form.submit(); return false;">
-            <option value=""></option>
-            <?php
-                $i = 0;
-
-                while (list($rid) = fetch_row($rid_result)) {
-                    $rid_result->MoveNext();
-                ?>
-            <option value="<?php echo $rid; ?>"><?php echo ++$i; ?></option>
-                <?php
-                }
-            ?>
-            </select> 
-            <?php
-            }
-        ?>
-        </td>
-        <td>
-        <?php
-            if (!empty($_GET['type'])){
-            ?>	
-        <a href="<?php echo("". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=results&sid=${sid}&type=cross")); ?>">
-            <?php   }
-                else {
-                ?>
-            <a href="<?php echo("". $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=results&sid=${sid}")); ?>">
-            <?php   } ?>
-            <?php echo($name); ?>
-                </a>
-                </td>
-            <td><?php echo($title); ?></td>
-            <td><?php echo($owner); ?></td>
-            <td><?php echo($realm); ?></td>
-            <td><?php echo($resp); ?></td>
-                </tr>
-                <?php
-        }
-        db_close($result);
-    ?>
-    </table>
-<?php #echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/logout.inc
===================================================================
--- admin/include/where/logout.inc	(revision 6370)
+++ admin/include/where/logout.inc	(working copy)
@@ -1,34 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: logout.inc,v 1.5 2007/12/10 12:15:55 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-// <jflemer@acm.rpi.edu>
-
-	manage_logout();
-?>
-<table cellspacing="0" cellpadding="4">
-	<tr>
-		<td><?php echo _('Logged out.'); ?><br>
-			<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Log back in.') . "</a>\n"); ?>
-		</td>
-	</tr>
-	<script type="text/javascript">
-		window.location = "/admin/";
-	</script>
-</table>
-&nbsp;
Index: admin/include/where/copy.inc
===================================================================
--- admin/include/where/copy.inc	(revision 6370)
+++ admin/include/where/copy.inc	(working copy)
@@ -1,118 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: copy.inc,v 1.17 2005/08/01 16:12:55 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	/* if survey has been selected ... */
-	if(!empty($_GET['sid'])) {
-		$sid = intval($_GET['sid']);
-		
-		$srealm = auth_get_survey_realm($sid);
-		/* check ACL to see if user is allowed to copy
-		 * _this_ survey */
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				!auth_is_owner($sid, $_SESSION['acl']['username']) &&
-				!in_array($srealm, array_intersect(
-						$_SESSION['acl']['pdesign'],
-						$_SESSION['acl']['pall'])) &&
-				!auth_no_access(_('to access this survey'))) {
-			return;
-		}
-
-		/* copy the survey */
-		if(!survey_copy($sid)) {
-			echo(mkerror(_('Error copying survey.') ." (". ErrorMsg() .")") . "<br>\n");
-			echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n");
-			return;
-		}
-?>
-<script language="JavaScript"><!--
-window.location="<?php echo($GLOBALS['ESPCONFIG']['ME'] ."?where=manage"); ?>"
-//-->
-</script>
-<?php
-		echo("<noscript><a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a></noscript>\n");
-		return;
-	}
-
-	/* load names and titles of all surveys available to
-	 * _this_ user */
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = 'SELECT id,name,title,status,owner,realm FROM '.$GLOBALS['ESPCONFIG']['survey_table'].' ORDER BY id DESC';
-	} else {
-		$realms = array_to_insql(
-			array_intersect(
-				$_SESSION['acl']['pall'],
-				$_SESSION['acl']['pdesign']));
-		$sql = "SELECT id,name,title,status,owner,realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE NOT (status & ". STATUS_DELETED .") AND (owner = ".
-			_addslashes($_SESSION['acl']['username']) ." || realm $realms) ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-	$bg = '';
-
-?>
-<h2><?php echo(_('Copy Survey')); ?></h2>
-<?php echo(
-_('Choose a survey of which to make a copy. The copy will have the same
-status of a newly created survey. You will be able to edit the
-survey, and will have to activate it before use.')); ?>
-<table cellpadding="4" cellspacing="0">
-	<tr class="header">
-		<th><?php echo(_('ID')); ?></th>
-		<th><?php echo(_('Name')); ?></th>
-		<th><?php echo(_('Title')); ?></th>
-		<th><?php echo(_('Status')); ?></th>
-		<th><?php echo(_('Owner')); ?></th>
-		<th><?php echo(_('Group')); ?></th>
-	</tr>
-<?php
-	while(list($sid,$name,$title,$status,$owner,$realm) = fetch_row($result)) {
-        $result->MoveNext();
-		if($status & STATUS_DELETED) {
-			$stat = _('Archived');
-		} elseif($status & STATUS_DONE) {
-			$stat = _('Ended');
-		} elseif($status & STATUS_ACTIVE) {
-			$stat = _('Active');
-		} elseif($status & STATUS_TEST) {
-			$stat = _('Testing');
-		} else {
-			$stat = _('Editing');
-		}
-		
-		if($bg != $ESPCONFIG['bgalt_color1'])
-			$bg = $ESPCONFIG['bgalt_color1'];
-		else
-			$bg = $ESPCONFIG['bgalt_color2'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td><?php echo($sid); ?></td>
-		<td><a href="<?php echo(htmlentities("". $GLOBALS['ESPCONFIG']['ME'] ."?where=copy&sid=${sid}")); ?>"><?php echo($name); ?></a></td>
-		<td><?php echo($title); ?></td>
-		<td><?php echo($stat); ?></td>
-		<td><?php echo($owner); ?></td>
-		<td><?php echo($realm); ?></td>
-	</tr>
-<?php
-	}
-	db_close($result);
-?>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/viewstep_html_4.inc
===================================================================
--- admin/include/where/viewstep_html_4.inc	(revision 6370)
+++ admin/include/where/viewstep_html_4.inc	(working copy)
@@ -1,50 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$("a[href='#activate']").click(function() {
-		$("input[name='activate']").attr('value','true');
-		$("a[href='#activate'] span").attr('class','green');
-		$("a[href='#later'] span").attr('class','grey');
-		$('#activate_continue').fadeIn();
-	});
-	$("a[href='#later']").click(function() {
-		$("input[name='activate']").attr('value','false');
-		$("a[href='#activate'] span").attr('class','grey');
-		$("a[href='#later'] span").attr('class','green');
-		$('#activate_continue').fadeOut();
-	});
-});
-</script>
-<div class="column" style="margin-left:50px;">
-<h1 style="text-align:center !important;">Activate "<?php echo $project->details[name]; ?>"</h1>
-<div class="note margined">
-	<div>Note: You will be setting this project to "active" which will change the start date to <strong>today</strong></div>
-	<div>This means your project will <span>now be available to the public</span> and your project will be able to capture data</div>
-</div>
-<div style="padding:20px 0px 0px 50px;text-align:center;" class="left">
-<h2><a href="#activate"><span class="grey">Activate Project</span></a></h2>
-<h2><a href="#later"><span class="green">Activate Later</span></a></h2>
-</div>
-<div class="left" id="activate_continue" style="text-align:left !important;padding:10px;display:none;">
-	<input type="submit" value="Click Here to Activate Project!"/><br /><br/>
-	<div class="note">
-		Note: This cannot be undone, and you will no longer be able to change project fields. <br />
-		<strong>You will only be able to manage testers</strong>
-	</div>
-</div>
-<input type="hidden" name="activate" value=""/>
-<input type="hidden" name="from" value="4" id="from" />
-<input type="hidden" name="go" value="5" id="go" />
-<input type="hidden" name="where" value="view" id="where" />
-</div>
\ No newline at end of file
Index: admin/include/where/viewstep_html_5.inc
===================================================================
--- admin/include/where/viewstep_html_5.inc	(revision 6370)
+++ admin/include/where/viewstep_html_5.inc	(working copy)
@@ -1,44 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-/*
-File: 		step_html_5.inc \\v 1.0
-Info:		for ?where=create&step=5 (invite users)
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-
-<div class="field_lines">
-<h1>Select Testers to Invite</h1>
-<input type="submit" value="Invite Users"/>
-<?php
-$fields = array('option_checkbox','userid','username','fname','lname');
-$aliases = array('userid'=>'User ID','username'=>'Username','fname'=>'First name','lname'=>'Last name');
-$options = array('titles'=>true,'aliases'=>$aliases);
-$testers = getUsers('tester');
-foreach ($testers as $k => $tester) {
-	$tester = new Perm('user',$tester->id);
-	if (!is_numeric($tester->id) OR $tester->checkUser($project->id)) {
-		unset($testers[$k]);
-	}
-}
-echo display_users_table($fields,$testers,$options);
-?>
-
-<input type="hidden" name="from" value="5" id="from" />
-<input type="hidden" name="go" value="5" id="go" />
-<input type="hidden" name="where" value="view" id="where" />
-<input type="submit" value="Invite Users"/>
-</div>
\ No newline at end of file
Index: admin/include/where/step_html_1.inc
===================================================================
--- admin/include/where/step_html_1.inc	(revision 6370)
+++ admin/include/where/step_html_1.inc	(working copy)
@@ -1,50 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-if (!$project->details[start]) {
-$checked['start'] = 'checked="checked"';
-$disabled['start'] = 'disabled="disabled"';
-}
-
-if (!$project->details[end]) {
-$checked['end'] = 'checked="checked"';
-$disabled['end'] = 'disabled="disabled"';
-}
-?>
-
-<div class="column">
-<h1><?php echo(_('Project Details')); ?></h1><br />
-<field>
-	<label>Name:</label>
-	<input type="text" name="pname" id="pname" class="form_field" value="<?php echo $project->details[name]; ?>"/>
-</field><br />
-<field>
-	<label>Introduction:<br/><em>Give a brief overview what your study is all about</em></label>
-	<textarea cols="20" rows="5" name="pintro" id="pintro"  class="form_field"/><?php echo $project->details[intro]; ?></textarea>
-</field><br />
-<?php
-/*<field>
-	<label>Study Goal:<br/><em>What are the specifics of what your are trying to test or accomplish?<br/>ex. We are trying to test the usability of a function, </em></label>
-	<textarea cols="20" rows="5" name="pgoal" id="pgoal"  class="form_field"/><?php echo $project->details[goal]; ?></textarea>
-</field><br />
-*/ ?>
-<field>
-	<label>URL to be Tested:</label>
-	<input type="text" name="purl" id="purl"  class="form_field" value="<?php echo $project->details[url]; ?>"/>
-</field><br />
-<field><label>Thank-you Message:</label><textarea cols="20" rows="5" name="pthanks" id="pthanks"/><?php echo $project->details[outro]; ?></textarea></field>
-<br />
-<input type="hidden" name="from" value="1" id="from" />
-<input type="hidden" name="go" value="2" id="go" />
-<input type="hidden" name="where" value="create" id="where" />
-<div class="buttons"><input type="button" value="Cancel"><input type="submit" value="Save as Draft and Continue"/></div>
-</div>
\ No newline at end of file
Index: admin/include/where/crosstab.inc
===================================================================
--- admin/include/where/crosstab.inc	(revision 6370)
+++ admin/include/where/crosstab.inc	(working copy)
@@ -1,310 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-
-
-    /* $Id: crosstab.inc,v 1.12 2006/02/21 06:17:14 angek Exp $ */
-
-    /* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-    /* The Cross Tabulation feature has been kept separate from the rest of phpESP intentionally.
-    It provides an easier means of disabling it by commenting out the require line in results.inc
-    and the function call (cross_tabulation()) plus it avoids cluttering survey_results...
-    */
-
-    /* {{{ proto void cross_tabulation (integer sid, integer qidc, integer qidr, integer qid, array cids)
-    Builds HTML to allow for cross tabulation reporting. */
-    function cross_tabulation($sid, $qidc, $qidr, $qid, $cids){
-        // some error handling
-        if (empty($qid) && empty($cids)){
-            if (!empty($qidc) && !empty($qidr)){
-                if ($qidc == $qidr){
-                    $errmsg = mkerror(_('Error cross-tabulating.').
-                    ' '. _('Please ensure that your column and row selections are not of the same question.'));
-                }
-                else {
-                    process($sid,$qidc,$qidr);
-                }
-            }
-            else if (!empty($qidc) || !empty($qidr)){
-                $errmsg = mkerror(_('Error cross-tabulating.').
-                ' '. _('Please ensure you make both a column and row selection.'));
-            }
-        }
-        else {
-            $errmsg = mkerror(_('Error cross-tabulating.'). ' '.
-            _('You are attempting to cross analyze and tabulate at the same time. This is not possible!'));
-        }
-        if (!empty($errmsg)){
-            echo($errmsg);
-        }
-
-    }
-    function process($sid, $qidc, $qidr){
-        $qids = array();
-        $cids_col = array();
-        $cids_row = array();
-        $qidc_content = array();
-        $qidr_content = array();
-        $row_totals = array();
-        $col_counts = array();
-        $qn_content = array();
-        $tbl = array();
-        $tids = array();
-        $tid_content = array('Y','N');
-        $count = 0;
-        $tid_count = 0;
-        $p = 0;
-
-
-        array_push($qids, $qidc);
-        array_push($qids, $qidr);
-
-        foreach ($qids as $qid){
-            $sql = "SELECT content FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-            WHERE survey_id=${sid}
-            AND id = ${qid}";
-            $tid_result = execute_sql($sql);
-            $result = fetch_row($tid_result);
-
-            array_push($qn_content, $result[0]);
-        }
-        db_close($tid_result);
-        unset($sql);
-        unset($result);
-
-        // let's determine each question's type.
-        foreach ($qids as $qid){
-            $sql = "SELECT type_id FROM ".$GLOBALS['ESPCONFIG']['question_table']."
-            WHERE survey_id=${sid}
-            AND id = ${qid}";
-            $tid_result = execute_sql($sql);
-            $result = fetch_row($tid_result);
-
-            array_push($tids, $result[0]);
-        }
-        db_close($tid_result);
-        unset($sql);
-        unset($result);
-        // Now that we know the question's type	
-        // let's grab each question's choice content.
-        foreach ($tids as $tid){
-            if ($tid_count == 0 && $tid == 1){
-                foreach($tid_content as $content){
-                    if ($content == 'Y'){
-                        $content = 'Yes';
-                    }
-                    else {
-                        $content = 'No';
-                    }
-                    array_push($qidc_content, $content);
-                }
-            }
-            else if ($tid_count == 0){
-                $sql = "SELECT content FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']."
-                WHERE question_id=${qidc}
-                ORDER BY id";
-                if ($result = execute_sql($sql)){
-                    while (list($row) = fetch_row($result)){
-                        $result->MoveNext();
-                        array_push($qidc_content, $row);
-                    }
-                    db_close($result);
-                    unset($sql);
-                }
-            }
-            else if ($tid == 1){
-                foreach($tid_content as $content){
-                    if ($content == 'Y'){
-                        $content = 'Yes';
-                    }
-                    else {
-                        $content = 'No';
-                    }
-                    array_push($qidr_content, $content);
-                }
-            }
-            else{
-                $sql = "SELECT content FROM ".$GLOBALS['ESPCONFIG']['question_choice_table']."
-                WHERE question_id=${qidr}
-                ORDER BY id";
-                if ($result = execute_sql($sql)){
-                    while (list($row) = fetch_row($result)){
-                        $result->MoveNext();
-                        array_push($qidr_content, $row);
-                    }
-                    db_close($result);
-                    unset($sql);	
-                }
-            }
-            $tid_count++;
-        }
-        reset($tids);
-        $tidcounter = 0;
-        // Now to build the tabulation arrays that hold response counts.
-        foreach ($qids as $qid){
-            switch ($tids[$tidcounter]){
-                case 1:
-                    $from_table = $GLOBALS['ESPCONFIG']['response_bool_table'];
-                    $order = 'id';
-                    $table = $GLOBALS['ESPCONFIG']['response_bool_table'];
-                    array_push($tbl, $table);
-                    break;
-                case 4:
-                case 6:
-                    $from_table = $GLOBALS['ESPCONFIG']['question_choice_table'];
-                    $order = 'id';
-                    $table = $GLOBALS['ESPCONFIG']['response_single_table'];
-                    array_push($tbl, $table);
-                    break;
-                case 5:
-                    $from_table = $GLOBALS['ESPCONFIG']['question_choice_table'];
-                    $order = 'id';
-                    $table = $GLOBALS['ESPCONFIG']['response_multiple_table'];
-                    array_push($tbl, $table);
-                    break;
-            }
-            if ($tids[$tidcounter] == 1){
-                if ($tidcounter == 0){
-                    foreach($tid_content as $content){
-                        array_push($cids_col, $content);
-                    }
-                }
-                else{
-                    foreach($tid_content as $content){
-                        array_push($cids_row, $content);
-                    }
-                }
-            }
-            else {
-                $sql = "SELECT id FROM ".$from_table."
-                WHERE question_id = $qids[$count]
-                ORDER BY $order";
-                $result = execute_sql($sql);
-                while ($cid = fetch_row($result)){
-                    $result->MoveNext();
-                    if ($count == 0){
-                        array_push($cids_col, $cid[0]);
-                    }
-                    else{
-                        array_push($cids_row, $cid[0]);
-                    }
-                }
-                db_close($result);
-            }
-            $count++;
-            $tidcounter++;	
-        }
-
-        $num = 0;
-        $cids_col_count = sizeof($cids_col);
-        $cids_row_count = sizeof($cids_row);
-
-        foreach ($cids_row as $yy){
-            $total_row = 0;
-            foreach ($cids_col as $xx){
-                $sql1 = "SELECT count(*) FROM ".$GLOBALS['ESPCONFIG'][$tbl[0].'_table']." r1, ".$GLOBALS['ESPCONFIG'][$tbl[1].'_table']." r2
-                WHERE (r1.question_id = ${qids[0]} AND r1.choice_id = '${xx}')
-                AND (r2.question_id = ${qids[1]} AND r2.choice_id = '${yy}')
-                AND r1.response_id = r2.response_id";
-                $result1 = execute_sql($sql1);
-                while ($counts = fetch_row($result1)){
-                    $result1->MoveNext();
-                    $total_row += intval($counts[0]);
-                    array_push($col_counts, $counts[0]);
-                }
-            }
-            array_push($row_totals,$total_row);
-        }                
-
-        // let's build the cross-tabulation results table
-    ?>
-    <center>
-<p><b><?php echo("\"<font color=\"#CC0000\">".$qn_content[1]."</font>\""); ?>
-<?php echo ("vs \"<font color=\"#0099FF\">".$qn_content[0]."</font>\""); ?></b></p>
-    <table width="714" border="0" cellpadding="5" cellspacing="1" bgcolor="#999999">
-    <tr>
-    <td width="411" height="25" valign="default" bgcolor="#FFFFFF"><!-- <div align="center">
-    <strong>graph cross tabulated results:&nbsp;&nbsp;&nbsp;&nbsp; 
-    </strong></div> --></td>
-    <?php
-        foreach ($qidc_content as $content){
-            //echo ("<td width=\"89\" bgcolor=\"#FFFFFF\">");
-            echo ("<td bgcolor=\"#FFFFFF\">");
-            echo ("<div align=\"center\"><font color=\"#0099FF\"><b>".$content."</b></font></div></td>\n");
-        }
-        unset($content);
-    ?>
-    <td bgcolor="#CCCCCC">
-    <div align="center"><strong>Totals</strong></div></td>
-    </tr>
-    <?php
-        $q = 0;
-        $counter = 0;
-        $rt = 0;
-        foreach ($col_counts as $tt){
-            $counter++;
-            if ($counter == 1){
-                echo ("<tr>\n");
-                echo ("<td height=\"30\" valign=\"default\" bgcolor=\"#FFFFFF\">");
-                echo ("<font color=\"#CC0000\">".$qidr_content[$q++].":</font></td>\n");
-            }
-            if ($counter == $cids_col_count+1){
-                echo ("<td valign=\"default\" bgcolor=\"#CCCCCC\">");
-                echo ("<div align=\"center\"><b>".$row_totals[$rt++]."</b></div></td>\n");
-                echo ("</tr>\n");
-                echo ("<tr><td height=\"30\" valign=\"default\" bgcolor=\"#FFFFFF\">");
-                echo ("<font color=\"#CC0000\">".$qidr_content[$q++].":</font></td>\n");
-                echo ("<td valign=\"default\" bgcolor=\"#FFFFFF\">");
-                echo ("<div align=\"center\">".$tt."</div></td>\n");
-                $counter = 1;
-            }
-            else {
-                echo ("<td valign=\"default\" bgcolor=\"#FFFFFF\">");
-                echo ("<div align=\"center\">".$tt."</div></td>\n");
-            }
-        }
-        echo ("<td valign=\"default\" bgcolor=\"#CCCCCC\">");
-        echo ("<div align=\"center\"><b>".$row_totals[$rt++]."</b></div></td>\n");
-        echo ("</tr>\n");
-        echo ("<tr bgcolor=\"#CCCCCC\">\n");
-        echo ("<td height=\"30\">\n");
-        echo ("<div align=\"center\"><strong>TOTALS</strong></div></td>\n");
-
-        $grand_total = 0;
-        for ($f = 0; $f < $cids_col_count; $f++){
-            for ($g = 0; $g < $cids_row_count; $g++){
-                if ($g == 0){
-                    $subtotal = $f;
-                    $total = intval($col_counts[$f]);
-                }
-                else {
-                    $subtotal += $cids_col_count;
-                    $total += intval($col_counts[$subtotal]);
-                }
-            }
-            echo ("<td valign=\"default\">");
-            echo ("<div align=\"center\"><strong>".$total."</strong></div></td>\n");
-            $grand_total += $total;
-            unset($total);
-        }
-        echo ("<td valign=\"default\">");
-        echo ("<div align=\"center\"><strong>".$grand_total."</strong></div></td>\n");
-        echo ("</tr>\n");
-    ?>
-    </table>
-    <p>&nbsp;</p>  
-<a href="<?php echo($GLOBALS['ESPCONFIG']['ME']); ?>?where=results&sid=<?php echo($sid);?>&type=cross">Go back to Cross Analysis/Tabulation</a>
-    </center>
-
-    <?php
-    }
-?>
Index: admin/include/where/step_html_2.inc
===================================================================
--- admin/include/where/step_html_2.inc	(revision 6370)
+++ admin/include/where/step_html_2.inc	(working copy)
@@ -1,123 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-//Clean up the session vars
-unset($_SESSION[renamed]);
-//Lets Build Array of All Project's Surveys
-//By putting a bogus status in for get_projects_by_owner() we will retrieve ALL projects
-$all_projects = get_projects_by($_SESSION[acl]['userid']);
-
-foreach ($all_projects as $aProject) {
-	$pname = $aProject->details['name'];
-	if ($pname != $project->details['name']) {  
-		if ($aProject->pre_survey) {
-			unset($sid);
-			$sid = $aProject->pre_survey['id'];
-			if (!in_array($sid,$all_surveys)) {
-				$all_surveys[$pname]['pre'] = $sid;
-			}
-		}
-	/*	if ($aProject->post_survey) {
-			$all_surveys[$pname]['post'] = $aProject->post_survey['id'];
-		}*/
-	}
-}
-////////////////////////////////////////
-////////////////////////////////////////
-//Build HTML for Survey List
-//Survey Templates
-// ...... 2BCoded >>>>>>
-$survey_list_html = '';
-
-//Next ALL Project Surveys
-$survey_list_html .= '------';
-foreach ($all_surveys as $pname=>$survey) {
-
-	foreach ($survey as $type=>$sid) {
-		if ($project->pre_survey['id'] AND $project->pre_source != 'new') {
-			$selected = "selected='selected'";
-		}
-		$survey_list_html .= "<option $selected id='survey_option_".$sid."' value='".$sid."'>Project: ".$pname." (".ucwords($type)."-test)</option>\n";
-	}
-}
-$survey_list_html = "<option>Choose a survey</option>\n".$survey_list_html;
-////////////////////////////////////////
-////////////////////////////////////////
-//Pre-load stuff for Saved Surveys
-if (empty($project->pre_survey['id'])) {
-	$source = "none";
-	$notes[] = "You do <span>not</span> have a Pre-test Survey. <span class='green'>Would you like one?</span>";
-}
-elseif (!empty($project->pre_survey['id']))
-{
-	if ($project->details['pre_source'] == 'new') {
-		//Set a Default
-		$source = 'new';
-	} elseif ($project->details['pre_source']) {
-		$source = 'copy';
-		$source_id = $project->details['pre_source'];
-	}
-	$noneWarning = 'noneWarning';
-	
-//Load the previous survey
-$pre_id = $project->pre_survey['id'];
-}
-//Setup The Survey Options Panel
-$checked[$source] = 'checked="checked"';
-/*echo "<pre>";
-	print_r($project);
-echo "</pre>";*/
-?>
-<div class="column field_lines">
-<h1><?php echo($project->details['name']._(' - Pre-Test Survey')); ?></h1>
-<?php
-if (count($notes) > 0) {
-	echo "<br /><div class='note'>";
-	foreach ($notes as $note) {
-		echo "<div>$note</div>";
-	}
-	echo "</div><br/>";
-}
-?>
-<h2>Choose:</h2>
-<field class="indent1">
-	<input type="radio" name="pre_choose" value="none" id="pre_none" <?=$checked['none'];?> class="<?=$noneWarning;?>" /><label>No pre-test survey</label>
-</field>
-
-<h3 class="indent1">Create a new survey</h3>
-<field class="indent2">
-	<input type="radio" name="pre_choose" value="new" id="pre_new" <?=$checked['new'];?> /><label>... from Scratch</label>
-</field>
-
-<field style="border-bottom:1px solid #ccc;padding-bottom:5px;width:300px;" class="indent2">
-	<input type="radio" name="pre_choose" value="copy" id="pre_copy" <?=$checked['copy'];?>/><label>... from Existing Survey</label>
-	<div class="indent">
-		<select id="copysurvey" name="copysurvey">
-			<?php echo $survey_list_html; ?>
-		</select>
-	</div>
-</field>
-
-<div id="surveytitle">
-<h2><? echo $project->pre_survey['title']; ?></h2>
-</div>
-<div >
-<div id="surveynote">Survey Changes Will Not be Saved</div>
-<iframe id="surveytool" style="<? if ($project->details['pre_source']) echo 'display:block;'; ?>" src="manage.php?where=survey_tool&pid=<?=$project->id;?>&lay=form&<? echo ($project->pre_survey[id]) ? 'newid='.$project->pre_survey[id] : 'new=true'; ?>"></iframe>
-</div>
-<input type="hidden" name="survey_source" id="survey_source" />
-<input type="hidden" name="survey_id" id="survey_id" />
-<input type="hidden" name="from" value="2" id="from" />
-<input type="hidden" name="go" value="3" id="go" />
-<input type="hidden" name="where" value="create" id="where" />
-<input type="submit" class="surveytoolsubmit" value="Save Project Pre-Survey and Continue" />
-</div>
\ No newline at end of file
Index: admin/include/where/step_html_3.inc
===================================================================
--- admin/include/where/step_html_3.inc	(revision 6370)
+++ admin/include/where/step_html_3.inc	(working copy)
@@ -1,122 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-//Clean up the session vars
-unset($_SESSION[renamed]);
-//Lets Build Array of All Project's Surveys
-//By putting a bogus status in for get_projects_by_owner() we will retrieve ALL projects
-$all_projects = get_projects_by($_SESSION[acl]['userid']);
-
-foreach ($all_projects as $aProject) {
-	$pname = $aProject->details['name'];
-	if ($pname != $project->details['name']) {  
-		if ($aProject->post_survey) {
-			unset($sid);
-			$sid = $aProject->post_survey['id'];
-			if (!in_array($sid,$all_surveys)) {
-				$all_surveys[$pname]['post'] = $sid;
-			}
-		}
-	/*	if ($aProject->post_survey) {
-			$all_surveys[$pname]['post'] = $aProject->post_survey['id'];
-		}*/
-	}
-}
-////////////////////////////////////////
-////////////////////////////////////////
-//Build HTML for Survey List
-//Survey Templates
-// ...... 2BCoded >>>>>>
-$survey_list_html = '';
-
-//Next ALL Project Surveys
-$survey_list_html .= '------';
-foreach ($all_surveys as $pname=>$survey) {
-
-	foreach ($survey as $type=>$sid) {
-		if ($project->post_survey['id'] AND $project->post_source != 'new') {
-			$selected = "selected='selected'";
-		}
-		$survey_list_html .= "<option $selected id='survey_option_".$sid."' value='".$sid."'>Project: ".$pname." (".ucwords($type)."-test)</option>\n";
-	}
-}
-$survey_list_html = "<option>Choose a survey</option>\n".$survey_list_html;
-////////////////////////////////////////
-////////////////////////////////////////
-//post-load stuff for Saved Surveys
-if (empty($project->post_survey['id'])) {
-	$source = "none";
-	$notes[] = "You do <span>not</span> have a post-test Survey. <span class='green'>Would you like one?</span>";
-}
-elseif (!empty($project->post_survey['id']))
-{
-	if ($project->details['post_source'] == 'new') {
-		//Set a Default
-		$source = 'new';
-	} elseif ($project->details['post_source']) {
-		$source = 'copy';
-		$source_id = $project->details['post_source'];
-	}
-	
-//Load the postvious survey
-$post_id = $project->post_survey['id'];
-}
-//Setup The Survey Options Panel
-$checked[$source] = 'checked="checked"';
-/*echo "<post>";
-	print_r($project);
-echo "</post>";*/
-?>
-<div class="column field_lines">
-<h1><?php echo($project->details['name']._(' - post-Test Survey')); ?></h1>
-<?php
-if (count($notes) > 0) {
-	echo "<br /><div class='note'>";
-	foreach ($notes as $note) {
-		echo "<div>$note</div>";
-	}
-	echo "</div><br/>";
-}
-?>
-<h2>Choose:</h2>
-<field class="indent1">
-	<input type="radio" name="post_choose" value="none" id="post_none" <?=$checked['none'];?> /><label>No post-test survey</label>
-</field>
-
-<h3 class="indent1">Create a new survey</h3>
-<field class="indent2">
-	<input type="radio" name="post_choose" value="new" id="post_new" <?=$checked['new'];?> /><label>... from Scratch</label>
-</field>
-
-<field style="border-bottom:1px solid #ccc;padding-bottom:5px;width:300px;" class="indent2">
-	<input type="radio" name="post_choose" value="copy" id="post_copy" <?=$checked['copy'];?>/><label>... from Existing Survey</label>
-	<div class="indent">
-		<select id="copysurvey" name="copysurvey">
-			<?php echo $survey_list_html; ?>
-		</select>
-	</div>
-</field>
-
-<div id="surveytitle">
-<h2><? echo $project->post_survey['title']; ?></h2>
-</div>
-<div >
-<div id="surveynote">Survey Changes Will Not be Saved</div>
-<iframe id="surveytool" style="<? if ($project->details['post_source']) echo 'display:block;'; ?>" src="manage.php?where=survey_tool&pid=<?=$project->id;?>&lay=form&<? echo ($project->post_survey[id]) ? 'newid='.$project->post_survey[id] : 'new=true'; ?>"></iframe>
-</div>
-<input type="hidden" name="survey_source" id="survey_source" />
-<input type="hidden" name="survey_id" id="survey_id" />
-<input type="hidden" name="from" value="3" id="from" />
-<input type="hidden" name="go" value="5" id="go" />
-<input type="hidden" name="where" value="create" id="where" />
-<input type="submit" class="surveytoolsubmit" value="Save Project Post-Survey and Continue" />
-</div>
\ No newline at end of file
Index: admin/include/where/admdesigner.inc
===================================================================
--- admin/include/where/admdesigner.inc	(revision 6370)
+++ admin/include/where/admdesigner.inc	(working copy)
@@ -1,357 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: admdesigner.inc,v 1.20 2007/12/17 15:53:30 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-// <jflemer@acm.rpi.edu>
-
-    /* SuperUser or Designers with "Administer Designers(pgroup)" permissions only*/
-    if($GLOBALS['ESPCONFIG']['auth_type'] != 'ldap_both' &&
-	$GLOBALS['ESPCONFIG']['auth_type'] != 'ldap_resp' &&
-	$GLOBALS['ESPCONFIG']['auth_type'] != 'ldap_des' &&
-	$_SESSION['acl']['superuser'] != 'Y' &&
-        count($_SESSION['acl']['pgroup']) == 0 &&
-        !auth_no_access(_('to access this form'))) {
-        return;
-    }
-
-	$bg1 =& $ESPCONFIG['bgalt_color1'];
-	$bg2 =& $ESPCONFIG['bgalt_color2'];
-
-	$errstr = '';
-	$u = '';
-	$r = '';
-
-	/* abort */
-	if(isset($_POST['cancel'])) {
-		unset($_POST['submit']);
-		unset($_POST['delete']);
-		include(esp_where('designers'));
-		return;
-	}
-
-	/* delete user */
-	if(isset($_POST['delete'])) {
-		unset($_POST['submit']);
-		$u = _addslashes($_POST['u']);
-		$r = _addslashes($_POST['r']);
-		/* user can't delete himself */
-		if ($_SESSION['username']===$u) {
-			include(esp_where('designers'));
-			return;
-		}
-		/* check acl */
-		if($_SESSION['acl']['superuser'] == 'Y' ||
-			in_array($r, $_SESSION['acl']['pgroup']) ||
-			auth_no_access(_('to access this group'))) {
-			$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['designer_table']." WHERE username=$u AND realm=$r";
-			if(!execute_sql($sql) || affected_rows() < 1) {
-				/* unsucessfull -- abort */
-				$errstr .= mkerror(_('Cannot delete account.') .' ('.
-					ErrorMsg() .')');
-			}
-		}
-		if(empty($errstr)) {
-			include(esp_where('designers'));
-			return;
-		}
-	}
-
-	/* submitted */
-	if(isset($_POST['submit'])) {
-		$u         = _addslashes($_POST['u']);
-		$r         = _addslashes($_POST['r']);
-		$u_password  = _addslashes($_POST['password']);
-		$u_fname     = _addslashes($_POST['fname']);
-		$u_lname     = _addslashes($_POST['lname']);
-		$u_email     = _addslashes($_POST['email']);
-		$u_pdesign   = _addslashes($_POST['pdesign']);
-		$u_pstatus   = _addslashes($_POST['pstatus']);
-		$u_pdata     = _addslashes($_POST['pdata']);
-		$u_pall      = _addslashes($_POST['pall']);
-		$u_pgroup    = _addslashes($_POST['pgroup']);
-		$u_puser     = _addslashes($_POST['puser']);
-		$u_disabled  = _addslashes($_POST['disabled']);
-
-		if(!empty($_POST['ex_year']) ||
-				!empty($_POST['ex_month']) ||
-				!empty($_POST['ex_day'])) {
-			if(empty($_POST['ex_day'])) {
-				$u_ex_day = 1;
-			} else {
-				$u_ex_day = intval($_POST['ex_day']);
-			}
-			if(empty($_POST['ex_month'])) {
-				$u_ex_month = 1;
-			} else {
-				$u_ex_month = intval($_POST['ex_month']);
-			}
-			if(empty($_POST['ex_year'])) {
-				$now = getdate(time());
-				$u_ex_year = $now['year'];
-			} else {
-				$u_ex_year = intval($_POST['ex_year']);
-				if($u_ex_year < 2000)
-					$u_ex_year += 2000;
-			}
-
-			$u_expiration = sprintf("%04d%02d%02d%06d",
-				$u_ex_year,$u_ex_month,$u_ex_day,0);
-		} else {
-			$u_expiration = "00000000000000";
-			$u_ex_year    = '';
-			$u_ex_month   = '';
-			$u_ex_day     = '';
-		}
-
-        /* check acl */
-        if($_SESSION['acl']['superuser'] == 'Y' ||
-            in_array($r, $_SESSION['acl']['pgroup']) ||
-            auth_no_access(_('to access this group'))) {
-            #$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['designer_table']." WHERE username=".db_qstr($u)." AND realm=".db_qstr($r);
-            $sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['designer_table']." WHERE username=$u";
-            $result = execute_sql($sql);
-            if(!$result || record_count($result) < 1) {
-		/* new user */
-            	if(empty($u) || empty($r) || empty($u_password)) {
-            		$errstr .= mkerror(_('Username, Password, and Group are required.'));
-            	} else {
-            		$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['designer_table']."
-            			(username,realm,password,changed)
-            			VALUES ($u,$r, ".db_crypt($u_password).", ".sys_time_stamp().")";
-            		if(!execute_sql($sql)) {
-            			$u = '';
-            			$r = '';
-            			$errstr .= mkerror(_('Error adding account.') .' ('.
-            				ErrorMsg() .')');
-            		}
-            	}
-            }
-            db_close($result);
-            
-            /* change user data */
-            if(!empty($u) && !empty($r)) {
-            	if(empty($u_pdesign))
-            		$u_pdesign = 'Y';
-            	$fields = array('u_pstatus','u_pdata','u_pall','u_pgroup','u_puser','u_disabled');
-            	foreach($fields as $f) {
-            		if(empty($$f))
-            			$$f = 'N';
-            	}
-            	if (!empty($u_password))
-            		$u_password = "password=".db_crypt($u_password).",";
-            	$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['designer_table']." SET
-            		$u_password
-			        realm=$r,
-            		fname=$u_fname,
-            		lname=$u_lname,
-            		email=$u_email,
-            		pdesign=$u_pdesign,
-            		pstatus=$u_pstatus,
-            		pdata=$u_pdata,
-            		pall=$u_pall,
-            		pgroup=$u_pgroup,
-            		puser=$u_puser,
-            		disabled=$u_disabled,
-            		changed=".sys_time_stamp().",
-            		expiration=$u_expiration WHERE username=$u";
-            	#WHERE username=$u AND realm=$r;
-            	if(!execute_sql($sql)) {
-            		/* unsucessfull -- abort */
-            		$errstr .= mkerror(_('Cannot change account data.') .' ('.
-            			ErrorMsg() .')');
-            	}
-            }
-        }
-
-	    if(empty($errstr)) {
-	    	include(esp_where('designers'));
-	    	return;
-	    }
-	} else if(isset($_GET['u']) && isset($_GET['r'])) {
-		$u = _addslashes($_GET['u']);
-		$r = _addslashes($_GET['r']);
-	} else {
-		$u = '';
-		$r = '';
-		$u_expiration = '';
-		$u_disabled = 'N';
-		$u_pdesign  = 'Y';
-		$u_pstatus  = 'N';
-		$u_pdata    = 'N';
-		$u_pall     = 'N';
-		$u_pgroup   = 'N';
-		$u_puser    = 'N';
-	}
-
-	/* load ACL */
-	if(!empty($u) && !empty($r)) {
-		$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['designer_table']." WHERE username=$u AND realm=$r";
-		$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-		if($arr = fetch_row($result)) {
-			#foreach(array(
-			#	'username', 'realm', 'fname', 'lname', 'email',
-			#	'pdesign', 'pstatus', 'pdata', 'pall', 'pgroup', 'puser',
-			#	'disabled', 'expiration') as $col)
-			#	{ $$col = $arr[$col]; }
-			#$u =& $username;
-			#$r =& $realm;
-			#if(intval($expiration) > 0) {
-			$u =$arr['username'];
-			$r =$arr['realm'];
-			if(intval($arr['expiration']) > 0) {
-				$arr['ex_year']  = substr($arr['expiration'],0,4);
-				$arr['ex_month'] = substr($arr['expiration'],5,2);
-				$arr['ex_day']   = substr($arr['expiration'],8,2);
-			} else {
-				$arr['ex_year']  = '';
-				$arr['ex_month'] = '';
-				$arr['ex_day']   = '';
-			}
-		} else {
-			$errstr .= mkerror(_('Account not found.') .' ('.
-				ErrorMsg() .')');
-		}
-	}
-
-?>
-<h2><?php echo(_('Designer Account Administration')); ?></h2>
-<?php if(!empty($errstr)) echo("<p>$errstr</p>\n"); ?>
-<input type="hidden" name="where" value="admdesigner" />
-<table cellspacing="0" cellpadding="4" style="width: 450px;">
-	<tr>
-<?php
-	echo("<th class=\"right\">". _('Username') ."</th>\n");
-	if(empty($u))
-		$u_u = mktext('u', 16, 16, $GLOBALS);
-	else
-		$u_u = mkhidden('u', $GLOBALS) . "<tt>$u</tt>";
-	echo("<td class=\"left\">$u_u</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Password') ."</th>\n");
-	echo("<td class=\"left\">". mkpass('password') ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Group') ."</th>\n");
-	#if(empty($r)) {
-		$u_r = '<select name="r"><option></option>';
-		$groups = array();
-		if($_SESSION['acl']['superuser'] == 'Y') {
-			$sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['realm_table'];
-			$result = execute_sql($sql);
-			while( list($g) = fetch_row($result) ) {
-				array_push($groups, $g);
-                $result->MoveNext();
-			}
-			db_close($result);
-		} else {
-			$groups =& $_SESSION['acl']['pgroup'];
-		}
-		foreach($groups as $g) {
-			if (!empty($r) && $g===$r)
-			   $u_r .= "<option value=\"$g\" selected>$g</option>";
-			else
-			   $u_r .= "<option value=\"$g\">$g</option>";
-		}
-		$u_r .= '</select>';
-	#} else {
-	#	$u_r = mkhidden('r', $GLOBALS) . "<tt>$r</tt>";
-	#}
-	echo("<td class=\"left\"><tt>$u_r</tt></td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('First Name') ."</th>\n");
-	echo("<td class=\"left\">". mktext('fname', 16, 16, $arr) ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Last Name') ."</th>\n");
-	echo("<td class=\"left\">". mktext('lname', 24, 24, $arr) ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Email') ."</th>\n");
-	echo("<td class=\"left\">". mktext('email', 24, 64, $arr) ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Expiration') ."</th>\n");
-	echo("<td class=\"left\">".
-		mktext('ex_year',4,4, $arr) .' '.
-		mktext('ex_month',2,2, $arr) .' '.
-		mktext('ex_day',2,2, $arr) .' ('.
-			_('year') .' '.
-			_('month') .' '.
-			_('day'). ")</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Disabled') ."</th>\n");
-	echo("<td class=\"left\">". mkselect('disabled',array('Y' => _('Yes'), 'N' => _('No')), $arr) ."</td>\n");
-?>
-	</tr><!-- <tr>
-		<th colspan="2" bgcolor="<?php echo($bg2); ?>">
-			<input type="submit" name="submit" value="<?php echo(_('Update')); ?>">&nbsp;
-			<input type="submit" name="cancel" value="<?php echo(_('Cancel')); ?>">&nbsp;
-			<input type="submit" name="delete" value="<?php echo(_('Delete')); ?>"></th>
-	</tr>--><tr>
-<?php
-	echo("<th class=\"right\">". _('Design Surveys') ."</th>\n");
-	echo("<td class=\"left\">". mkselect('pdesign',array('Y' => _('Yes'), 'N' => _('No')), $arr) ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Change Survey Status') ."</th>\n");
-	echo("<td class=\"left\">". mkselect('pstatus',array('Y' => _('Yes'), 'N' => _('No')), $arr) .
-		'<!-- ('. _('Activate/End') .") --></td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Export Survey Data') ."</th>\n");
-	echo("<td class=\"left\">". mkselect('pdata',array('Y' => _('Yes'), 'N' => _('No')), $arr) ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Group Editor') ."</th>\n");
-	echo("<td class=\"left\">". mkselect('pall',array('Y' => _('Yes'), 'N' => _('No')), $arr) .
-		'<!-- ('. _('may edit <b>all</b> forms owned by this group') .") --></td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Administer Designers') ."</th>\n");
-	echo("<td class=\"left\">". mkselect('pgroup',array('Y' => _('Yes'), 'N' => _('No')), $arr) ."</td>\n");
-?>
-	</tr><tr>
-<?php
-	echo("<th class=\"right\">". _('Administer Respondents') ."</th>\n");
-	echo("<td class=\"left\">". mkselect('puser',array('Y' => _('Yes'), 'N' => _('No')), $arr) ."</td>\n");
-?>
-	</tr><tr>
-		<td colspan="2" class="center">
-			<input type="submit" name="submit" value="<?php echo(_('Update')); ?>"/>&nbsp;
-			<input type="submit" name="cancel" value="<?php echo(_('Cancel')); ?>"/>&nbsp;
-			<?php if (!($_SESSION['username']===$u)) { ?>
-			<input type="submit" name="delete" value="<?php echo(_('Delete')); ?>"/>
-			<?php } ?>
-		</td>
-	</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/step_html_4.inc
===================================================================
--- admin/include/where/step_html_4.inc	(revision 6370)
+++ admin/include/where/step_html_4.inc	(working copy)
@@ -1,91 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$("a[href='#activate']").click(function() {
-		$("input[name='activate']").attr('value','true');
-		$("a[href='#activate'] span").attr('class','green');
-		$("a[href='#later'] span").attr('class','grey');
-		$('#activate_continue').fadeIn();
-	});
-	$("a[href='#later']").click(function() {
-		$("input[name='activate']").attr('value','false');
-		$("a[href='#activate'] span").attr('class','grey');
-		$("a[href='#later'] span").attr('class','green');
-		$('#activate_continue').fadeOut();
-	});
-	
-	$("a[href='#active']").click(function() {
-		$("a[href='#active']").removeClass('grey');
-		$("a[href='#inactive']").addClass('grey');
-		$("#inactive").fadeOut('fast');
-		$("#activating").fadeIn();
-		$("#inactivelink").html('');
-	});
-});
-</script>
-<div class="column" style="margin-left:50px;">
-<h1 style="text-align:center !important;">Activate "<?php echo $project->details[name]; ?>"</h1>
-<div class="note margined" id="activating">
-	<div>This means your project will <span>now be available to the public</span> and your project will be able to capture data</div>
-	<div>Note: You will <strong>NOT</strong> be able to edit the surveys associated with this project</div>
-</div>
-<div class="margined warn" id="inactive">
-	<div>This project is <strong>not</strong> currently active!</div>
-	<div><em>Note:</em> This project will not be available to receive any study results and will need to be activated before any data can be collected</div>
-</div>
-<div style="padding:15px;">
-<input type="checkbox" id="pend_toggle" <?=$checked[end]?>/>&nbsp;No specified end date.<br />
-<strong>Select End Date:</strong>
-	<select id="eselectMonth"><option value="01">Jan</option><option value="02">Feb</option> 
-    <option value="03">Mar</option><option value="04">Apr</option> 
-    <option value="05">May</option><option value="06">Jun</option> 
-    <option value="07">Jul</option><option value="08">Aug</option> 
-    <option value="09">Sep</option><option value="10">Oct</option> 
-    <option value="11">Nov</option><option value="12">Dec</option></select> 
-<select id="eselectDay"><option value="01">1</option><option value="02">2</option> 
-    <option value="03">3</option><option value="04">4</option> 
-    <option value="05">5</option><option value="06">6</option> 
-    <option value="07">7</option><option value="08">8</option> 
-    <option value="09">9</option><option value="10">10</option> 
-    <option value="11">11</option><option value="12">12</option> 
-    <option value="13">13</option><option value="14">14</option> 
-    <option value="15">15</option><option value="16">16</option> 
-    <option value="17">17</option><option value="18">18</option> 
-    <option value="19">19</option><option value="20">20</option> 
-    <option value="21">21</option><option value="22">22</option> 
-    <option value="23">23</option><option value="24">24</option> 
-    <option value="25">25</option><option value="26">26</option> 
-    <option value="27">27</option><option value="28">28</option> 
-    <option value="29">29</option><option value="30">30</option> 
-    <option value="31">31</option></select> 
-<select id="eselectYear"><option value="2001">2001</option><option value="2002">2002</option> 
-    <option value="2003">2003</option><option value="2004">2004</option> 
-    <option value="2005">2005</option><option value="2006">2006</option> 
-    <option value="2007">2007</option><option value="2008">2008</option> 
-    <option value="2009">2009</option><option value="2010">2010</option></select> 
-</div><br />
-<h2><center>Current Status: <span id="inactivelink">Inactive</span> | <span id="activelink"><a href="#active" class="grey">Active</a></span></center></h2>
-<br />
-<div class="left" id="activate_continue" style="clear:both;text-align:left !important;padding:10px;display:none;">
-	<input type="submit" value="Click Here to Activate Project!"/><br /><br/>
-	<div class="note">
-		Note: This cannot be undone, and you will no longer be able to change project fields. <br />
-		<strong>You will only be able to manage testers</strong>
-	</div>
-</div>
-<input type="hidden" name="activate" value=""/>
-<input type="hidden" name="from" value="4" id="from" />
-<input type="hidden" name="go" value="5" id="go" />
-<input type="hidden" name="where" value="create" id="where" />
-</div>
\ No newline at end of file
Index: admin/include/where/purgesurveys.inc
===================================================================
--- admin/include/where/purgesurveys.inc	(revision 6370)
+++ admin/include/where/purgesurveys.inc	(working copy)
@@ -1,118 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: purge.inc,v 1.12 2005/08/01 16:12:55 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	if($_SESSION['acl']['superuser'] != 'Y') {
-		echo(mkerror(_('Only superusers allowed.'))."<br>\n");
-		echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n");
-		return;
-	}
-
-	$sids = array();
-	if(!empty($_POST['list'])) {
-		while(list(,$sid) = each($_POST['list'])) {
-			array_push($sids, intval($sid));
-		}
-		survey_purge($sids);
-	}
-
-//	$sql = "
-//SELECT s.id,s.name,s.title,s.status,s.owner,s.realm,COUNT(q.id) as count
-//FROM survey s LEFT JOIN question q ON
-	$sql = "
-SELECT s.id,s.name,s.title,s.status,s.owner,s.realm,COUNT(q.id) as count
-FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s LEFT JOIN ".$GLOBALS['ESPCONFIG']['question_table']." q ON
-	s.id = q.survey_id AND q.deleted = 'N'
-GROUP BY s.id, s.name, s.title, s.status, s.owner, s.realm
-ORDER BY s.id DESC";
-	$result = execute_sql($sql);
-
-	$bg = $ESPCONFIG['bgalt_color2'];
-?>
-<h2><?php echo(_('Purge Surveys')); ?></h2>
-
-	<p><?php echo(_('
-This page is not directly on the main menu because it is
-dangerous. This <b>completely</b> removes everything about a
-survey from the database <b>forever</b>. All question info,
-general info, results, etc. are purged from the database. Do
-not do anything here that you are not completely certain
-about. There is no confirmation, there is no turning
-back.')); ?></p>
-
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<table cellspacing="0" cellpadding="4">
-	<tr style="background-color: <?php echo($bg); ?>">
-		<td>&nbsp;</td>
-		<th><?php echo(_('ID')); ?></th>
-		<th><?php echo(_('Name')); ?></th>
-		<th><?php echo(_('Title')); ?></th>
-		<th><?php echo(_('Owner')); ?></th>
-		<th><?php echo(_('Group')); ?></th>
-		<th><?php echo(_("# Q's")); ?></th>
-		<th><?php echo(_('Status')); ?></th>
-	</tr>
-<?php
-	while(list($sid,$name,$title,$status,$owner,$realm,$qnum) = fetch_row($result)) {
-        $result->MoveNext();
-		if($status & STATUS_DELETED) {
-			$stat = _('Archived');
-		} elseif($status & STATUS_DONE) {
-			$stat = _('Ended');
-		} elseif($status & STATUS_ACTIVE) {
-			$stat = _('Active');
-		} elseif($status & STATUS_TEST) {
-			$stat = _('Testing');
-		} else {
-			$stat = _('Editing');
-		}
-		
-		if($bg != $ESPCONFIG['bgalt_color1'])
-			$bg = $ESPCONFIG['bgalt_color1'];
-		else
-			$bg = $ESPCONFIG['bgalt_color2'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>">
-		<td><input type="checkbox" name="list[]" value="<?php echo($sid); ?>" /></td>
-		<td><?php echo($sid); ?></td>
-		<td><?php echo($name); ?></td>
-		<td><?php echo($title); ?></td>
-		<td><?php echo($owner); ?></td>
-		<td><?php echo($realm); ?></td>
-		<td><?php echo($qnum); ?></td>
-		<td><?php echo($stat); ?></td>
-	</tr>
-<?php
-	}
-	
-	if($bg != $ESPCONFIG['bgalt_color1'])
-		$bg = $ESPCONFIG['bgalt_color1'];
-	else
-		$bg = $ESPCONFIG['bgalt_color2'];
-?>
-    <tr style="background-color: <?php echo($bg); ?>">
-		<td colspan="8">
-			<input type="hidden" name="where" value="purge" />
-			<input type="reset" name="reset" value="<?php echo(_('Clear Checkboxes')); ?>" />
-			<input type="submit" name="submit" value="<?php echo(_('Purge Surveys')); ?>" />
-		</td>
-	</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/step_html_5.inc
===================================================================
--- admin/include/where/step_html_5.inc	(revision 6370)
+++ admin/include/where/step_html_5.inc	(working copy)
@@ -1,44 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-/*
-File: 		step_html_5.inc \\v 1.0
-Info:		for ?where=create&step=5 (invite users)
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-
-<div class="field_lines">
-<h1 style='margin-left:40px;'>Select Testers to Invite</h1>
-<input type="submit" value="Invite Users and Save Project" style="float:left;margin:10px 0px 10px 40px"/>
-<?php
-$fields = array('option_checkbox','userid','username','fname','lname');
-$aliases = array('userid'=>'User ID','username'=>'Username','fname'=>'First name','lname'=>'Last name');
-$options = array('titles'=>true,'aliases'=>$aliases);
-$testers = getUsers('tester');
-foreach ($testers as $k => $tester) {
-	$tester = new Perm('user',$tester->id);
-	if (!is_numeric($tester->id) OR $tester->checkUser($project->id)) {
-		unset($testers[$k]);
-	}
-}
-echo display_users_table($fields,$testers,$options);
-?>
-
-<input type="hidden" name="from" value="5" id="from" />
-<input type="hidden" name="go" value="5" id="go" />
-<input type="hidden" name="where" value="create" id="where" />
-<input type="submit" value="Invite Users and Save Project" style="float:left;margin:10px 0px 10px 40px"/>
-</div>
\ No newline at end of file
Index: admin/include/where/edit.inc
===================================================================
--- admin/include/where/edit.inc	(revision 6370)
+++ admin/include/where/edit.inc	(working copy)
@@ -1,75 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: edit.inc,v 1.12 2005/08/01 16:12:55 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-
-    $bg = '';
-
-	/* load names and titles of all surveys available to
-	 * _this_ user */
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-		FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status = 0 ORDER BY s.id DESC";
-	} else {
-		$realms = array_to_insql(
-			array_intersect(
-				$_SESSION['acl']['pall'],
-				$_SESSION['acl']['pdesign']));
-		$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status = 0 AND (s.owner = ".
-			_addslashes($_SESSION['acl']['username']) ." || s.realm $realms) ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-
-?>
-<h2><?php echo(_('Edit a Survey')); ?></h2>
-<?php echo(_('Pick Survey to Edit')); ?>
-<table cellspacing="0" cellpadding="4">
-	<tr class="header">
-		<th><?php echo(_('ID')); ?></th>
-		<th><?php echo(_('Name')); ?></th>
-		<th><?php echo(_('Title')); ?></th>
-		<th><?php echo(_('Owner')); ?></th>
-		<th><?php echo(_('Group')); ?></th>
-	</tr>
-<?php
-	while(list($sid,$name,$title,$owner,$realm) = fetch_row($result)) {
-        $result->MoveNext();
-		if($bg != $ESPCONFIG['bgalt_color1'])
-			$bg = $ESPCONFIG['bgalt_color1'];
-		else
-			$bg = $ESPCONFIG['bgalt_color2'];
-?>
-	<!-- Alternating Colors are set in the phpESP.ini.php file -->
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td><?php echo($sid); ?></td>
-		<td>
-			<a href="<?php echo(htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=tab&newid=${sid}")); ?>"><?php echo($name); ?></a>
-		</td>
-		<td><?php echo($title); ?></td>
-		<td><?php echo($owner); ?></td>
-		<td><?php echo($realm); ?></td>
-	</tr>
-<?php
-	}
-	db_close($result);
-?>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/step_html_complete.inc
===================================================================
--- admin/include/where/step_html_complete.inc	(revision 6370)
+++ admin/include/where/step_html_complete.inc	(working copy)
@@ -1,50 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$("a[href='#complete']").click(function() {
-		$("input[name='complete']").attr('value','true');
-		$("a[href='#complete'] span").attr('class','green');
-		$("a[href='#later'] span").attr('class','grey');
-		$('#complete_continue').fadeIn();
-	});
-	$("a[href='#later']").click(function() {
-		$("input[name='complete']").attr('value','false');
-		$("a[href='#complete'] span").attr('class','grey');
-		$("a[href='#later'] span").attr('class','green');
-		$('#complete_continue').fadeOut();
-	});
-});
-</script>
-<div class="column" style="margin-left:50px;">
-<h1 style="text-align:center !important;">complete "<?php echo $project->details[name]; ?>"</h1>
-<div class="note margined">
-	<div>Note: You will be setting this project to "complete" which will change the start date to <strong>today</strong></div>
-	<div>This means your project will <span>now be available to the public</span> and your project will be able to capture data</div>
-</div>
-<div style="padding:20px 0px 0px 50px;text-align:center;" class="left">
-<h2><a href="#complete"><span class="grey">complete Project</span></a></h2>
-<h2><a href="#later"><span class="green">complete Later</span></a></h2>
-</div>
-<div class="left" id="complete_continue" style="text-align:left !important;padding:10px;display:none;">
-	<input type="submit" value="Click Here to complete Project!"/><br /><br/>
-	<div class="note">
-		Note: This cannot be undone, and you will no longer be able to change project fields. <br />
-		<strong>You will only be able to manage testers</strong>
-	</div>
-</div>
-<input type="hidden" name="complete" value=""/>
-<input type="hidden" name="from" value="4" id="from" />
-<input type="hidden" name="go" value="5" id="go" />
-<input type="hidden" name="where" value="create" id="where" />
-</div>
\ No newline at end of file
Index: admin/include/where/step_html_2.inc.ajaxforkv1
===================================================================
--- admin/include/where/step_html_2.inc.ajaxforkv1	(revision 6370)
+++ admin/include/where/step_html_2.inc.ajaxforkv1	(working copy)
@@ -1,148 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-//Clean up the session vars
-unset($_SESSION[renamed]);
-//Lets Build Array of All Project's Surveys
-//By putting a bogus status in for get_projects_by_owner() we will retrieve ALL projects
-$all_projects = get_projects_by($_SESSION[acl]['userid']);
-
-foreach ($all_projects as $aProject) {
-	$pname = $aProject->details['name'];
-	if ($pname != $project->details['name']) {  
-		if ($aProject->pre_survey) {
-			unset($sid);
-			$sid = $aProject->pre_survey['id'];
-			if (!in_array($sid,$all_surveys)) {
-				$all_surveys[$pname]['pre'] = $sid;
-			}
-		}
-	/*	if ($aProject->post_survey) {
-			$all_surveys[$pname]['post'] = $aProject->post_survey['id'];
-		}*/
-	}
-}
-////////////////////////////////////////
-////////////////////////////////////////
-//Build HTML for Survey List
-//Survey Templates
-// ...... 2BCoded >>>>>>
-$survey_list_html = '';
-
-//Next ALL Project Surveys
-$survey_list_html .= '------';
-foreach ($all_surveys as $pname=>$survey) {
-
-	foreach ($survey as $type=>$sid) {
-		$survey_list_html .= "<option id='survey_option_".$sid."' value='".$sid."'>Project: ".$pname." (".ucwords($type)."-test)</option>\n";
-	}
-}
-$survey_list_html = "<option>Choose a survey</option>\n".$survey_list_html;
-////////////////////////////////////////
-////////////////////////////////////////
-//Pre-load stuff for Saved Surveys
-if (empty($project->pre_survey['id'])) {
-	$source = "none";
-	$notes[] = "You do <span>not</span> have a Pre-test Survey. <span class='green'>Would you like one?</span>";
-}
-elseif (!empty($project->pre_survey['id']))
-{
-	if ($project->pre_source == 'new' OR !$project->pre_source) {
-		//Set a Default
-		$source = 'new';
-	}elseif ($project->pre_source) {
-		$source = 'copy';
-		$source_id = $project->pre_source;
-	}
-	
-//Load the previous survey
-$pre_id = $project->pre_survey['id'];
-?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$.ajax({
-  		type: "POST",
-   		url: "manage.php?where=survey_tool&lay=ajax&where_context=pre_existing&newid=<?=$pre_id;?>",
-   		data: $('#postdata').text(),
-   		success: function(html){
-   		 	$('#surveytool').empty();
-			$('#surveytool').attr('innerHTML',html);
-			$('#surveytool').fadeIn('fast');
-		}
-   	});
-});
-</script>
-<?
-}
-//Setup The Survey Options Panel
-$checked[$source] = 'checked="checked"';
-/*echo "<pre>";
-	print_r($project);
-echo "</pre>";*/
-?>
-<div class="column field_lines">
-<h1><?php echo($project->details['name']._(' - Pre-Test Survey')); ?></h1>
-<?php
-if (count($notes) > 0) {
-	echo "<br /><div class='note'>";
-	foreach ($notes as $note) {
-		echo "<div>$note</div>";
-	}
-	echo "</div><br/>";
-}
-?>
-<h2>Choose:</h2>
-<field class="indent1">
-	<input type="radio" name="pre_choose" value="none" <?=$checked['none'];?> id="pre_none" class="isolatetoggle"/><label>No pre-test survey</label>
-</field>
-
-<h3 class="indent1">Create a new survey</h3>
-<field class="indent2">
-	<input type="radio" name="pre_choose" value="new" <?=$checked['new'];?> id="pre_new" class="isolatetoggle"/><label>... from Scratch</label>
-</field>
-
-<field style="border-bottom:1px solid #ccc;padding-bottom:5px;width:300px;" class="indent2">
-	<input type="radio" name="pre_choose" value="copy" <?=$checked['copy'];?>  id="pre_copy" class="isolatetoggle"/><label>... from Existing Survey</label>
-	<div class="indent hidden pre_copy editsurvey">
-		<select id="copysurvey" name="copysurvey">
-			<?php echo $survey_list_html; ?>
-		</select><a id="editsurvey" class="loadsurvey isolatetoggle hidden"/>Create a New Survey from This</a>
-	</div>
-</field>
-
-<?php if (!empty($project->pre_survey['id']) && $foo = '1') { ?>
-<field id="field_exist">
-	<input type="radio" name="pre_choose" value="existing" class="isolatetoggle"/><label>Current Survey</label>
-</field>
-<?php } ?>
-
-<div id="surveytitle"></div>
-<div id="surveytool" class="pre_new editsurvey">
-<?php
-if ($_POST[where_context]) {
-	?>
-	<script type="text/javascript">
-		$(document).ready(function(){
-			$("#<?=@$_POST['where_context']?>").attr("checked",true);
-		});
-	</script>
-	<?
-	include(esp_where("survey_tool"));
-}
-?>
-</div>
-
-<input type="hidden" name="from" value="2" id="from" />
-<input type="hidden" name="go" value="3" id="go" />
-<input type="hidden" name="where" value="create" id="where" />
-<input type="submit" class="surveytoolsubmit" value="Save Draft and Continue" style="margin-left:165px;"/>
-</div>
\ No newline at end of file
Index: admin/include/where/readme.inc
===================================================================
--- admin/include/where/readme.inc	(revision 6370)
+++ admin/include/where/readme.inc	(working copy)
@@ -1,33 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: readme.inc,v 1.7 2005/04/14 17:51:22 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-?>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<?php if (file_exists(ESP_BASE . '/README')) { ?>
-<table border="0"><tr><td><pre>
-<?php include(ESP_BASE . '/README'); ?>
-</pre></td></tr></table>
-<?php
-	} else {
-		echo('<p>' . mkwarn(_('README not found.')) . "</p>\n");
-	}
-?>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/guide.inc
===================================================================
--- admin/include/where/guide.inc	(revision 6370)
+++ admin/include/where/guide.inc	(working copy)
@@ -1,33 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: guide.inc,v 1.5 2005/04/14 17:51:21 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-?>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<?php if (file_exists(ESP_BASE . '/docs/GUIDE')) { ?>
-<table><tr><td><pre>
-<?php include(ESP_BASE . '/docs/GUIDE'); ?>
-</pre></td></tr></table>
-<?php
-	} else {
-		echo('<p>' . mkwarn(_("User's guide not found.")) . "</p>\n");
-	}
-?>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/response_purge.inc
===================================================================
--- admin/include/where/response_purge.inc	(revision 6370)
+++ admin/include/where/response_purge.inc	(working copy)
@@ -1,67 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: response_purge.inc,v 1.2 2007/12/28 14:33:35 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	if($_SESSION['acl']['superuser'] != 'Y') {
-		echo(mkerror(_('Only superusers allowed.'))."<br>\n");
-		echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n");
-		return;
-	}
-
-	if(isset($_POST['q_rid']) && !empty($_POST['q_rid'])) {
-	   response_purge($_POST['q_rid']);
-	}
-
-	$bg = $ESPCONFIG['bgalt_color2'];
-?>
-<h2><?php echo(_('Purge response')); ?></h2>
-
-	<p><?php echo(_('
-This page is not directly on the main menu because it is
-dangerous. This <b>completely</b> removes everything about a
-response from the database <b>forever</b>. Do
-not do anything here that you are not completely certain
-about. There is no confirmation, there is no turning
-back.')); ?></p>
-
-<table cellspacing="0" cellpadding="4">
-	<tr style="background-color: <?php echo($bg); ?>">
-		<td><?php echo(_('Response')); echo(_('ID')); ?></td>
-	</tr>
-<?php
-			$bg = $ESPCONFIG['bgalt_color2'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>">
-		<td><input type="text" name="q_rid" value="" /></td>
-	</tr>
-<?php
-	if($bg != $ESPCONFIG['bgalt_color1'])
-		$bg = $ESPCONFIG['bgalt_color1'];
-	else
-		$bg = $ESPCONFIG['bgalt_color2'];
-?>
-    <tr style="background-color: <?php echo($bg); ?>">
-		<td colspan="8">
-			<input type="hidden" name="where" value="response_purge" />
-			<input type="submit" name="submit" value="<?php echo(_('Purge response')); ?>" />
-		</td>
-	</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/step_process_complete.inc
===================================================================
--- admin/include/where/step_process_complete.inc	(revision 6370)
+++ admin/include/where/step_process_complete.inc	(working copy)
@@ -1,36 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-if ($_SESSION['mode'] == 'edit') {
-	//Make markers to remove emptied fields
-	
-
-	
-	if ($_POST['activate'] == 'true') {
-		$data = array('status'=>'3');
-		$editresult = $project->update($data);
-		if (is_array($editresult)) {
-			//set errors
-			$err = $editresult;
-		} else { //Set Success
-			unset($project);
-			$project = new Project;
-			$project->init($_SESSION[pid]);
-		}
-	}
-}
-if (is_array($err)) {
-	$step = $from;
-}
-
-
-?>
Index: admin/include/where/tpsave.inc
===================================================================
--- admin/include/where/tpsave.inc	(revision 6370)
+++ admin/include/where/tpsave.inc	(working copy)
@@ -1,32 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-error_reporting(E_ALL);
-
-require ESP_BASE.'admin/sanitize.php';
-
-
-	$sql = "insert into `userprojectrel` values('','".sanitize($_POST['tester'])."','".sanitize($_POST['project'])."','";
-	if ($_POST['admin'] == '1')
-		$sql .= "Y";
-	else
-		$sql .= "N";
-	$sql .= "')";
-	$result = execute_sql($sql);
-	
-	$sql = "select * from `user` WHERE `userid` = '".sanitize($_POST['tester'])."'";
-	$result = execute_sql($sql);
-	$emailAddress = $result->fields[5];
-	mail($emailAddress,"You have been Added to a Project",$result->fields[3].",\n\tYou have been added to a new Vu Labs project.");
-	
-	echo "<h2>The user has been added to your project!</h2>";
-?>
\ No newline at end of file
Index: admin/include/where/respondents.inc
===================================================================
--- admin/include/where/respondents.inc	(revision 6370)
+++ admin/include/where/respondents.inc	(working copy)
@@ -1,154 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: respondents.inc,v 1.12 2007/11/26 11:36:17 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-// <jflemer@acm.rpi.edu>
-
-    /* SuperUser or Designers with "Administer Respondents(puser)" permissions only*/
-    if($GLOBALS['ESPCONFIG']['auth_type'] != 'ldap_both' &&
-	$GLOBALS['ESPCONFIG']['auth_type'] != 'ldap_resp' &&
-	$_SESSION['acl']['superuser'] != 'Y' &&
-        count($_SESSION['acl']['puser']) == 0 &&
-        !auth_no_access(_('to access this form'))) {
-            return;
-        }
-
-	$sql = 'SELECT username, fname, lname, realm, disabled, expiration FROM '.$GLOBALS['ESPCONFIG']['respondent_table'];
-
-	/* load only accounts available to _this_ user */
-	if($_SESSION['acl']['superuser'] != 'Y') {
-		$realms = array_to_insql(
-			array_merge(
-				$_SESSION['acl']['pall'],
-				$_SESSION['acl']['puser']));
-		$sql .= " WHERE realm $realms";
-	}
-
-	$sql .= ' ORDER BY ';
-	$base = $GLOBALS['ESPCONFIG']['ME'] .'?where=respondents';
-	if(!isset($_GET['u'])) $_GET['u'] = '';
-	if(!isset($_GET['g'])) $_GET['g'] = '';
-	if(!isset($_GET['f'])) $_GET['f'] = '';
-	if(!isset($_GET['l'])) $_GET['l'] = '';
-	if(!isset($_GET['s'])) $_GET['s'] = '';
-
-	if($_GET['u'] == 'd') {
-		$us = 'username DESC';
-		$u = 'a';
-	} else {
-		$_GET['u'] = 'a';
-		$us = 'username ASC';
-		$u = 'd';
-	}
-	if($_GET['g'] == 'd') {
-		$gs = 'realm DESC';
-		$g = 'a';
-	} else {
-		$_GET['g'] = 'a';
-		$gs = 'realm ASC';
-		$g = 'd';
-	}
-	if($_GET['f'] == 'd' || $_GET['l'] == 'd') {
-		$ls = 'lname DESC';
-		$l = 'a';
-		$fs = 'fname DESC';
-		$f = 'a';
-	} else {
-		$_GET['l'] = 'a';
-		$ls = 'lname ASC';
-		$l = 'd';
-		$_GET['f'] = 'a';
-		$fs = 'fname ASC';
-		$f = 'd';
-	}
-	if($_GET['s'] == 'g') {
-		$sql .= "$gs, $us";
-		$u = "&s=u&g=" . $_GET['g'] ."&u=". $_GET['u'];
-		$g = "&s=g&g=$g&u=". $_GET['u'];
-		$f = "&s=f";
-		$l = "&s=l";
-	} elseif($_GET['s'] == 'f' || $_GET['s'] == 'l') {
-		$sql .= "$fs, $ls";
-		$f = "&s=f&f=$f";
-		$l = "&s=l&l=$l";
-		$u = "&s=u";
-		$g = "&s=g";
-	} else {
-		$sql .= "$us, $gs";
-		$u = "&s=u&g=" . $_GET['g'] ."&u=$u";
-		$g = "&s=g&g=" . $_GET['g'] ."&u=". $_GET['u'];
-		$f = "&s=f";
-		$l = "&s=l";
-	}
-	$result = execute_sql($sql);
-	
-	$bg = $ESPCONFIG['bgalt_color2'];
-?>
-<h2><?php echo(_('Manage Respondent Accounts')); ?></h2>
-<p><?php echo(_('Click on a username to edit, or click on add new user below.')); ?></p>
-<table cellspacing="0" cellpadding="4" style="width: 550px;">
-	<tr style="background-color: <?php echo($bg); ?>">
-		<th><a href="<?php echo(htmlentities($base . $u)); ?>"><?php echo(_('Username')); ?></a></th>
-		<th><a href="<?php echo(htmlentities($base . $f)); ?>"><?php echo(_('First Name')); ?></a></th>
-		<th><a href="<?php echo(htmlentities($base . $l)); ?>"><?php echo(_('Last Name')); ?></a></th>
-		<th><a href="<?php echo(htmlentities($base . $g)); ?>"><?php echo(_('Group')); ?></a></th>
-		<th>&nbsp;</th>
-	</tr>
-<?php
-	while(list($u, $fname, $lname, $r, $d, $e) = fetch_row($result)) {
-        $result->MoveNext();
-		if($d == 'N')
-			$d = '&nbsp;';
-		else
-			$d = '('. _('disabled') .')';
-		
-		if (empty($fname)) $fname = '&nbsp;';
-		if (empty($lname)) $lname = '&nbsp;';
-
-		if ($bg == $ESPCONFIG['bgalt_color1'])
-			$bg =& $ESPCONFIG['bgalt_color2'];
-		else
-			$bg =& $ESPCONFIG['bgalt_color1'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>">
-		<td class="left">
-			<a href="<?php echo($GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=admrespondent&u=$u&r=$r")); ?>"><?php echo($u); ?></a>
-		</td>
-		<td class="left"><?php echo($fname); ?></td>
-		<td class="left"><?php echo($lname); ?></td>
-		<td class="left"><?php echo($r); ?></td>
-		<td class="left"><?php echo($d); ?></td>
-	</tr>
-<?php
-	}
-	if ($bg == $ESPCONFIG['bgalt_color1'])
-		$bg =& $ESPCONFIG['bgalt_color2'];
-	else
-		$bg =& $ESPCONFIG['bgalt_color1'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>">
-		<td colspan="5" class="center">
-			<strong><a href="<?php echo($GLOBALS['ESPCONFIG']['ME'] ."?where=admrespondent"); ?>">
-				<?php echo(_('Add a new Respondent')); ?></a>
-			&nbsp;&nbsp;&nbsp;&nbsp;
-			<a href="<?php echo($GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=upload&account_type=respondents")); ?>">
-				<?php echo(_('Bulk Upload Respondents')); ?></a></strong>
-		</td>
-	</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/step_process_2.inc.ajaxforkv1
===================================================================
--- admin/include/where/step_process_2.inc.ajaxforkv1	(revision 6370)
+++ admin/include/where/step_process_2.inc.ajaxforkv1	(working copy)
@@ -1,62 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-//File to Save Changes and Manage the PHP of Step 1
-if ($_SESSION['mode'] == 'edit') {
-
-	
-	if ($_POST['pre_choose'] == 'none') {
-		$data = array('ppre'=>'delete','pre_source'=>'delete');
-		unset($_SESSION['pre_settings']['version']);
-		$go = 3;
-		$from = 2; 
-		//echo "none";
-	}
-	elseif ($_POST['pre_choose'] == 'copy') {
-		include(esp_where("survey_process"));
-		$survey_processed = true;
-		$sid = $_SESSION['survey_id'];
-		$data = array('ppre'=>$sid,'pre_source'=>$_POST['copysurvey']);			
-		$go = 3;
-		$from = 2;
-		//echo "copy";
-	}
-	elseif ($_POST['pre_choose'] == 'new') {
-		include(esp_where("survey_process"));
-		if ($_POST['tab'] == 'General') {
-			$_SESSION['pre_settings']['version'] = 'new';
-//			$sql = "SELECT * FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE `name`='".$_POST['name']."'";
-	//		$result = execute_sql($sql,"",ADODB_FETCH_ASSOC);
-		//	$survey = fetch_row($result);
-			$survey_processed = true;
-			$sid = $_SESSION['survey_id'];
-			$data = array('ppre'=>$sid,'pre_source'=>'new');
-		}
-		//echo "else";
-	}
-	//print_r($data);
-	$editresult = $project->update($data);
-	if (is_array($editresult)) {
-		//set errors
-		$err = $editresult;
-	} else { //Set Success
-		unset($project);
-		$project = new Project;
-		$project->init($_SESSION[pid]);
-	}
-}
-	
-if (is_array($err)) {
-		$step = $from;
-}
-?>
Index: admin/include/where/page.html
===================================================================
--- admin/include/where/page.html	(revision 6370)
+++ admin/include/where/page.html	(working copy)
@@ -1,71 +0,0 @@
-	<script type="text/javascript" src="http://localhost/users/vulab/js/jquery-1.2.6.pack.js"></script>
-    <script type="text/javascript" src="http://localhost/users/vulab/js/ui/ui.core.js"></script>
-    <script type="text/javascript" src="http://localhost/users/vulab/js/ui/ui.datepicker.js"></script>
-    
-<script type='text/javascript'>
-$("#linkedDates").datepicker({ 
-    minDate: new Date(2001, 1 - 1, 1), 
-    maxDate: new Date(2010, 12 - 1, 31), 
-    beforeShow: $.datepicker.readLinked, 
-    onSelect: $.datepicker.updateLinked, 
-    showOn: "both", 
-    buttonImage: "http://localhost/users/vulab/images/calendar.gif", 
-    buttonImageOnly: true 
-}); 
-$("#selectMonth, #selectYear").change($.datepicker.checkLinkedDays);
-</script>
-
-<select id="selectMonth"><option value="01">Jan</option><option value="02">Feb</option> 
-    <option value="03">Mar</option><option value="04">Apr</option> 
-    <option value="05">May</option><option value="06">Jun</option> 
-    <option value="07">Jul</option><option value="08">Aug</option> 
-    <option value="09">Sep</option><option value="10">Oct</option> 
-    <option value="11">Nov</option><option value="12">Dec</option></select> 
-<select id="selectDay"><option value="01">1</option><option value="02">2</option> 
-    <option value="03">3</option><option value="04">4</option> 
-    <option value="05">5</option><option value="06">6</option> 
-    <option value="07">7</option><option value="08">8</option> 
-    <option value="09">9</option><option value="10">10</option> 
-    <option value="11">11</option><option value="12">12</option> 
-    <option value="13">13</option><option value="14">14</option> 
-    <option value="15">15</option><option value="16">16</option> 
-    <option value="17">17</option><option value="18">18</option> 
-    <option value="19">19</option><option value="20">20</option> 
-    <option value="21">21</option><option value="22">22</option> 
-    <option value="23">23</option><option value="24">24</option> 
-    <option value="25">25</option><option value="26">26</option> 
-    <option value="27">27</option><option value="28">28</option> 
-    <option value="29">29</option><option value="30">30</option> 
-    <option value="31">31</option></select> 
-<select id="selectYear"><option value="2001">2001</option><option value="2002">2002</option> 
-    <option value="2003">2003</option><option value="2004">2004</option> 
-    <option value="2005">2005</option><option value="2006">2006</option> 
-    <option value="2007">2007</option><option value="2008">2008</option> 
-    <option value="2009">2009</option><option value="2010">2010</option></select> 
-<input type="hidden" size="10" id="linkedDates" disabled="disabled"/></p> 
-<script type="text/javascript"> 
-// Prepare to show a date picker linked to three select controls 
-function readLinked() { 
-    $('#linkedDates').val($('#selectMonth').val() + '/' + 
-        $('#selectDay').val() + '/' + $('#selectYear').val()); 
-    return {}; 
-} 
- 
-// Update three select controls to match a date picker selection 
-function updateLinked(date) { 
-    $('#selectMonth').val(date.substring(0, 2)); 
-    $('#selectDay').val(date.substring(3, 5)); 
-    $('#selectYear').val(date.substring(6, 10)); 
-} 
- 
-// Prevent selection of invalid dates through the select controls 
-function checkLinkedDays() { 
-    var daysInMonth = 32 - new Date($('#selectYear').val(), 
-        $('#selectMonth').val() - 1, 32).getDate(); 
-    $('#selectDay option').attr('disabled', ''); 
-    $('#selectDay option:gt(' + (daysInMonth - 1) +')').attr('disabled', 'disabled'); 
-    if ($('#selectDay').val() > daysInMonth) { 
-        $('#selectDay').val(daysInMonth); 
-    } 
-} 
-</script> 
\ No newline at end of file
Index: admin/include/where/manage_tester.inc
===================================================================
--- admin/include/where/manage_tester.inc	(revision 6370)
+++ admin/include/where/manage_tester.inc	(working copy)
@@ -1,73 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-if ($where == 'manage') {
-
-//error_reporting(E_ALL);
-/* $Id: manage.inc,v 1.32 2007/12/03 13:08:13 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-$base =& $GLOBALS['ESPCONFIG']['ME'];
-$bg = '';
-$accessible = get_projects_access($_SESSION[acl]['userid'],3);
-foreach ($accessible as $perm) {
-	unset($p);
-	$p = new Project;
-	$p->init($perm['projectid']);
-	$myProjects[] = $p;
-}
-
-?>
-<?php /*<h4>You have <?php echo  count($drafts_array); ?> draft projects</h4>*/ ?>
-<? /* <h4>You have <?php echo count($active_array); ?> active projects</h4>*/ ?>
-<br />
-<div id="container">
-<div class="titlebar topped">
-	<div class="left">
-		<h1><?php echo(_('My Survey Projects')); ?></h1>
-	</div>
-</div>
-<div class="column clear" style="width:90% !important;">
-<div class="column box height3" style="width:90% !important;">
-<h5>Survey Websites for Usability</h5>
-<br />
-<p>You've been invited to participate in the following usability studies!</p>
-<br />
-	<?php
-		$fields = array('name');
-		$options = array(	'titles'=>false,
-							'link'=>'/public/project.php?id=<pid>',
-							'link_attrib'=>'target="_blank"'
-							);
-		if (count($myProjects) > 0) {
-			echo display_projects_table($fields,$myProjects,$options);
-		} else {
-		
-		echo "<em>You don't have any Survey Projects Yet</em><br /><br /><br /><br /><br /><br /><br />";
-		}
-	?>
-</div>
-</div>
-<? /*</div>
-</div><!-- col_left -->
-<div id="col_right" class="column">
-</div>*/ ?>
-
-
-<?php } ?>
-</div>
\ No newline at end of file
Index: admin/include/where/newproject.inc
===================================================================
--- admin/include/where/newproject.inc	(revision 6370)
+++ admin/include/where/newproject.inc	(working copy)
@@ -1,202 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-session_register('project_name');
-//session_register('new_survey');
-//session_register('last_tab');
-//session_register('curr_q');
-
-/* Use this hack to work around how PHP handles session vars.
- * When Register_Globals is on, the value of the global $foo
- * is saved, and $_SESSION['foo'] is ignored.
- * When Register_Globals is off, the global $foo is ignored
- * and $_SESSION['foo'] is saved.
- * By making $_SESSION['foo'] a copy of $foo
- * when reg_glob is on, we can use $_SESSION uniformly
- * from here on, regardless of the INI settings.
- */
-if(ini_get('register_globals')) {
-	$_SESSION['project_name']  = $project_name;
-	//$_SESSION['new_survey'] = $new_survey;
-	//$_SESSION['last_tab']   = $last_tab;
-	//$_SESSION['curr_q']     = $curr_q;
-}
-
-
-
-if($_SESSION['acl']['superuser'] == 'Y') {
-	$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-		FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status = 0 ORDER BY s.id DESC";
-} else {
-	$realms = array_to_insql(
-	array_intersect(
-	$_SESSION['acl']['pall'],
-	$_SESSION['acl']['pdesign']));
-	$sql = "SELECT s.id, s.name, s.title, s.owner, s.realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.status = 0 AND (s.owner = ".
-	_addslashes($_SESSION['acl']['username']) ." || s.realm $realms) ORDER BY id DESC";
-}
-$result = execute_sql($sql);
-
-$survey_opts = "";
-
-
-while(list($sid,$name,$title,$owner,$realm) = fetch_row($result)) {
-	$result->MoveNext();
-	$survey_opts .= '"<option value="' . $sid .'">' . $title . '</option>';
-}
-
-db_close($result); 
-?>
-
-</div>
-</form>
-<?
-function validLink($link) {
-    if(preg_match("/http:\/\//", $link)) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-if(isset($_POST['submit'])) {
-	unset($_POST['submit']);
-	/*$project_name = $_POST['project_name'];
-	$presurvey = $_POST['presurvey'];
-	$postsurvey = $_POST['postsurvey'];
-	$preactiontext = $_POST['preactiontext'];
-	$postactiontext = $_POST['postactiontext'];
-	$actionurl = $_POST['actionurl'];*/
-	require ESP_BASE.'admin/sanitize.php';
-	$project_name = sanitize($_POST['project_name']);
-	$presurvey = sanitize($_POST['presurvey']);
-	$postsurvey = sanitize($_POST['postsurvey']);
-	$preactiontext = sanitize($_POST['preactiontext']);
-	$postactiontext = sanitize($_POST['postactiontext']);
-	$actionurl = sanitize($_POST['actionurl']);
-	
-	$sql = execute_sql("SELECT * FROM `project` WHERE `name` = '".$project_name."'");
-	if ($sql->RecordCount() > 0)
-	{
-		// Project already exists
-		echo("<h2>$project_name already exists.</h2>");
-	}
-	
-	// Check the validity of the URL
-	elseif (!validLink($actionurl))
-	{
-		// url is invalid
-		echo("<h2>Invalid URL</h2>");
-	}
-	elseif ($presurvey == $postsurvey && ($presurvey!= -1))
-	{
-		echo("<h2>Postsurvey can not equal Presurvey</h2>");
-	}
-	else
-	{
-	$sqlins = 'insert into project' .
-	 '(name,presurvey,postsurvey,action_intro_msg,action_outro_msg,action_url) values ( ' .
-	"'$project_name', ".
-	"$presurvey, ".
-	"$postsurvey, ".
-	"'$preactiontext', ".
-	"'$postactiontext', ".
-	"'$actionurl') ";
-	
-	$result = execute_sql($sqlins);
-	echo ErrorMsg();
-	
-	$sqlresults = "select * from project WHERE name = '".$project_name."'";
-	$result = execute_sql($sqlresults);
-	$projectid = $result->fields[0];
-	
-	// Insert into userprojectrel table
-	$sqlins = "insert into userprojectrel values ('','".$_SESSION['acl']['userid']."','".$projectid."','Y')";
-	
-	$result = execute_sql($sqlins);
-	echo ErrorMsg();
-	// Insert the root user record
-	$sqlins = "insert into userprojectrel values ('','6','".$projectid."','Y')";
-	
-	$result = execute_sql($sqlins);
-	echo ErrorMsg();
-	
-	$sql = "UPDATE `survey` SET `status` = '1' WHERE `id` = '$presurvey'";
-	execute_sql($sql);
-	$sql = "UPDATE `survey` SET `status` = '1' WHERE `id` = '$postsurvey'";
-	execute_sql($sql);
-	
-	
-	
-	echo "<h2> $project_name added. </h2>";
-	}
-		
-} else {
-
-?>
-<h2><?php echo(_('Create A New Project')); ?></h2>
-<form method="post" name="newprojectform"
-	action="<?php echo($ESPCONFIG['ME'])."?where=newproject"; ?>">
-<div align="center">
-<table>
-	<tr>
-		<td align="right">Project Name:</td>
-		<td align="left"><input type="text" id="project_name"
-			name="project_name" maxlength="40" /></td>
-	</tr>
-	<tr>
-		<td align="right">Pre-Survey:</td>
-		<td align="left"><select name="presurvey">
-			<option value="-1">none</option>
-			<?
-			echo $survey_opts;
-			?>
-		</select>
-		<a href="<?php echo($ESPCONFIG['ME'])."?where=new"; ?>">create a new survey</a>
-		</td>
-	</tr>
-	<tr>
-		<td align="right">Post-Survey:</td>
-		<td align="left"><select name="postsurvey">
-			<option value="-1">none</option>
-			<?
-			echo $survey_opts;
-			?>
-		</select>
-		<a href="<?php echo($ESPCONFIG['ME'])."?where=new"; ?>">create a new survey</a>
-		</td>
-	</tr>
-	<!--
-	<tr>
-		<td align="right">Pre-Action Text:</td>
-		<td align="left"><textarea rows="4" cols="40" name="preactiontext"></textarea>
-		</td>
-	</tr>
-	<tr>
-		<td align="right">Post-Action Text:</td>
-		<td align="left"><textarea rows="4" cols="40" name="postactiontext"></textarea>
-		</td>
-	</tr>
-	-->
-	<tr>
-		<td align="right">URL of Action:</td>
-		<td align="left"><input type="text" value="http://" name="actionurl" />
-		</td>
-	</tr>
-
-</table>
-<input type="reset" value="Reset"> <input type="submit" name="submit"
-	value="Create"></div>
-</form>
-			<? } ?>
Index: admin/include/where/export.inc
===================================================================
--- admin/include/where/export.inc	(revision 6370)
+++ admin/include/where/export.inc	(working copy)
@@ -1,202 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: export.inc,v 1.20 2006/03/27 23:10:41 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-if(!empty($_POST['sid']))
-	$sid = intval($_POST['sid']);
-elseif(!empty($_GET['sid']))
-	$sid = intval($_GET['sid']);
-else
-	$sid = '';
-$bg = '';
-
-?>
-</div>
-</form>
-<div class="contents">
-<h2><?php echo(_('Export Data')); ?></h2>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<table cellspacing="0" cellpadding="4">
-<?php
-
-/* If the Survey ID is not given, then build
- * a menu of available surveys to chose from.
- */
-if(!$sid) {
-?>
-	<tr class="header">
-		<th><?php echo(_('ID')); ?></th>
-		<th><?php echo(_('Name')); ?></th>
-		<th><?php echo(_('Title')); ?></th>
-		<th><?php echo(_('Owner')); ?></th>
-		<th><?php echo(_('Group')); ?></th>
-		<th><?php echo(_('Status')); ?></th>
-		<th colspan="2"><?php echo(_('Format')); ?></th>
-	</tr>
-<?php
-	/* load names and titles of all surveys available to
-	 * _this_ user */
-	$statusok = (STATUS_ACTIVE | STATUS_DONE | STATUS_DELETED);
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = "SELECT id,name,title,status,owner,realm FROM ".$GLOBALS['ESPCONFIG']['survey_table']."
-		WHERE (status & $statusok) ORDER BY id DESC";
-	} else {
-		$realms = array_to_insql(
-			array_intersect(
-				$_SESSION['acl']['pall'],
-				$_SESSION['acl']['pdata']));
-		$sql = "SELECT id,name,title,status,owner,realm
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE (status & $statusok) AND (owner = ".
-			_addslashes($_SESSION['acl']['username']) ." || realm $realms) ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-
-	while(list($sid,$name,$title,$status,$owner,$realm) = fetch_row($result)) {
-        $result->MoveNext();
-		$stat = _('Editing');
-
-		if($status & STATUS_DELETED) {
-			$stat = _('Archived');
-		} elseif($status & STATUS_DONE) {
-			$stat = _('Ended');
-		} elseif($status & STATUS_ACTIVE) {
-			$stat = _('Active');
-		} elseif($status & STATUS_TEST) {
-			$stat = _('Testing');
-		}
-
-		if($bg != $ESPCONFIG['bgalt_color1'])
-			$bg = $ESPCONFIG['bgalt_color1'];
-		else
-			$bg = $ESPCONFIG['bgalt_color2'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td><?php echo($sid); ?></td>
-		<td><?php echo($name); ?></td>
-		<td><?php echo($title); ?></td>
-		<td><?php echo($owner); ?></td>
-		<td><?php echo($realm); ?></td>
-		<td><?php echo($stat); ?></td>
-		<td style="font-size: xx-small; vertical-align: top;">
-    <form id="export<?php echo($sid) ?>" action="<?php echo($GLOBALS['ESPCONFIG']['ME']) ?>">
-	<div>
-        <select name="type">
-            <option value="csv_full_header" selected="selected">CSV Full Headers</option>
-            <option value="csv_short_header">CSV Short Headers</option>
-            <option value="spss_csv">CSV for SPSS</option>
-            <option value="tab">Tab</option>
-        </select>
-        <input type="hidden" name="sid" value="<?php echo($sid) ?>" />
-        <input type="hidden" name="where" value="" />
-        <div class="exportsave">
-			<?php echo('<a href="javascript: exportSubmit(\'export\', document.getElementById(\'export'.$sid.'\'));" title="Save the results for \''.$name.'\' to the survey in CSV Format (Comma Delimted File). Column Titles are based on question text.">' . _('Save On Server') . '</a>');
-            echo("\n");?>
-			| <?php
-			echo('<a href="javascript: exportSubmit(\'download\', document.getElementById(\'export'.$sid.'\'));" title="Download the results for \''.$name.'\' to your computer in CSV Format (Comma Delimted File). Column Titles are based on the question text. Click this link and select \'Save\' when prompted by your browser.">' . _('Download') . '</a>'); ?>
-            </div>
-            </div></form>
-		</td>
-	</tr>
-<?php
-	}
-?>
-</table>
-</div>
-<form method="post" id="null" action="">
-<div class="contents">
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<?php
-	return;
-	}
-
-	/* sid supplied ... continue */
-	$sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id = $sid";
-	$name = get_one($sql);
-
-	/* check ACLs for permissions */
-	$srealm = auth_get_survey_realm($sid);
-	if(isset($_GET['test'])) {
-		/* check ACL to see if user is allowed to test
-		 * _this_ survey */
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				!auth_is_owner($sid, $_SESSION['acl']['username']) &&
-				!in_array($srealm, array_intersect(
-						$_SESSION['acl']['pdesign'],
-						$_SESSION['acl']['pall'])) &&
-				!auth_no_access(_('to access this survey'))) {
-			return;
-		}
-		echo("<p><b>". _('Testing Survey...') ."</b> (". _('SID') ." = $sid)</p>\n");
-	} else {
-		/* check ACL to see if user is allowed to export
-		 * _this_ survey */
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				!auth_is_owner($sid, $_SESSION['acl']['username']) &&
-				!in_array($srealm, array_intersect(
-						$_SESSION['acl']['pdata'],
-						$_SESSION['acl']['pall'])) &&
-				!auth_no_access(_('to access this survey'))) {
-			return;
-		}
-	}
-
-	$type = isset($_GET['type']) ? $_GET['type'] : 'csv_full_header';
-
-	// prepare file name, default to csv_full_headers
-    switch ($type) {
-        case 'tab': 
-            $file = $_SESSION['acl']['home'] . "/$name.txt";
-            break;
-            
-        case 'xml':
-            //Not implemented yet
-            break;
-            
-        case 'spss_csv':
-            $file = $_SESSION['acl']['home'] . "/$name.csv";
-            break;
-            
-        case 'dbf':
-            $file = $_SESSION['acl']['home'] . "/$name.dbf";
-            if(extension_loaded('dbase')) {
-                $ret = survey_export_dbf($sid, $file);
-            } else {
-                $ret = 0;
-                echo("<tr><td>" . mkerror(_('The PHP dBase Extension is not installed.')) . "</td></tr>");
-            }
-            break;
-
-        default: //csv_full_header,csv_short_header
-            $file = $_SESSION['acl']['home'] . "/$name.csv";
-	}
-	$ret = survey_export_results($type, $sid, $file);
-
-	echo("<tr><td>");
-	if(isset($_GET['test'])) {
-		echo("<p><b>". _('Testing Survey...') ."</b> (". _('SID') ." = $sid)</p>\n");
-	}
-	if($ret) {
-		echo(_('Survey exported as:') . " <tt>$file</tt>");
-	} else {
-		echo(mkwarn(_('Error exporting survey as:') . " <tt>$file</tt>"));
-	}
-	echo("</td></tr></table>\n");
-	echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n");
-
-?>
Index: admin/include/where/designers.inc
===================================================================
--- admin/include/where/designers.inc	(revision 6370)
+++ admin/include/where/designers.inc	(working copy)
@@ -1,153 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: designers.inc,v 1.10 2005/08/01 16:12:55 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-// <jflemer@acm.rpi.edu>
-
-    /* SuperUser or Designers with "Administer Designers(pgroup)" permissions only*/
-    if(($_SESSION['acl']['superuser'] != 'Y') &&
-        count($_SESSION['acl']['pgroup']) == 0 &&
-        !auth_no_access(_('to access this form'))) {
-        return;
-    }
-    
-	$sql = 'SELECT username, fname, lname, realm, disabled, expiration FROM '.$GLOBALS['ESPCONFIG']['designer_table'];
-
-	/* load only accounts available to _this_ user */
-	if($_SESSION['acl']['superuser'] != 'Y') {
-		$realms = array_to_insql(
-			array_merge(
-				$_SESSION['acl']['pall'],
-				$_SESSION['acl']['puser']));
-		$sql .= " WHERE realm $realms";
-	}
-
-	$sql .= ' ORDER BY ';
-	$base = $GLOBALS['ESPCONFIG']['ME'] .'?where=designers';
-	if(!isset($_GET['u'])) $_GET['u'] = '';
-	if(!isset($_GET['g'])) $_GET['g'] = '';
-	if(!isset($_GET['f'])) $_GET['f'] = '';
-	if(!isset($_GET['l'])) $_GET['l'] = '';
-	if(!isset($_GET['s'])) $_GET['s'] = '';
-
-	if($_GET['u'] == 'd') {
-		$us = 'username DESC';
-		$u = 'a';
-	} else {
-		$_GET['u'] = 'a';
-		$us = 'username ASC';
-		$u = 'd';
-	}
-	if($_GET['g'] == 'd') {
-		$gs = 'realm DESC';
-		$g = 'a';
-	} else {
-		$_GET['g'] = 'a';
-		$gs = 'realm ASC';
-		$g = 'd';
-	}
-	if($_GET['f'] == 'd' || $_GET['l'] == 'd') {
-		$ls = 'lname DESC';
-		$l = 'a';
-		$fs = 'fname DESC';
-		$f = 'a';
-	} else {
-		$_GET['l'] = 'a';
-		$ls = 'lname ASC';
-		$l = 'd';
-		$_GET['f'] = 'a';
-		$fs = 'fname ASC';
-		$f = 'd';
-	}
-	if($_GET['s'] == 'g') {
-		$sql .= "$gs, $us";
-		$u = "&s=u&g=" . $_GET['g'] ."&u=". $_GET['u'];
-		$g = "&s=g&g=$g&u=". $_GET['u'];
-		$f = "&s=f";
-		$l = "&s=l";
-	} elseif($_GET['s'] == 'f' || $_GET['s'] == 'l') {
-		$sql .= "$fs, $ls";
-		$f = "&s=f&f=$f";
-		$l = "&s=l&l=$l";
-		$u = "&s=u";
-		$g = "&s=g";
-	} else {
-		$sql .= "$us, $gs";
-		$u = "&s=u&g=" . $_GET['g'] ."&u=$u";
-		$g = "&s=g&g=" . $_GET['g'] ."&u=". $_GET['u'];
-		$f = "&s=f";
-		$l = "&s=l";
-	}
-
-	$result = execute_sql($sql);
-	
-	$bg = $ESPCONFIG['bgalt_color2'];
-?>
-<h2><?php echo(_('Manage Web Form Designer Accounts')); ?></h2>
-<p><?php echo(_('Click on a username to edit, or click on add new user below.')); ?></p>
-<table cellspacing="0" cellpadding="4" style="width: 550px;">
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<th><a href="<?php echo(htmlentities($base . $u)); ?>"><?php echo(_('Username')); ?></a></th>
-		<th><a href="<?php echo(htmlentities($base . $f)); ?>"><?php echo(_('First Name')); ?></a></th>
-		<th><a href="<?php echo(htmlentities($base . $l)); ?>"><?php echo(_('Last Name')); ?></a></th>
-		<th><a href="<?php echo(htmlentities($base . $g)); ?>"><?php echo(_('Group')); ?></a></th>
-		<th>&nbsp;</th>
-	</tr>
-<?php
-	while(list($u, $fname, $lname, $r, $d, $e) = fetch_row($result)) {
-        $result->MoveNext();
-		if($d == 'N')
-			$d = '&nbsp;';
-		else
-			$d = '('. _('disabled') .')';
-		
-		if (empty($fname)) $fname = '&nbsp;';
-		if (empty($lname)) $lname = '&nbsp;';
-		
-		if ($bg == $ESPCONFIG['bgalt_color1'])
-			$bg =& $ESPCONFIG['bgalt_color2'];
-		else
-			$bg =& $ESPCONFIG['bgalt_color1'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td class="left">
-			<a href="<?php echo($GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=admdesigner&u=$u&r=$r")); ?>"><?php echo($u); ?></a>
-		</td>
-		<td class="left"><?php echo($fname); ?></td>
-		<td class="left"><?php echo($lname); ?></td>
-		<td class="left"><?php echo($r); ?></td>
-		<td class="left"><?php echo($d); ?></td>
-	</tr>
-<?php
-	}
-	if ($bg == $ESPCONFIG['bgalt_color1'])
-		$bg =& $ESPCONFIG['bgalt_color2'];
-	else
-		$bg =& $ESPCONFIG['bgalt_color1'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<th colspan="5" class="center">
-			<strong><a href="<?php echo($GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=admdesigner")); ?>">
-				<?php echo(_('Add a new Designer')); ?></a>
-			&nbsp;&nbsp;&nbsp;&nbsp;
-			<a href="<?php echo($GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=upload&account_type=designers")); ?>">
-				<?php echo(_('Bulk Upload Designers')); ?></a></strong>
-		</th>
-	</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/rmsurvey.inc
===================================================================
--- admin/include/where/rmsurvey.inc	(revision 6370)
+++ admin/include/where/rmsurvey.inc	(working copy)
@@ -1,35 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-require ESP_BASE.'admin/sanitize.php';
-
-
-//Load All Projects for the direct access visitors
-$surveys = get_surveys();
-
-$ids = explode(',',$_GET[id]);
-
-rm_surveys($ids);
-?>
-<h2><?php echo(_('Remove Surveys')); ?></h2>
-<pre style="text-align:left;">
-<?php
-	while($survey = fetch_row($surveys))
-	{
-		$surveys->MoveNext();
-		echo "<pre>";
-		print_r($survey);
-		echo "</pre>";
-	}
-?>
-</pre>
\ No newline at end of file
Index: admin/include/where/purgeprojects.inc
===================================================================
--- admin/include/where/purgeprojects.inc	(revision 6370)
+++ admin/include/where/purgeprojects.inc	(working copy)
@@ -1,118 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: purge.inc,v 1.12 2005/08/01 16:12:55 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	if($_SESSION['acl']['superuser'] != 'Y') {
-		echo(mkerror(_('Only superusers allowed.'))."<br>\n");
-		echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n");
-		return;
-	}
-
-	$sids = array();
-	if(!empty($_POST['list'])) {
-		while(list(,$sid) = each($_POST['list'])) {
-			array_push($sids, intval($sid));
-		}
-		survey_purge($sids);
-	}
-
-//	$sql = "
-//SELECT s.id,s.name,s.title,s.status,s.owner,s.realm,COUNT(q.id) as count
-//FROM survey s LEFT JOIN question q ON
-	$sql = "
-SELECT s.id,s.name,s.title,s.status,s.owner,s.realm,COUNT(q.id) as count
-FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s LEFT JOIN ".$GLOBALS['ESPCONFIG']['question_table']." q ON
-	s.id = q.survey_id AND q.deleted = 'N'
-GROUP BY s.id, s.name, s.title, s.status, s.owner, s.realm
-ORDER BY s.id DESC";
-	$result = execute_sql($sql);
-
-	$bg = $ESPCONFIG['bgalt_color2'];
-?>
-<h2><?php echo(_('Purge Surveys')); ?></h2>
-
-	<p><?php echo(_('
-This page is not directly on the main menu because it is
-dangerous. This <b>completely</b> removes everything about a
-survey from the database <b>forever</b>. All question info,
-general info, results, etc. are purged from the database. Do
-not do anything here that you are not completely certain
-about. There is no confirmation, there is no turning
-back.')); ?></p>
-
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<table cellspacing="0" cellpadding="4">
-	<tr style="background-color: <?php echo($bg); ?>">
-		<td>&nbsp;</td>
-		<th><?php echo(_('ID')); ?></th>
-		<th><?php echo(_('Name')); ?></th>
-		<th><?php echo(_('Title')); ?></th>
-		<th><?php echo(_('Owner')); ?></th>
-		<th><?php echo(_('Group')); ?></th>
-		<th><?php echo(_("# Q's")); ?></th>
-		<th><?php echo(_('Status')); ?></th>
-	</tr>
-<?php
-	while(list($sid,$name,$title,$status,$owner,$realm,$qnum) = fetch_row($result)) {
-        $result->MoveNext();
-		if($status & STATUS_DELETED) {
-			$stat = _('Archived');
-		} elseif($status & STATUS_DONE) {
-			$stat = _('Ended');
-		} elseif($status & STATUS_ACTIVE) {
-			$stat = _('Active');
-		} elseif($status & STATUS_TEST) {
-			$stat = _('Testing');
-		} else {
-			$stat = _('Editing');
-		}
-		
-		if($bg != $ESPCONFIG['bgalt_color1'])
-			$bg = $ESPCONFIG['bgalt_color1'];
-		else
-			$bg = $ESPCONFIG['bgalt_color2'];
-?>
-	<tr style="background-color: <?php echo($bg); ?>">
-		<td><input type="checkbox" name="list[]" value="<?php echo($sid); ?>" /></td>
-		<td><?php echo($sid); ?></td>
-		<td><?php echo($name); ?></td>
-		<td><?php echo($title); ?></td>
-		<td><?php echo($owner); ?></td>
-		<td><?php echo($realm); ?></td>
-		<td><?php echo($qnum); ?></td>
-		<td><?php echo($stat); ?></td>
-	</tr>
-<?php
-	}
-	
-	if($bg != $ESPCONFIG['bgalt_color1'])
-		$bg = $ESPCONFIG['bgalt_color1'];
-	else
-		$bg = $ESPCONFIG['bgalt_color2'];
-?>
-    <tr style="background-color: <?php echo($bg); ?>">
-		<td colspan="8">
-			<input type="hidden" name="where" value="purge" />
-			<input type="reset" name="reset" value="<?php echo(_('Clear Checkboxes')); ?>" />
-			<input type="submit" name="submit" value="<?php echo(_('Purge Surveys')); ?>" />
-		</td>
-	</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/merge.inc
===================================================================
--- admin/include/where/merge.inc	(revision 6370)
+++ admin/include/where/merge.inc	(working copy)
@@ -1,114 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: merge.inc,v 1.12 2005/10/26 20:47:33 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by Romans Jasins
-// <roma@latnet.lv>
-
-    if(!isset($_GET['precision'])) {
-        $_GET['precision'] = "";
-    }
-    if(!isset($_GET['totals'])) {
-        $_GET['totals'] = "";
-    }
-    if(!isset($_GET['test'])) {
-        $_GET['test'] = "";
-    }
-
-    $_GET['precision'] = intval($_GET['precision']);
-    $_GET['totals'] = intval($_GET['totals']);
-    $_GET['test'] = intval($_GET['test']);
-
-	// see if surveys have been selected
-	if(!empty($_REQUEST['sids'])) {
-		$sid = intval($_REQUEST['sids']);
-        $_REQUEST['sids'] = htmlspecialchars($_REQUEST['sids']);
-		if($_GET['test']) {
-			echo("<p><b>". _('Testing Survey...') .'</b> ('. _('SIDS') ." = ". $sid .")</p>\n");
-		}
-
-		/* check ACLs for permissions ...
-		 * XXX only check the first of the SIDS for ownership */
-		if($_SESSION['acl']['superuser'] == 'Y' ||
-				auth_is_owner($sid, $_SESSION['acl']['username']) ||
-				($_GET['test'] &&
-					$_SESSION['acl']['seeall'] == 'Y') ||
-				auth_no_access('to access this survey')) {
-?>
-<table><tr><td>
-<?php
-			$ret = survey_merge(split("\+",$_REQUEST['sids']),$_GET['precision'],$_GET['totals']);
-			if(!empty($ret))
-				echo("<span class=\"error\">$ret</span>\n");
-?>
-</td></tr></table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<?php
-		}
-		return;
-	}
-
-	// otherwise:
-	// build a table of surveys to choose from ...
-	/* check with ACL for allowed surveys */
-	$statusok = (STATUS_ACTIVE | STATUS_DONE & ~STATUS_DELETED);
-	if($_SESSION['acl']['superuser'] == 'Y' ||
-		$_SESSION['acl']['seeall'] == 'Y')
-		$sql = "SELECT id,name,title,owner FROM ".$GLOBALS['ESPCONFIG']['survey_table']."
-			WHERE ".db_bin("status", $statusok) ."
-			ORDER BY id DESC";
-	else
-		$sql = "SELECT id,name,title,owner FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE owner=".
-			_addslashes($_SESSION['acl']['username']) ."
-			AND ".db_bin("status",$statusok)."
-			ORDER BY id DESC";
-	$result = execute_sql($sql);
-
-?>
-<h2><?php echo(_('Merge Survey Results')); ?></h2>
-<?php echo(_('Pick Surveys to Merge')); ?>
-</form>
-    <div id="error"></div>
-<form id="merge" action="<?php echo($GLOBALS['ESPCONFIG']['ME']) ?>?where=merge" method="post">
-<table cellspacing="0" cellpadding="4">
-	<tr>
-		<th><?php echo(_('List of Surveys')); ?></th>
-		<th>&nbsp;</th>
-		<th><?php echo(_('Surveys to Merge')); ?></th>
-	</tr>
-	<tr>
-		<td class="center">
-		<select multiple="multiple" size="10" name="list1">
-			<?php while(list($sid, $name, $title, $owner) = fetch_row($result)) { 
-                    $result->MoveNext()
-                    ?>
-			<option value="<?php echo($sid); ?>"><?php echo($name); ?></option>
-			<?php } db_close($result); ?>
-		</select>
-		</td>
-		<td class="center">
-<input type="button" value="   &gt;&gt;   " onclick="move(this.form.list1,this.form.list2)" name="B1" /><br />
-<input type="button" value="   &lt;&lt;   " onclick="move(this.form.list2,this.form.list1)" name="B2" /><br />
-<input type="button" value="Merge" onclick="merge(this.form.list2)" name="B3" />
-    <input type="hidden" id="sids" name="sids" value="">
-		</td>
-		<td class="center">
-		<select multiple="multiple" size="10" name="list2">
-		</select>
-		</td>
-	</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/access.inc
===================================================================
--- admin/include/where/access.inc	(revision 6370)
+++ admin/include/where/access.inc	(working copy)
@@ -1,267 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: access.inc,v 1.17 2005/08/01 16:12:54 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	if (!empty($_POST['sid']))
-		$sid = intval($_POST['sid']);
-	elseif (!empty($_GET['sid']))
-		$sid = intval($_GET['sid']);
-	else
-		$sid = '';
-
-	$errstr = "";
-	$bg = '';
-
-	if ($sid) {
-		if($_SESSION['acl']['superuser'] == 'Y') {
-			$sql = "SELECT s.name, s.title, s.owner, s.realm, s.public
-				FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.id = $sid";
-			$sql1 = "SELECT a.realm, a.maxlogin, a.resume, a.navigate FROM ".$GLOBALS['ESPCONFIG']['access_table']." a
-				WHERE a.survey_id = $sid ORDER BY a.realm";
-		} else {
-			$realms = array_to_insql(
-				array_intersect(
-					$_SESSION['acl']['pall'],
-					array_merge(
-						$_SESSION['acl']['pall'],
-						$_SESSION['acl']['pdesign'])));
-                $sql = "SELECT s.name, s.title, s.owner, s.realm, s.public
-				FROM ".$GLOBALS['ESPCONFIG']['survey_table']." s WHERE s.id = $sid AND NOT (status & " .STATUS_DELETED. ") AND                (s.owner = "._addslashes($_SESSION['acl']['username']) ." || s.realm $realms)";
-			    $sql1 = "SELECT a.realm, a.maxlogin, a.resume, a.navigate 
-                FROM ".$GLOBALS['ESPCONFIG']['access_table']." a, ".$GLOBALS['ESPCONFIG']['survey_table']." s
-				WHERE a.survey_id = $sid AND s.id=a.survey_id AND (s.owner = ".
-				_addslashes($_SESSION['acl']['username']) ." || s.realm $realms) ORDER BY a.realm";
-		}
-		$result = execute_sql($sql);
-		if (record_count($result) < 1) {
-			$sid = 0;
-		}
-	}
-	if ($sid) {
-		list($name,$title,$owner,$realm,$public) = fetch_row($result);
-		db_close($result);
-
-		if (!empty($_POST['op']))
-			$op = $_POST['op'];
-		elseif (!empty($_GET['op']))
-			$op = $_GET['op'];
-		else
-			$op = '';
-
-		if (!empty($_POST['realm']))
-			$arealm = _addslashes($_POST['realm']);
-		elseif (!empty($_GET['realm']))
-			$arealm = _addslashes($_GET['realm']);
-
-		if (isset($_POST['resume']))
-			$resume = 'Y';
-		else
-			$resume = 'N';
-	    $resume = _addslashes($resume);	
-		
-		if (isset($_POST['navigate']))
-			$navigate = 'Y';
-		else
-			$navigate = 'N';
-	    $navigate = _addslashes($navigate);
-		
-		if (!empty($_POST['max']))
-			$max = intval($_POST['max']);
-		elseif (!empty($_GET['max']))
-			$max = intval($_GET['max']);
-		else
-			$max = 0;
-
-		if ($op == 'a') {
-			if (empty($_POST['realm'])) {
-				$errstr = mkerror(_('Please select a group.'));
-			} else {
-				$sql = "INSERT INTO ".$GLOBALS['ESPCONFIG']['access_table']." (survey_id, realm, maxlogin, resume, navigate)
-						VALUES ($sid, $arealm, $max, $resume, $navigate)";
-				execute_sql($sql);
-			}
-		} elseif ($op == 'r') {
-			$sql = "DELETE FROM ".$GLOBALS['ESPCONFIG']['access_table']." WHERE survey_id = $sid AND realm = $arealm";
-			execute_sql($sql);
-		} elseif ($op == 'v') {
-			$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['survey_table']." SET public = 'N' WHERE id = $sid";
-			execute_sql($sql);
-			$sid = 0;
-		} elseif ($op == 'p') {
-			$sql = "UPDATE ".$GLOBALS['ESPCONFIG']['survey_table']." SET public = 'Y' WHERE id = $sid";
-			execute_sql($sql);
-			$sid = 0;
-		}
-	}
-	if ($sid) {
-		if ($public == 'N')
-			$public = _('Private');
-		else
-			$public = _('Public');
-
-		$r = '<select name="realm"><option></option>';
-		$groups = array();
-        $selected_groups = array();
-        // if realm has already been added then do not include it for
-        // reselection.
-        $result = execute_sql($sql1);
-        while (list($sg) = fetch_row($result)) {
-            array_push($selected_groups, $sg);
-            $result->MoveNext();
-        }
-        db_close($result);
-		if($_SESSION['acl']['superuser'] == 'Y') {
-
-			$sql = "SELECT name FROM ".$GLOBALS['ESPCONFIG']['realm_table'];
-			$result = execute_sql($sql);
-			while( list($g) = fetch_row($result) ) {
-                if (!in_array($g, $selected_groups)) {
-				    array_push($groups, $g);
-                }
-                $result->MoveNext();
-			}
-			db_close($result);
-        } else {
-            $g =& $_SESSION['acl']['pdesign'];
-            foreach ($g as $t) {
-                if (!in_array($t, $selected_groups)) {
-                    array_push($groups, $t);
-                }
-            }
-        }
-		foreach($groups as $g) {
-			$r .= "<option value=\"$g\">$g</option>";
-		}
-		$r .= '</select>';
-	}
-?>
-<h2><?php echo(_('Survey Access')); ?></h2>
-
-<?php if(!empty($errstr)) echo("<p>$errstr</p>\n"); ?>
-
-<div style="text-align: left">
-<p><?php
-	echo(_('This lets you control who has access to fill out a form.
-Public surveys let anyone submit data.
-Private surveys are restricted by Respondent Groups.')); ?></p>
-
-<p><b><?php echo(_('Note')); ?>:</b>
-<?php printf(_('You must use %s when using private surveys.'),
-	'<tt>'. substr(strrchr($ESPCONFIG['handler_prefix'], '/'), 1) .
-	' &amp; '. substr(strrchr($ESPCONFIG['handler'], '/'), 1) . '</tt>'); ?></p>
-</div>
-
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<?php if ($sid) { ?>
-<input type="hidden" name="where" value="access" />
-<input type="hidden" name="sid" value="<?php echo($sid); ?>" />
-<input type="hidden" name="op" value="a" />
-<table cellspacing="0" cellpadding="4">
-	<tr class="header"><th align="left"><?php echo(_('ID')); ?></th><td colspan="5"><?php echo($sid); ?></td></tr>
-	<tr class="header"><th align="left"><?php echo(_('Name')); ?></th><td colspan="5"><?php echo($name); ?></tr>
-	<tr class="header"><th align="left"><?php echo(_('Title')); ?></th><td colspan="5"><?php echo($title); ?></tr>
-	<tr class="header"><th align="left"><?php echo(_('Owner')); ?></th><td colspan="5"><?php echo($owner); ?></tr>
-	<tr class="header"><th align="left"><?php echo(_('Group')); ?></th><td colspan="5"><?php echo($realm); ?></tr>
-	<tr class="header"><th align="left"><?php echo(_('Public')); ?></th><td colspan="5"><?php echo($public); ?></tr>
-	<tr><td colspan="6"><hr /></td></tr>
-	<tr><th><?php echo(_('Group')); ?></th>
-		<th><?php echo(_('Max Responses')); ?></th>
-		<th><?php echo(_('Save/Restore')); ?></th>
-		<th><?php echo(_('Back/Forward')); ?></th>
-		<td>&nbsp;</td></tr>
-<?php
-		$result = execute_sql($sql1);
-		while ( list($arealm, $amax, $aresume, $anavigate) = fetch_row($result) ) { 
-            $result->MoveNext();
-            ?>
-	<tr><td><?php echo($arealm); ?></td>
-		<td><?php echo($amax); ?></td>
-		<td><?php echo(($aresume == 'Y') ? _('Yes') : _('No')); ?></td>
-		<td><?php echo(($anavigate == 'Y') ? _('Yes') : _('No')); ?></td>
-		<td><a href="<?php echo($GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=access&sid=$sid&op=r&realm=") . urlencode($arealm)); ?>">
-		<?php echo(_('Remove')); ?></a></td></tr>
-<?php	} ?>
-	<tr><td><?php echo($r); ?></td>
-		<td><input type="text" name="max" size="5"></td>
-		<td><input type="checkbox" name="resume" /></td>
-		<td><input type="checkbox" name="navigate" /></td>
-		<td><input type="submit" value="<?php echo(_('Add')); ?>"></td></tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
-<?php
-		return;
-	}
-?>
-<table cellspacing="0" cellpadding="4">
-	<tr class="header">
-		<th><?php echo(_('ID')); ?></th>
-		<th><?php echo(_('Name')); ?></th>
-		<th><?php echo(_('Title')); ?></th>
-		<th><?php echo(_('Owner')); ?></th>
-		<th><?php echo(_('Group')); ?></th>
-		<th><?php echo(_('Public')); ?></th>
-		<td>&nbsp;</td>
-	</tr>
-<?php
-	/* load names and titles of all surveys available to
-	 * _this_ user */
-	if($_SESSION['acl']['superuser'] == 'Y') {
-		$sql = "SELECT id,name,title,owner,realm,public FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE NOT ".db_bin("status",STATUS_DELETED)." ORDER BY id DESC";
-	} else {
-		$realms = array_to_insql(
-			array_intersect(
-				$_SESSION['acl']['pall'],
-				array_merge(
-					$_SESSION['acl']['pall'],
-					$_SESSION['acl']['pdesign'])));
-		$sql = "SELECT id,name,title,owner,realm,public
-			FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE NOT ".db_bin("status",STATUS_DELETED)." AND (owner = ".
-			_addslashes($_SESSION['acl']['username']) ." || realm $realms) ORDER BY id DESC";
-	}
-	$result = execute_sql($sql);
-	while(list($sid,$name,$title,$owner,$realm,$public) = fetch_row($result)) {
-        $result->MoveNext();
-		if($bg != $ESPCONFIG['bgalt_color1'])
-			$bg = $ESPCONFIG['bgalt_color1'];
-		else
-			$bg = $ESPCONFIG['bgalt_color2'];
-
-		if ($public == 'N') {
-			$public = _('Private');
-			$op     = '<a href="'. $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=access&sid=$sid&op=p")."\">". _('Make Public') .'</a>';
-		} else {
-			$public = _('Public');
-			$op     = '<a href="'. $GLOBALS['ESPCONFIG']['ME'] .htmlentities("?where=access&sid=$sid&op=v")."\">". _('Make Private') .'</a>';
-		}
-?>
-	<tr style="background-color: <?php echo($bg); ?>;">
-		<td><?php echo($sid); ?></td>
-		<td><a href="<?php echo(htmlentities($GLOBALS['ESPCONFIG']['ME'] ."?where=access&sid=$sid")); ?>"><?php echo($name); ?></a></td>
-		<td><?php echo($title); ?></td>
-		<td><?php echo($owner); ?></td>
-		<td><?php echo($realm); ?></td>
-		<td><?php echo($public); ?></td>
-		<td><?php echo($op); ?></td>
-	</tr>
-<?php
-	}
-?>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/passwd.inc
===================================================================
--- admin/include/where/passwd.inc	(revision 6370)
+++ admin/include/where/passwd.inc	(working copy)
@@ -1,71 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-
-/* $Id: passwd.inc,v 1.7 2005/08/01 16:12:55 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-// <jflemer@acm.rpi.edu>
-
-	/* ACL: everyone is allowed to change her own password */
-?>
-<h2><?php echo(_('Change Password')); ?></h2>
-<?php
-	if(isset($_POST['newpass1']) &&
-		$_POST['newpass1'] == $_POST['newpass2'] &&
-		!empty($_POST['newpass1'])) {
-		if(auth_change_manager_passwd(
-				$_SESSION['acl']['username'],
-				_addslashes($_POST['oldpass']),
-				_addslashes($_POST['newpass1']))) {
-			echo(_('Your password has been successfully changed.') ."<br>\n");
-			echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n");
-			return;
-		} else {
-			echo(mkerror(_('Password not set, check your old password.')));
-		}
-	} else if(isset($_POST['newpass1'])) {
-		echo(mkerror(_('New passwords do not match or are blank.')));
-	}
-?>
-<input type="hidden" name="where" value="passwd" />
-<table cellspacing="0" cellpadding="4">
-<tr>
-	<th class="right">
-	<?php echo(_('Username')); ?></th>
-	<td class="left">
-	<?php echo('<tt>'. $_SESSION['acl']['username'] .'</tt>'); ?></td>
-</tr><tr>
-	<th class="right">
-	<?php echo(_('Old Password')); ?></th>
-	<td class="left">
-	<?php echo(mkpass('oldpass')); ?></td>
-</tr><tr>
-	<th class="right">
-	<?php echo(_('New Password')); ?></th>
-	<td class="left">
-	<?php echo(mkpass('newpass1')); ?></td>
-</tr><tr>
-	<th class="right">
-	<?php echo(_('Confirm New Password')); ?></th>
-	<td class="left">
-	<?php echo(mkpass('newpass2')); ?></td>
-</tr><tr>
-	<th colspan="2" class="center">
-	<input type="submit" value="<?php echo(_('Change Password')); ?>" />
-	</th>
-</tr>
-</table>
-<?php echo("<a href=\"". $GLOBALS['ESPCONFIG']['ME'] ."?where=manage\">" . _('Go back to Management Interface') . "</a>\n"); ?>
Index: admin/include/where/rmproject.inc
===================================================================
--- admin/include/where/rmproject.inc	(revision 6370)
+++ admin/include/where/rmproject.inc	(working copy)
@@ -1,59 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-session_register('project_name');
-
-	//error_reporting(E_ALL);
-	
-//session_register('new_survey');
-//session_register('last_tab');
-//session_register('curr_q');
-
-/* Use this hack to work around how PHP handles session vars.
- * When Register_Globals is on, the value of the global $foo
- * is saved, and $_SESSION['foo'] is ignored.
- * When Register_Globals is off, the global $foo is ignored
- * and $_SESSION['foo'] is saved.
- * By making $_SESSION['foo'] a copy of $foo
- * when reg_glob is on, we can use $_SESSION uniformly
- * from here on, regardless of the INI settings.
- */
-if(ini_get('register_globals')) {
-	$_SESSION['project_name']  = $project_name;
-	//$_SESSION['new_survey'] = $new_survey;
-	//$_SESSION['last_tab']   = $last_tab;
-	//$_SESSION['curr_q']     = $curr_q;
-}
-
-
-require ESP_BASE.'admin/sanitize.php';
-
-
-//Load All Projects for the direct access visitors
-$projects = get_projects();
-
-$ids = explode(',',$_GET[id]);
-
-rm_projects($ids);
-?>
-<h2><?php echo(_('Remove Projects')); ?></h2>
-<pre style="text-align:left;">
-<?php
-	while($project = fetch_row($projects))
-	{
-		$projects->MoveNext();
-		echo "<pre>";
-		print_r($project);
-		echo "</pre>";
-	}
-?>
-</pre>
\ No newline at end of file
Index: admin/include/where/tab.inc
===================================================================
--- admin/include/where/tab.inc	(revision 6370)
+++ admin/include/where/tab.inc	(working copy)
@@ -1,198 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?><?php
-//error_reporting(E_ALL);
-/* $Id: tab.inc,v 1.22 2007/12/03 13:40:55 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-	session_register('survey_id');
-	session_register('new_survey');
-	session_register('last_tab');
-	session_register('curr_q');
-
-	/* Use this hack to work around how PHP handles session vars.
-	 * When Register_Globals is on, the value of the global $foo
-	 * is saved, and $_SESSION['foo'] is ignored.
-	 * When Register_Globals is off, the global $foo is ignored
-	 * and $_SESSION['foo'] is saved.
-	 * By making $_SESSION['foo'] a copy of $foo
-	 * when reg_glob is on, we can use $_SESSION uniformly
-	 * from here on, regardless of the INI settings.
-	 */
-	if(ini_get('register_globals')) {
-		$_SESSION['survey_id']  = intval($survey_id);
-		$_SESSION['new_survey'] = $new_survey;
-		$_SESSION['last_tab']   = $last_tab;
-		$_SESSION['curr_q']     = $curr_q;
-	}
-	
-	global $errstr;
-	$tab="";
-	
-	if(@$_GET['where'] == 'new') {
-		$_SESSION['survey_id']  = '';
-		$_SESSION['new_survey'] = '';
-		$_SESSION['last_tab']   = '';
-		$_SESSION['curr_q']     = '';
-	}		
-	
-	if(!empty($_GET['newid'])) {
-		$_SESSION['survey_id']  = intval($_GET['newid']);
-		$tab="general";
-		$_SESSION['last_tab']   = '';
-		$_SESSION['new_survey'] = false;
-	}
-
-	if(empty($_SESSION['survey_id'])) {
-		$_SESSION['survey_id']  = '';
-		$_SESSION['new_survey'] = true;
-	}
-
-	if(empty($_SESSION['new_survey']))
-		$_SESSION['new_survey'] = empty($_SESSION['survey_id']);
-	
-	/* check ACL to see if user is allowed to design
-	 * _this_ survey */
-	 $sql = "SELECT * FROM `user` WHERE `userid` = '".$_SESSION['acl']['userid']."'";
-		$result = execute_sql($sql);
-	if(!empty($_SESSION['survey_id'])) {
-		/*$srealm = auth_get_survey_realm($_SESSION['survey_id']);
-		if($_SESSION['acl']['superuser'] != 'Y' &&
-				!auth_is_owner($_SESSION['survey_id'], $_SESSION['acl']['username']) &&
-				!in_array($srealm, array_intersect(
-						$_SESSION['acl']['pdesign'],
-						$_SESSION['acl']['pall'])) &&
-				!auth_no_access(_('to access this form'))) {
-			return;
-		}*/
-		if ($_SESSION['acl']['superuser'] != 'Y' &&
-			$result->fields[6] != 'Y')
-				auth_no_access(_('to access this form'));
-		//else
-		//	return;
-		
-	}
-
-	/* check user's ACL to see if they have rights to
-	 * edit/create _any_ survey */
-	if($_SESSION['acl']['superuser'] != 'Y' &&
-			$result->fields[6] != 'Y' &&
-			!auth_no_access(_('to access this form'))) {
-		return;
-	}
-		
-	if (isset($_POST['tab'])) {
-		$tab=$_POST['tab'];
-	}
-	if ($tab=="") {
-		$tab = $_SESSION['last_tab'];
-	}
-	$tab = strtolower(ereg_replace(' +','_',$tab));
-
-/* XXX I18n do not translate */
-	if(stristr($tab,'continue')) {
-		switch($_SESSION['last_tab']) {
-			case 'general':
-				$tab='questions';
-				break;
-			case 'questions':
-				$tab='order';
-				break;
-			case 'order':
-				$tab='conditions';
-				break;
-			case 'conditions':
-				$tab='preview';
-				break;
-			default:
-				$tab='general';
-		}
-	}
-
-/* XXX I18n do not translate */
-		
-	if(!ereg('^[A-Za-z0-9_]+$',$tab))	// Valid chars are [A-Za-z0-9_]
-		$tab = 'general';
-	if(!file_exists($ESPCONFIG['include_path'].'/tab/'.$tab.$ESPCONFIG['extension']))
-		$tab = 'general';
-	if(!file_exists($ESPCONFIG['include_path'].'/tab/'.$tab.$ESPCONFIG['extension'])) {
-		echo('<b>'. _('Unable to open include file. Check INI settings. Aborting.'). '</b>');
-		exit;
-	}
-	
-	$errstr = '';
-	$updated = survey_update($_SESSION['survey_id'],$tab,$_SESSION['last_tab']);
-?>
-
-
-<?php if (@$_GET[lay] == 'ajax') { ?>
-<?php } //ajax ?>
-</div>
-</form>
-<form method="post" id="tabs" onsubmit="validate();" action="<?php echo($ESPCONFIG['ME']); ?>">
-<div>
-<?php if(!empty($errstr)) echo(mkerror($errstr)."<br />\n"); ?>
-
-      <input type="hidden" name="where" value="tab" />
-<div id="tabmenu">
-<input type="submit" name="tab" value="General" />
-<input type="submit" name="tab" value="Questions" />
-<input type="submit" name="tab" value="Order" />
-<input type="submit" name="tab" value="Conditions" />
-<input type="submit" name="tab" value="Preview" />
-<input type="submit" name="tab" value="Finish" />
-</div>
-<table>
-  <tr>
-    <td>
-<?php include($ESPCONFIG['include_path'].'/tab/'.$tab.$ESPCONFIG['extension']); $_SESSION['last_tab'] = $tab; ?>
-    </td>
-  </tr>
-</table>
-<?php if($tab=='finish') {echo('&nbsp;'); return;} ?>
-<?php if($_SESSION['new_survey']) { ?>
-<?php if (@$_GET[lay] != 'ajax') { ?>
-<?php echo(_('Click cancel to cancel this survey, or click continue to proceed to the next tab.')); ?><br />
-<input type="submit" name="where" value="Cancel" onclick='return cancelConfirm()' />
-<?php if($tab=='preview') { ?>
-	<input type="submit" name="tab" value="Finish" />
-<?php 	return; } ?>
-<input type="submit" name="tab" value="Continue &gt;" />
-<?php } //ajax ?>
-<?php return; } ?>
-<?php /*echo(_('The survey title and other general fields are on the <strong>General</strong> tab.
-Individual survey questions are added and modified on the <strong>Questions</strong> tab.
-Questions may be re-ordered or deleted from the <strong>Order</strong> tab.
-You may see a preview of your survey at any time, by going to the <strong>Preview</strong>
-tab. If you have no further changes click <strong>Finish</strong> to go back to the
-Management Interface.')); */?><br />
-<? /*
-<input type="submit" name="tab" value="General" />
-<input type="submit" name="tab" value="Questions" />
-<input type="submit" name="tab" value="Order" />
-<input type="submit" name="tab" value="Conditions" />
-<input type="submit" name="tab" value="Preview" />
-<input type="submit" name="tab" value="Finish" />
-*/ ?>
-<?php if (@$_GET[lay] != 'ajax') { ?>
-</form>
-
-<form method="post" action="" id="null">
-<div>
-<?php } else { //if it IS ajax?>
-<input type="submit" value="Save as Survey New Survey"/>
-<?php } //ajax else ?>
\ No newline at end of file
Index: admin/include/js/survey.include-existing.js
===================================================================
--- admin/include/js/survey.include-existing.js	(revision 6370)
+++ admin/include/js/survey.include-existing.js	(working copy)
@@ -1,13 +0,0 @@
-$(document).ready(function() {
-	$.ajax({
-  			type: "POST",
-   			url: "manage.php?where=survey_tool&lay=ajax&where_context=pre_existing&newid=<?=$project->pre_survey['id']?>",
-   			data: postdata,
-   			success: function(html){
-   			 	$('#surveytool').empty();
-				$('#surveytool').attr('innerHTML',html);
-				$('#surveytool').fadeIn('fast');
-			}
-   		});
-   	$("#pre_existing").attr("checked",true);
-});
\ No newline at end of file
Index: admin/include/debug.inc
===================================================================
--- admin/include/debug.inc	(revision 6370)
+++ admin/include/debug.inc	(working copy)
@@ -1,81 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-/* $Id: debug.inc,v 1.12 2005/08/01 16:12:53 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-	$arr = array();
-	
-	array_push($arr, array('SID', session_id()));
-	if (@file_exists(session_save_path()."/sess_".session_id()))
-		array_push($arr, array('SESSION', implode('', @file(session_save_path()."/sess_".session_id()))));
-	
-	if(isset($_SESSION['acl'])) {
-		array_push($arr, 'ACL');
-		foreach ($_SESSION['acl'] as $key => $val) {
-			if(is_array($val))
-				$val = '[ '. implode(' ', $val) .' ]';
-			array_push($arr, array($key, $val));
-		}
-	}
-	
-	foreach (array(
-		//'HTTP_SESSION_VARS', 'ESPCONFIG', 'HTTP_GET_VARS',
-		'_SESSION', 'ESPCONFIG', '_GET',
-		//'HTTP_POST_VARS', 'HTTP_SERVER_VARS', 'HTTP_ENV_VARS') as $v) {
-		'_POST', '_SERVER', '_ENV') as $v) {
-		if(isset($$v)) {
-			array_push($arr, $v);
-			foreach ($$v as $key => $val) {
-				if(is_array($val))
-					$val = '[ '. @implode(' ', $val) .' ]';
-				array_push($arr, array($key, $val));
-			}
-		}
-	}
-	
-	$str = "<table cellspacing=\"0\" cellpadding=\"0\" width=\"590\">\n";
-	foreach ($arr as $key) {
-		if (is_array($key)) {
-			$str .= '<tr><td bgcolor="#ccccff">' .
-					htmlspecialchars($key[0]) . '</td>';
-			$str .= '<td bgcolor="#cccccc">' .
-					@htmlspecialchars($key[1]) . "</td></tr>\n";
-		} else {
-			$str .= '<tr><th align="left" colspan="2" bgcolor="#ccccff">' .
-					htmlspecialchars($key) . "</th></tr>\n";
-		}
-	}
-	$str .= "</table>\n";
-?>
-<script language="JavaScript">
-<!-- // Begin <?php // This should really go into <head> tag ?>
-
-function windowOpener(title,msg) {
-  msgWindow=window.open("","displayWindow","menubar=no,alwaysRaised=yes,dependent=yes,width=600,height=500,scrollbars=yes,resizable=yes");
-  msgWindow.document.write("<html><head><title>"+title+"</title></head>");
-  msgWindow.document.write("<body>"+msg+"</body></html>");
-}
-
-function debugWindow () {
- title="Debug Window";
- msg="<?php echo(addcslashes($str, "\0..\31\\\"")); ?>";
- windowOpener(title, msg);
-}
-// End -->
-</script>
-<form name="debug"><input type="button" value="debug" onClick="debugWindow()"></form>
Index: admin/style.css
===================================================================
--- admin/style.css	(revision 6370)
+++ admin/style.css	(working copy)
@@ -1,518 +0,0 @@
-html,body {
-font-size: 12px;
-padding: 0;
-				margin: 0;
-				font-family: Arial, sans-serif;
-}
-#container { 
-width:87%;
-margin:auto;
-
-}
-#main {
-	background-color: #ffffff;
-}
-
-#header tt {
-	font-size: 130%;
-}
-#header {
-padding-bottom:5px;
-}
-#surveyAdmin, #surveyResults, #userAdmin, #guide, #logout {
-    width: 40%;
-    margin: auto;
-}
-
-#surveyAdmin, #surveyResults, #userAdmin, #guide, #logout ul{
-    text-align: left;
-}
-
-#tabmenu {
-    margin: auto;
-}
-
-#sections li{
-    display: inline;
-    list-style-type: none;
-    vertical-align: bottom;
-}
-
-#sections input {
-    vertical-align: bottom;
-}
-
-#sections {
-    padding-top: 3px;
-}
-
-.contents {
-        border: none;
-        width: 85%;
-        margin: auto;
-        text-align: center;
-        background-color: #FFFFFF;
-
-}
-
-.contents table {
-	margin: auto;
-	background-color: #FFFFFF;
-	width: 95%;
-}
-
-.contents table .header {
-	background-color: #DDDDDD;
-}
-
-.contents table th {
-	text-align: left;
-}
-
-.contents table .right{
-	text-align: right;
-	padding-right: 5px;
-}
-
-.contents table .left{
-	text-align: left;
-}
-
-.contents table .center{
-	text-align: center;
-}
-
-.contents table .user {
-	width: 300px;
-	border: 1px solid black;
-}
-
-.contents .results {
-    border: 1px solid;
-    text-align: left;
-}
-
-#footer {
-	width: 100%;
-	text-align: center;
-	font-size: x-small;
-}
-
-.red {
-	color: #FF0000;
-}
-
-.large {
-	font-size: x-large;
-}
-
-img {
-	border: 0px;
-}
-
-.line1 {
-	width: 100%;
-	color: #FFFFFF;
-}
-
-.createSurvey {
-	width: 90%;
-}
-
-.warn {
-	border:1px solid #EFA82C;
-	background-color:#FFE2BF;
-	padding:5px;
-	font-style:italic;
-	color:#DF4E00;
-	font-weight:bold;
-}
-.warn strong {
-	color:#2F0C00;
-}
-
-.error {
-	color: #FF0000;
-	font-size: large;
-}
-
-.numbered {
-	text-align: right;
-	padding-right: 5px;
-}
-
-.help {
-	background-color: #FFFFFF;
-	width: 98%;
-}
-
-.help td {
-	text-align: left;
-}
-.exportsave {
-    clear: left;
-}
-
-
-
-ul {
-				list-style: none;
-				text-align: left;
-				margin-left: auto;
-    			margin-right: auto;
-			}
-
-			ul a {
-				color: #FFF;
-				text-decoration: none;
-				display: block;
-				padding: 5px 5px 5px 10px;
-				width: 125px;
-				background: #333;
-			}
-			
-			ul a:hover {
-				color: #4BD8FF;
-				text-decoration: none;
-				background: #3C3C3C;
-			}
-			
-			ul li {
-				border-bottom: 1px solid #FFF;
-				border-right: 1px solid #FFF;
-				float: left;
-				position: relative;
-			}
-			
-			ul li ul {
-				list-style: none;
-				position: absolute;
-				left: 0;
-				top: 100%;
-				display: none;
-				width: 125px;
-				border-top: 1px solid #FFF;
-			}
-			
-			ul li:hover ul { display: block; }
-			
-			ul li:hover ul li ul { display: none; }
-			
-			ul li ul li:hover ul {
-				display: block;
-				position: absolute;
-				left: 140px;
-				top: -1px;
-				border-left: 1px solid #FFF;
-			}
-			
-	.usergreeting {
-	background: #fff;
-	}
-
-
-/** SOME NEW GOODNESS **/
-.trightnav {
-float:right;
-}
-.column {
-float:left;
-text-align:left;
-padding:10px;
-}
-#col_left {
-width:60%;
-}
-#col_right {
-width:30%;
-}
-.center {
-text-align:center;
-}
-.clear {
-clear:both;
-}
-.left {
-float:left;
-}
-.right {
-float:right;
-}
-field {
-display:block;
-margin:5px;
-}
-field input {
-margin-left:0px;
-vertical-align:middle;
-width:450px;
-}
-.form_field,textarea {
-border:1px solid #888;
-width:450px;
-}
-label {
-float:left;
-text-align:right;
-padding:5px;
-font-weight:bold;
-width:170px;
-}
-.field_lines label {
-float:none;
-}
-label em {
-	font-size:11px;
-	color:#5F5F5F;
-	font-weight:normal;
-	font-style:normal;
-}
-#steps {
-margin:auto;
-margin-bottom:10px;
-}
-#steps input {
-/*margin:5px;*/
-
-}
-/*Data Table Display*/
-table.display { 
-/*	width: 400px;*/
-}
-table.display td {
-	text-align:left;
-}
-table.display th { 
-/*	width:150px;*/
-	text-align:left;
-	vertical-align:top;
-}
-table.display th.slim {
-width:70px;
-}
-.box {
-	border:1px solid #000;
-	margin:10px !important;
-	margin-left:0px !important;
-	vertical-align:middle;
-}
-.width3 {
-	width:29% !important;
-}
-.height3 {
-/*	height:125px;*/
-}
-h1,h2,h3,h4,h5 {
-margin:0px;
-text-align:left !important;
-}
-h2 small {
-color:#666;
-font-size:12px;
-}
-.topped {
-margin-top:20px !important;
-}
-.titlebar a {
-vertical-align:middle;
-}
-.pad {
-padding:5px;
-}
-.padded {
-padding:20px;
-}
-.padded th {
-padding:10px;
-}
-.padded td {
-padding:10px;
-border-top:1px solid #eee;
-border-left:1px solid #ccc;
-}
-.indent {
-margin-left:35px;
-}
-.hidden { 
-display:none;
-}
-h4 {
-color:#888;
-}
-#project_container {
-border:1px solid #666;
-padding:5px;
-width:87%;
-margin:auto;
-}
-#project_container .buttons {
-margin:auto;
-}
-#project_container .buttons input {
-margin-left:10px;
-border:1px solid #555;
-}
-#project_topnav {
-border-bottom:1px solid #ccc;
-text-align:left;
-padding:5px;
-line-height:20px;
-}
-#project_topnav a {
-margin-left:40px;
-text-decoration:none;
-vertical-align:middle;
-color:#333;
-font-size:10px;
-font-weight:bold;
-}
-#project_topnav a:hover {
-color:#000;
-}
-#project_topnav a img {
-vertical-align:middle;
-margin-right:3px;
-margin-bottom:3px;
-}
-.icon {
-vertical-align:middle;
-margin:3px;
-}
-
-a,a:visited,a:active {
-color:#0066CC;
-color:#258B89;
-}
-.color {
-color:#258B89;
-}
-a:hover {
-color:#333333;
-text-decoration:none;
-}
-h1 { margin-bottom:10px; }
-
-#errors {
-	border:1px solid #ff8080;
-	background-color:#ffc5c5;
-	padding:5px;
-	font-size:#811919;
-	font-style:italic;
-	color:#270808;
-	font-weight:bold;
-}
-#notes {
-	border:1px solid #00336F;
-	background-color:#BFDCFF;
-	padding:5px;
-	font-size:#811919;
-	font-style:italic;
-	color:#00336F;
-	font-weight:bold;
-}
-#goods {
-	border:1px solid #055F00;
-	background-color:#B3FFAF;
-	padding:5px;
-	font-size:#811919;
-	font-style:italic;
-	color:#055F00;
-	font-weight:bold;
-}
-
-
-pre {
-text-align:left !important;
-}
-#surveytool {
-margin:5px;
-border:1px dotted red;
-padding:5px;
-width:620px;
-height:300px;
-display:none;
-}
-#surveynote {
-color:red;
-width:635px;
-text-align:right;
-display:none;
-}
-.show {
-display:block;
-}
-.indent1 {
-padding-left:15px;
-}
-.indent2 {
-padding-left:35px;
-}
-
-.note {
-font-size:14px;
-border:1px dotted #4C8FFF;
-border-left:10px #4C8FFF solid;
-padding:5px;
-}
-.note span {
-font-weight:bold;
-}
-.green {
-color:green !important;
-}
-.black {
-color:black;
-}
-.grey {
-color:grey !important;
-}
-.hand {
-cursor:pointer;
-}
-.debug,.log {
-border:1px dotted #ccc;
-padding:5px;
-float:left;
-margin:3px;
-display:none;
-font-size:10px;
-}
-.debug {
-display:block;
-}
-#postdata {
-display:none;
-font-size:1px;
-color:#FFF;
-}
-#copysurvey {
-display:none;
-}
-#notes,#goods,#errors {
-margin:10px;
-margin-left:50px;
-margin-right:50px;
-}
-#activating {
-display:none;
-}
-.activatebutton {
-	color:green;
-	background:#AFFFBA;
-	border:1px solid green;
-	padding:5px 8px 5px 8px;
-	width:20px;
-}
-a.activatebutton:hover {
-	background:#FFF;
-}
-.deactivatebutton {
-	color:green;
-	background:#AFFFBA;
-	border:1px solid green;
-	padding:5px 8px 5px 8px;
-	width:20px;
-}
-a.deactivatebutton:hover {
-	background:#FFF;
-}
\ No newline at end of file
Index: admin/t.php
===================================================================
--- admin/t.php	(revision 6370)
+++ admin/t.php	(working copy)
@@ -1,15 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-echo "To Whom it may Concern:\n\tA new signup has been submitted for a researcher with the following details:\n\tUsername: $_REQUEST[username]\n\tName: $_REQUEST[fname] $_REQUEST[lname]\n\tE-Mail Address: $_REQUEST[email]\n\n\tTo disable this user's account, please click here: http://".$_SERVER['SERVER_NAME']."/admin/disable.php?username=$_REQUEST[username]\n\n\nThis is an automated e-mail.";
-?>
\ No newline at end of file
Index: admin/config.live.php
===================================================================
--- admin/config.live.php	(revision 6370)
+++ admin/config.live.php	(working copy)
@@ -1,75 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-
-
-	
-/// Options to Change
-
-	# database configuration
-	$db['main']['host'] = 'localhost';
-	$db['main']['dbname'] = 'vulab_vulab';
-	$db['main']['user'] = 'vulab';
-	$db['main']['pass'] = 'vudev';
-	$db['main']['link'] = dbConnect('main');
-
-
-	# http or https?
-	$CONFIG['url']['proto'] = 'http://';
-	
-	
-	# If you have installed OpenVuLab in a subdirectory (ex. domain.com/folder/vulab) enter it below:
-	# - DO NOT ADD A TRAILING SLASH
-	# - If its installed in the root of the domain (ex. domain.com/index.php) leave this blank.
-	$CONFIG['url']['subdir'] = '';
-
-	# base URL
-	$CONFIG['url']['base'] = $CONFIG['url']['proto'] . $_SERVER['HTTP_HOST'] . $CONFIG['url']['subdir'];
-	
-	
-	# url of the images directory (for <img src='...'> tags)
-	$CONFIG['url']['images'] = $CONFIG['url']['base'] . $CONFIG['url']['subdir'] . '/images/';
-
-	# url for logo
-	$CONFIG['url']['logo'] = $CONFIG['url']['images'] . 'OpenVULab.png';
-	
-	# url of the css directory (for themes)
-	$CONFIG['url']['css'] = $CONFIG['url']['base'] . '/public/css/';
-
-	$CONFIG['path']['include'] = CORE_BASE . 'admin/include/';
-	$CONFIG['path']['css'] = CORE_BASE . 'public/css/';
-	$CONFIG['path']['locale'] = CORE_BASE . 'locale';
-	
-	# some files
-	$CONFIG['url']['admin-css'] = $CONFIG['url']['base'].'/admin/style.css';
-	
-
-	# url for management javascript
-	$CONFIG['url']['js'] = $CONFIG['url']['base'] . '/js/';
-	
-	$CONFIG['version'] = '0.3 alpha';
-
-
-
-/// Site Options
-	
-	$SITE['name'] = 'OpenVULab';
-	$SITE['slogan'] = 'Remote Usability Testing Suite';
-	# HTML page title
-	$SITE['title'] = $SITE['name'] .', v('. $CONFIG['version'].')';
-	
-// Email Options
-	
-
-//// Options for the Experienced
-
-	include (CORE_BASE.'admin/config.legacylive.php');
- ?>
\ No newline at end of file
Index: admin/disable.php
===================================================================
--- admin/disable.php	(revision 6370)
+++ admin/disable.php	(working copy)
@@ -1,20 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-	require_once '/home/silkwire/public_html/vulabdev/admin/phpESP.ini.php';
-	require_once ($ESPCONFIG['include_path']."/lib/vulabdatalib.php");
-    esp_init_adodb();
-    $sql = "UPDATE $ESPCONFIG[user_table] SET `disabled` = 'Y' WHERE `username` = '$_REQUEST[username]'";
-    $result = execute_sql($sql);
-?>
-The user <?=$_REQUEST['username'];?> has been set inactive in the database.
\ No newline at end of file
Index: admin/lostpassword.php
===================================================================
--- admin/lostpassword.php	(revision 6370)
+++ admin/lostpassword.php	(working copy)
@@ -1,86 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-
-<?php
-if (isset($_POST['submit']))
-{
-	$required_fields = array(
-		'username'
-	);
-	foreach ($required_fields as $field)
-	{
-		if (!isset($_REQUEST[$field]))
-			error_required_field();
-	}
-	$confirmation = array(
-	);
-	foreach ($confirmation as $field)
-	{
-		if (!($_REQUEST[$field] == $_REQUEST['c'.$field]))
-			error_non_confirmed();
-	}
-	require_once '/home/silkwire/public_html/vulabdev/admin/phpESP.ini.php';
-	require_once ($ESPCONFIG['include_path']."/lib/vulabdatalib.php");
-    esp_init_adodb();
-    $sql = "SELECT * FROM $ESPCONFIG[user_table] WHERE `username` = '$_REQUEST[username]'";
-    $result = execute_sql($sql);
-    if ($result->RecordCount() <= 0)
-    	error_username_invalid();
-    //$sql = "UPDATE $ESPCONFIG[user_table] SET `password` = PASSWORD('change_me_now')";
-    $sql = "UPDATE $ESPCONFIG[user_table] SET `password` = PASSWORD('change1me') where `username` =  '$_REQUEST[username]'";
-    $n = execute_sql($sql);
-    
-    $mailMSG = "$_REQUEST[username]:\n\tYour password has been changed. Your new password is \"change1me\" (without quotes). Please log in and change this password as soon as possible.";
-    
-    mail($result->fields[5],"Password Change Notification",$mailMSG);
-    
-	echo "Your password has successfully been changed, and an email has been dispatched to you with your new password.";
-	echo "<br/> <a href='/'>Back to Login</a>";
-}
-else
-	showForm();
-function error_required_field()
-{
-	showForm('Your have omitted one or more required fields.');
-}
-function error_non_confirmed()
-{
-	showForm('Your passwords and/or e-mail addresses did not match their confirmation tests.');
-}
-function showForm($error = null)
-{
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><head>
-<title>OpenVULab Registration</title>
-<link rel="stylesheet" href="http://vulabdev.silkwire.com/vulab-dev/public/css/default.css" type="text/css">
-</head>
-<body id="auth">
-<div class="headerGraphic"></div><div class="login"><h1>OpenVULab Registration</h1>
-<form name="loginform" id="loginform"  method="post">
-<fieldset><legend>Reset Password</legend>
-<h2>Please fill out the following form (all fields are required) to reset your password</h2>
-<?php
-	if ($error != null)
-		echo '<h2 style="color:red">ERROR: '.$error.'</h2>';
-?>
-<div class="row"><label for="username">Username:</label><input type="text" size="20" name="username" />
-</div><div class="row">
-<input type="submit" name="submit" value="Submit" /><input type="reset" value="Clear" /></div></fieldset>
-</div>
-</form>
-</body>
-</html>
-<?php
-	exit();
-}
-?>
Index: admin/signup.php
===================================================================
--- admin/signup.php	(revision 6370)
+++ admin/signup.php	(working copy)
@@ -1,122 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-error_reporting(E_ALL);
-if (isset($_REQUEST['Register']))
-{
-	$required_fields = array(
-		'username',
-		'password',
-		'cpassword',
-		'email',
-		'cemail'
-	);
-	foreach ($required_fields as $field)
-	{
-		if (!isset($_REQUEST[$field]))
-			error_required_field();
-	}
-	$confirmation = array(
-		'password',
-		'email'
-	);
-	foreach ($confirmation as $field)
-	{
-		if (!($_REQUEST[$field] == $_REQUEST['c'.$field]))
-			error_non_confirmed();
-	}
-	require_once 'include_all.php';
-	require_once ($ESPCONFIG['include_path']."/lib/vulabdatalib.php");
-    esp_init_adodb();
-    $sql = "INSERT INTO $ESPCONFIG[user_table] VALUES('','$_REQUEST[username]',PASSWORD('$_REQUEST[password]'),'$_REQUEST[fname]','$_REQUEST[lname]','$_REQUEST[email]','$_REQUEST[type]','N')";
-    $result = execute_sql($sql);
-    
-    if ($_REQUEST['type'] == 'Y')
-    {
-	    $sql = "INSERT INTO `designer` VALUES ('$_REQUEST[username]',PASSWORD('$_REQUEST[password]'),'BASIC','auto','$_REQUEST[fname]','$_REQUEST[lname]','$_REQUEST[email]','Y','N','N','N','N','N','N',now(),NULL)";
-    	$result = execute_sql($sql);
-	}
-	$sql = "INSERT INTO `respondent` VALUES('$_REQUEST[username]',PASSWORD('$_REQUEST[password]'),'BASIC','auto','$_REQUEST[fname]','$_REQUEST[lname]','$_REQUEST[email]','N',now(),NULL)";
-		
-    $result = execute_sql($sql);
-    
-    if ($_REQUEST['type'] == 'Y') {
-    	//$emailMESSAGE = "To Whom it may Concern:\n\tA new signup has been submitted for a researcher with the following details:\n\tUsername: $_REQUEST[username]\n\tName: $_REQUEST[fname] $_REQUEST[lname]\n\tE-Mail Address: $_REQUEST[email]\n\n\tTo disable this user's account, please click here: http://".$_SERVER['SERVER_NAME']."/admin/disable.php?username=$_REQUEST[username]\n\n\nThis is an automated e-mail.";
-	    //mail($ESPCONFIG['email']['to'],$ESPCONFIG['email']['subject'],$emailMESSAGE);
-	}
-	
-	$user = new User(mysql_insert_id());
-	$options = array('type'=>'welcome','from'=>'invite@vulab.electblake.com');
-	$mailresults = $user->email($subject,$message,$options);
-	if ($mailresults) {
-		echo 'Welcome Email Successfully Sent!</br>';
-	} else {
-		$err[] = "Sorry! Welcome email cannot be sent at this time.";
-	}    
-	echo "Thank you for registering! You may now <a href='/admin/'>log in</a>.";
-}
-else
-	showForm();
-	
-function error_required_field()
-{
-	showForm('Your have omitted one or more required fields.');
-}
-function error_non_confirmed()
-{
-	showForm('Your passwords and/or e-mail addresses did not match their confirmation tests.');
-}
-function showForm($error = null)
-{
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><head>
-<title>OpenVULab Registration</title>
-<link rel="stylesheet" href="http://vulabdev.silkwire.com/vulab-dev/public/css/default.css" type="text/css">
-</head>
-<body id="auth">
-<div class="headerGraphic"></div><div class="login"><h1>OpenVULab Registration</h1>
-<form name="loginform" id="loginform"  method="post">
-<fieldset><legend>Registration</legend>
-<h1>All fields are required unless marked otherwise</h1>
-<?php
-	if ($error != null)
-		echo '<h2 style="color:red">ERROR: '.$error.'</h2>';
-?>
-<div class="row"><label for="username">Username:</label><input type="text" size="20" name="username" />
-</div><div class="row">
-<label for="password">Password:</label><input type="password" name="password" />
-</div><div class="row">
-<label for="password">Confirm Password:</label><input type="password" name="cpassword" />
-</div><div class="row">
-<label for="password">First Name (optional):</label><input type="text" name="fname" />
-</div><div class="row">
-<label for="password">Last Name (optional):</label><input type="text" name="lname" />
-</div><div class="row">
-<label for="password">E-Mail Address:</label><input type="text" name="email" />
-</div><div class="row">
-<label for="password">Confirm E-Mail Address:</label><input type="text" name="cemail" />
-</div><div class="row">
-<label for="password">I am a:</label><select name="type">
-	<option value="Y">Researcher</option>
-	<option value="N" SELECTED>Tester</option>
-</select>
-</div><div class="row">
-<input type="submit" name="Register" value="Submit" /><input type="reset" value="Clear" /></div></fieldset>
-</form>
-</div>
-</body>
-</html>
-<?php
-	exit();
-}
-?>
\ No newline at end of file
Index: admin/manage.old.php
===================================================================
--- admin/manage.old.php	(revision 6370)
+++ admin/manage.old.php	(working copy)
@@ -1,230 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-global $_POST;
-if (@$_GET[where] == 'manage') {
-	if (!empty($_SESSION['pid'])) { unset($_SESSION['pid']); }
-	if (!empty($_SESSION['renamed'])) { unset($_SESSION['renamed']); }
-	if (!empty($_SESSION['last_tab'])) { unset($_SESSION['last_tab']); }
-	if (!empty($_SESSION['curr_q'])) { unset($_SESSION['curr_q']); }
-	if (!empty($_SESSION['survey_id'])) { unset($_SESSION['survey_id']); }
-	if (!empty($_SESSION['new_survey'])) { unset($_SESSION['new_survey']); }
-}
-
-//ini_set('display_errors','0');
-
-    /* $Id: manage.php,v 1.32 2007/12/10 12:15:55 liedekef Exp $ */
-
-    /* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-    // Written by James Flemer
-    // For eGrad2000.com
-    // <jflemer@alum.rpi.edu>
-
-    if (!defined('ESP_BASE'))
-    define('ESP_BASE', dirname(dirname(__FILE__)) .'/');
-    $CONFIG = ESP_BASE . '/admin/phpESP.ini.php';
-
-    if(!file_exists($CONFIG)) {
-        echo("<b>FATAL: Unable to open $CONFIG. Aborting.</b>");
-        exit;
-    }
-    if(!extension_loaded('mysql')) {
-        echo('<b>FATAL: Mysql extension not loaded. Aborting.</b>');
-        exit;
-    }
-    require_once($CONFIG);
-  	
-  	///Include Our Libraries
-	require_once ($ESPCONFIG['include_path']."/lib/vulabdatalib.php");
-	require_once ($ESPCONFIG['include_path']."/lib/vulab.functions.php");
-	require_once ($ESPCONFIG['include_path']."/lib/vulab.projects.class.php");
-	require_once ($ESPCONFIG['include_path']."/lib/vulab.projects.function.php");
-	require_once ($ESPCONFIG['include_path']."/lib/vulab.users.class.php");
-	require_once ($ESPCONFIG['include_path']."/lib/vulab.users.function.php");
-	require_once ($ESPCONFIG['include_path']."/lib/vulab.surveys.class.php");
-	require_once ($ESPCONFIG['include_path']."/lib/vulab.debugger.php");
-	require_once ($ESPCONFIG['include_path']."/lib/vulab.permissions.class.php");
-	
-	
-    /* check for an unsupported web server configuration */
-    if((in_array(php_sapi_name(), $ESPCONFIG['unsupported'])) and ($ESPCONFIG['auth_design']) and ($ESPCONFIG['auth_mode'] == 'basic')) {
-        echo ('<b>FATAL: Your webserver is running PHP in an unsupported mode. Aborting.</b><br/>');
-        echo ('<b>Please read <a href="http://phpesp.sf.net/cvs/docs/faq.html?rev=.&content-type=text/html#iunsupported">this</a> entry in the FAQ for more information</b>');
-        exit;
-    }
-    esp_init_adodb();
-    if(get_cfg_var('register_globals')) {
-        $_SESSION['acl'] = &$acl;
-    }
-    if($ESPCONFIG['auth_design']) {
-        if ($ESPCONFIG['auth_mode'] == 'basic') {
-            $raw_password = @$_SERVER['PHP_AUTH_PW'];
-            $username = @$_SERVER['PHP_AUTH_USER'];
-        }
-        elseif ($ESPCONFIG['auth_mode'] == 'form') {
-            if (isset($_POST['Login'])) {
-                if (!isset($_POST['username'])) {
-                    $username = "";
-                }
-                if ($_POST['username'] != "") {
-                    $_SESSION['username'] = $_POST['username'];
-                }
-                if (!isset($_POST['password'])) {
-                    $password = "";
-                }
-                if ($_POST['password'] != "") {
-                    $_SESSION['raw_password'] = $_POST['password'];
-                }
-            }
-            if (isset($_SESSION['username'])) {
-                $username = $_SESSION['username'];
-            }
-            else {
-                $username = "";
-            }
-            if (isset($_SESSION['raw_password'])) {
-                $raw_password = $_SESSION['raw_password'];
-            }
-            else {
-                $raw_password = "";
-            }
-        }
-        $password = _addslashes($raw_password);
-        if(!manage_auth($username, $password, $raw_password))
-        	exit;
-    } else {
-        $_SESSION['acl'] = array (
-            'username'  => 'none',
-            'pdesign'   => array('none'),
-            'pdata'     => array('none'),
-            'pstatus'   => array('none'),
-            'pall'      => array('none'),
-            'pgroup'    => array('none'),
-            'puser'     => array('none'),
-            'superuser' => 'Y',
-            'disabled'  => 'N'
-        );
-    }
-	
-	if($_SESSION['acl']) {
-		$user = new User($_SESSION['acl']['userid']);
-		if ($user->details['researcher'] == 'Y') {
-			$interface = 'researcher';
-			$interface_suffix = '';
-		}
-		elseif ($user->details['researcher'] == 'N') {
-			$interface = 'tester';
-			$interface_suffix = '_'.$interface;
-		}
-	}
-	
-    if(isset($_POST['where']))
-       $where = $_POST['where'];
-    elseif(isset($_GET['where']))
-       $where = $_GET['where'];
-	if (!@$where) { $where = 'manage'; }
-	if (!isset($where)) { $where = 'manage'; }
-	
-	
-    if ($where == 'download') {
-        include(esp_where($where));
-        exit;
-    }
-    
-    if ($_SESSION['acl']['username'] == 'root')
-		$_SESSION['acl']['superuser'] = 'Y';
-?>
-
-<?php if (@$_GET[lay] != 'ajax') { ?>
-<!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">
-<head>
-    <title><?php echo($ESPCONFIG['title']); ?></title>
-    <script type="text/javascript" src="<?php echo($ESPCONFIG['js_url']);?>default.js"></script>
-	<script type="text/javascript" src="<?php echo($ESPCONFIG['js_url']);?>jquery-1.2.6.pack.js"></script>
-    <script type="text/javascript" src="<?php echo($ESPCONFIG['js_url']);?>jquery.ajaxContent.js"></script>
-    <script type="text/javascript" src="<?php echo($ESPCONFIG['js_url']);?>vulab.admin.js"></script>
-    <script type="text/javascript" src="<?php echo($ESPCONFIG['js_url']);?>jquery.form.js"></script>
-    <script type="text/javascript" src="<?php echo($ESPCONFIG['js_url']);?>thickbox.js"></script>
-    <link rel="stylesheet" href="<?php echo($ESPCONFIG['js_url']);?>thickbox.css" type="text/css" media="screen" />
-    
-<?php
-	if(!empty($ESPCONFIG['style_sheet'])) {
-		echo("<link href=\"". $ESPCONFIG['style_sheet'] ."\" rel=\"stylesheet\" type=\"text/css\" />\n");
-	}
-	if(!empty($ESPCONFIG['charset'])) {
-		echo('<meta http-equiv="Content-Type" content="text/html; charset='. $ESPCONFIG['charset'] ."\" />\n");
-	}
-?>
-<script type="text/javascript">
-
-</script>
-</head>
-<body>
-<?php } ?>
- <?php
-	/* Moved to Stylesheet
-	*
-	*echo('bgcolor="'. $ESPCONFIG['main_bgcolor'] .'"');
-	*if(!empty($ESPCONFIG['link_color']))  echo(' link="'.  $ESPCONFIG['link_color']  .'"');
-	*if(!empty($ESPCONFIG['vlink_color'])) echo(' vlink="'. $ESPCONFIG['vlink_color'] .'"');
-	*if(!empty($ESPCONFIG['alink_color'])) echo(' alink="'. $ESPCONFIG['alink_color'] .'"'); 
-	*/
-
-	if($ESPCONFIG['DEBUG']) {
-		include($ESPCONFIG['include_path']."/debug".$ESPCONFIG['extension']);
-	}
-	if (@$_SESSION[debug]) {
-	echo "<a id='debug_toggle' class='hand'>minimize debug</a> - <a id='log_toggle' class='hand'>expand log</a> - <a href='?where=desettings'>settings</a>";
-	echo "<pre class='debug'>";
-	echo '<strong>$_POST</strong>'."\n";
-	print_r($_POST);
-	/*echo '<strong>$_GET</strong>'."\n";
-	print_r($_GET);*/
-	echo '<strong>$_SESSION</strong>'."\n";
-	print_r($_SESSION);
-	/*echo '<strong>System</strong>';
-	echo "<li>step: ".@$step."</li>";
-	echo "<li>go: ".@$go."</li>";
-	echo "<li>from: ".@$from."</li>";
-
-	echo '<strong>$project</strong>'."\n";
-	print_r($project);
-		*/
-	echo "</pre>";
-	echo "<pre class='log'>";
-	echo "</pre>";
-	}
-	if (!@$_GET['lay']) { $_GET['lay'] = 'full'; }
-	
-	if ($_GET['lay'] == 'full') {
-		if(file_exists($ESPCONFIG['include_path']."/head".$ESPCONFIG['extension'])) {
-			include($ESPCONFIG['include_path']."/head".$ESPCONFIG['extension']);
-		}
-	}
-	if ($where != 'logout' AND $where != 'account' AND $where != 'help') {
-		$where_interface = "$where$interface_suffix";
-	}
-//	$include_where = ;
-	include(esp_where(($where_interface ? $where_interface : $where)));
-	if(@$_GET[lay] == 'full') {
-		if(file_exists($ESPCONFIG['include_path']."/foot".$ESPCONFIG['extension']))
-			include($ESPCONFIG['include_path']."/foot".$ESPCONFIG['extension']);
-
-
-?>
-</body>
-</html>
-<?php }//end ajax lay if ?>
\ No newline at end of file
Index: admin/phpESP.ini-local.php
===================================================================
--- admin/phpESP.ini-local.php	(revision 6370)
+++ admin/phpESP.ini-local.php	(working copy)
@@ -1,288 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-error_reporting(E_ALL ^ E_NOTICE);
-/* $Id: phpESP.ini.php,v 1.51 2007/12/30 18:35:20 liedekef Exp $ */
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-if (!isset($_SESSION)) session_start();
-// if the session fails to start
-if (!isset($_SESSION)) {
-   echo "This script can't work without setting the php session variable first!!!";
-   exit ;
-}
-
-if (!defined('ESP_BASE')) define('ESP_BASE', dirname(dirname(__FILE__)) .'/');
-if (isset($_SERVER))  $server =& $_SERVER;
-else                  $server =& $HTTP_SERVER_VARS;
-
-/**
- * Here are all the configuration options.
- */
-
-// use http or https?
-$ESPCONFIG['proto'] = 'http://';
-
-//$server['HTTP_HOST'] .= '/users/vuLab';
-
-// Base URL for phpESP
-$ESPCONFIG['base_url'] = $ESPCONFIG['proto'] . $server['HTTP_HOST'];
-
-// If you have installed OpenVuLab in a subdirectory (ex. domain.com/folder/vulab) enter it below:
-// - DO NOT ADD A TRAILING SLASH
-// - If its installed in the root of the domain (ex. domain.com/index.php) leave this blank.
-//$ESPCONFIG['subdir_url'] = '/users/vulab';
-
-// URL of the images directory (for <img src='...'> tags)
-$ESPCONFIG['image_url'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/images/';
-
-$ESPCONFIG['logo_url'] = $ESPCONFIG['image_url'] . 'OpenVULab.png';
-
-// URL of the automatic survey publisher
-$ESPCONFIG['autopub_url'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/public/survey.php';
-
-// URL of the CSS directory (for themes)
-$ESPCONFIG['css_url'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/public/css/';
-
-//URL for management javascript
-$ESPCONFIG['js_url'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/js/';
-
-// Database connection information
-$ESPCONFIG['db_host'] = 'localhost';
-$ESPCONFIG['db_user'] = 'dbUser';
-$ESPCONFIG['db_pass'] = 'dbPass';
-$ESPCONFIG['db_name'] = 'vulab_vulab';
-
-// to limit double postings
-// set this to the number of days people are restricted from resubmitting
-// this is in fact the expire time for a cookie
-// Set this to 0 to disable
-$ESPCONFIG['limit_double_postings'] = 3;
-
-// to use captcha confirmation, set this to 1
-// Be sure to install the GD extension for PHP first, before using this
-$ESPCONFIG['use_captcha'] = 0;
-
-//date format to be used when filling in date fields in a survey
-$ESPCONFIG['date_format'] = "%d/%m/%Y";
-//$ESPCONFIG['date_format'] = "%m/%d/%Y";
-
-// ADODB
-$ESPCONFIG['adodb_path'] = ESP_BASE . 'admin/include/lib/adodb/';
-$ESPCONFIG['adodb_database_type'] = 'mysql';
-$ESPCONFIG['adodb_dbpersist'] = 'true';
-$ESPCONFIG['adodb_pathto_db'] = "/var/www/phpESP/scripts/db/esp.dbm";
-
-// Allow phpESP to send email (BOOLEAN)
-$ESPCONFIG['allow_email'] = true;
-
-// Send human readable email, rather than machine readable (BOOLEAN)
-$ESPCONFIG['human_email'] = true;
-
-// The from address to use in the mails
-// (use valid emails, I won't protect you here ...)
-$ESPCONFIG['email_from_name'] = "PHPESP";
-$ESPCONFIG['email_from_address'] = "phpesp@". $_SERVER['SERVER_NAME'];
-// the email return path for bounces ...
-$ESPCONFIG['email_return_path'] = $_SERVER['SERVER_ADMIN'] ."@". $_SERVER['SERVER_NAME'];
-# example:
-# $ESPCONFIG['email_from_name'] = "Customer Department";
-# $ESPCONFIG['email_from_address'] = "cust@somedomain.com";
-# $ESPCONFIG['email_return_path'] = "admin@somedomain.com";
-
-// Use authentication for designer interface (BOOLEAN)
-$ESPCONFIG['auth_design'] = true;
-
-// Use authentication for survey responders (BOOLEAN)
-$ESPCONFIG['auth_response'] = true;
-
-// Choose authentication type: { 'default', 'ldap_both', 'ldap_resp', 'ldap_des' }
-// ldap_resp: respondents in LDAP, ldap_des: designers in LDAP
-// ldap_both: both respondents and designers in LDAP
-// default: mysql
-$ESPCONFIG['auth_type'] = 'default';
-
-// LDAP connection information
-// (Set these values if you choose 'ldap' as the authentication type.)
-// if a user is not found in ldap, the DB is still searched as well
-// designer info is copied in the DB
-$ESPCONFIG['ldap_server'] = 'ldap://ldap.example.com';
-$ESPCONFIG['ldap_port']   = '389';
-$ESPCONFIG['ldap_dn']     = 'dc=example, dc=com';
-$ESPCONFIG['ldap_filter'] = 'uid=';
-// the LDAP attribute that is compared with the "group" when completing private
-// surveys
-$ESPCONFIG['ldap_realm_attr'] = 'objectClass';
-// the LDAP attribute/value needed to designate a LDAP user as a designer
-$ESPCONFIG['ldap_designer_filter'] = 'UserCategory=engineer';
-// the LDAP attribute needed to designate a LDAP user as a superuser
-// we show the example of "uid=test"
-$ESPCONFIG['ldap_superuser_attr'] = 'uid';
-// the LDAP value needed to designate a LDAP user as a superuser
-$ESPCONFIG['ldap_superuser_value'] = 'test';
-// most newer LDAP servers need protocol 3 to be able to bind successfully
-// if this doesn't work for you, turn it of
-$ESPCONFIG['ldap_force_proto_3'] = true;
-
-// Group to add responders to via the sign-up page
-// (Set to "null", without quotes, to disable the sign-up page.)
-// Please do disable this for LDAP auth for respondents
-$ESPCONFIG['signup_realm'] = 'auto';
-
-// Default language for designer interface
-// (Must have gettext support avaiable.)
-$ESPCONFIG['default_lang'] = 'en_US';
-
-// HTML character set used by phpESP
-// (Try 'Windows-1251' for Cryillic, etc.)
-//$ESPCONFIG['charset'] = 'ISO-8859-15';
-$ESPCONFIG['charset'] = 'UTF-8';
-
-// Default number of option lines for new questions
-$ESPCONFIG['default_num_choices'] = 10;
-
-// Colors used by phpESP
-$ESPCONFIG['main_bgcolor']      = '#FFFFFF';
-$ESPCONFIG['link_color']        = '#0000CC';
-$ESPCONFIG['vlink_color']       = '#0000CC';
-$ESPCONFIG['alink_color']       = '#0000CC';
-$ESPCONFIG['dim_bgcolor']       = '#3399CC';
-$ESPCONFIG['error_color']       = '#FF0000';
-$ESPCONFIG['warn_color']        = '#FF0000';
-$ESPCONFIG['reqd_color']        = '#FF0000';
-$ESPCONFIG['bgalt_color1']      = '#FFFFFF';
-$ESPCONFIG['bgalt_color2']      = '#EEEEEE';
-
-/*******************************************************************
- * Most users will not need to change anything below this line.    *
- *******************************************************************/
-// Enable debugging code (BOOLEAN)
-$ESPCONFIG['DEBUG'] = false;
-
-// Name of application
-$ESPCONFIG['name'] = 'OpenVULab';
-
-// Application version
-$ESPCONFIG['version'] = '2.0.2';
-
-// Extension of support files
-$ESPCONFIG['extension'] = '.inc';
-
-// Choose authentication mode: { 'basic', 'form' }
-$ESPCONFIG['auth_mode'] = 'form';
-
-// Survey handler to use
-$ESPCONFIG['handler']        = ESP_BASE . '/public/handler.php';
-$ESPCONFIG['handler_prefix'] = ESP_BASE . '/public/handler-prefix.php';
-
-// Valid tabs when editing surveys
-//$ESPCONFIG['tabs'] = array('general', 'questions', 'order', 'conditions', 'preview', 'finish');
-
-// Copy of PHP_SELF for later use
-//$ESPCONFIG['ME'] = $server['PHP_SELF'];
-$ESPCONFIG['ME'] = $ESPCONFIG['base_url'].$_SERVER['PHP_SELF'];
-
-// CSS stylesheet to use for designer interface
-$ESPCONFIG['style_sheet'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/admin/style.css';
-
-// Status of gettext extension
-$ESPCONFIG['gettext'] = extension_loaded('gettext');
-
-// HTML page title
-$ESPCONFIG['title'] = $ESPCONFIG['name'] .', v('. $ESPCONFIG['version'].')';
-
-// phpESP include path
-$ESPCONFIG['include_path'] = ESP_BASE . '/admin/include/';
-
-// phpESP css path
-$ESPCONFIG['css_path'] = ESP_BASE . '/public/css/';
-
-// phpESP locale path
-$ESPCONFIG['locale_path'] = ESP_BASE . '/locale/';
-
-// Unsuported web server configuration check values
-$ESPCONFIG['unsupported'] = array('cgi', 'sapi');
-
-// Database Table Names:
-$DB_PREFIX = "";	// If your database uses a prefix, set it here.
-$ESPCONFIG['access_table']              = $DB_PREFIX."access";
-$ESPCONFIG['designer_table']            = $DB_PREFIX."designer";
-$ESPCONFIG['question_table']            = $DB_PREFIX."question";
-$ESPCONFIG['question_choice_table']     = $DB_PREFIX."question_choice";
-$ESPCONFIG['question_type_table']       = $DB_PREFIX."question_type";
-$ESPCONFIG['realm_table']               = $DB_PREFIX."realm";
-$ESPCONFIG['respondent_table']          = $DB_PREFIX."respondent";
-$ESPCONFIG['response_table']            = $DB_PREFIX."response";
-$ESPCONFIG['response_bool_table']       = $DB_PREFIX."response_bool";
-$ESPCONFIG['response_date_table']       = $DB_PREFIX."response_date";
-$ESPCONFIG['response_multiple_table']   = $DB_PREFIX."response_multiple";
-$ESPCONFIG['response_other_table']      = $DB_PREFIX."response_other";
-$ESPCONFIG['response_rank_table']       = $DB_PREFIX."response_rank";
-$ESPCONFIG['response_single_table']     = $DB_PREFIX."response_single";
-$ESPCONFIG['response_text_table']       = $DB_PREFIX."response_text";
-$ESPCONFIG['survey_table']              = $DB_PREFIX."survey";
-$ESPCONFIG['condition_table']           = $DB_PREFIX."conditions";
-$ESPCONFIG['project_table']           = $DB_PREFIX."project";
-$ESPCONFIG['user_table']				= $DB_PREFIX."user";
-$ESPCONFIG['userprojectrel_table']		= $DB_PREFIX."userprojectrel";
-
-
-// Debug mode
-$ESPCONFIG['debug_mode'] = 1;
-
-// Load I18N support
-require_once($ESPCONFIG['include_path'] . '/lib/espi18n' . $ESPCONFIG['extension']);
-if (isset($_REQUEST['lang'])) {
-   esp_setlocale_ex($_REQUEST['lang']);
-   $_SESSION['lang']=$_REQUEST['lang'];
-} elseif (isset($lang)) {
-   esp_setlocale_ex($lang);
-   $_SESSION['language']=$lang;
-} elseif (isset($_SESSION['language'])) {
-   esp_setlocale_ex($_SESSION['language']);
-} else {
-   esp_setlocale_ex();
-}
-
-// E-mail details
-$ESPCONFIG['email']['to'] = "dmakalsky@gmail.com";
-$ESPCONFIG['email']['subject'] = "New Researcher Signup";
-
-
-// default thank you messages
-$ESPCONFIG['thank_head'] = _('Thank You For Completing This Survey.');
-$ESPCONFIG['thank_body'] = _('Please do not use the back button on your browser to go
-back.');
-
-if (!file_exists($ESPCONFIG['include_path']. '/funcs'. $ESPCONFIG['extension'])) {
-    printf('<b>'. _('Unable to find the phpESP %s directory.
-			Please check %s to ensure that all paths are set correctly.') .
-			'</b>', 'include', 'phpESP.ini.php');
-    exit;
-}
-if (!file_exists($ESPCONFIG['css_path'])) {
-    printf('<b>'. _('Unable to find the phpESP %s directory.
-			Please check %s to ensure that all paths are set correctly.') .
-			'</b>', 'css', 'phpESP.ini.php');
-    exit;
-}
-
-if (isset($GLOBALS)) {
-    $GLOBALS['ESPCONFIG'] = $ESPCONFIG;
-} else {
-    global $ESPCONFIG;
-}
-
-require_once($ESPCONFIG['include_path'].'/funcs'.$ESPCONFIG['extension']);
-
-?>
Index: admin/resetpassword.php
===================================================================
--- admin/resetpassword.php	(revision 6370)
+++ admin/resetpassword.php	(working copy)
@@ -1,85 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-
-<?php
-if (isset($_POST['submit']))
-{
-	$required_fields = array(
-		'username'
-	);
-	foreach ($required_fields as $field)
-	{
-		if (!isset($_REQUEST[$field]))
-			error_required_field();
-	}
-	$confirmation = array(
-	);
-	foreach ($confirmation as $field)
-	{
-		if (!($_REQUEST[$field] == $_REQUEST['c'.$field]))
-			error_non_confirmed();
-	}
-	include('include_all.php');
-    esp_init_adodb();
-    $sql = "SELECT * FROM $ESPCONFIG[user_table] WHERE `username` = '$_REQUEST[username]'";
-    $result = execute_sql($sql);
-    if ($result->RecordCount() <= 0)
-    	error_username_invalid();
-    //$sql = "UPDATE $ESPCONFIG[user_table] SET `password` = PASSWORD('change_me_now')";
-    $sql = "UPDATE $ESPCONFIG[user_table] SET `password` = PASSWORD('change1me') where `username` =  '$_REQUEST[username]'";
-    $n = execute_sql($sql);
-    
-    $mailMSG = "$_REQUEST[username]:\n\tYour password has been changed. Your new password is \"change1me\" (without quotes). Please log in and change this password as soon as possible.";
-    
-    mail($result->fields[5],"Password Change Notification",$mailMSG);
-    
-	echo "Your password has successfully been changed, and an email has been dispatched to you with your new password.";
-	echo "<br/> <a href='/'>Back to Login</a>";
-}
-else
-	showForm();
-function error_required_field()
-{
-	showForm('Your have omitted one or more required fields.');
-}
-function error_non_confirmed()
-{
-	showForm('Your passwords and/or e-mail addresses did not match their confirmation tests.');
-}
-function showForm($error = null)
-{
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><head>
-<title>OpenVULab Registration</title>
-<link rel="stylesheet" href="http://vulabdev.silkwire.com/vulab-dev/public/css/default.css" type="text/css">
-</head>
-<body id="auth">
-<div class="headerGraphic"></div><div class="login"><h1>OpenVULab Registration</h1>
-<form name="loginform" id="loginform"  method="post">
-<fieldset><legend>Reset Password</legend>
-<h2>Please fill out the following form (all fields are required) to reset your password</h2>
-<?php
-	if ($error != null)
-		echo '<h2 style="color:red">ERROR: '.$error.'</h2>';
-?>
-<div class="row"><label for="email">Email:</label><input type="text" size="20" name="email" />
-</div><div class="row">
-<input type="submit" name="submit" value="Submit" /><input type="reset" value="Clear" /></div></fieldset>
-</div>
-</form>
-</body>
-</html>
-<?php
-	exit();
-}
-?>
Index: admin/index.php
===================================================================
--- admin/index.php	(revision 6370)
+++ admin/index.php	(working copy)
@@ -1,40 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: index.php,v 1.5 2005/08/01 16:12:52 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-    if (isset($_SERVER))  $s =& $_SERVER;
-    //else                  $s =& $HTTP_SERVER_VARS;
-
-    if (isset($s['HTTPS']) && $s['HTTPS'] == 'on') {
-        $proto = 'https';
-        $port  = 443;
-    } else {
-        $proto = 'http';
-        $port  = 80;
-    }
-
-    if (isset($s['SERVER_PORT']) && $s['SERVER_PORT'] != $port) {
-        $port = ':' . $s['SERVER_PORT'];
-    } else {
-        $port = '';
-    }
-
-    $url = sprintf('%s://%s%s%s%s', $proto, $s['SERVER_NAME'], $port,
-            dirname($s['SCRIPT_NAME']), '/manage.php');
-
-    header("Location: $url");
-?>
Index: admin/changepassword.php
===================================================================
--- admin/changepassword.php	(revision 6370)
+++ admin/changepassword.php	(working copy)
@@ -1,94 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-
-<?php
-if (isset($_POST['submit']))
-{
-	$required_fields = array(
-		'username',
-		'pass',
-		'newpass',
-		'cnewpass'
-	);
-	foreach ($required_fields as $field)
-	{
-		if (!isset($_REQUEST[$field]))
-			error_required_field();
-	}
-	$confirmation = array(
-		'newpass'
-	);
-	foreach ($confirmation as $field)
-	{
-		if (!($_REQUEST[$field] == $_REQUEST['c'.$field]))
-			error_non_confirmed();
-	}
-	require_once '/home/silkwire/public_html/vulabdev/admin/phpESP.ini.php';
-	require_once ($ESPCONFIG['include_path']."/lib/vulabdatalib.php");
-    esp_init_adodb();
-    $sql = "SELECT * FROM $ESPCONFIG[user_table] WHERE `password` = PASSWORD('$_REQUEST[pass]') AND `username` = '$_REQUEST[username]'";
-    $result = execute_sql($sql);
-    if ($result->RecordCount() <= 0)
-    	error_password_invalid();
-    $sql = "UPDATE $ESPCONFIG[user_table] SET `password` = PASSWORD('$_REQUEST[newpass]') WHERE `username` = '$_REQUEST[username]'";
-    $result = execute_sql($sql);
-    
-	echo "Your password has successfully been changed! You may now <a href='/admin/'>log in</a>.";
-}
-else
-	showForm();
-function error_password_invalid()
-{
-	showForm('Your current password is invalid.');
-}
-function error_required_field()
-{
-	showForm('Your have omitted one or more required fields.');
-}
-function error_non_confirmed()
-{
-	showForm('Your passwords and/or e-mail addresses did not match their confirmation tests.');
-}
-function showForm($error = null)
-{
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><head>
-<title>OpenVULab Registration</title>
-<link rel="stylesheet" href="http://vulabdev.silkwire.com/vulab-dev/public/css/default.css" type="text/css">
-</head>
-<body id="auth">
-<div class="headerGraphic"></div><div class="login"><h1>OpenVULab Registration</h1>
-<form name="loginform" id="loginform"  method="post">
-<fieldset><legend>Change Password</legend>
-<h2>Please fill out the following form (all fields are required) to change your password</h2>
-<?php
-	if ($error != null)
-		echo '<h2 style="color:red">ERROR: '.$error.'</h2>';
-?>
-<div class="row"><label for="username">Username:</label><input type="text" size="20" name="username" />
-</div>
-<div class="row"><label for="username">Current Password:</label><input type="password" size="20" name="pass" />
-</div>
-<div class="row"><label for="username">New Password:</label><input type="password" size="20" name="newpass" />
-</div>
-<div class="row"><label for="username">Confirm New Password:</label><input type="password" size="20" name="cnewpass" />
-</div><div class="row">
-<input type="submit" name="submit" value="Submit" /><input type="reset" value="Clear" /></div></fieldset>
-</div>
-</form>
-</body>
-</html>
-<?php
-	exit();
-}
-?>
\ No newline at end of file
Index: admin/tpl/home.tpl
===================================================================
--- admin/tpl/home.tpl	(revision 6370)
+++ admin/tpl/home.tpl	(working copy)
@@ -1,7 +0,0 @@
-<div id="container">
-
-
-<h1>My Drafts Projects</h1>
-
-<h1>My Published Projects</h1>
-</div>
\ No newline at end of file
Index: admin/include_all.php
===================================================================
--- admin/include_all.php	(revision 6370)
+++ admin/include_all.php	(working copy)
@@ -1,35 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-	
-	if (!defined('CORE_BASE')) define('CORE_BASE', dirname(dirname(__FILE__)) .'/');
-
-	# include session management
-	include(CORE_BASE.'/admin/include/lib/vulab.sessions.php');
-	
-	# include database management
-	include(CORE_BASE.'/admin/include/lib/vulab.databases.php');
-	
-	# include configuration
-	include(CORE_BASE.'/admin/config.inc.php');
-		
-	///Include Our Libraries
-	require_once ($CONFIG['path']['include']."/lib/vulabdatalib.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.functions.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.projects.class.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.projects.function.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.users.class.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.users.function.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.surveys.class.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.debugger.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.permissions.class.php");
-	
-?>
Index: admin/phpESP.ini.php
===================================================================
--- admin/phpESP.ini.php	(revision 6370)
+++ admin/phpESP.ini.php	(working copy)
@@ -1,24 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-# basic config file switching
-if (is_numeric(stripos($_SERVER['SERVER_NAME'],'localhost'))) {
-	include ('phpESP.ini-local.php');
-	include ('config.localhost.php');
-} else { // its running on a real live domain.
-	include ('config.legacylive.php');
-	include ('config.live.php');
- } // locahost else
-
-?>
\ No newline at end of file
Index: admin/config.inc.php
===================================================================
--- admin/config.inc.php	(revision 6370)
+++ admin/config.inc.php	(working copy)
@@ -1,35 +0,0 @@
-<?php
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-
-# define base path
-if (!defined('ESP_BASE')) define('ESP_BASE', dirname(dirname(__FILE__)) .'/');
-if (!defined('CORE_BASE')) define('CORE_BASE', dirname(dirname(__FILE__)) .'/');
-
-# define error reporting
-error_reporting(E_ALL ^ E_NOTICE);
-
-# clear all old configs
-unset($CONFIG);
-
-# clean up HTTP_HOST for config switching
-$host = explode(':',$_SERVER['HTTP_HOST']);
-	switch($host[0]) {
-		
-		case 'vulab.localhost':
-			include(CORE_BASE.'admin/config.localhost.php');
-			break;
-		default:
-			#include (CORE_BASE.'admin/config.legacylive.php');
-			include (CORE_BASE.'admin/config.live.php');
-			break;
-	}
- ?>
\ No newline at end of file
Index: admin/test.php
===================================================================
--- admin/test.php	(revision 6370)
+++ admin/test.php	(working copy)
@@ -1,185 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: test.php,v 1.11 2007/12/10 12:15:55 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// <jflemer@alum.rpi.edu>
-
-/* phpESP System Information */
-
-session_start();
-// if the session fails to start
-if (!isset($_SESSION)) {
-   echo "This script can't work without setting the php session variable first!!!";
-   exit ;
-}
-
-if (!isset($_SESSION['esp_counter']))
-    $_SESSION['esp_counter'] = 0;
-$_SESSION['esp_counter']++;
-
-function _pass($str)
-{
-    echo '<font color="green">' . htmlspecialchars($str) . '</font>';
-}
-
-function _fail($str)
-{
-    echo '<font color="red">' . htmlspecialchars($str) . '</font>';
-}
-
-function check_string($have, $want)
-{
-    if (strcasecmp($have, $want) == 0)
-        _pass($have);
-    else
-        _fail($have);
-}
-
-function check_bool($have, $want)
-{
-    $val = $have ? 'Yes' : 'No';
-    if ($have == $want)
-        _pass($val);
-    else
-        _fail($val);
-}
-
-function check_extension($ext)
-{
-    if (!isset($GLOBALS['php_extensions'])) {
-        $GLOBALS['php_extensions'] =
-                array_map('strtolower', get_loaded_extensions());
-    }
-    
-    if (in_array(strtolower($ext), $GLOBALS['php_extensions']))
-        _pass('Yes');
-    else
-        _fail('No');
-}
-
-function check_version()
-{
-    if (!function_exists('version_compare')) {
-        _fail(PHP_VERSION);
-        return;
-    }
-    if (version_compare(PHP_VERSION, '4.1.0', 'ge'))
-        _pass(PHP_VERSION);
-    else
-        _fail(PHP_VERSION);
-}
-
-?>
-<html>
-<head>
-<title>phpESP System Information</title>
-<style type="text/css">
-<!--
-ul,th {
-        font-family : Verdana, Arial, Helvetica, Geneva, sans-serif;
-        font-size : 9px;
-        font-weight : bold;
-        font-variant : normal;
-        font-style : normal;
-}
-
-
--->
-</style>
-</head>
-<body>
-<table><tbody align="left">
-  <tr><th>PHP Information</th></tr>
-  <tr><td><ul>
-    <li>Version: <?php check_version(); ?></li>
-    <li>OS: <?php _pass(PHP_OS); ?></li>
-    <li>SAPI: <?php check_string(php_sapi_name(), 'apache'); ?></li>
-    <li>register_globals: <?php check_bool(ini_get('register_globals'), false); ?></li>
-    <li>magic_quotes_gpc: <?php check_bool(ini_get('magic_quotes_gpc'), false); ?></li>
-    <li>magic_quotes_runtime: <?php check_bool(ini_get('magic_quotes_runtime'), false); ?></li>
-    <li>safe_mode: <?php check_bool(ini_get('safe_mode'), false); ?></li>
-    <li>open_basedir: <?php check_string(ini_get('open_basedir'), ''); ?></li>
-  </ul></td></tr>
-  
-  <tr><th>PHP Extensions</th></tr>
-  <tr><td><ul>
-    <li>dBase: <?php check_extension('dbase'); ?></li>
-    <li>GD: <?php
-        check_extension('gd');
-        if (function_exists('gd_info')) {
-            $gdinfo = gd_info();
-            echo " -- ${gdinfo['GD Version']}";
-        }
-    ?></li>
-    <li>GNU Gettext: <?php check_extension('gettext'); ?></li>
-    <li>LDAP: <?php check_extension('ldap'); ?></li>
-    <li>MySQL: <?php check_extension('mysql'); ?></li>
-    <li>PHP Extension Dir (compiled): <?php _pass(PHP_EXTENSION_DIR); ?></li>
-    <li>PHP Extension Dir (run time): <?php _pass(ini_get('extension_dir')); ?></li>
-  </ul></td></tr>
-
-  <tr><th>phpESP Settings</th></tr>
-  <tr><td><ul>
-    <li>Expected ESP_BASE: <?php _pass(dirname(dirname(__FILE__)) .'/'); ?></li>
-    <li>Expected base_url: <?php _pass($ESPCONFIG['proto'] . $_SERVER['HTTP_HOST'] . dirname(dirname($_SERVER['REQUEST_URI'])) . '/'); ?></li>
-    <li><b>Loading phpESP.ini.php ...</b><br />
-      <?php require_once('phpESP.ini.php'); ?></li>
-    <li>ESP_BASE: <?php
-        if ((ESP_BASE == dirname(__FILE__) . '/../') || (ESP_BASE == dirname(dirname(__FILE__)) .'/'))
-            _pass(ESP_BASE);
-        else
-            _fail(ESP_BASE);
-    ?></li>
-    <li>base_url: <?php check_string($ESPCONFIG['base_url'], $ESPCONFIG['proto']. $_SERVER['HTTP_HOST'] . dirname(dirname($_SERVER['REQUEST_URI'])) . '/'); ?></li>
-    <li>Version: <?php _pass($ESPCONFIG['version']); ?></li>
-    <li>Debug: <?php check_bool($ESPCONFIG['DEBUG'], false); ?></li>
-  </ul></td></tr>
-
-  <tr><th>phpESP Language Settings</th></tr>
-  <tr><td><ul>
-    <li>GNU Gettext: <?php check_string(
-            ($ESPCONFIG['gettext'] ? 'Real' : 'Emulated'), 'Real'); ?></li>
-    <li>default_lang: <?php _pass($ESPCONFIG['default_lang']); ?></li>
-    <li>current lang: <?php _pass($ESPCONFIG['lang']); ?></li>
-    <li>available langs: <?php _pass(implode(', ', esp_getlocales())); ?><br />
-      (<?php _pass(implode(', ', array_keys(esp_getlocale_map()))); ?>)
-    </li>
-    <li>GNU Gettext test: <?php
-        esp_setlocale('en_US');
-        check_string(_('%%%% Gettext Test Failed'), 'Passed'); ?></li>
-    <li>Catalog Open Test: <?php
-        $ret = fopen($ESPCONFIG['locale_path'] . '/en_US/LC_MESSAGES/messages.mo', 'r');
-        check_bool($ret !== false, true);
-        fclose($ret);
-    ?></li>
-  </ul></td></tr>
-
-  <tr><th>PHP Session Test</th></tr>
-  <tr><td><ul>
-    <li>session.save_path: <?php
-        if (stristr(PHP_OS, 'win') && (substr(ini_get('session.save_path'), 0, 1) == '/'))
-            _fail(ini_get('session.save_path'));
-        else
-            _pass(ini_get('session.save_path'));
-    ?></li>
-    <li>Counter: <?php echo $_SESSION['esp_counter']; ?></li>
-  </ul></td></tr>
-    
-</tbody></table>
-</body>
-</html>
Index: admin/sanitize.php
===================================================================
--- admin/sanitize.php	(revision 6370)
+++ admin/sanitize.php	(working copy)
@@ -1,175 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?
-///////////////////////////////////////
-// sanitize.inc.php
-// Sanitization functions for PHP
-// by: Gavin Zuchlinski, Jamie Pratt, Hokkaido
-// webpage: http://libox.net
-// Last modified: September 27, 2003
-//
-// Many thanks to those on the webappsec list for helping me improve these functions
-///////////////////////////////////////
-// Function list:
-// sanitize_paranoid_string($string) -- input string, returns string stripped of all non 
-//           alphanumeric
-// sanitize_system_string($string) -- input string, returns string stripped of special
-//           characters
-// sanitize_sql_string($string) -- input string, returns string with slashed out quotes
-// sanitize_html_string($string) -- input string, returns string with html replacements
-//           for special characters
-// sanitize_int($integer) -- input integer, returns ONLY the integer (no extraneous 
-//           characters
-// sanitize_float($float) -- input float, returns ONLY the float (no extraneous 
-//           characters)
-// sanitize($input, $flags) -- input any variable, performs sanitization 
-//           functions specified in flags. flags can be bitwise 
-//           combination of PARANOID, SQL, SYSTEM, HTML, INT, FLOAT, LDAP, 
-//           UTF8
-///////////////////////////////////////
-define("PARANOID", 1);
-define("SQL", 2);
-define("SYSTEM", 4);
-define("HTML", 8);
-define("INT", 16);
-define("FLOAT", 32);
-define("LDAP", 64);
-define("UTF8", 128);
-
-// internal function for utf8 decoding
-// thanks to Jamie Pratt for noticing that PHP's function is a little 
-// screwy
-function my_utf8_decode($string)
-{
-return strtr($string, 
-  "???????�����̀����������?����ͅ����?�����������������?�����������?�", 
-  "SOZsozYYuAAAAAAACEEEEIIIIDNOOOOOOUUUUYsaaaaaaaceeeeiiiionoooooouuuuyy");
-}
-
-// paranoid sanitization -- only let the alphanumeric set through
-function sanitize_paranoid_string($string, $min='', $max='')
-{
-  $string = preg_replace("/[^a-zA-Z0-9]/", "", $string);
-  $len = strlen($string);
-  if((($min != '') && ($len < $min)) || (($max != '') && ($len > $max)))
-    return FALSE;
-  return $string;
-}
-
-// sanitize a string in prep for passing a single argument to system() (or similar)
-function sanitize_system_string($string, $min='', $max='')
-{
-  $pattern = '/(;|\||`|>|<|&|^|"|'."\n|\r|'".'|{|}|[|]|\)|\()/i'; // no piping, passing possible environment variables ($),
-                           // seperate commands, nested execution, file redirection, 
-                           // background processing, special commands (backspace, etc.), quotes
-                           // newlines, or some other special characters
-  $string = preg_replace($pattern, '', $string);
-  $string = '"'.preg_replace('/\$/', '\\\$', $string).'"'; //make sure this is only interpretted as ONE argument
-  $len = strlen($string);
-  if((($min != '') && ($len < $min)) || (($max != '') && ($len > $max)))
-    return FALSE;
-  return $string;
-}
-
-// sanitize a string for SQL input (simple slash out quotes and slashes)
-function sanitize_sql_string($string, $min='', $max='')
-{
-  $pattern[0] = '/(\\\\)/';
-  $pattern[1] = "/\"/";
-  $pattern[2] = "/'/";
-  $replacement[0] = '\\\\\\';
-  $replacement[1] = '\"';
-  $replacement[2] = "\\'";
-  $len = strlen($string);
-  if((($min != '') && ($len < $min)) || (($max != '') && ($len > $max)))
-    return FALSE;
-  return preg_replace($pattern, $replacement, $string);
-}
-
-// sanitize a string for SQL input (simple slash out quotes and slashes)
-function sanitize_ldap_string($string, $min='', $max='')
-{
-  $pattern = '/(\)|\(|\||&)/';
-  $len = strlen($string);
-  if((($min != '') && ($len < $min)) || (($max != '') && ($len > $max)))
-    return FALSE;
-  return preg_replace($pattern, '', $string);
-}
-
-
-// sanitize a string for HTML (make sure nothing gets interpretted!)
-function sanitize_html_string($string)
-{
-  $pattern[0] = '/\&/';
-  $pattern[1] = '/</';
-  $pattern[2] = "/>/";
-  $pattern[3] = '/\n/';
-  $pattern[4] = '/"/';
-  $pattern[5] = "/'/";
-  $pattern[6] = "/%/";
-  $pattern[7] = '/\(/';
-  $pattern[8] = '/\)/';
-  $pattern[9] = '/\+/';
-  $pattern[10] = '/-/';
-  $replacement[0] = '&amp;';
-  $replacement[1] = '&lt;';
-  $replacement[2] = '&gt;';
-  $replacement[3] = '<br>';
-  $replacement[4] = '&quot;';
-  $replacement[5] = '&#39;';
-  $replacement[6] = '&#37;';
-  $replacement[7] = '&#40;';
-  $replacement[8] = '&#41;';
-  $replacement[9] = '&#43;';
-  $replacement[10] = '&#45;';
-  return preg_replace($pattern, $replacement, $string);
-}
-
-// make int int!
-function sanitize_int($integer, $min='', $max='')
-{
-  $int = intval($integer);
-  if((($min != '') && ($int < $min)) || (($max != '') && ($int > $max)))
-    return FALSE;
-  return $int;
-}
-
-// make float float!
-function sanitize_float($float, $min='', $max='')
-{
-  $float = floatval($float);
-  if((($min != '') && ($float < $min)) || (($max != '') && ($float > $max)))
-    return FALSE;
-  return $float;
-}
-
-// glue together all the other functions
-function sanitize($input, $flags=2, $min='', $max='')
-{
-  if($flags & UTF8) $input = my_utf8_decode($input);
-  if($flags & PARANOID) $input = sanitize_paranoid_string($input, $min, $max);
-  if($flags & INT) $input = sanitize_int($input, $min, $max);
-  if($flags & FLOAT) $input = sanitize_float($input, $min, $max);
-  if($flags & HTML) $input = sanitize_html_string($input, $min, $max);
-  if($flags & SQL) $input = sanitize_sql_string($input, $min, $max);
-  if($flags & LDAP) $input = sanitize_ldap_string($input, $min, $max);
-  if($flags & SYSTEM) $input = sanitize_system_string($input, $min, $max);
-  return $input;
-}
-
-function test()
-{
-	echo sanitize("This is' a \"Test of the sys;--tem",2);
-}
-
-?>
\ No newline at end of file
Index: admin/manage.php
===================================================================
--- admin/manage.php	(revision 6370)
+++ admin/manage.php	(working copy)
@@ -1,224 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-global $_POST;
-if (@$_GET[where] == 'manage') {
-	if (!empty($_SESSION['pid'])) { unset($_SESSION['pid']); }
-	if (!empty($_SESSION['renamed'])) { unset($_SESSION['renamed']); }
-	if (!empty($_SESSION['last_tab'])) { unset($_SESSION['last_tab']); }
-	if (!empty($_SESSION['curr_q'])) { unset($_SESSION['curr_q']); }
-	if (!empty($_SESSION['survey_id'])) { unset($_SESSION['survey_id']); }
-	if (!empty($_SESSION['new_survey'])) { unset($_SESSION['new_survey']); }
-}
-
-//ini_set('display_errors','0');
-
-    /* $Id: manage.php,v 1.32 2007/12/10 12:15:55 liedekef Exp $ */
-
-    /* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-    // Written by James Flemer
-    // For eGrad2000.com
-    // <jflemer@alum.rpi.edu>
-
-    if (!defined('ESP_BASE'))
-    define('ESP_BASE', dirname(dirname(__FILE__)) .'/');
-    $configuration_file = ESP_BASE . 'admin/include_all.php';
-    
-    if(!file_exists($configuration_file)) {
-        echo("<b>FATAL: Unable to open $CONFIG. Aborting.</b>");
-        exit;
-    }
-    if(!extension_loaded('mysql')) {
-        echo('<b>FATAL: Mysql extension not loaded. Aborting.</b>');
-        exit;
-    }
-    require_once($configuration_file);
-
-  	///Include Our Libraries
-	require_once ($CONFIG['path']['include']."/lib/vulabdatalib.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.functions.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.projects.class.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.projects.function.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.users.class.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.users.function.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.surveys.class.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.debugger.php");
-	require_once ($CONFIG['path']['include']."/lib/vulab.permissions.class.php");
-	
-
-    /* check for an unsupported web server configuration */
-    if((in_array(php_sapi_name(), $ESPCONFIG['unsupported'])) and ($ESPCONFIG['auth_design']) and ($ESPCONFIG['auth_mode'] == 'basic')) {
-        echo ('<b>FATAL: Your webserver is running PHP in an unsupported mode. Aborting.</b><br/>');
-        echo ('<b>Please read <a href="http://phpesp.sf.net/cvs/docs/faq.html?rev=.&content-type=text/html#iunsupported">this</a> entry in the FAQ for more information</b>');
-        exit;
-    }
-    esp_init_adodb();
-    if(get_cfg_var('register_globals')) {
-        $_SESSION['acl'] = &$acl;
-    }
-    if($ESPCONFIG['auth_design']) {
-        if ($ESPCONFIG['auth_mode'] == 'basic') {
-            $raw_password = @$_SERVER['PHP_AUTH_PW'];
-            $username = @$_SERVER['PHP_AUTH_USER'];
-        }
-        elseif ($ESPCONFIG['auth_mode'] == 'form') {
-            if (isset($_POST['Login'])) {
-                if (!isset($_POST['username'])) {
-                    $username = "";
-                }
-                if ($_POST['username'] != "") {
-                    $_SESSION['username'] = $_POST['username'];
-                }
-                if (!isset($_POST['password'])) {
-                    $password = "";
-                }
-                if ($_POST['password'] != "") {
-                    $_SESSION['raw_password'] = $_POST['password'];
-                }
-            }
-            if (isset($_SESSION['username'])) {
-                $username = $_SESSION['username'];
-            }
-            else {
-                $username = "";
-            }
-            if (isset($_SESSION['raw_password'])) {
-                $raw_password = $_SESSION['raw_password'];
-            }
-            else {
-                $raw_password = "";
-            }
-        }
-        $password = _addslashes($raw_password);
-        if(!manage_auth($username, $password, $raw_password))
-        	exit;
-    } else {
-        $_SESSION['acl'] = array (
-            'username'  => 'none',
-            'pdesign'   => array('none'),
-            'pdata'     => array('none'),
-            'pstatus'   => array('none'),
-            'pall'      => array('none'),
-            'pgroup'    => array('none'),
-            'puser'     => array('none'),
-            'superuser' => 'Y',
-            'disabled'  => 'N'
-        );
-    }
-	
-	if($_SESSION['acl']) {
-		$user = new User($_SESSION['acl']['userid']);
-		if ($user->details['researcher'] == 'Y') {
-			$interface = 'researcher';
-			$interface_suffix = '';
-		}
-		elseif ($user->details['researcher'] == 'N') {
-			$interface = 'tester';
-			$interface_suffix = '_'.$interface;
-		}
-	}
-	
-    if(isset($_POST['where']))
-       $where = $_POST['where'];
-    elseif(isset($_GET['where']))
-       $where = $_GET['where'];
-	if (!@$where) { $where = 'manage'; }
-	if (!isset($where)) { $where = 'manage'; }
-	
-	
-    if ($where == 'download') {
-        include(esp_where($where));
-        exit;
-    }
-    
-    if ($_SESSION['acl']['username'] == 'root')
-		$_SESSION['acl']['superuser'] = 'Y';
-?>
-
-<?php if (@$_GET[lay] != 'ajax') { ?>
-<!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">
-<head>
-    <title><?php echo($SITE['title']); ?></title>
-    <script type="text/javascript" src="<?php echo($CONFIG['url']['js']);?>default.js"></script>
-	<script type="text/javascript" src="<?php echo($CONFIG['url']['js']);?>jquery-1.2.6.pack.js"></script>
-    <script type="text/javascript" src="<?php echo($CONFIG['url']['js']);?>jquery.ajaxContent.js"></script>
-    <script type="text/javascript" src="<?php echo($CONFIG['url']['js']);?>vulab.admin.js"></script>
-    <script type="text/javascript" src="<?php echo($CONFIG['url']['js']);?>jquery.form.js"></script>
-    <script type="text/javascript" src="<?php echo($CONFIG['url']['js']);?>thickbox.js"></script>
-
-    <link rel="stylesheet" href="<?php echo($CONFIG['url']['js']);?>thickbox.css" type="text/css" media="screen" />
-    
-<?php
-	if(!empty($CONFIG['url']['admin-css'])) {
-		echo("<link href=\"". $CONFIG['url']['admin-css'] ."\" rel=\"stylesheet\" type=\"text/css\" />\n");
-	}
-	if(!empty($ESPCONFIG['charset'])) {
-		echo('<meta http-equiv="Content-Type" content="text/html; charset='. $ESPCONFIG['charset'] ."\" />\n");
-	}
-?>
-<script type="text/javascript">
-
-</script>
-</head>
-<body>
-<?php } ?>
- <?php
-
-	if($ESPCONFIG['DEBUG']) {
-		include($CONFIG['path']['include']."/debug".$ESPCONFIG['extension']);
-	}
-	if (@$_SESSION[debug]) {
-		echo "<a id='debug_toggle' class='hand'>minimize debug</a> - <a id='log_toggle' class='hand'>expand log</a> - <a href='?where=desettings'>settings</a>";
-		echo "<pre class='debug'>";
-		echo '<strong>$_POST</strong>'."\n";
-		print_r($_POST);
-		/*echo '<strong>$_GET</strong>'."\n";
-		print_r($_GET);*/
-		echo '<strong>$_SESSION</strong>'."\n";
-		print_r($_SESSION);
-		/*echo '<strong>System</strong>';
-		echo "<li>step: ".@$step."</li>";
-		echo "<li>go: ".@$go."</li>";
-		echo "<li>from: ".@$from."</li>";
-
-		echo '<strong>$project</strong>'."\n";
-		print_r($project);
-		*/
-		echo "</pre>";
-		echo "<pre class='log'>";
-		echo "</pre>";
-	}
-	if (!@$_GET['lay']) { $_GET['lay'] = 'full'; }
-	
-	if ($_GET['lay'] == 'full') {
-		if(file_exists($CONFIG['path']['include']."/head".$ESPCONFIG['extension'])) {
-			include($CONFIG['path']['include']."/head".$ESPCONFIG['extension']);
-		}
-	}
-	if ($where != 'logout' AND $where != 'account' AND $where != 'help') {
-		$where_interface = "$where$interface_suffix";
-	}
-//	$include_where = ;
-	include(esp_where(($where_interface ? $where_interface : $where)));
-	if(@$_GET[lay] == 'full') {
-		if(file_exists($CONFIG['path']['include']."/foot".$ESPCONFIG['extension']))
-			include($CONFIG['path']['include']."/foot".$ESPCONFIG['extension']);
-
-
-?>
-</body>
-</html>
-<?php }//end ajax lay if ?>
\ No newline at end of file
Index: admin/config.legacylive.php
===================================================================
--- admin/config.legacylive.php	(revision 6370)
+++ admin/config.legacylive.php	(working copy)
@@ -1,270 +0,0 @@
-<?php
-
-/* $Id: phpESP.ini.php,v 1.51 2007/12/30 18:35:20 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-
-if (!defined('ESP_BASE')) define('ESP_BASE', dirname(dirname(__FILE__)) .'/');
-if (isset($_SERVER))  $server =& $_SERVER;
-else                  $server =& $HTTP_SERVER_VARS;
-
-/**
- * Here are all the configuration options.
- */
-
-// use http or https?
-$ESPCONFIG['proto'] = 'http://';
-
-// Base URL for phpESP
-$ESPCONFIG['base_url'] = $ESPCONFIG['proto'] . $server['HTTP_HOST'];
-
-$ESPCONFIG['subdir_url'] = '';
-
-// URL of the images directory (for <img src='...'> tags)
-$ESPCONFIG['image_url'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/images/';
-
-$ESPCONFIG['logo_url'] = $ESPCONFIG['image_url'] . 'OpenVULab.png';
-
-// URL of the automatic survey publisher
-$ESPCONFIG['autopub_url'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/public/survey.php';
-
-// URL of the CSS directory (for themes)
-$ESPCONFIG['css_url'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/public/css/';
-
-//URL for management javascript
-$ESPCONFIG['js_url'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/js/';
-
-// Database connection information
-$ESPCONFIG['db_host'] = 'localhost';
-$ESPCONFIG['db_user'] = 'vulab';
-$ESPCONFIG['db_pass'] = 'vudev';
-$ESPCONFIG['db_name'] = 'vulab_vulab';
-
-// to limit double postings
-// set this to the number of days people are restricted from resubmitting
-// this is in fact the expire time for a cookie
-// Set this to 0 to disable
-$ESPCONFIG['limit_double_postings'] = 3;
-
-// to use captcha confirmation, set this to 1
-// Be sure to install the GD extension for PHP first, before using this
-$ESPCONFIG['use_captcha'] = 0;
-
-//date format to be used when filling in date fields in a survey
-$ESPCONFIG['date_format'] = "%d/%m/%Y";
-//$ESPCONFIG['date_format'] = "%m/%d/%Y";
-
-// ADODB
-$ESPCONFIG['adodb_path'] = ESP_BASE . 'admin/include/lib/adodb/';
-$ESPCONFIG['adodb_database_type'] = 'mysql';
-$ESPCONFIG['adodb_dbpersist'] = 'true';
-$ESPCONFIG['adodb_pathto_db'] = "/vulab/www/scripts/db/esp.dbm";
-
-// Allow phpESP to send email (BOOLEAN)
-$ESPCONFIG['allow_email'] = true;
-
-// Send human readable email, rather than machine readable (BOOLEAN)
-$ESPCONFIG['human_email'] = true;
-
-// The from address to use in the mails
-// (use valid emails, I won't protect you here ...)
-$ESPCONFIG['email_from_name'] = "openVuLab";
-$ESPCONFIG['email_from_address'] = "vulab@". $_SERVER['SERVER_NAME'];
-// the email return path for bounces ...
-$ESPCONFIG['email_return_path'] = $_SERVER['SERVER_ADMIN'] ."@". $_SERVER['SERVER_NAME'];
-# example:
-# $ESPCONFIG['email_from_name'] = "Customer Department";
-# $ESPCONFIG['email_from_address'] = "cust@somedomain.com";
-# $ESPCONFIG['email_return_path'] = "admin@somedomain.com";
-
-@$ESPCONFIG['email_invite_name'];
-@$ESPCONFIG['email_invite_address'];
-@$ESPCONFIG['email_reply'];
-
-
-// Use authentication for designer interface (BOOLEAN)
-$ESPCONFIG['auth_design'] = true;
-
-// Use authentication for survey responders (BOOLEAN)
-$ESPCONFIG['auth_response'] = true;
-
-// Choose authentication type: { 'default', 'ldap_both', 'ldap_resp', 'ldap_des' }
-// ldap_resp: respondents in LDAP, ldap_des: designers in LDAP
-// ldap_both: both respondents and designers in LDAP
-// default: mysql
-$ESPCONFIG['auth_type'] = 'default';
-
-// LDAP connection information
-// (Set these values if you choose 'ldap' as the authentication type.)
-// if a user is not found in ldap, the DB is still searched as well
-// designer info is copied in the DB
-$ESPCONFIG['ldap_server'] = 'ldap://ldap.example.com';
-$ESPCONFIG['ldap_port']   = '389';
-$ESPCONFIG['ldap_dn']     = 'dc=example, dc=com';
-$ESPCONFIG['ldap_filter'] = 'uid=';
-// the LDAP attribute that is compared with the "group" when completing private
-// surveys
-$ESPCONFIG['ldap_realm_attr'] = 'objectClass';
-// the LDAP attribute/value needed to designate a LDAP user as a designer
-$ESPCONFIG['ldap_designer_filter'] = 'UserCategory=engineer';
-// the LDAP attribute needed to designate a LDAP user as a superuser
-// we show the example of "uid=test"
-$ESPCONFIG['ldap_superuser_attr'] = 'uid';
-// the LDAP value needed to designate a LDAP user as a superuser
-$ESPCONFIG['ldap_superuser_value'] = 'test';
-// most newer LDAP servers need protocol 3 to be able to bind successfully
-// if this doesn't work for you, turn it of
-$ESPCONFIG['ldap_force_proto_3'] = true;
-
-// Group to add responders to via the sign-up page
-// (Set to "null", without quotes, to disable the sign-up page.)
-// Please do disable this for LDAP auth for respondents
-$ESPCONFIG['signup_realm'] = 'auto';
-
-// Default language for designer interface
-// (Must have gettext support avaiable.)
-$ESPCONFIG['default_lang'] = 'en_US';
-
-// HTML character set used by phpESP
-// (Try 'Windows-1251' for Cryillic, etc.)
-//$ESPCONFIG['charset'] = 'ISO-8859-15';
-$ESPCONFIG['charset'] = 'UTF-8';
-
-// Default number of option lines for new questions
-$ESPCONFIG['default_num_choices'] = 10;
-
-// Colors used by phpESP
-$ESPCONFIG['main_bgcolor']      = '#FFFFFF';
-$ESPCONFIG['link_color']        = '#0000CC';
-$ESPCONFIG['vlink_color']       = '#0000CC';
-$ESPCONFIG['alink_color']       = '#0000CC';
-$ESPCONFIG['dim_bgcolor']       = '#3399CC';
-$ESPCONFIG['error_color']       = '#FF0000';
-$ESPCONFIG['warn_color']        = '#FF0000';
-$ESPCONFIG['reqd_color']        = '#FF0000';
-$ESPCONFIG['bgalt_color1']      = '#FFFFFF';
-$ESPCONFIG['bgalt_color2']      = '#EEEEEE';
-
-/*******************************************************************
- * Most users will not need to change anything below this line.    *
- *******************************************************************/
-// Enable debugging code (BOOLEAN)
-$ESPCONFIG['DEBUG'] = false;
-
-// Name of application
-$ESPCONFIG['name'] = 'OpenVULab';
-
-// Application version
-$ESPCONFIG['version'] = '2.0.2';
-
-// Extension of support files
-$ESPCONFIG['extension'] = '.inc';
-
-// Choose authentication mode: { 'basic', 'form' }
-$ESPCONFIG['auth_mode'] = 'form';
-
-// Survey handler to use
-$ESPCONFIG['handler']        = ESP_BASE . '/public/handler.php';
-$ESPCONFIG['handler_prefix'] = ESP_BASE . '/public/handler-prefix.php';
-
-// Valid tabs when editing surveys
-//$ESPCONFIG['tabs'] = array('general', 'questions', 'order', 'conditions', 'preview', 'finish');
-
-// Copy of PHP_SELF for later use
-//$ESPCONFIG['ME'] = $server['PHP_SELF'];
-$ESPCONFIG['ME'] = $ESPCONFIG['base_url'].$_SERVER['PHP_SELF'];
-
-// CSS stylesheet to use for designer interface
-$ESPCONFIG['style_sheet'] = $ESPCONFIG['base_url'] . $ESPCONFIG['subdir_url'] . '/admin/style.css';
-
-// Status of gettext extension
-$ESPCONFIG['gettext'] = extension_loaded('gettext');
-
-// HTML page title
-$ESPCONFIG['title'] = $ESPCONFIG['name'] .', v('. $ESPCONFIG['version'].')';
-
-// phpESP include path
-$ESPCONFIG['include_path'] = ESP_BASE . '/admin/include/';
-
-// phpESP css path
-$ESPCONFIG['css_path'] = ESP_BASE . '/public/css/';
-
-// phpESP locale path
-$ESPCONFIG['locale_path'] = ESP_BASE . '/locale/';
-
-// Unsuported web server configuration check values
-$ESPCONFIG['unsupported'] = array('cgi', 'sapi');
-
-// Database Table Names:
-$DB_PREFIX = "";	// If your database uses a prefix, set it here.
-$ESPCONFIG['access_table']              = $DB_PREFIX."access";
-$ESPCONFIG['designer_table']            = $DB_PREFIX."designer";
-$ESPCONFIG['question_table']            = $DB_PREFIX."question";
-$ESPCONFIG['question_choice_table']     = $DB_PREFIX."question_choice";
-$ESPCONFIG['question_type_table']       = $DB_PREFIX."question_type";
-$ESPCONFIG['realm_table']               = $DB_PREFIX."realm";
-$ESPCONFIG['respondent_table']          = $DB_PREFIX."respondent";
-$ESPCONFIG['response_table']            = $DB_PREFIX."response";
-$ESPCONFIG['response_bool_table']       = $DB_PREFIX."response_bool";
-$ESPCONFIG['response_date_table']       = $DB_PREFIX."response_date";
-$ESPCONFIG['response_multiple_table']   = $DB_PREFIX."response_multiple";
-$ESPCONFIG['response_other_table']      = $DB_PREFIX."response_other";
-$ESPCONFIG['response_rank_table']       = $DB_PREFIX."response_rank";
-$ESPCONFIG['response_single_table']     = $DB_PREFIX."response_single";
-$ESPCONFIG['response_text_table']       = $DB_PREFIX."response_text";
-$ESPCONFIG['survey_table']              = $DB_PREFIX."survey";
-$ESPCONFIG['condition_table']           = $DB_PREFIX."conditions";
-$ESPCONFIG['project_table']           = $DB_PREFIX."project";
-$ESPCONFIG['user_table']				= $DB_PREFIX."user";
-
-
-// Debug mode
-$ESPCONFIG['debug_mode'] = 1;
-
-// Load I18N support
-require_once($ESPCONFIG['include_path'] . '/lib/espi18n' . $ESPCONFIG['extension']);
-if (isset($_REQUEST['lang'])) {
-   esp_setlocale_ex($_REQUEST['lang']);
-   $_SESSION['lang']=$_REQUEST['lang'];
-} elseif (isset($lang)) {
-   esp_setlocale_ex($lang);
-   $_SESSION['language']=$lang;
-} elseif (isset($_SESSION['language'])) {
-   esp_setlocale_ex($_SESSION['language']);
-} else {
-   esp_setlocale_ex();
-}
-
-// E-mail details
-$ESPCONFIG['email']['to'] = "dmakalsky@gmail.com";
-$ESPCONFIG['email']['subject'] = "New Researcher Signup";
-
-
-// default thank you messages
-$ESPCONFIG['thank_head'] = _('Thank You For Completing This Survey.');
-$ESPCONFIG['thank_body'] = _('Please do not use the back button on your browser to go
-back.');
-
-if (!file_exists($ESPCONFIG['include_path']. '/funcs'. $ESPCONFIG['extension'])) {
-    printf('<b>'. _('Unable to find the phpESP %s directory.
-			Please check %s to ensure that all paths are set correctly.') .
-			'</b>', 'include', 'phpESP.ini.php');
-    exit;
-}
-if (!file_exists($ESPCONFIG['css_path'])) {
-    printf('<b>'. _('Unable to find the phpESP %s directory.
-			Please check %s to ensure that all paths are set correctly.') .
-			'</b>', 'css', 'phpESP.ini.php');
-    exit;
-}
-
-if (isset($GLOBALS)) {
-    $GLOBALS['ESPCONFIG'] = $ESPCONFIG;
-} else {
-    global $ESPCONFIG;
-}
-
-require_once($ESPCONFIG['include_path'].'/funcs'.$ESPCONFIG['extension']);
-
-?>
\ No newline at end of file
Index: phpESP-LICENSE.txt
===================================================================
--- phpESP-LICENSE.txt	(revision 6370)
+++ phpESP-LICENSE.txt	(working copy)
@@ -1,24 +0,0 @@
-Copyright (c) 2003 James Flemer
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Index: index.php
===================================================================
--- index.php	(revision 6370)
+++ index.php	(working copy)
@@ -1,39 +0,0 @@
-<?
-/*****************************************************************************
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-*******************************************************************************/
-?>
-<?php
-
-/* $Id: index.php,v 1.4 2005/08/01 16:12:50 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-    if (isset($_SERVER))  $s =& $_SERVER;
-//angek:    else                  $s =& $HTTP_SERVER_VARS;
-
-    if (isset($s['HTTPS']) && $s['HTTPS'] == 'on') {
-        $proto = 'https';
-        $port  = 443;
-    } else {
-        $proto = 'http';
-        $port  = 80;
-    }
-
-    if (isset($s['SERVER_PORT']) && $s['SERVER_PORT'] != $port) {
-        $port = ':' . $s['SERVER_PORT'];
-    } else {
-        $port = '';
-    }
-
-    $url = sprintf('%s://%s%s%s%s', $proto, $s['SERVER_NAME'], $port,
-            dirname($s['SCRIPT_NAME']), 'admin/manage.php');
-    header("Location: $url");
-?>
Index: README
===================================================================
--- README	(revision 6370)
+++ README	(working copy)
@@ -1,30 +0,0 @@
-phpESP (php Easy Survey Package)
-========================================================================
-Written by James Flemer <jflemer@alum.rpi.edu>
-[Originally for eGrad2000.com]
-
-phpESP is a package for PHP that provides an easy to use web-based
-interface to designing surveys, deploying them on your web site, and
-exporting data.  It features multiple users and user groups, with data
-isolation and hiding between groups.  It is suitable for use by a
-single person, a department, or an entire organization.  The surveys
-created by phpESP can be easily embedded into existing HTML templates
-with one or two new lines.
-
------
-FILES
------
-admin/        Administration interface and support files
-docs/         Documentation files
-examples/     Example files for themes
-images/       Image files
-locale/       Language files
-public/       Public interface to taking surveys
-scripts/      Database and other scripts
-LICENSE       The license, please read this.
-
-For installation instructions please read the INSTALL file in the docs/
-directory.
-
----
-$Id: README,v 1.17 2005/01/18 14:57:36 greggmc Exp $
Index: locale/sv_SE/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/sv_SE/LC_MESSAGES/messages.po
===================================================================
--- locale/sv_SE/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/sv_SE/LC_MESSAGES/messages.po	(working copy)
@@ -1,2542 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.6 2007/12/10 10:50:36 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-03-22 16:40-0500\n"
-"Last-Translator: Mats Landstedt <mats.landstedt@tuesday.se>\n"
-"Language-Team: sv_SE <jflemer@acm.jhu.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Kan inte öppna inkluderad fil. Kontrollera INI inställningarna. Avslutar"
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Kan inte öppna inkluderad fil. Kontrollera INI inställningarna. Avslutar"
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Servicen är ej tillgänglig"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr "Inga flikar är definierade. Kontrollera INI inställningarna."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Resume survey"
-msgstr "Test undersökning"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Ja"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Nej"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "Ej tillgängligt"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "kopierar"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Ogiltigt argument."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Fel vid öppning av undersökning."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr " Fel vid öppning av undersökning."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Hittade inga svar."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "TOTALT"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Hittade inga frågor."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-#, fuzzy
-msgid "Questions marked with a %s are required."
-msgstr "Frågor markerade med en"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "Tyvärr,  du måste välja en typ för denna fråga."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "FEL, systemets tabeller är korrupta."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Tabell"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Rapport för"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "Nr."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Önskat"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Offentlig"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Innehåll"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-#, fuzzy
-msgid "Previous"
-msgstr "Förhandsvisning"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-#, fuzzy
-msgid "Next"
-msgstr "Nästa sida"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Fel vid korsanalys. Frågorna är inte av en relevant typ."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "Korsanalys på QID"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Tyvärr, fyll i namn, grupp och titel före du fortsätter."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Tyvärr, namnet används redan. Använd ett annat namn."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr " Tyvärr, namnet används redan."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Varning! Det har uppstått ett fel."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Fyll i texten till denna fråga."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Tyvärr,  du måste välja en typ för denna fråga."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Nytt fält"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"Tyvärr, du kan inte ändra typ av fråga . Skapa en ny fråga med en annan typ, "
-"istället."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr "Tyvärr, det skall vara minst ett svar till denna typ av fråga."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Fyll i texten till denna fråga."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Fel vid processering av undersökningen. Säkerhetsöverträdelse"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Kan inte genomföra frågan om tillgång."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Kan inte öppna för användaren."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Ej akuktoriserad"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"Fel användare ID eller lösenord - eller så är ditt konto spärrat/utgånget."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr ""
-"Ditt konto är spärrat eller så har du redan svarat på denna undersökning."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "Kan inte ladda ACL:en"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Administratörs sida"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Detta konto har inga rättigheter"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Gå tillbaka till administratörs sidan"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "Detta konto har inga rättigheter"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-#, fuzzy
-msgid "Submit"
-msgstr "Undertitel"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Rankning"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Svar"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Genomsnitts rankning"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Du har glömt följande obligatoriska frågor:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Fyll i texten till denna fråga."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Resultat"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "---- Ny Sida ----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "Undersöknings designen är klar"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Du har färdigställt denna undersöknings design"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"För att länka denna undesökning till din sida, \n"
-"kopierar du texten nedan och klistrar in den i \n"
-"HTML koden på din sida"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"Efter det att undersökningen blivit aktiverad\n"
-"kan du nå den via följande URL."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-#, fuzzy
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Du skall aktivera denna undersökning före du kan samla in \n"
-"resultat. När en undersökning är aktiv kan du inte \n"
-"längre redigera den. Du kan aktivera undersökningen genom att välja \n"
-"<b>Ändra status på en existerande undersökning</b>, detta gör du från "
-"Administratörs sidan."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"Informationen under denna flik gäller hela undersökning.\n"
-"Fyll i denna sida och gå tilll <b>Fälten</b> för att \n"
-"redigera fälten."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Namn"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-#, fuzzy
-msgid "Required"
-msgstr "Obligatorisk?"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Undersökningens filnamn"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Används för alla framtida åtkomst  till denna undersökning."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "inga mellanrum"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "endast alfa-numeriska värden"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Ägare"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "Grupp som äger denna undersökning."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Titel"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "Titel på undersökningen"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-#, fuzzy
-msgid "This appears at the top of every page of this survey."
-msgstr "Det här syns i huvudet på alla sidor för denna undersökning."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-#, fuzzy
-msgid "free-form, including spaces"
-msgstr "inklusive mellanrum"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Undertitel"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "Undersökningens undertitel."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Syns under titeln."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Ytterligare information"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-#, fuzzy
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "Text som skall synas, i undersökningen, före varje fält."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-#, fuzzy
-msgid "Confirmation Page"
-msgstr "Bekräftelse Text"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-#, fuzzy
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"Rubrik på &quot;Bekräftelse&quot; sida (uppträder efter en användare har "
-"fullföljt en undersökning). Denna text visas i <b>fet</b> still."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "E-post"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-#, fuzzy
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Sänd en kopia av alla färdiga enkäter till (eller lämna tomt om du inte vill "
-"ha e-post) "
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-#, fuzzy
-msgid "Options"
-msgstr "Frågor"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Ändra ordningen för hur frågorna presenteras\n"
-"med hjälp av att välja önskad position från listan."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Lägg till sidbrytning"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Förhandsgranskning av undersökningens utformning\n"
-"Visar &quot;Nästa sida&quot; och \n"
-"&quot;Sänd undersökning&quot; inaktiv.\n"
-"Undersökningen kommer att ha samma färg som det dokument den placeras i Om "
-"du inte har ytterligare ändringar \n"
-"tryck på <b>Avsluta</b> i slutet på denna sida."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Sektion"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Nästa sida"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Sänd undersökning"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-" Redigera detta fält eller klicka på fältnumret på det fält du vill redigera:"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Frågor"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Frågor"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Frågor"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Typ"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Längd"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Precision"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-#, fuzzy
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"Skriv möjliga svar (om möjligt). Enter \n"
-"<tt>!other</tt> på en linje för att skapa en fyll i luckornasvar i slutet av "
-"denna fråga.\n"
-"Alla tomma rader tas bort."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Ytterligare information till en svarslinje"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Vänligen välj en grupp."
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Privat"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Tillgång till undersökningen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Här kan du kontrollera vem som har rätt att fylla i ett formulär.\n"
-"Offentliga undersökningar tillåter att ALLA kan fylla i ett formulär.\n"
-"Privata undersökningar är begränsade till svarsgrupper"
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-#, fuzzy
-msgid "Note"
-msgstr "Anm."
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-#, fuzzy
-msgid "You must use %s when using private surveys."
-msgstr "vid privat undersökning"
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Grupp"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Max Responses"
-msgstr "Svar"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Ta bort"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Lägg till"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Offentliggör"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Gör Privat"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "för att komma åt detta formulär"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "åtkomst till denna grupp."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Kan inte ta bort detta konto."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Användarnamn,Lösenord och Grupp krävs."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Fel vid uppläggning av kontot. "
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Kan inte ändra kontots data."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Hittade inte kontot."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Designkontots Administration"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Användarnam"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Lösenord"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Förnamn"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Efternamn"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Gäller t.om."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "år"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "månad"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "dag"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Inaktivera"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Uppdatera"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Avsluta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Ta bort"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-#, fuzzy
-msgid "Design Surveys"
-msgstr "Designa undersökningar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-#, fuzzy
-msgid "Change Survey Status"
-msgstr "Ändra undersökningens status"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Aktivera/Avsluta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-#, fuzzy
-msgid "Export Survey Data"
-msgstr "Exportera Undersöknings Data"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-#, fuzzy
-msgid "Group Editor"
-msgstr "Grupp Redigerare"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "kan redigera <b>alla</b> formulär som ägs av denna grupp"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Lägg till en ny Designer "
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Administrera Gruppen Svarare"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Svarare Konto Administration"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "för att öppna denna undersökning"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Fel vid kopiering av undersökningen"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Kopiera undersökning"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-#, fuzzy
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Välj undersökning som skall kopieras. Kopian kommer att ha samma\n"
-"status som en ny undersökning. Du kommer att kunna redigera denna kopia & du "
-"måste aktivera den före dina användare kan få tillgång till den."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Status"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Arkivera"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Avslutad"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Aktiv"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Testar"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Redigera"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-msgid "Error cross-tabulating."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Administrera Web Form Designer Konton"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Klicka på användarnamnet för att redigera, eller klicka nedan på lägg till "
-"en ny användare."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "Inaktivera"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Lägg till en ny Designer "
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-#, fuzzy
-msgid "Invalid survey ID."
-msgstr "Felaktigt undersöknings ID."
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Redigera en undersökning"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Välj en undersökning att redigera"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Exportera Data"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Format"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "download"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Testar undersökningen.."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-#, fuzzy
-msgid "The PHP dBase Extension is not installed."
-msgstr "PHP: dBase modulen är inte installerad"
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Undersökningen exporterad som:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Fel vid exportering av undersökningen som:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Fel när gruppen skulle läggas till."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Fel när gruppen skulle tas bort."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Gruppen är inte tom."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Administrera Grupper"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Beskrivning"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Medlemmar"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "Beskrivning för användare ej funnen"
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Logga in igen"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Superanvändare"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-#, fuzzy
-msgid "Create a New Survey"
-msgstr "Skapa en Ny Undersökning"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Redigera en Existerande Undersökning"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Testa en Undersökning"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Kopiera en Befintlig Undersökning"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Töm Undersökningar"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Ändra Status på en Undersökning"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(aktiv/avslut/ta bort)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Ändra Åtkomsten till en Undersökning"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Begränsa Användarna"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Visa Resultatet från en Undersökning"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "Sammanfoga Undersöknings Reslutaten"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Visa en Undersöknings Rapport"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Svar"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Ändra ditt Lösenord"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Administrera Svars Konton"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Administrera Designer Konton"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "Visa TO-DO listan"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(utvecklingsmål)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "Visa Användar &amp; Administrations Guide"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Klicka här för att öppna Hjälp Fönstret."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Logga ut"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Sammanfoga Undersöknings Reslutaten"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "Välj Undersökningar att Sammanfoga"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Lista över Undersökningar"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "Undersökningar som skall Sammanfogas"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Ändra Lösenord"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-#, fuzzy
-msgid "Your password has been successfully changed."
-msgstr "Ditt lösenord har ändrats."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Lösenordet är inte satt, kontrollera ditt gamla lösenord."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "De nya lösenorden överensstämmer inte - eller är blanka."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Gamla Lösenordet"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Nytt Lösenord"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Bekräfta det Nya Lösenordet"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Endast superanvändare är tillåtna."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Töm Undersökningar"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Denna sida ligger inte direkt på huvud menyn pga\n"
-"att det är farligt. Detta raderar <b>allt</b> om undersökningen\n"
-"från databasen för <b>alltid</b>. All svarsinformation, generell \n"
-"information, resultat, etc. kommer att försvinna från databasen.\n"
-"Gör ingeting här om du inte är helt säker. Det finns ingen andra chans, \n"
-"det finns ingen återvändo."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "Sp. nummer"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Töm checkboxarna"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "README ej funnen."
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Gå tillbaka till Rapport Menyn"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Visa Formulär Rapport"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Välj ett Formulär för Visning"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Läggtill användare"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-#, fuzzy
-msgid "Bulk Upload Respondents"
-msgstr "Läggtill användare"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "Töm Undersökningar"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Denna sida ligger inte direkt på huvud menyn pga\n"
-"att det är farligt. Detta raderar <b>allt</b> om undersökningen\n"
-"från databasen för <b>alltid</b>. All svarsinformation, generell \n"
-"information, resultat, etc. kommer att försvinna från databasen.\n"
-"Gör ingeting här om du inte är helt säker. Det finns ingen andra chans, \n"
-"det finns ingen återvändo."
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-#, fuzzy
-msgid "Cross Tabulation"
-msgstr "Välj funktion"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Test undersökning"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-#, fuzzy
-msgid "Reset"
-msgstr "Test"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Visa Undersöknings Resultat"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Välj en Undersökning att Visa"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Välj en Undersökning att Testa"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "Svar"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-#, fuzzy
-msgid "Resp"
-msgstr "Svar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Kan inte sätta undersökningens status."
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Undersökningens Status"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Test</b> sätter en undersökning i testmode, därifrån kan du göra ett "
-"riktigt test\n"
-"från din undersökning och se resultatet. Du kan därefter inte utföra "
-"ytterligare förändringar idin undersökning."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-#, fuzzy
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Aktivera</b> sätter en undersökning till aktiv status. När undersökningen "
-"är akriverad såär den klar för användning och kan läggas ut online. "
-"Resultaten från testerna nollställs (om det fanns några värden).\n"
-"Ingen ytterligare redigering är tillåten."
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Avsluta</b> sätter en ny undersökning till avslutsstatus. Inga ändringar "
-"kan utföras och inga användare kan svara på undersökningen, men resultatet "
-"bevaras och är tillgängligt."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Arkivera</b> tar bort denna unndersökning. Undersökningen är fortfarande "
-"lagrad, \n"
-"i databasen men den kan inte användas, du kan <b>inte</b> se resultaten från "
-"en \n"
-"arkiverad undersökning."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Test"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Aktivera"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Avsluta"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Arkivera"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Redigera"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Hjälp"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Klicka på Avslut för att avbryta denna undersökning eller klicka på Fortsätt "
-"för att gå vidare till nästa flik."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"Undersökningens titel och generella fält är under fliken <b>Generellt</b>.\n"
-"Individuella undersöknings frågor lägg tills och ändras under fliken "
-"<b>Frågor</b>.\n"
-"Frågorna kan omstruktureras under fliken <b>Ordning</b>.\n"
-"Du kan förhandsgranska undersökningen under fliken <b>Visa</b> . Om du inte "
-"har ytterligare ändringar klicka på <b>Avslut</b> för att gå tillbaka till \n"
-"Administrations Sidan."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Visa Resultat"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Välj en Undersökning att Testa"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Exportera"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Resultat"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Todo listan hittades ej"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-#, fuzzy
-msgid "Upload Account Information"
-msgstr "Svarare Konto Administration"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-#, fuzzy
-msgid "All fields are required"
-msgstr "är obligatoriska"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-#, fuzzy
-msgid "File Type"
-msgstr "Typ"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-#, fuzzy
-msgid "File to upload"
-msgstr "Kan inte ladda ACL:en"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr " Fel vid processering av undersökningen.: Undersökning ej specificerad"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Du har färdigställt denna undersöknings design"
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr " Fel vid processering av undersökningen: Undersökningen är ej aktiv."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 72
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "De nya lösenorden överensstämmer inte - eller är blanka."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-#, fuzzy
-msgid "Confirm Password"
-msgstr "Bekräfta det Nya Lösenordet"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#, fuzzy
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr "Inga flikar är definierade. Kontrollera INI inställningarna."
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "Generellt"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Frågor"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Ordning"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Förhandsvisning"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Avsluta"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Sida"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "av"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr " Tyvärr, namnet används redan."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Fält"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Fält Namn"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-#~ msgid "DBF download not yet implemented."
-#~ msgstr "DBF download är inte installerat"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CVS"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "Välj funktion"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Exportera Data till CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Fel!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Du måste välja minst två undersäkningar"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Administrera Grupp Medlemmar"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "Ingen undersökning är specificerad"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "Totalt"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Incorrect User ID or Password, or your account has been disabled."
-#~ msgstr "Fel användare ID eller password, eller så har ditt konto spärrats."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "free-form"
-#~ msgstr "fritext"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "dvs. instruktioner, information osv."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "Bekräftelse Rubrik"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Body text on the &quot;Confirmation&quot; page. This is displayed below "
-#~ "the Confirmation Heading."
-#~ msgstr ""
-#~ "Body text på &quot;Bekräftelse&quot; sida. Detta visas under "
-#~ "Bekräftelsens Rubrik."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "You must use"
-#~ msgstr "Du måste använda"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Max Logins"
-#~ msgstr "Maximalt antal login"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to access this menu"
-#~ msgstr "för att öppna denna meny"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Purge"
-#~ msgstr "Töm"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "STATUS"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to design forms"
-#~ msgstr "att designa formulär"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Design Web Forms"
-#~ msgstr "Designa Web  Formulär"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "NOTE: This does not currently work on embedded forms."
-#~ msgstr "OBS! Detta fungerar ej för tillfället på (embedded) formulär."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Response from survey:"
-#~ msgstr "Svar från undersökningen"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Sorry, please fill out the name and title before proceeding."
-#~ msgstr "Beklagar, vänligen fyll i namnet och titeln före exekvering."
Index: locale/ja_JP/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/ja_JP/LC_MESSAGES/messages.po
===================================================================
--- locale/ja_JP/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/ja_JP/LC_MESSAGES/messages.po	(working copy)
@@ -1,2270 +0,0 @@
-# phpESP.
-# By: James Flemer
-# <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.7 2007/12/10 10:50:36 liedekef Exp $
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-09-26 19:00+0900\n"
-"Last-Translator: IYODA Atsushi <iyoda@users.sourceforge.net>\n"
-"Language-Team: ja_JP <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"設定ファイルが開けませんでした。INIファイルの設定を確認してください。中断しま"
-"す。"
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"設定ファイルが開けませんでした。INIファイルの設定を確認してください。中断しま"
-"す。"
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "サービスを利用できません"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr "無効なタブ。INI設定をチェックしてください"
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Resume survey"
-msgstr "テストアンケート"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "はい"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "いいえ"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "copy"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "不正な引数です"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "アンケートが開けませんでした"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "1個以上のアンケートが開けませんでした"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "No responses found."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "合計"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "設問が1つもありません"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-#, fuzzy
-msgid "Questions marked with a %s are required."
-msgstr " "
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "この設問事項に対する方を選択しなければなりません。"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "不正なシステムテーブルです"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "テーブル"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "必須"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "パブリック"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "コンテンツ"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-#, fuzzy
-msgid "Previous"
-msgstr "プレビュー"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-#, fuzzy
-msgid "Next"
-msgstr "次のページ"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "質問は有効な形ではありません"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "クロス分析 QID:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "実行前に名前、グループ、タイトルの項目を埋めてください。"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "すでにその名前は使われています。他の名前を使ってください。"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "すでにその名前は使われています。"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "エラーが発生しました。"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "この設問事項に対する説明を入力してください"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "この設問事項に対する方を選択しなければなりません。"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "新しいフィールド"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"ご指定のアンケートタイプには変更できません。新しい設問を作成してください。"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "この設問事項に対する説明を入力してください"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "エラー：セキュリティ違反"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "未認証"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"ユーザーIDとパスワードが間違っていまるか、アカウントが仕様不可になっています/"
-"終了します"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "ACLをロードすることができません"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "管理画面"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "このアカウントは許可されていません"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "管理画面に戻る"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "このアカウントは許可されていません"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-#, fuzzy
-msgid "Submit"
-msgstr "サブタイトル"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "ランク"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "レスポンス"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "平均ランク"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "以下の項目が記入されていません。"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "この設問事項に対する説明を入力してください"
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "結果"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "-----空きセクション-----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "アンケートデザイン完成"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "アンケートデザインが完成しました"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"このアンケートをPHPソースに挿入するには、下のテキストをコピーし貼り付けてくだ"
-"さい。"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"一度アクティブにした後は、以下のURLからアンケートに直接アクセスできます。"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"アンケートを使用するにはステータスを「アクティブ」にする必要があります。ス"
-"テータスの変更は“アンケートの状態を変更する”ページより行って下さい。「アク"
-"ティブ」にした後は一切の変更が不可能になります。"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"このタブで設定した情報はアンケート全体に反映されます。このタブを設定した後、"
-"各タブで個々設定を行ってください。"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "名前"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-#, fuzzy
-msgid "Required"
-msgstr "必須項目"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "ファイルネーム"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "このアンケートのファイルネーム。"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "スペース使用不可"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "英数字のみ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "オーナー"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "このアンケートを所有するグループ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "タイトル"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "アンケートタイトル"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-#, fuzzy
-msgid "This appears at the top of every page of this survey."
-msgstr "アンケートページのトップに表示されます"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-#, fuzzy
-msgid "free-form, including spaces"
-msgstr "スペース仕様可"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "サブタイトル"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "アンケートサブタイトル"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "タイトルの下に表示されます"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "付加情報"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-#, fuzzy
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "アンケートフィールドの前に表示される文章"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-#, fuzzy
-msgid "Confirmation Page"
-msgstr "確認テキスト"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-#, fuzzy
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"アンケート完成後に表示される「確認」ページ用です。これは太字で表示されます。"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "Email"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-#, fuzzy
-msgid "Options"
-msgstr "質問"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"リストの番号を変更することにより、質問の順番を並び替えることができます。"
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "空きセクションの追加"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"アンケートのプレビューです。「次のページ」ボタンおよび「投稿する」ボタンは使"
-"用できません。アンケートの背景には、アンケートを挿入するページの背景が適用さ"
-"れます。変更のない場合はFinishタブより編集を終了し、管理画面に戻ってくださ"
-"い。"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "セクション"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "次のページ"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "投稿する"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-"このフィールドを編集するか、編集したいフィールドの番号をクリックしてくださ"
-"い："
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "質問"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "質問"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "質問"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "タイプ"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "入力文字数"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "入力文字制限"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "回答項目の追加"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "グループを選んでください"
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "プライベート"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "アンケートアクセス"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"アンケートへのアクセスの設定を行えます。「パブリック」は誰でもアクセスが可能"
-"です。「プライベート」は設定したグループしかアクセスできません。"
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-#, fuzzy
-msgid "You must use %s when using private surveys."
-msgstr "を使用しなければなりません。"
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "グループ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Max Responses"
-msgstr "レスポンス"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "削除"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "追加"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "パブリックに変更"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "プライベートに変更"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "アカウントを削除できません"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "ユーザーネーム、パスワード、およびグループが必要です"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "アカウントデータを変更できません"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "アカウントが見つかりませんでした"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "デザイナーアカウント管理"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "ユーザーネーム"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "パスワード"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "名"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "姓"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "終了"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "年"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "月"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "日"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "使用不可"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "アップデート"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "キャンセル"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "削除"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "デザインアンケート"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "アンケートステータスを変更"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "アンケートデータをエクスポート"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "グループエディタ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "新しいデザイナーを追加してください"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "グループ回答者を管理"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "コピーアンケート"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-#, fuzzy
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"コピーを作りたいアンケートを選んでください。コピーしたアンケートは編集可能で"
-"す。使用前には動作確認を行ってください。"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "ステータス"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "アーカイブ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "終了"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "アクティブ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "テスト"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "編集"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-#, fuzzy
-msgid "Error cross-tabulating."
-msgstr "機能を選んでください"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "使用不可"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "新しいデザイナーを追加してください"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "無効のアンケートIDです"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "アンケート編集"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "編集したいアンケートを選択"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "エクスポートデータ"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "フォーマット"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "ダウンロード"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "テストアンケート…"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "アンケートのエクスポートに失敗しました。"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "説明"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "メンバー"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "ユーザーズ・ガイドは見つかりませんでした"
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "スーパーユーザー"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "新しいアンケートを作る"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "アンケートを編集する"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "アンケートをテストする"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "既存のアンケートをコピーする"
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Purge a survey"
-msgstr "テストアンケート"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "アンケートの状態を変更する"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(アクティブ/終了/アーカイブ)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "アンケートのアクセス権を変更する"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "回答者制限"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "アンケートの結果を見る"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "アンケート結果をマージしてください"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "アンケートの内容をみる"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "レスポンス"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "あなたのパスワードを変更してください"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "ユーザー&管理者ガイドを見る"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "ヘルプウィンドウを開く"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "ログアウト"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "アンケート結果をマージしてください"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "マージするために、アンケートを選んでください"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "アンケートのリスト"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "マージするアンケート"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "パスワードの変更"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "あなたのパスワードは変更されました"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "ふるいのん"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "あたらしいのん"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "もっかい"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "チェックボックスをクリア"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "READMEが見つかりません"
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "リポートメニューに戻って下さい"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "アンケートの内容を見る"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "内容を見たいアンケートを選択"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "新しい回答者を追加してください"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-#, fuzzy
-msgid "Bulk Upload Respondents"
-msgstr "新しい回答者を追加してください"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-#, fuzzy
-msgid "Purge response"
-msgstr "レスポンス"
-#
-# File: phpESP/admin/include/where/response_purge.inc, line: 25
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-#, fuzzy
-msgid "Cross Tabulation"
-msgstr "機能を選んでください"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "テストアンケート"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-#, fuzzy
-msgid "Reset"
-msgstr "テスト"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "アンケート結果を見る"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "結果を見たいアンケートを選択"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "テストするアンケートを選択"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "レスポンス"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-#, fuzzy
-msgid "Resp"
-msgstr "レスポンス"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "アンケートステータスを設定できません。"
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "アンケートステータス"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>「テスト」</b>…テストモードです。アンケートのテストや結果の表示が可能で"
-"す。テストモード時はアンケートを編集することができません。"
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-#, fuzzy
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>「アクティブ」</b>…アクティブモードです。このモード実行中はアンケートが実"
-"際に稼動しています。テストモード時のアンケート結果は反映されません。アクティ"
-"ブモード実行後、アンケートの編集は一切できません。"
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>「終了」</b>…稼動中のアンケートを終了します。このモード実行後はアンケート"
-"を取ることができません。結果は管理メニューから表示可能です。"
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>「アーカイブ」</b>…アンケートを削除します。データはデータベースに残ります"
-"が、以後一切の操作が不可能になります。また、アーカイブされたアンケートの結果"
-"は見ることができません。"
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "テスト"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "アクティブ"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "終了"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "アーカイブ"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "編集"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "ヘルプ"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"このアンケートをキャンセルする場合は「Cancel」をクリックしてください。隣のタ"
-"ブに進む場合は「Continue」をクリックしてください。"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"アンケートタイトルおよび他の一般情報のフィールドは、<b>「General」</b>タブに"
-"あります。\n"
-"<b>「Questions」</b>タブより質問の追加、修正をすることができます。\n"
-"<b>「Oeder」</b>タブからは質問の編集、削除を行えます。<b>「Preview」</b>タブ"
-"は作成したアンケートのプレビューを行えます。変更のない場合は<b>「Finish」</b>"
-"タブより編集を終了し、管理画面に戻ってください。"
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "結果を見る"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "テストするアンケートを選択"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "エクスポート"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "結果"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Todoリストは見つかりませんでした"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-msgid "Upload Account Information"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-#, fuzzy
-msgid "All fields are required"
-msgstr "マークの質問は必須項目です。"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-#, fuzzy
-msgid "File Type"
-msgstr "タイプ"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-#, fuzzy
-msgid "File to upload"
-msgstr "ACLをロードすることができません"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "エラー：アンケートが選択されていません"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "アンケートデザインが完成しました"
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "エラー：アンケートはアクティブではありません"
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 72
-msgid "Passwords do not match."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-#, fuzzy
-msgid "Confirm Password"
-msgstr "もっかい"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr "無効なタブ。INI設定をチェックしてください"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "質問"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "オーダー"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "プレビュー"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "終了"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "ページ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "すでにその名前は使われています。"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "フィールド"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "フィールドネーム"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "機能を選んでください"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "CVSデータを見る"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "ぶべらんぼー"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "最低2つのアンケートを選んでください！"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "グループメンバーを管理"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "アンケートが指定されていません"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "Total"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "are required."
-#~ msgstr "マークの質問は必須項目です。"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "free-form"
-#~ msgstr "フリーフォーム"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "ie.手順、背景情報など"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Required?"
-#~ msgstr "必須項目"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "You must use"
-#~ msgstr "「プライベート」にする場合は"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "ステータス"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "確認表題"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Body text on the &quot;Confirmation&quot; page. This is displayed below "
-#~ "the Confirmation Heading."
-#~ msgstr "「確認」ページのボディテキスト。確認表題の下に表示されます。"
Index: locale/pt_PT/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/pt_PT/LC_MESSAGES/messages.po
===================================================================
--- locale/pt_PT/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/pt_PT/LC_MESSAGES/messages.po	(working copy)
@@ -1,2478 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.7 2007/12/10 10:50:36 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-02-18 13:29-0500\n"
-"Last-Translator: Lopo Pizarro <lopopizarro@users.sourceforge.net>\n"
-"Language-Team: pt_PT <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Incapaz de abrir o arquivo de include. Verifique o arquivo de configurações "
-"INI. Abortando."
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Incapaz de abrir o arquivo de include. Verifique o arquivo de configurações "
-"INI. Abortando."
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Serviço indisponível"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr "Nenhuma aba foi definida. Por favor verifique configurações INI."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Resume survey"
-msgstr "Testar o Questionário"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Sim"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Não"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "Não disponível"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "cópia"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Argumento inválido"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Erro ao abri o questionário"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Erro ao abri os questionários"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Não foi encontrada nenhuma resposta."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "TOTAL"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Não foi encontrada qualquer pergunta."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-#, fuzzy
-msgid "Questions marked with a %s are required."
-msgstr "Perguntas marcadas com a"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "Desculpe, deve selecionar um tipo para esta pergunta."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "Erro. Tabela de sistema corrompida."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Tabela"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Relatório para"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Obrigatório"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Público"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Conteúdo"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-#, fuzzy
-msgid "Previous"
-msgstr "Pré-visualizar"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-#, fuzzy
-msgid "Next"
-msgstr "Próxima Página"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Erro na análise cruzada. Pergunta não é de um tipo válido."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "Análise cruzada em QID:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Por favor, preencha o nome, grupo e título antes de continuar."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Desculpe, este nome já está a ser usado. Escolha um novo nome."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Desculpe, este nome já está a ser usado."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Aviso. foi encontrado um erro."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Por favor, entre o texto para esta pergunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Desculpe, deve selecionar um tipo para esta pergunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Novo campo"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr "Desculpe, não pode mudar o tipo de pergunta. Criar uma nova pergunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-"Desculpe, precisa de pelo menos uma resposta para este tipo de pergunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Por favor, entre o texto para esta pergunta."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Erro ao processar o questionário: Violação de Segurança."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Incapaz de executar a query para o acesso."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Incapaz de executar a query respondentes"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Não autorizado"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"O utilizador e a senha estão incorrectos ou a sua conta foi desactivada/"
-"expirou."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr "A sua conta foi desabilitada ou já completou este questionário."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "Incapaz de carregar ACL"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Interface de Gestão"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Esta conta não tem permissão"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Voltar para a Interface de Gestão"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "Esta conta não tem permissão"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-#, fuzzy
-msgid "Submit"
-msgstr "Sub-Título"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Classificação"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Classificação Média"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Não respondeu às perguntas abaixo:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Por favor, entre o texto para esta pergunta."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Resultados"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "----- Quebra de secção -----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "O design do questionário está completo"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Completou o design do questionário."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Para inserir este questionário na sua página, copie o texto\n"
-"Abaixo e cole dentro do HTML da sua página."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"Uma vez activado, também poderá aceder ao questionário\n"
-"directament através do seguinte URL."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Precisa de activar o questionário antes de recolher\n"
-"os resultados. Uma vez activado, deixa de poder fazer\n"
-"qualquer modificação no questionário. Deve activar este\n"
-"questionário escolhendo <b>Mudar o Status de um questionário</b> através da "
-"Interface de Gestão."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"A informação desta aba alica-se a todo o questionário.\n"
-"Preencha esta página e depois siga para as abas dos <b>Campos</b> para "
-"editar os campos individualmente."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Nome"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-#, fuzzy
-msgid "Required"
-msgstr "Obrigatório?"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Nome do questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Isto é usado para todos os futuros acessos a este questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "sem espaços"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "apenas alfa-numérico"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Dono"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "Grupo que mantém este questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Título"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "Título do questionário"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-#, fuzzy
-msgid "This appears at the top of every page of this survey."
-msgstr "Isto aparece no topo de todas as páginas do questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-#, fuzzy
-msgid "free-form, including spaces"
-msgstr "incluindo espaços"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Sub-Título"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "Sub-Título do questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Aparece abaixo do título."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Informação Adicional"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-#, fuzzy
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "Texto para ser visto no questionário antes de qualquer campo."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-#, fuzzy
-msgid "Confirmation Page"
-msgstr "Texto de Confirmação"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-#, fuzzy
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"Cabeçalho na página de &quot;Confirmação&quot; (aparece depois de um "
-"utilizador completar o questionário). É visto em negrito."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "Email"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Envia uma cópia de cada envio para o endereço (ou deixe em branco para não "
-"ter backup via email."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-#, fuzzy
-msgid "Options"
-msgstr "Perguntas"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Para mudar a ordem das perguntas escolha a posição\n"
-"desejada na lista."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Adicionar Quebra de Secção"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Isto é uma pré-visualização de como o questionário ficará.\n"
-"Nesta pré-visualização, o &quot;Próxima Página&quot; e \n"
-"&quot;Enviar Questionário&quot; estão inactivos.\n"
-"O questionário usará a cor de fundo do documento\n"
-"que está inserido. Se não precisa fazer alterações\n"
-"clique <b>Finalizar</b> no final desta página."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Secção"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Próxima Página"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Enviar Questionário"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr "Edite este campo ou clique no número do campo que você deseja editar:"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Perguntas"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Perguntas"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Perguntas"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Tipo"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Comprimento"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Precisão"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-#, fuzzy
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr "Qualquer linha em branco será suprimida."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Adicione outra linha de resposta"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Por favor, selecione um grupo."
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Privado"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Acesso ao Questionário"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Isto permite-lhe controlar quem tem acesso para preencher o formulário.\n"
-"Questionários públicos deixam qualquer pessoa enviar dados.\n"
-"Questionários privados são restritos a Grupos de Utilizadores."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Nota"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-#, fuzzy
-msgid "You must use %s when using private surveys."
-msgstr "quando está a usar questionários privados."
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Grupo"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Max Responses"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Remover"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Adicionar"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Tornar Público"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Tornar Privado"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "para aceder este formulário"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "para aceder a este grupo"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Não é possível apagar esta conta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Nome de Utilizador, Senha, e Grupo são obrigatórios."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Erro ao adicionar a conta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Não é possível mudar os dados da conta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "A Conta não foi encontrada."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Administração do Design da Conta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Nome de Utilizador"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Senha"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Primeiro Nome"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Último Nome"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Data de Expiração"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "ano"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "mês"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "dia"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Desabilitado"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Actualizar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Cancelar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Apagar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Design do Questionário"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Mudar o Status de um questionário"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Activar/Terminar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Exportar os Dados do Questionário"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Editor do Grupo"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "deve editar <a>todos</b> os formulários mantidos por este grupo."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Adicione um novo designer"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Administrar os Respondentes do Grupo"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Administração da Conta do Respondente"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "para aceder este questionário"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Erro ao copiar o questionário."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Copiar Questionário"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-#, fuzzy
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Escolha o questionário que será copiado. A cópia terá o mesmo\n"
-"status. Poderá editar o questionário e terá que\n"
-"activá-lo antes de o usar."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Status"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Arquivado"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Finalizado"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Activo"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Testando"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Editando"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-#, fuzzy
-msgid "Error cross-tabulating."
-msgstr "Escolha uma função"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Gestão das contas dos Designers de formulários web"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Clique em um username para editar ou clique em adicionar novo utilizador "
-"abaixo."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "desabilitado"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Adicione um novo designer"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "O ID do questionário é inválido."
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Editar o Questionário"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Escolha o Questionário para Editar"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Exportar Dados"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Formatar"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "download"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Testando o Questionário..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr "A extensão PHP dBase não está instalada."
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Questionário exportado como: "
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Erro ao exportar o questionário como: "
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Erro ao adicionar grupo"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Erro ao apagar grupo"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Este grupo não está vazio."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Gerir grupos"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Descrição"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Membros"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "O Guia do Utilizador não foi encontrado."
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Refazer Log-in"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Super-utilizador"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Criar um Novo Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Editar um Questionário Existente"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Testar um Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Copiar um Questionário Existente"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Remover Questionários"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Mudar o Status de um Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(ativar/finalizar/apagar)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Mudar o Acesso a um Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Limitar Respondentes"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Ver Resultados de um Questionário."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "Fundir os resultados do Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Ver o Relatório do Questionário"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Mudar sua Senha"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Gerir a Conta dos Respondentes"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Gerir a Conta dos Designers"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "Ver a lista de coisa a fazer"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(objetivos de desenvolvimento)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "(Ver o Guia de Administração do Utilizador)"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Clique aqui para abrir a janela de ajuda."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Encerrar sessão"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Fundir os resultados do Questionário"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "Escolha os Questionários que serão Fundidos"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Listagem dos Questionários"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "Questionários para Fundir"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Alterar Senha"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Sua senha foi alterada com sucesso."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Senha não foi configurada, seleccione sua senha antiga."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "A nova senha não combinou ou está em branco."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Senha Antiga"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Nova Senha"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Confirmar Nova Senha"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Permitido somente para os super-utilizadores"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Remover Questionários"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Esta página não está no menu principal porque é perigosa.\n"
-"Ela remove <b>completamente</b> tudo sobre um Questionário\n"
-"da base de dados <b>para sempre</b>. Todas as perguntas, \n"
-"informações genéricas, resultados, etc. serão removidos da base \n"
-"de dados. Não faça nada aqui que não tenha certeza absoluta.\n"
-"Nesta página não existe confirmação para suas escolhas e nem mesmo \n"
-"possibilidade para voltar atrás."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "Número de Perguntas"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Apagar Checkboxes"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "LEIAME não foi localizado."
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Voltar para Menu de Relatório"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Ver Relatório do Formulário"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Escolha um Formulário para ver"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Adicionar um novo Respondente"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-#, fuzzy
-msgid "Bulk Upload Respondents"
-msgstr "Adicionar um novo Respondente"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "Remover Questionários"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Esta página não está no menu principal porque é perigosa.\n"
-"Ela remove <b>completamente</b> tudo sobre um Questionário\n"
-"da base de dados <b>para sempre</b>. Todas as perguntas, \n"
-"informações genéricas, resultados, etc. serão removidos da base \n"
-"de dados. Não faça nada aqui que não tenha certeza absoluta.\n"
-"Nesta página não existe confirmação para suas escolhas e nem mesmo \n"
-"possibilidade para voltar atrás."
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-#, fuzzy
-msgid "Cross Tabulation"
-msgstr "Escolha uma função"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Testar o Questionário"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-#, fuzzy
-msgid "Reset"
-msgstr "Teste"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Ver os Resultados de um Questionário"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Escolha um Questionário para ver"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Escolha o Questionário para Testar"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-#, fuzzy
-msgid "Resp"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Não é possível configurar o status do questionário."
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Status do Questionário"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Testar</b> muda o questionário para o modo de testes. Neste ponto \n"
-"poderá fazer testes no questionário e ver os resultados. Não poderá fazer \n"
-"nenhuma alteração futura no questionário uma mudado para o modo de teste."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-#, fuzzy
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Activar</b> muda o questionário para o modo activo. É o modo em que\n"
-"o questionário é aberto para uso em produção e pode ser colocado online.\n"
-"Isto irá apagar qualquer resultado inserido no modo de testes (se existir "
-"algum)./nNenhuma edição futura no questionário será permitida."
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Finalizar</b> muda o questionário para o modo Finalizado. É o modo em "
-"que\n"
-"nenhuma edição é possível. Nenhum utilizador poderá usar o questionário "
-"(estará inactivo),/nmas os seus resultados poderão ser vistos através do "
-"menu de resultados."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Arquivar</b> remove o questionário. Este continuará armazenado na base de "
-"dados,\n"
-" mas nenhuma interacção futura será permitida. <b>Não</b> poderá ver os "
-"resultados de um/nquestionário arquivado."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Teste"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Activar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Finalizar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Arquivar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Editar"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Ajuda"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Clique em cancelar para cancelar esse questionário ou clique em continue "
-"para proceder para próxima aba"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"O título do questionário e outros campos genéricos estão na aba <b>Geral</"
-"b>.\n"
-"Perguntas individuais são adicionadas e modificadas na aba <b>Perguntas</"
-"b>.\n"
-"Perguntas podem ser reordenadas ou apagadas na aba <b>Ordenar</b>.\n"
-"Pode ver uma visualização do questionário a qualquer momento indo ao "
-"<b>Preview</b>.\n"
-"Se não tiver nenhuma alteração a fazer, clique em <b>Finalizar</b> para "
-"voltar\n"
-"à Interface de Gestão"
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Ver os Resultados"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Escolha o Questionário para Testar"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Exportar"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Resultados"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Listagem de coisas a fazer não foi localizada."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-#, fuzzy
-msgid "Upload Account Information"
-msgstr "Administração da Conta do Respondente"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-#, fuzzy
-msgid "All fields are required"
-msgstr "são obrigatórias."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-#, fuzzy
-msgid "File Type"
-msgstr "Tipo"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-#, fuzzy
-msgid "File to upload"
-msgstr "Incapaz de carregar ACL"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "Erro ao processar o questionário: Questionário não especificado."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Completou o design do questionário."
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Erro ao processar o questionário: Questionário não está activo."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 72
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "A nova senha não combinou ou está em branco."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-#, fuzzy
-msgid "Confirm Password"
-msgstr "Confirmar Nova Senha"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr "Nenhuma aba foi definida. Por favor verifique configurações INI."
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "Geral"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Perguntas"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Ordenar"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Pré-visualizar"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Finalizar"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Página"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "de"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "Desculpe, este nome já está a ser usado."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Campo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Nome do Campo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-#~ msgid "DBF download not yet implemented."
-#~ msgstr "O download do DBF não foi implementado."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "Escolha uma função"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Exportar dados no formato CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Erro!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Precisa selecionar no mínimo dois questionários"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Administrar os Membros do Grupo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "Não foi especificado qualquer questionário."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "Total"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "are required."
-#~ msgstr "são obrigatórias."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Incorrect User ID or Password, or your account has been disabled."
-#~ msgstr ""
-#~ "O Utilozador e a senha estão incorretos ou a sua conta foi desactivada."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "free-form"
-#~ msgstr "free-form"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "ex.: instruções, background info, etc."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Required?"
-#~ msgstr "Obrigatório?"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "You must use"
-#~ msgstr "Tem que usar"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to access this menu"
-#~ msgstr "para aceder este menu"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Purge"
-#~ msgstr "Remover"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "STATUS"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to design forms"
-#~ msgstr "para fazer o design dos formulários"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "Cabeçalho de Confirmação"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Body text on the &quot;Confirmation&quot; page. This is displayed below "
-#~ "the Confirmation Heading."
-#~ msgstr ""
-#~ "Body text na página de &quot;Confirmação&quot;. Aparece abaixo do "
-#~ "Cabeçalho de Confirmação."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Max Logins"
-#~ msgstr "Logins máximos"
Index: locale/el_GR/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/el_GR/LC_MESSAGES/messages.po
===================================================================
--- locale/el_GR/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/el_GR/LC_MESSAGES/messages.po	(working copy)
@@ -1,2438 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@acm.jhu.edu>
-# $Id: messages.po,v 1.7 2007/12/10 10:50:35 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2003-02-07 10:01+0200\n"
-"Last-Translator: armandos <armandos@hol.gr>\n"
-"Language-Team: el_GR <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"ΔΕΝ ΕΙΝΑΙ ΔΥΝΑΤΟΝ ΝΑ ΑΝΟΙΧΘΕΙ ΤΟ ΑΡΧΕΙΟ include. ΕΛΕΓΞΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΤΟΥ "
-"ΙΝΙ. ΑΚΥΡΩΣΗ..."
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"ΔΕΝ ΕΙΝΑΙ ΔΥΝΑΤΟΝ ΝΑ ΑΝΟΙΧΘΕΙ ΤΟ ΑΡΧΕΙΟ include. ΕΛΕΓΞΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΤΟΥ "
-"ΙΝΙ. ΑΚΥΡΩΣΗ..."
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "ΜΗ ΔΙΑΘΕΣΙΜΗ ΥΠΗΡΕΣΙΑ"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr "ΔΕΝ ΟΡΙΣΤΗΚΑΝ ΤΑ ΤΑΒS. ΕΛΕΓΞΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΤΟΥ ΙΝΙ."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Resume survey"
-msgstr "ΔΟΚΙΜΑΣΤΕ ΜΙΑ ΕΡΕΥΝΑ"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "ΝΑΙ"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "ΟΧΙ"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "Δ.Α."
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "ΑΝΤΙΓΡΑΦΗ"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "ΛΑΘΟΣ ΠΑΡΑΜΕΤΡΟΣ"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "ΛΑΘΟΣ ΚΑΤΑ ΤΟ ΑΝΟΙΓΜΑ ΤΗΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "ΛΑΘΟΣ ΚΑΤΑ ΤΟ ΑΝΟΙΓΜΑ ΤΩΝ ΕΡΕΥΝΩΝ"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "ΔΕΝ ΒΡΕΘΗΚΑΝ ΑΠΑΝΤΗΣΕΙΣ"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "ΣΥΝΟΛΟ"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "ΔΕΝ ΒΡΕΘΗΚΑΝ ΕΡΩΤΗΣΕΙΣ"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-#, fuzzy
-msgid "Questions marked with a %s are required."
-msgstr "ΟΙ ΕΡΩΤΗΣΕΙΣ ΠΟΥ ΣΗΜΕΙΩΝΟΝΤΑΙ ΜΕ "
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "ΛΥΠΑΜΑΙ, ΠΡΕΠΕΙ ΝΑ ΕΠΙΛΕΞΕΤΕ ΕΝΑΝ ΤΥΠΟ ΓΙΑ ΑΥΤΗ ΤΗΝ ΕΡΩΤΗΣΗ."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "ΛΑΘΟΣ ΠΙΝΑΚΑ ΣΥΣΤΗΜΑΤΟΣ (corrupt)"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "ΠΙΝΑΚΑΣ"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "ΕΚΘΕΣΗ ΓΙΑ"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "ΑΠΑΙΤΕΙΤΑΙ"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "ΔΗΜΟΣΙΑ"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "ΠΕΡΙΕΧΟΜΕΝΟ"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-#, fuzzy
-msgid "Previous"
-msgstr "ΠΡΟΕΠΙΣΚΟΠΗΣΗ"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-#, fuzzy
-msgid "Next"
-msgstr "ΕΠΟΜΕΝΗ ΣΕΛΙΔΑ"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr ""
-"ΛΑΘΟΣ ΣΤΗΝ ΣΤΑΥΡΩΤΗ ΑΝΑΛΥΣΗ (cross-analyszing). Η ΕΡΩΤΗΣΗ ΔΕΝ ΕΧΕΙ ΑΠΟΔΕΚΤΟ "
-"ΤΥΠΟ."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "ΣΤΑΥΡΩΤΗ ΑΝΑΛΥΣΗ (cross-analysis) ΣΤΟ QID:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr ""
-"ΛΥΠΑΜΑΙ, ΠΑΡΑΚΑΛΩ ΣΥΜΠΛΗΡΩΣΤΕ ΤΟ ΟΝΟΜΑ, ΤΗΝ ΟΜΑΔΑ ΚΑΙ ΤΟΝ ΤΙΤΛΟ ΠΡΙΝ "
-"ΠΡΟΧΩΡΗΣΕΤΕ."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "ΛΥΠΑΜΑΙ, ΤΟ ΟΝΟΜΑ ΥΠΑΡΧΕΙ ΗΔΗ. ΕΠΙΛΕΞΤΕ ΕΝΑ ΝΕΟ ΟΝΟΜΑ."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "ΛΥΠΑΜΑΙ, ΤΟ ΟΝΟΜΑ ΧΡΗΣΙΜΟΠΟΙΕΙΤΑΙ ΗΔΗ."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "ΠΡΟΣΟΧΗ, ΕΝΤΟΠΙΣΤΗΚΑΝ ΛΑΘΗ."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "ΠΑΡΑΚΑΛΩ ΕΙΣΑΓΕΤΕ ΤΟ ΚΕΙΜΕΝΟ ΓΙΑ ΑΥΤΗ ΤΗΝ ΕΡΩΤΗΣΗ."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "ΛΥΠΑΜΑΙ, ΠΡΕΠΕΙ ΝΑ ΕΠΙΛΕΞΕΤΕ ΕΝΑΝ ΤΥΠΟ ΓΙΑ ΑΥΤΗ ΤΗΝ ΕΡΩΤΗΣΗ."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "ΝΕΟ ΠΕΔΙΟ"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"ΛΥΠΑΜΑΙ, ΔΕΝ ΜΠΟΡΕΙΤΕ ΝΑ ΑΛΛΑΞΕΤΕ ΑΝΑΜΕΣΑ ΣΕ ΑΥΤΟΥΣ ΤΟΥ ΤΥΠΟΥΣ ΤΗΣ ΕΡΩΤΗΣΗ. "
-"ΔΗΜΙΟΥΡΗΣΤΕ ΜΙΑ ΝΕΑ ΕΡΩΤΗΣΗ."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-"ΛΥΠΑΜΑΙ, ΠΡΕΠΕΙ ΝΑ ΥΠΑΡΧΕΙ ΤΟΥΛΑΧΙΣΤΟΝ 1 ΠΙΘΑΝΗ ΑΠΑΝΤΗΣΗ ΣΕ ΑΥΤΟ ΤΟΝ ΤΥΠΟ "
-"ΕΡΩΤΗΣΗΣ."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "ΠΑΡΑΚΑΛΩ ΕΙΣΑΓΕΤΕ ΤΟ ΚΕΙΜΕΝΟ ΓΙΑ ΑΥΤΗ ΤΗΝ ΕΡΩΤΗΣΗ."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "ΛΑΘΟΣ ΔΙΑΔΙΚΑΣΙΑΣ ΕΡΕΥΝΑΣ: ΠΑΡΑΒΙΑΣΗ ΑΣΦΑΛΕΙΑΣ"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "ΑΔΥΝΑΤΟΝ ΝΑ ΕΚΤΕΛΕΣΤΕΙ ΤΟ ΕΡΩΤΗΜΑ (query) ΓΙΑ ΤΗΝ ΠΡΟΣΒΑΣΗ"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "ΑΔΥΝΑΤΟΝ ΝΑ ΕΚΤΕΛΕΣΤΕΙ ΤΟ ΕΡΩΤΗΜΑ (query) ΓΙΑ ΤΟΥΣ ΕΡΩΤΗΘΕΝΤΕΣ"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "ΔΕΝ ΕΧΕΤΕ ΠΡΟΣΒΑΣΗ (UNAUTHORIZED)"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"ΛΑΘΟΣ ΟΝΟΜΑ ΧΡΗΣΤΗ ή ΚΩΔΙΚΟΣ ή Ο ΛΟΓΑΡΙΑΣΜΟΣ ΕΧΕΙ ΑΠΕΝΕΡΓΟΠΟΙΗΘΕΙ/ΛΗΞΕΙ"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr ""
-"Ο ΛΟΓΑΡΙΑΣΜΟΣ ΑΥΤΟΣ ΕΧΕΙ ΑΠΕΝΕΡΓΟΠΟΙΗΘΕΙ ή ΕΧΕΤ ΗΔΗ ΣΥΜΜΕΤΑΣΧΕΙ ΣΕ ΑΥΤΗ ΤΗΝ "
-"ΕΡΕΥΝΑ."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "ΔΕΝ ΕΙΝΑΙ ΔΥΝΑΤΟΝ ΝΑ ΦΟΡΤΩΘΕΙ ΤΟ ACL"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "ΠΕΡΙΒΑΛΛΟΝ ΔΙΑΧΕΙΡΙΣΗΣ"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "ΑΥΤΟΣ Ο ΛΟΓΑΡΙΑΣΜΟΣ ΔΕΝ ΕΧΕΙ ΤΗΝ ΑΔΕΙΑ"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "ΠΙΣΩ ΣΤΟ ΠΕΡΙΒΑΛΛΟΝ ΔΙΑΧΕΙΡΙΣΗΣ"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "ΑΥΤΟΣ Ο ΛΟΓΑΡΙΑΣΜΟΣ ΔΕΝ ΕΧΕΙ ΤΗΝ ΑΔΕΙΑ"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-#, fuzzy
-msgid "Submit"
-msgstr "ΥΠΟΤΙΤΛΟΣ"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "ΚΑΤΑΤΑΞΗ"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "ΑΠΑΝΤΗΣΗ"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "ΜΕΣΟΣ ΟΡΟΣ ΚΑΤΑΤΑΞΗΣ"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "ΔΕΝ ΕΧΕΤΕ ΑΠΑΝΤΗΣΕΙ ΣΤΙΣ ΠΑΡΑΚΑΤΩ ΥΠΟΧΡΕΩΤΙΚΕΣ ΕΡΩΤΗΣΕΙΣ:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "ΠΑΡΑΚΑΛΩ ΕΙΣΑΓΕΤΕ ΤΟ ΚΕΙΜΕΝΟ ΓΙΑ ΑΥΤΗ ΤΗΝ ΕΡΩΤΗΣΗ."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "ΑΠΟΤΕΛΕΣΜΑΤΑ"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "ΑΛΛΑΓΗ ΤΟΜΕΑ"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "Η ΣΧΕΔΙΑΣΗ ΤΗΣ ΕΡΕΥΝΑΣ ΟΛΟΚΛΗΡΩΘΗΚΕ"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "ΕΧΕΤΕ ΟΛΟΚΛΗΡΩΣΕΙ ΤΗΝ ΣΧΕΔΙΑΣΗ ΤΗΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"ΓΙΑ ΝΑ ΕΙΣΑΓΕΤΕ ΑΥΤΗ ΤΗΝ ΕΡΕΥΝΑ ΣΤΗΝ ΙΣΤΙΟΣΕΛΙΔΑ ΣΑΣ,\n"
-"ΑΝΤΙΓΡΆΨΤΕ ΤΟ ΠΑΡΑΚΑΤΩ ΚΕΙΜΕΝΟ ΚΑΙ ΕΠΙΚΟΛΛΗΣΤΕ ΤΟ\n"
-"ΣΤΟΝ HTML ΚΩΔΙΚΑ ΤΗΣ ΣΕΛΙΔΑΣ ΣΑΣ"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"ΑΦΟΥ ΕΝΕΡΓΟΠΟΙΗΣΕΤΕ ΤΗΝ ΕΡΕΥΝΑ ΜΠΟΡΕΙΤΕ ΝΑ\n"
-"ΕΧΕΤΕ ΠΡΟΣΒΑΣΗ ΣΕ ΑΥΤΗ ΚΑΤΕΥΘΕΙΑΝ ΜΕΣΩ ΤΗΣ\n"
-"ΕΞΗΣ ΔΙΕΥΘΥΝΣΗΣ:"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"ΠΡΕΠΕΙ ΝΑ ΕΝΕΡΓΟΠΟΙΗΣΕΤΕ ΤΗΝ ΕΡΕΥΝΑ ΠΡΙΝ ΑΡΧΙΣΕΤΕ\n"
-"ΤΗΝ ΣΥΛΛΟΓΗ ΔΕΔΟΜΕΝΩΝ. ΑΦΟΥ Η ΕΡΕΥΝΑ ΓΙΝΕΙ ΕΝΕΡΓΗ\n"
-"ΔΕΝ ΘΑ ΜΠΟΡΕΙΤΕ ΝΑ ΚΑΝΕΤΕ ΚΑΜΙΑ ΑΛΛΑΓΗ. ΜΠΟΡΕΙΤΕ ΝΑ\n"
-"ΕΝΕΡΓΟΠΟΙΗΣΕΤΕ ΤΗΝ ΕΡΕΥΝΑ ΔΙΑΛΕΓΟΝΤΑΣ ΤΗΝ ΕΠΙΛΟΓΗ\n"
-"<b>ΑΛΛΑΓΗ ΚΑΤΑΣΤΑΣΗΣ ΥΠΑΡΧΟΥΣΑΣ ΕΡΕΥΝΑΣ</b> ΑΠΟ\n"
-"ΤΟ ΠΕΡΙΒΑΛΛΟΝ ΔΙΑΧΕΙΡΙΣΗΣ."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"ΟΙ ΠΛΗΡΟΦΟΡΙΕΣ ΕΔΩ ΕΠΗΡΕΑΖΟΥΝ ΟΛΗ ΤΗΝ ΕΡΕΥΝΑ.\n"
-"ΣΥΜΠΛΗΡΩΣΤΕ ΑΥΤΗ ΤΗΝ ΣΕΛΙΔΑ ΚΑΙ ΜΕΤΑ ΠΗΓΑΙΝΕΤΕ\n"
-"ΣΤΑ <b>ΠΕΔΙΑ</b> ΩΣΤΕ ΝΑ ΕΠΕΞΕΡΓΑΣΤΕΙΤΕ ΚΑΘΕ\n"
-"ΠΕΔΙΟ ΧΩΡΙΣΤΑ."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "ΟΝΟΜΑ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-#, fuzzy
-msgid "Required"
-msgstr "ΑΠΑΙΤΕΙΤΑΙ;"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "ΟΝΟΜΑ ΑΡΧΕΙΟΥ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr ""
-"ΑΥΤΟ ΧΡΗΣΙΜΟΠΟΙΕΙΤΑΙ ΓΙΑ ΟΛΕΣ ΤΙΣ ΥΠΟΛΟΙΠΕΣ ΠΡΟΣΒΑΣΕΙΣ ΣΕ ΑΥΤΗ ΤΗΝ ΕΡΕΥΝΑ."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "ΧΩΡΙΣ ΚΕΝΑ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "ΜΟΝΟ ΑΛΦΑΡΙΘΜΗΤΙΚΟΥΣ ΧΑΡΑΚΤΗΡΕΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "ΙΔΙΟΚΤΗΤΗΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "ΟΜΑΔΑ ΠΟΥ ΕΧΕΙ ΑΥΤΗ ΤΗΝ ΕΡΕΥΝΑ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "ΤΙΤΛΟΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "ΤΙΤΛΟΣ ΤΗΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-#, fuzzy
-msgid "This appears at the top of every page of this survey."
-msgstr "ΑΥΤΟ ΕΜΦΑΝΙΖΕΤΑΙ ΣΤΗΝ ΑΡΧΗ ΚΑΘΕ ΣΕΛΙΔΑΣ ΤΗΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-#, fuzzy
-msgid "free-form, including spaces"
-msgstr "ΣΥΜΠΕΡΙΛΑΜΒΑΝΩΜΕΝΩΝ ΤΩΝ ΚΕΝΩΝ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "ΥΠΟΤΙΤΛΟΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "ΥΠΟΤΙΤΛΟΣ ΤΗΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "ΕΜΦΑΝΙΖΕΤΕ ΚΑΤΩ ΑΠΟ ΤΟΝ ΤΙΤΛΟ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "ΕΠΙΠΛΕΟΝ ΠΛΗΡΟΦΟΡΙΕΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-#, fuzzy
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "ΚΕΙΜΕΝΟ ΠΟΥ ΘΑ ΕΜΦΑΝΙΖΕΤΑΙ ΣΤΗΝ ΕΡΕΥΝΑ ΠΡΙΝ ΑΠΟ ΚΑΘΕ ΠΕΔΙΟ."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-#, fuzzy
-msgid "Confirmation Page"
-msgstr "ΚΕΙΜΕΝΟ ΕΠΙΒΕΒΑΙΩΣΗΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-#, fuzzy
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"ΕΠΙΚΕΦΑΛΙΔΑ ΣΤΗΝ ΣΕΛΙΔΑ &quot;ΕΠΙΒΕΒΑΙΩΣΗΣ&quot;  (ΕΜΦΑΝΙΖΕΤΑΙ ΜΕ ΕΝΤΟΝΑ "
-"ΓΡΑΜΜΑΤΑ ΑΦΟΥ Ο ΕΡΩΤΗΘΕΝΤΑΣ ΣΥΜΠΛΗΡΩΣΕΙ ΤΗΝ ΕΡΕΥΝΑ). "
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "ΔΙΕΥΘΥΝΣΗ EMAIL"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"ΣΤΕΛΝΕΙ ΕΝΑ ΑΝΤΙΓΡΑΦΟ ΚΑΘΕ ΑΠΑΝΤΗΣΗΣ ΣΕ ΜΙΑ ΔΙΕΥΘΥΝΣΗ (ή ΑΦΗΣΤΕ ΤΟ ΚΕΝΟ ΓΙΑ "
-"ΝΑ ΜΗΝ ΥΠΑΡΧΕΙ EMAIL BACKUP)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-#, fuzzy
-msgid "Options"
-msgstr "ΕΡΩΤΗΣΕΙΣ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"ΑΛΛΑΞΤΕ ΤΗ ΣΕΙΡΑ ΠΟΥ ΘΕΛΕΤΕ ΝΑ\n"
-"ΕΜΦΑΝΙΣΖΟΝΤΑΙ ΟΙ ΕΡΩΤΗΣΕΙΣ ΔΙΑΛΕΓΟΝΤΑΣ\n"
-"ΤΗΝ ΕΠΙΘΥΜΗΤΗ ΘΕΣΗ ΑΠΟ ΤΗΝ ΛΙΣΤΑ."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "ΠΡΟΣΘΗΚΗ ΤΟΜΕΑ"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"ΑΥΤΗ ΕΙΝΑΙ ΜΙΑ ΕΠΙΣΚΟΠΗΣΗ ΤΗΣ ΕΡΕΥΝΑΣ.\n"
-"ΣΤΗΝ ΕΠΙΣΚΟΠΗΣΗ ΤΑ ΚΟΥΜΠΙΑ &quot;ΕΠΟΜΕΝΗ\n"
-"ΣΕΛΙΔΑ&quot; ΚΑΙ &quot;ΑΠΟΣΤΟΛΗ ΑΠΑΝΤΗΣΕΩΝ&quot;\n"
-"ΕΙΝΑΙ ΑΝΕΝΕΡΓΑ. Η ΕΡΕΥΝΑ ΘΑ ΧΡΗΣΙΜΟΠΟΙΗΣΕΙ\n"
-"ΤΑ ΧΡΩΜΑΤΑ ΤΗΣ ΙΣΤΙΟΣΕΛΙΔΑΣ ΠΟΥ ΘΑ\n"
-"ΣΥΜΠΕΡΙΛΗΦΘΕΙ. ΕΑΝ ΔΕΝ ΘΕΛΕΤΕ ΝΑ ΚΑΝΕΤΕ\n"
-"ΑΛΛΕΣ ΑΛΛΑΓΕΣ ΚΑΝΤΕ ΚΛΙΚ ΣΤΟ <b>ΤΕΛΟΣ</b>."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "ΤΟΜΕΑΣ"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "ΕΠΟΜΕΝΗ ΣΕΛΙΔΑ"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "ΑΠΟΣΤΟΛΗ ΑΠΑΝΤΗΣΕΩΝ"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-"ΔΙΟΡΘΩΣΤΕ ΤΟ ΠΕΔΙΟ ή ΚΑΝΤΕ ΚΛΙΚ ΣΤΟΝ ΑΡΙΘΜΟ ΤΟΥ ΠΕΔΙΟΥ ΠΟΥ ΘΕΛΕΤΕ ΝΑ "
-"ΔΙΟΡΘΩΣΕΤΕ:"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "ΕΡΩΤΗΣΕΙΣ"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "ΕΡΩΤΗΣΕΙΣ"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "ΕΡΩΤΗΣΕΙΣ"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "ΤΥΠΟΣ"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "ΜΗΚΟΣ"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "ΑΚΡΙΒΕΙΑ (Precision)"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-#, fuzzy
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"ΕΙΣΑΓΕΤΕ ΤΙΣ ΠΙΘΑΝΕΣ ΑΠΑΝΤΗΣΕΙΣ (ΑΝ ΑΠΑΙΤΕΙΤΑΙ)\n"
-"ΕΙΣΑΓΕΤΕ <tt>!other</tt> ΣΕ ΜΙΑ ΓΡΑΜΜΗ ΓΙΑ ΝΑ \n"
-"ΔΗΜΙΟΥΡΓΗΣΕΤΕ ΚΕΝΟ ΠΕΔΙΟ ΓΙΑ ΕΛΕΥΘΕΡΗ ΑΠΑΝΤΗΣΗ.\n"
-"ΟΙ ΚΕΝΕΣ ΓΡΑΜΜΕΣ ΔΕΝ ΘΑ ΥΠΑΡΧΟΥΝ ΣΤΗΝ ΤΕΛΙΚΗ ΕΡΕΥΝΑ."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "ΠΡΟΣΘΗΚΗ ΝΕΑΣ ΓΡΑΜΜΗΣ ΑΠΑΝΤΗΣΗΣ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "ΠΑΡΑΚΑΛΩ ΔΙΑΛΕΞΤΕ ΜΙΑ ΟΜΑΔΑ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "ΙΔΙΩΤΙΚΗ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "ΠΡΟΣΒΑΣΗ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"ΑΥΤΟ ΣΑΣ ΕΠΙΤΡΕΠΕΙ ΝΑ ΕΛΕΓΧΕΤΕ ΠΟΙΟΣ ΕΧΕΙ ΠΡΟΣΒΑΣΗ\n"
-"ΝΑ ΣΥΜΠΛΗΡΩΝΕΙ ΜΙΑ ΦΟΡΜΑ. ΟΙ ΔΗΜΟΣΙΕΣ ΕΡΕΥΝΕΣ ΜΠΟΡΟΥΝ\n"
-"ΝΑ ΣΥΜΠΛΗΡΩΘΟΥΝ ΑΠΟ ΟΠΟΙΟΝΔΗΠΟΤΕ. ΟΙ ΙΔΙΩΤΙΚΕΣ ΕΡΕΥΝΕΣ\n"
-"ΕΙΝΑΙ ΠΕΡΙΟΡΙΣΜΕΝΕΣ ΣΤΗΝ ΟΜΑΔΑ ΕΡΩΤΗΘΕΝΤΩΝ."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "ΣΗΜΕΙΩΣΗ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-#, fuzzy
-msgid "You must use %s when using private surveys."
-msgstr "ΟΤΑΝ ΧΡΗΣΙΜΟΠΟΙΟΥΝΤΑΙ ΟΙ ΙΔΙΩΤΙΚΕΣ ΕΡΕΥΝΕΣ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "ΟΜΑΔΑ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Max Responses"
-msgstr "ΑΠΑΝΤΗΣΗ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "ΑΦΑΙΡΕΣΗ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "ΠΡΟΣΘΗΚΗ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "ΜΕΤΑΤΡΟΠΗ ΣΕ ΔΗΜΟΣΙΑ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "ΜΕΤΑΤΡΟΠΗ ΣΕ ΙΔΙΩΤΙΚΗ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "ΓΟΑ ΤΗΝ ΠΡΟΣΒΑΣΗ ΣΕ ΑΥΤΗ ΤΗΝ ΦΟΡΜΑ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "ΓΙΑ ΤΗΝ ΠΡΟΣΒΑΣΗ ΣΕ ΑΥΤΗ ΤΗΝ ΟΜΑΔΑ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "ΔΕΝ ΕΙΝΑΙ ΔΥΝΑΤΟΝ ΝΑ ΔΙΑΓΡΑΦΕΙ Ο ΛΟΓΑΡΙΑΣΜΟΣ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "ΤΟ ΟΝΟΜΑ ΧΡΗΣΤΗ, Ο ΚΩΔΙΚΟΣ ΚΑΙ Η ΟΜΑΔΑ ΑΠΑΙΤΟΥΝΤΑΙ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "ΛΑΘΟΣ ΚΑΤΑ ΤΗΝ ΠΡΟΣΘΗΚΗ ΛΟΓΑΡΙΑΣΜΟΥ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "ΔΕΝ ΕΙΝΑΙ ΔΥΝΑΤΟΝ ΝΑ ΑΛΛΑΧΘΟΥΝ ΤΑ ΔΕΔΟΜΕΝΑ ΤΟΥ ΛΟΓΑΡΙΑΣΜΟΥ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Ο ΛΟΓΑΡΙΑΣΜΟΣ ΔΕΝ ΒΡΕΘΗΚΕ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "ΔΙΑΧΕΙΡΙΣΗ ΛΟΓΑΡΙΑΣΜΟΥ ΣΧΕΔΙΑΣΤΗ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "ΟΝΟΜΑ ΧΡΗΣΤΗ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "ΚΩΔΙΚΟΣ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "ΟΝΟΜΑ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "ΕΠΩΝΥΜΟ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "ΛΗΞΗ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "ΕΤΟΣ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "ΜΗΝΑΣ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "ΗΜΕΡΑ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "ΑΝΕΝΕΡΓΟ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "ΑΝΑΝΕΩΣΗ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "ΑΚΥΡΩΣΗ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "ΔΙΑΓΡΑΦΗ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "ΣΧΕΔΙΑΣΗ ΕΡΕΥΝΩΝ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "ΑΛΛΑΞΤΕ ΤΗΝ ΚΑΤΑΣΤΑΣΗ ΤΗΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "ΕΝΕΡΓΟΠΟΙΗΣΗ/ΛΗΞΗ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "ΕΞΑΓΩΓΗ ΔΕΔΟΜΕΝΩΝ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "ΕΠΕΞΕΡΓΑΣΙΑ ΟΜΑΔΩΝ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr ""
-"ΜΠΟΡΟΥΝ ΝΑ ΔΙΟΡΘΩΘΟΥΝ <b>ΟΛΕΣ</b> ΟΙ ΦΟΡΜΕΣ ΠΟΥ ΑΝΗΚΟΥΝ ΣΕ ΑΥΤΗ ΤΗΝ ΟΜΑΔΑ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "ΠΡΟΣΘΗΚΗ ΝΕΟΥ ΣΧΕΔΙΑΣΤΗ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "ΔΙΑΧΕΙΡΙΣΤΕΙΤΕ ΤΗΝ ΟΜΑΔΑ ΕΡΩΤΗΘΕΝΤΕΣ"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "ΔΙΑΧΕΙΡΙΣΗ ΛΟΓΑΡΙΑΣΜΩΝ ΕΡΩΤΗΘΕΝΤΩΝ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "ΓΙΑ ΤΗΝ ΠΡΟΣΒΑΣΗ ΣΕ ΑΥΤΗ ΤΗΝ ΕΡΕΥΝΑ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "ΛΑΘΟΣ ΚΑΤΑ ΤΗΝ ΑΝΤΙΓΡΑΦΗ ΤΗΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "ΑΝΤΙΓΡΑΦΗ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-#, fuzzy
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"ΕΠΙΈΞΤΕ ΜΙΑ ΕΡΕΥΝΑ ΓΙΑ ΝΑ ΤΗΝ ΑΝΤΙΓΡΑΨΕΤΕ. ΤΟ ΑΝΤΙΓΡΑΦΟ ΘΑ ΕΧΕΙ\n"
-"ΑΚΡΙΒΩΣ ΤΗΝ ΙΔΙΑ ΚΑΤΑΣΤΑΣΞ ΜΕ ΜΙΑ ΚΑΙΝΟΥΡΓΙΑ ΕΡΕΥΝΑ. ΘΑ ΜΠΟΡΕΙΤΕ\n"
-"ΝΑ ΕΠΕΞΕΡΓΑΣΤΕΙΤΕ ΤΗΝ ΕΡΕΥΝΑ ΚΑΙ ΘΑ ΠΡΕΠΕΙ ΝΑ ΤΗΝ ΕΝΕΡΓΟΠΟΙΗΣΕΤΕ ΠΡΙΝ ΤΗΝ "
-"ΧΡΗΣΙΜΟΠΟΙΗΣΕΤΕ. "
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "ΚΑΤΑΣΤΑΣΗ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "ΑΡΧΕΙΟΘΕΤΗΜΕΝΗ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "ΛΗΓΜΕΝΗ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "ΕΝΕΡΓΗ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "ΣΕ ΔΟΚΙΜΗ"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "ΣΕ ΕΠΕΞΕΡΓΑΣΙΑ"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-msgid "Error cross-tabulating."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "ΔΙΑΧΕΙΡΙΣΗ ΔΙΚΤΥΑΚΗΣ ΦΟΡΜΑΣ ΛΟΓΑΡΙΑΣΜΩΝ ΣΧΕΔΙΑΣΤΩΝ"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"ΚΑΝΤΕ ΚΛΙΚ ΣΕ ΕΝΑ ΟΝΟΜΑ ΧΡΗΣΤΗ ΓΙΑ ΝΑ ΔΙΟΡΘΩΣΕΤΕ ή ΚΑΝΤΕ ΚΛΙΚ ΣΤΟ ΠΡΟΣΘΗΚΗ "
-"ΝΕΟΥ ΧΡΗΣΤΗ ΠΑΡΑΚΑΤΩ."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "ΑΝΕΝΕΡΓΗ"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "ΠΡΟΣΘΗΚΗ ΝΕΟΥ ΣΧΕΔΙΑΣΤΗ"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "ΛΑΘΟΣ ID ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "ΕΠΕΞΕΡΓΑΣΙΑ ΜΙΑΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "ΕΠΙΛΕΞΤΕ ΤΗΝ ΕΡΕΥΝΑ ΠΡΟΣ ΕΠΕΞΕΡΓΑΣΙΑ"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "ΕΞΑΓΩΓΗ ΔΕΔΟΜΕΝΩΝ"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "ΔΙΑΜΟΡΦΩΣΗ"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "ΚΑΤΕΒΑΣΜΑ"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "ΔΟΚΙΜΗ ΕΡΕΥΝΑΣ..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr "ΤΟ PHP dBase Extension ΔΕΝ ΕΧΕΙ ΕΓΚΑΤΑΣΤΑΘΕΙ"
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Η ΕΡΕΥΝΑ ΕΞΑΧΘΗΚΕ ΩΣ:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "ΛΑΘΟΣ ΚΑΤΑ ΤΗΝ ΕΞΑΓΩΓΗ ΤΗΣ ΕΡΕΥΝΑΣ ΩΣ:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "ΛΑΘΟΣ ΚΑΤΑ ΤΗΝ ΠΡΟΣΘΗΚΗ ΟΜΑΔΑΣ"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "ΛΑΘΟΣ ΚΑΤΑ ΤΗΝ ΔΙΑΓΡΑΦΗ ΟΜΑΔΑΣ"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Η ΟΜΑΔΑ ΕΧΕΙ ΔΕΔΟΜΕΝΑ"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "ΔΙΑΧΕΙΡΙΣΤΕΙΤΕ ΤΙΣ ΟΜΑΔΕΣ"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "ΠΕΡΙΓΡΑΦΗ"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "ΜΕΛΗ"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "ΤΟ ΕΓΧΕΙΡΙΔΙΟ ΧΡΗΣΗΣ ΔΕΝ ΒΡΕΘΗΚΕ"
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "ΕΠΑΝΑΣΥΝΔΕΣΗ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "SUPERUSER"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "ΔΗΜΙΟΥΡΓΙΑ ΝΕΑΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "ΕΠΕΞΕΡΓΑΣΤΕΙΤΕ ΜΙΑ ΥΠΑΡΧΟΥΣΑ ΕΡΕΥΝΑ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "ΔΟΚΙΜΗ ΜΙΑΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "ΑΝΤΙΓΡΑΨΤΕ ΜΙΑ ΥΠΑΡΧΟΥΣΑ ΕΡΕΥΝΑ"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "ΔΙΑΓΡΑΦΗ ΕΡΕΥΝΩΝ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "ΑΛΛΑΞΤΕ ΤΗΝ ΚΑΤΑΣΤΑΣΗ ΜΙΑΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(ΕΝΕΡΓΟΠΟΙΗΣΗ/ΛΗΞΗ/ΔΙΑΓΡΑΦΗ)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "ΑΛΛΑΞΤΕ ΤΗΝ ΠΡΟΣΒΑΣΗ ΣΕ ΜΙΑ ΕΡΥΕΝΑ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "ΠΕΡΙΟΡΙΣΤΕ ΤΟΥΣ ΕΡΩΤΗΘΕΝΤΕΣ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "ΔΕΙΤΕ ΤΑ ΑΠΟΤΕΛΕΣΜΑΤΑ ΑΠΟ ΜΙΑ ΕΡΕΥΝΑ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "ΣΥΓΧΩΝΕΥΣΗ ΑΠΟΤΕΛΕΣΜΑΤΩΝ ΕΡΕΥΝΩΝ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "ΔΕΙΤΕ ΜΙΑ ΕΚΘΕΣΗ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "ΑΠΑΝΤΗΣΗ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "ΑΛΛΑΞΤΕ ΤΟΝ ΚΩΔΙΚΟ ΣΑΣ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "ΔΙΑΧΕΙΡΙΣΤΕΙΤΕ ΤΟΥΣ ΛΟΓΑΡΙΑΣΜΟΥΣ ΕΡΩΤΗΘΕΝΤΩΝ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "ΔΙΑΧΕΙΡΙΣΤΕΙΤΕ ΤΟΥΣ ΛΟΓΑΡΙΑΣΜΟΥΣ ΣΧΕΔΙΑΣΤΩΝ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "ΔΕΙΤΕ ΤΗΝ ΛΙΣΤΑ ΜΕ ΤΙΣ ΒΕΛΤΙΩΣΕΙΣ ΠΟΥ ΘΑ ΓΙΝΟΥΝ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(ΣΤΟΧΟΙ ΑΝΑΠΡΥΞΗΣ)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "ΔΕΙΤΕ ΤΟ ΕΓΧΕΙΡΙΔΙΟ ΧΡΗΣΗΣ &amp; ΔΙΑΧΕΙΡΙΣΗΣ"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "ΚΑΝΤΕ ΚΛΙΚ ΕΔΩ ΓΙΑ ΝΑ ΑΝΟΙΞΕΤΕ ΤΗΝ ΒΟΗΘΕΙΑ"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "ΕΞΟΔΟΣ"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "ΣΥΓΧΩΝΕΥΣΗ ΑΠΟΤΕΛΕΣΜΑΤΩΝ ΕΡΕΥΝΩΝ"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "ΕΠΙΛΕΞΤΕ ΤΙΣ ΕΡΕΥΝΕΣ ΠΡΟΣ ΣΥΓΧΩΝΕΥΣΗ"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "ΛΙΣΤΑ ΕΡΕΥΝΩΝ"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "ΕΡΕΥΝΕΣ ΓΙΑ ΣΥΓΧΩΝΕΥΣΗ"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "ΑΛΛΑΓΗ ΚΩΔΙΚΟΥ"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Ο ΚΩΔΙΚΟΣ ΣΑΣ ΑΛΛΑΞΕ ΕΠΙΤΥΧΩΣ"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Ο ΚΩΔΙΚΟΣ ΣΑΣ ΔΕΝ ΑΛΛΑΞΕ, ΕΛΕΓΞΤΕ ΤΟΝ ΠΑΛΙΟ ΣΑΣ ΚΩΔΙΚΟ"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "ΟΙ ΝΕΟΙ ΚΩΔΙΚΟΙ ΔΕΝ ΤΑΙΡΙΑΖΟΥΝ ή ΕΙΝΑΙ ΚΕΝΟΙ."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "ΠΑΛΙΟΣ ΚΩΔΙΚΟΣ"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "ΝΕΟΣ ΚΩΔΙΚΟΣ"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "ΕΠΙΒΕΒΑΙΩΣΗ ΝΕΟΥ ΚΩΔΙΚΟΥ"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "ΕΠΙΤΡΕΠΟΝΤΑΙ ΜΟΝΟ ΟΙ SUPERUSERS"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "ΔΙΑΓΡΑΦΗ ΕΡΕΥΝΩΝ"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Η ΣΕΛΙΔΑ ΑΥΤΗ ΔΕΝ ΕΙΝΑΙ ΣΤΟ ΚΕΝΤΡΙΚΟ ΜΕΝΟΥ ΕΠΕΙΔΗ ΕΙΝΑΙ\n"
-"ΕΠΙΚΙΝΥΔΝΟ. ΑΥΤΟ ΔΙΑΓΡΑΦΕΙ <b>ΕΝΤΕΛΩΣ</b> ΤΗΝ ΕΡΕΥΝΑ\n"
-"ΑΠΟ ΤΗΝ ΒΑΣΗ ΔΕΔΟΜΕΝΩΝ ΓΙΑ <b>ΠΑΝΤΑ</b>. ΟΛΕΣ ΟΙ ΕΡΩΤΗΣΕΙΣ,\n"
-"ΟΙ ΠΛΗΡΟΦΟΡΙΕΣ, ΤΑ ΑΠΟΤΕΛΕΣΜΑΤΑ, ΚΛΠ ΘΑ ΔΙΑΓΡΑΦΟΥΝ. ΜΗΝ\n"
-"ΠΡΟΧΩΡΗΣΕΤΕ ΑΝ ΔΕΝ ΕΙΣΤΕ ΑΠΟΛΥΤΩΣ ΒΕΒΑΙΟΙ. ΔΕΝ ΥΠΑΡΧΕΙ\n"
-"ΑΛΛΗ ΕΠΙΒΕΒΑΙΩΣΗ ΚΑΙ ΔΕΝ ΘΑ ΜΠΟΡΕΣΕΤΕ ΝΑ ΑΝΑΚΤΗΣΕΤΕ ΤΑ ΔΕΔΟΜΕΝΑ\n"
-"ΠΟΤΕ."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "# ΕΡ."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "ΚΑΘΑΡΙΣΜΟΣ ΤΩΝ CHECKBOXES"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "ΔΕΝ ΒΡΕΘΗΚΕ ΤΟ ΑΡΧΕΙΟ README"
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "ΠΙΣΩ ΣΤΟ ΜΕΝΟΥ ΤΩΝ ΕΚΘΕΣΕΩΝ"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "ΔΕΙΤΕ ΤΗΝ ΕΚΘΕΣΗ ΦΟΡΜΑΣ"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "ΕΠΙΛΕΞΤΕ ΜΙΑ ΦΟΡΜΑ ΝΑ ΔΕΙΤΕ"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "ΠΡΟΣΘΗΚΗ ΝΕΟΥ ΕΡΩΤΗΘΕΝΤΑ"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-#, fuzzy
-msgid "Bulk Upload Respondents"
-msgstr "ΠΡΟΣΘΗΚΗ ΝΕΟΥ ΕΡΩΤΗΘΕΝΤΑ"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "ΔΙΑΓΡΑΦΗ ΕΡΕΥΝΩΝ"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Η ΣΕΛΙΔΑ ΑΥΤΗ ΔΕΝ ΕΙΝΑΙ ΣΤΟ ΚΕΝΤΡΙΚΟ ΜΕΝΟΥ ΕΠΕΙΔΗ ΕΙΝΑΙ\n"
-"ΕΠΙΚΙΝΥΔΝΟ. ΑΥΤΟ ΔΙΑΓΡΑΦΕΙ <b>ΕΝΤΕΛΩΣ</b> ΤΗΝ ΕΡΕΥΝΑ\n"
-"ΑΠΟ ΤΗΝ ΒΑΣΗ ΔΕΔΟΜΕΝΩΝ ΓΙΑ <b>ΠΑΝΤΑ</b>. ΟΛΕΣ ΟΙ ΕΡΩΤΗΣΕΙΣ,\n"
-"ΟΙ ΠΛΗΡΟΦΟΡΙΕΣ, ΤΑ ΑΠΟΤΕΛΕΣΜΑΤΑ, ΚΛΠ ΘΑ ΔΙΑΓΡΑΦΟΥΝ. ΜΗΝ\n"
-"ΠΡΟΧΩΡΗΣΕΤΕ ΑΝ ΔΕΝ ΕΙΣΤΕ ΑΠΟΛΥΤΩΣ ΒΕΒΑΙΟΙ. ΔΕΝ ΥΠΑΡΧΕΙ\n"
-"ΑΛΛΗ ΕΠΙΒΕΒΑΙΩΣΗ ΚΑΙ ΔΕΝ ΘΑ ΜΠΟΡΕΣΕΤΕ ΝΑ ΑΝΑΚΤΗΣΕΤΕ ΤΑ ΔΕΔΟΜΕΝΑ\n"
-"ΠΟΤΕ."
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-#, fuzzy
-msgid "Cross Tabulation"
-msgstr "ΕΠΙΛΕΞΤΕ ΜΙΑ ΛΕΙΤΟΥΡΓΙΑ"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "ΔΟΚΙΜΑΣΤΕ ΜΙΑ ΕΡΕΥΝΑ"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-#, fuzzy
-msgid "Reset"
-msgstr "ΔΟΚΙΜΗ"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "ΔΕΙΤΕ ΤΑ ΑΠΟΤΕΛΕΣΜΑΤΑ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "ΕΠΙΛΕΞΤΕ ΜΙΑ ΕΡΕΥΝΑ ΝΑ ΔΕΙΤΕ"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "ΕΠΙΛΕΞΤΕ ΤΗΝ ΕΡΕΥΝΑ ΠΟΥ ΘΑ ΤΕΘΕΙ ΣΕ ΔΟΚΙΜΗ"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "ΑΠΑΝΤΗΣΗ"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-#, fuzzy
-msgid "Resp"
-msgstr "ΑΠΑΝΤΗΣΗ"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "ΔΕΝ ΕΙΝΑΙ ΣΥΝΑΤΟ ΝΑ ΤΕΘΕΙ Η ΚΑΤΑΣΤΑΣΗ ΤΗΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "ΚΑΤΑΣΤΑΣΗ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"H <b>ΔΟKΙMΗ</b> ΘΕΤΕΙ ΜΙΑ ΕΡΕΥΝΑ ΣΕ ΔΟΚΙΜΑΣΤΙΚΗ ΠΕΡΙΟΔΟ. ΣΤΗΝ ΟΠΟΙΑ\n"
-"ΠΕΡΙΟΔΟ ΜΠΟΡΕΙΤΕ ΝΑ ΔΟΚΙΜΑΣΤΕ ΤΗΝ ΕΡΥΕΝΑ ΚΑΙ ΝΑ ΔΕΙΤΕ ΑΠΟΤΕΛΕΣΜΑΤΑ.\n"
-"ΔΕΝ ΘΑ ΜΠΟΡΕΙΕΤΕ ΝΑ ΚΑΝΕΤΕ ΑΛΛΕΣ ΑΛΛΑΓΕΣ ΣΤΗΝ ΕΡΕΥΝΑ ΑΠΟ ΤΗΝ ΣΤΙΓΜΗ\n"
-"ΠΟΥ ΘΑ ΜΠΕΙ Η ΕΡΕΥΝΑ ΣΕ ΔΟΚΙΜΗ. "
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-#, fuzzy
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"Η <b>ΕΝΕΡΓΟΠΟΙΗΣΗ</b> ΜΕΤΑΤΡΕΠΕΙ ΤΗΝ ΕΡΕΥΝΑ ΣΕ ΕΝΕΡΓΗ. ΣΕ ΑΥΤΟ ΤΟ ΣΤΑΔΙΟ\n"
-"Η ΕΡΕΥΝΑ ΒΡΙΣΚΕΤΑΙ ΣΕ ΠΑΡΑΓΩΓΙΚΟ ΣΤΑΔΙΟ ΚΑΙ ΜΠΟΡΕΙ ΝΑ ΜΠΕΙ ONLINE. ΑΥΤΟ ΘΑ\n"
-"ΔΙΑΓΡΑΨΕΙ ΟΛΑ ΤΑ ΑΠΟΤΕΛΕΣΜΑΤΑ ΑΠΟ ΤΗΝ ΔΟΚΙΜΣΤΙΚΗ ΠΕΡΙΟΔΟ (ΑΝ ΥΠΑΡΧΟΥΝ).\n"
-"ΚΑΜΙΑ ΕΠΕΞΕΡΓΑΣΙΑ ΔΕΝ ΕΠΙΤΡΕΠΕΤΑΙ ΑΠΟ ΕΔΩ ΚΑΙ ΠΕΡΑ. "
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"Η <b>ΛΗΞΗ</b> ΜΕΤΑΤΡΕΠΕΙ ΜΙΑ ΕΡΕΥΝΑ ΣΕ ΛΗΓΜΕΝΗ. ΣΕ ΑΥΤΗ ΤΗΝ ΚΑΤΑΣΤΑΣΗ\n"
-"ΔΕΝ ΜΠΟΡΕΙ ΝΑ ΓΙΝΕΙ ΚΑΜΙΑ ΠΕΡΑΙΤΕΡΩ ΕΠΞΕΡΓΑΣΙΑ ΚΑΙ ΔΕΝ ΜΠΟΡΕΙ ΝΑ ΔΕΧΤΕΙ "
-"ΑΛΛΕΣ\n"
-"ΑΠΑΝΤΗΣΕΙΣ. ΤΑ ΑΠΟΤΕΛΕΣΜΑΤΑ ΟΜΩΣ ΜΠΟΡΕΙΤΕ ΝΑ ΤΑ ΒΛΕΠΕΤΕ ΑΠΟ ΤΟ ΜΕΝΟΥ ΤΩΝ\n"
-"ΑΠΟΤΕΛΕΣΜΑΤΩΝ."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"Η <b>ΑΡΧΕΙΟΘΕΤΗΣΗ</b> ΔΙΑΓΡΑΦΕΙ ΤΗΝ ΕΡΕΥΝΑ. ΑΠΟΘΗΚΕΥΕΙ ΤΗΝ ΕΡΕΥΝΑ ΣΤΗΝ ΒΑΣΗ\n"
-"ΔΕΔΟΜΕΝΩΝ ΑΛΛΑ ΔΕΝ ΘΑ ΥΠΑΡΧΕΙ ΠΕΡΑΙΤΕΡΩ ΕΠΕΞΕΡΓΑΣΙΑ ΤΗΣ ΕΡΕΥΝΑΣ. <b>ΔΕΝ</b> "
-"ΘΑ ΜΠΟΡΕΙΤΕ\n"
-"ΠΛΕΟΝ ΝΑ ΔΕΙΤΕ ΤΑ ΑΠΟΤΕΛΕΣΜΑΤΑ ΜΙΑΣ ΑΡΧΕΙΟΘΕΤΗΜΕΝΗΣ ΕΡΕΥΝΑΣ."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "ΔΟΚΙΜΗ"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "ΕΝΕΡΓΟΠΟΙΗΣΗ"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "ΛΗΞΗ"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "ΑΡΧΕΙΟ"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "ΕΠΕΞΕΡΓΑΣΙΑ"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "ΒΟΗΘΕΙΑ"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"ΚΑΝΤΕ ΚΛΙΚ ΣΤΗΝ ΑΚΥΡΩΣΗ ΓΙΑ ΝΑ ΑΚΥΡΩΣΕΤΕ ΤΗΝ ΕΡΕΥΝΑ, ΑΛΛΙΩΣ ΚΑΝΤΕ ΚΛΙΚ ΣΤΟ "
-"ΣΥΝΕΧΕΙΑ ΓΙΑ ΝΑ ΠΡΟΧΩΡΗΣΕΤΕ."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"Ο ΤΙΤΛΟΣ ΤΗΣ ΕΡΕΥΝΑΣ ΚΑΙ ΤΑ ΑΛΛΑ ΓΕΝΙΚΑ ΠΕΔΙΑ ΒΡΙΣΚΟΝΤΑΙ ΣΤΟ <b>ΓΕΝΙΚΟ</b>.\n"
-"ΟΙ ΕΡΩΤΗΣΕΙΣ ΤΗΣ ΕΡΕΥΝΑΣ ΠΡΟΣΤΙΘΟΝΤΑΙ ΚΑΙ ΑΛΛΑΖΟΥΝ ΑΠΟ ΤΟ <b>ΕΡΩΤΗΣΕΙΣ</b>.\n"
-"ΜΠΟΡΕΙ ΝΑ ΑΛΛΑΧΘΕΙ Η ΣΕΙΡΑ ΕΜΦΑΝΙΣΗΣ ΤΩΝ ΕΡΩΤΗΣΕΩΝ, ή ΝΑ ΔΙΑΓΡΑΦΟΥΝ ΑΠΟ ΤΟ "
-"<b>ΣΕΙΡΑ</b>.\n"
-"ΜΠΟΡΕΙΤΕ ΝΑ ΠΡΟΕΠΙΣΚΟΠΗΣΕΤΕ ΜΙΑ ΕΡΕΥΝΑ ΟΠΟΙΑΔΗΠΟΤΕ ΣΤΙΓΜΗ ΕΠΙΛΕΓΟΝΤΑΣ ΤΗΝ "
-"<b>ΠΡΟΕΠΙΣΚΟΠΗΣΗ</b>.\n"
-"ΑΝ ΔΕΝΘΕΛΕΤΕ ΝΑ ΚΑΝΕΤΕ ΑΛΛΕΣ ΑΛΛΑΓΕΣ ΕΠΙΛΕΞΤΕ <b>ΤΕΛΟΣ</b> ΓΙΑ ΝΑ "
-"ΕΠΙΣΤΡΕΨΕΤΕ ΣΤΟ\n"
-"ΠΕΡΙΒΑΛΛΟΝ ΔΙΑΧΕΙΡΙΣΗΣ."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "ΔΕΙΤΕ ΑΠΟΤΕΛΕΣΜΑΤΑ"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "ΕΠΙΛΕΞΤΕ ΤΗΝ ΕΡΕΥΝΑ ΠΟΥ ΘΑ ΤΕΘΕΙ ΣΕ ΔΟΚΙΜΗ"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "ΕΞΑΓΩΓΗ"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "ΑΠΟΤΕΛΕΣΜΑΤΑ"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Η ΛΙΣΤΑ ΔΕΝ ΒΡΕΘΗΚΕ"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-#, fuzzy
-msgid "Upload Account Information"
-msgstr "ΔΙΑΧΕΙΡΙΣΗ ΛΟΓΑΡΙΑΣΜΩΝ ΕΡΩΤΗΘΕΝΤΩΝ"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-#, fuzzy
-msgid "All fields are required"
-msgstr " ΕΙΝΑΙ ΥΠΟΧΡΕΩΤΙΚΕΣ"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-#, fuzzy
-msgid "File Type"
-msgstr "ΤΥΠΟΣ"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-#, fuzzy
-msgid "File to upload"
-msgstr "ΔΕΝ ΕΙΝΑΙ ΔΥΝΑΤΟΝ ΝΑ ΦΟΡΤΩΘΕΙ ΤΟ ACL"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "ΛΑΘΟΣ ΔΙΑΔΙΚΑΣΙΑΣ ΕΡΕΥΝΑΣ: ΔΕΝ ΕΧΕΙ ΕΠΙΛΕΓΕΙ ΕΡΕΥΝΑ"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "ΕΧΕΤΕ ΟΛΟΚΛΗΡΩΣΕΙ ΤΗΝ ΣΧΕΔΙΑΣΗ ΤΗΣ ΕΡΕΥΝΑΣ"
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "ΛΑΘΟΣ ΔΙΑΔΙΚΑΣΙΑΣ ΕΡΕΥΝΑΣ: Η ΕΡΕΥΝΑ ΔΕΝ ΕΙΝΑΙ ΕΝΕΡΓΗ"
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 72
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "ΟΙ ΝΕΟΙ ΚΩΔΙΚΟΙ ΔΕΝ ΤΑΙΡΙΑΖΟΥΝ ή ΕΙΝΑΙ ΚΕΝΟΙ."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-#, fuzzy
-msgid "Confirm Password"
-msgstr "ΕΠΙΒΕΒΑΙΩΣΗ ΝΕΟΥ ΚΩΔΙΚΟΥ"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr "ΔΕΝ ΟΡΙΣΤΗΚΑΝ ΤΑ ΤΑΒS. ΕΛΕΓΞΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΤΟΥ ΙΝΙ."
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "ΓΕΝΙΚΟ"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "ΕΡΩΤΗΣΕΙΣ"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "ΣΕΙΡΑ"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "ΠΡΟΕΠΙΣΚΟΠΗΣΗ"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "ΤΕΛΟΣ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "ΣΕΛΙΔΑ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "ΑΠΟ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "ΛΥΠΑΜΑΙ, ΤΟ ΟΝΟΜΑ ΧΡΗΣΙΜΟΠΟΙΕΙΤΑΙ ΗΔΗ."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "ΠΕΔΙΟ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "ΟΝΟΜΑ ΠΕΔΙΟΥ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-#~ msgid "DBF download not yet implemented."
-#~ msgstr "ΤΟ ΚΑΤΒΕΣΜΑ ΤΟΥ DBF ΔΕΝ ΕΧΕΙ ΥΛΟΠΟΙΗΘΕΙ ΑΚΟΜΑ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "ΕΠΙΛΕΞΤΕ ΜΙΑ ΛΕΙΤΟΥΡΓΙΑ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "ΕΞΑΓΩΓΗ ΣΤΟΙΧΕΙΩΝ ΣΕ CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "ΛΑΘΟΣ!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "ΠΡΕΠΕΙ ΝΑ ΕΠΙΛΕΞΕΤΕ ΤΟΥΛΑΧΙΣΤΟΝ ΔΥΟ ΕΡΕΥΝΕΣ!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "ΔΙΑΧΕΙΡΙΣΤΕΙΤΕ ΤΗΝ ΟΜΑΔΑ ΜΕΛΗ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "ΔΕΝ ΕΠΙΛΕΧΘΗΚΕ ΕΡΕΥΝΑ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "ΣΥΝΟΛΟ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Incorrect User ID or Password, or your account has been disabled."
-#~ msgstr "ΛΑΘΟΣ ΟΝΟΜΑ ΧΡΗΣΤΗ ή ΚΩΔΙΚΟΣ, ή Ο ΛΟΓΑΡΙΑΣΜΟΣ ΣΑΣ ΕΙΝΑΙ ΑΝΕΝΕΡΓΟΣ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "free-form"
-#~ msgstr "ΕΛΕΥΘΕΡΗ ΦΟΡΜΑ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "ΔΗΛ. ΟΔΗΓΙΕΣ, ΠΛΗΡΟΦΟΡΙΕΣΜ ΚΛΠ."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "ΕΠΙΚΕΦΑΛΙΔΑ ΕΠΙΒΕΒΑΙΩΣΗΣ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Body text on the &quot;Confirmation&quot; page. This is displayed below "
-#~ "the Confirmation Heading."
-#~ msgstr ""
-#~ "ΚΕΙΜΕΝΟ ΣΤΗΝ ΣΕΛΙΔΑ &quot;ΕΠΙΒΕΒΑΙΩΣΗΣ&quot; . ΕΜΦΑΝΙΖΕΤΑΙ ΚΑΤΩ ΑΠΟ ΤΗΝ "
-#~ "ΕΠΙΚΕΦΑΛΙΔΑ ΕΠΙΒΕΒΑΙΩΣΗΣ "
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "You must use"
-#~ msgstr "ΠΡΕΠΕΙ ΝΑ ΧΡΗΣΙΜΟΠΟΙΗΣΕΤΕ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Max Logins"
-#~ msgstr "ΜΕΓΙΣΤΟΣ ΑΡΙΘΜΟΣ ΠΡΟΣΒΑΣΕΩΝ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to access this menu"
-#~ msgstr "ΓΙΑ ΤΗΝ ΠΡΟΣΒΑΣΗ ΣΕ ΑΥΤΟ ΤΟ ΜΕΝΟΥ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Purge"
-#~ msgstr "ΔΙΑΓΡΑΦΗ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "ΚΑΤΑΣΤΑΣΗ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to design forms"
-#~ msgstr "ΠΡΟΣ ΦΟΡΜΕΣ ΣΧΕΔΙΑΣΗΣ"
Index: locale/es_ES/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/es_ES/LC_MESSAGES/messages.po
===================================================================
--- locale/es_ES/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/es_ES/LC_MESSAGES/messages.po	(working copy)
@@ -1,2379 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.7 2007/12/10 10:50:35 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-08-02 16:21--500\n"
-"Last-Translator: RAUL PITTI <rpitti@netmasters.com.pa>\n"
-"Language-Team: es_ES <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Incapaz de abrir el include file.  Revise la configuración del archivo INI. "
-"Finalizando."
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Incapaz de abrir el include file.  Revise la configuración del archivo INI. "
-"Finalizando."
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Servicio no disponible actualmente"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr ""
-"No se han definido opciones.  Por favor revise la configuración de su "
-"archivo INI ."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Resume survey"
-msgstr "Probar  encuesta"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Si"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "No"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "N/D"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "copiar"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Argumento inválido."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Error abriendo al encuesta."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Error abriendo las encuestas."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "No se encontraron respuestas."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "TOTAL"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "No se encontraron preguntas."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-#, fuzzy
-msgid "Questions marked with a %s are required."
-msgstr "Las preguntas marcadas con "
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "Debe seleccionar un tipo para ésta pregunta."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "Tabla de error del sistema corrupta."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Tabla"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Reporte para"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Req'd"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Público/a"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Contenido"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-#, fuzzy
-msgid "Previous"
-msgstr "Previsualizar"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-#, fuzzy
-msgid "Next"
-msgstr "Siguiente Página"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Error haciendo análisis cruzado. Tipo de pregunta inválido."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "Análisis cruzado en QID:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Por favor complete el nombre, grupo y título antes de continuar."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Nombre en uso.  Por favor seleccione un nuevo nombre."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Disculpe, el nombre se encuentra en uso."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "ATENCIÓN!, se ha encontrado un error."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Por favor introduzca el texto para ésta pregunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Debe seleccionar un tipo para ésta pregunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Campo Nuevo"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"Lo sentimos, no puede cambiar entre estos dos tipos de preguntas.  Cree una "
-"pregunta nueva."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr "Necesita al menos una opción de respuesta para esta pregunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Por favor introduzca el texto para ésta pregunta."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Error procesando la encuesta.  Violación de seguridad."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Incapaz de ejecutar el query para acceso."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Unable to execute query respondents."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Sin autorización."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"Nombre de usuario o contraseña incorrecta, o su cuenta  ha sido "
-"desactivada / expirada."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr "Su cuenta ha sido desactivada, o ya ha completada esta encuesta."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "Incapaz de cargar ACL."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Interface Administrativa"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Esta cuenta no tiene los permisos necesarios"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Regresar a la interface administrativa"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "Esta cuenta no tiene los permisos necesarios"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-#, fuzzy
-msgid "Submit"
-msgstr "Subtítulo"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Rango"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Respuesta"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Rango Promedio"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "No ha completado las siguientes preguntas obligatorias:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Por favor introduzca el texto para ésta pregunta."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Resultados"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "----- Salto de Sección -----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "Diseño de la encuesta completado"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Usted ha completado el diseño de esta encuesta."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Para insertar esta encuesta en su página, copie el texto\n"
-"debajo, y péguelo en el código HTML de su página."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"Una vez activada puede accesar la encuesta directamente\n"
-"desde el siguiente URL."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Debe activar esta encuesta antes de  recolectar\n"
-"resultados. Una vez activada una encuesta, no podrá hacer cambios\n"
-"en ella.  Puedes activar esta encuesta al escoger\n"
-"<b>Cambiar Estatus de la Encuesta</b> desde la\n"
-"Interface administrativa."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Nombre"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-#, fuzzy
-msgid "Required"
-msgstr "Requerido?"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Nombre de la encuesta."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Este es utilizado para to los accesos futuros a esta encuesta."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "sin espacios"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "solamente alfa-numérico"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Dueño"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "Grupo que controla esta encuesta."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Título"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "Título de la encuesta."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-#, fuzzy
-msgid "This appears at the top of every page of this survey."
-msgstr "Esto aparecerá al inicio de todas las páginas de la encuesta."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-#, fuzzy
-msgid "free-form, including spaces"
-msgstr "incluyendo espacios"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Subtítulo"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "Subtítulo de la encuesta."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Aparecera debajo del título."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Información adicional"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-#, fuzzy
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "Texto a ser mostrado antes que cualquier campo."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-#, fuzzy
-msgid "Confirmation Page"
-msgstr "texto de Confirmación"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "Correo electrónico"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Enviar copias de las encuestas a la siguiente dirección de correo ( dejar en "
-"blanco para deshabilitar)."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-#, fuzzy
-msgid "Options"
-msgstr "Preguntas"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Agregar salto de sección"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Sección"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Siguiente Página"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Enviar Encuesta"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 87
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Preguntas"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Preguntas"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Preguntas"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Tipo"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Largo"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Precisión"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Agregar otra línea para respuestas"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Por favor, seleccione un grupo."
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Privado"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Acceso a la Encuesta"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Nota"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-#, fuzzy
-msgid "You must use %s when using private surveys."
-msgstr "cuando utilice encuestas privadas."
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Grupo"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Max Responses"
-msgstr "Respuesta"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Remover"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Agregar"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Hacerla Pública"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Hacerla Privada"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "para accesar esta encuesta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "para acessar este grupo"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "No se puede borrar esta cuenta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Nombre de Usuario, Grupo y contraseña son requeridos."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Error al agregar la cuenta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "No se puede cambiar la información de cuenta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Cuenta inexistente."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Administración de la cuenta de diseñador"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Nombre de Usuario"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Contraseña"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Nombre"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Apellido"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Vencimiento"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "año"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "mes"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "día"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Deshabilitado/a"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Actualizar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Cancelar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Borrar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Diseño de Encuestas"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Cambiar Estatus de la Encuesta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Activar/Terminar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Exportar data de encuesta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Editor de grupos"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "puede editar <b>todos<b> los formularios que pertenezcan al grupo"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Agregar nuevo diseñador"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Administrar Grupo de Encuestados"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Administración de cuentas de encuestados"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "para accesar esta encuesta"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "error al copiar la encuesta"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Copiar Encuesta"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Status"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Archivada"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Terminado/a"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Activa"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Probando"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Editando"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-#, fuzzy
-msgid "Error cross-tabulating."
-msgstr "Escoja una función"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Administrar cuentas de Diseñadores de Formularios"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Presione en el nombre de usuario a editar, o en  Agregar Nuevo Usuario."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "deshabilitado/a"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Agregar nuevo diseñador"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "ID de encuesta inválido"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Editar Encuesta"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Escoja la encuesta a editar"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Exportar Datos"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Formato"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "bajar"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Probando Encuesta..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr "The PHP dBase Extension is not installed."
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Encuesta exportada como:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Error al exportar la encuesta como:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Error al agregar este grupo"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Error al borrar este grupo"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "El grupo no esta vacío"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Administrar grupos"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Descripción"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Miembros"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "No se encuentra la guia del usuario."
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Volver a entrar."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Superusuario"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Crear  nueva encuesta"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Editar una encuesta existente"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Probar una encuesta"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Copiar una encuesta existente"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Eliminar Encuestas"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Cambiar el estatus de una encuesta"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(activar/finalizar/borrar)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "CAmbiar el acceso a esta encuesta"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Limitar los encuestados"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Ver resultados de una encuesta"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "Resultado de unir encuestas"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Ver reporte de la encuesta"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Respuesta"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Cambiar contraseña"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Administrar cuentas de Encuestados"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Administrar cuentas de diseñadores"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "Ver la lista de cosas pendientes"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(Metas de desarrollo)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "Ver la guía de usuaruios  &amp;  Adminsitradores"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Presione para abrir la ventana de ayuda."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Log out"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Resultado de unir encuestas"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "Escoja las encuestas a unir"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Lista de encuestas"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "Encuestas a unir"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Cambiar Contraseña"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Su contraseña se ha actualizado satisfactoriamente."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "No se puede cambiar la contraseña, REvise su contraseña anterior."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "Error al confirmar la contraseña, o la contraseña está en blanco."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Contraseña actual"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Nueva Contraseña"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Confirme la nueva contraseña"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Sólo se permiten superusuarios."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Eliminar Encuestas"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Esta página no aparece directamente en el menú principal\n"
-"por su peligrosidad.  Esta opción removera PARA SIEMPRE\n"
-"de la base de datos TODA LA ENCUESTA (preguntas, resultados, etc.)\n"
-"NO REALIZA NINGUNA ACCIÓN SI NO ESTA SEGURO DE LO QUE HACE.\n"
-"NO EXISTE CONFIRMACIÓN NI PUNTO DE RETORNO!. "
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "# Q's"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Borrar los cuadros de confirmación"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "No se encuentra el archivo README"
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Regresar al menú de reportes"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Ver reporte del formulario"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Escoja el formulario a ver"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Agregrar un nuevo encuestado"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-#, fuzzy
-msgid "Bulk Upload Respondents"
-msgstr "Agregrar un nuevo encuestado"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "Eliminar Encuestas"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Esta página no aparece directamente en el menú principal\n"
-"por su peligrosidad.  Esta opción removera PARA SIEMPRE\n"
-"de la base de datos TODA LA ENCUESTA (preguntas, resultados, etc.)\n"
-"NO REALIZA NINGUNA ACCIÓN SI NO ESTA SEGURO DE LO QUE HACE.\n"
-"NO EXISTE CONFIRMACIÓN NI PUNTO DE RETORNO!. "
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-#, fuzzy
-msgid "Cross Tabulation"
-msgstr "Escoja una función"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Probar  encuesta"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-#, fuzzy
-msgid "Reset"
-msgstr "Probar"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Ver resultados de la encuesta"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Escoja la encuesta a ver"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Escoja la encuesta a probar"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "Respuesta"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-#, fuzzy
-msgid "Resp"
-msgstr "Respuesta"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "No es posible asignar el estado de la encuesta"
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Estado de la Encuesta"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Probar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Activar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Terminar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Archivar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Editar"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Ayuda"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Presione Cancelar para cancelar esta encuesta, o presione continuar para "
-"proceder hacia el siguiente opción."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"The survey title and other general fields are on the <b>General</b> tab.\n"
-"Individual survey questions are added and modified on the <b>Questions</b> "
-"tab.\n"
-"Questions may be re-ordered or deleted from the <b>Order</b> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<b>Preview</b>\n"
-"tab. If you have no further changes click <b>Finish</b> to go back to the\n"
-"Management Interface."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Ver Resultados"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Escoja la encuesta a probar"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Exportar"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Resultados"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "No se encuentra la lista de pendientes."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-#, fuzzy
-msgid "Upload Account Information"
-msgstr "Administración de cuentas de encuestados"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-#, fuzzy
-msgid "All fields are required"
-msgstr "son obligatorias."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-#, fuzzy
-msgid "File Type"
-msgstr "Tipo"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-#, fuzzy
-msgid "File to upload"
-msgstr "Incapaz de cargar ACL."
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "Error procesando la encuesta.  No especificó una encuesta."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Usted ha completado el diseño de esta encuesta."
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Error procesando la encuesta.  La encuesta no esta activa."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 72
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "Error al confirmar la contraseña, o la contraseña está en blanco."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-#, fuzzy
-msgid "Confirm Password"
-msgstr "Confirme la nueva contraseña"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr ""
-#~ "No se han definido opciones.  Por favor revise la configuración de su "
-#~ "archivo INI ."
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "General"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Preguntas"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Ordenar"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Previsualizar"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Finalizar"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Página"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "de"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "Disculpe, el nombre se encuentra en uso."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Campo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Nombre del Campo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-#~ msgid "DBF download not yet implemented."
-#~ msgstr "Descargas en formato DBF no están implementadas"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "Escoja una función"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Exportar datos a CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Error!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Necesita seleccionar al menso dos encuestas!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Administrar membresía del Grupo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "No se especificó la encuesta."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "Total"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "are required."
-#~ msgstr "son obligatorias."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Incorrect User ID or Password, or your account has been disabled."
-#~ msgstr ""
-#~ "Nombre de usuario o contraseña incorrecta, o su cuenta  ha sido "
-#~ "desactivada."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#, fuzzy
-#~ msgid "free-form"
-#~ msgstr "texto libre"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "p.ej. instrucciones, información adicional, étc."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Required?"
-#~ msgstr "Requerido?"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "You must use"
-#~ msgstr "Debe utilizar"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to access this menu"
-#~ msgstr "para acessar este menú"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Purge"
-#~ msgstr "Eliminar"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "STATUS"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to design forms"
-#~ msgstr "para diseñar el formulario"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "Encabezado de Confirmación"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Max Logins"
-#~ msgstr "Max. Logins"
Index: locale/fi/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/fi/LC_MESSAGES/messages.po
===================================================================
--- locale/fi/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/fi/LC_MESSAGES/messages.po	(working copy)
@@ -1,1748 +0,0 @@
-# translation of messages.po to Finnish
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.1 2004/09/17 17:38:01 greggmc Exp $
-# Tom Ingberg <tom.ingberg@edu.vantaa.fi>, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2004-09-17 11:44-0400\n"
-"PO-Revision-Date: 2004-05-26 14:12+0300\n"
-"Last-Translator: Tom Ingberg <tom.ingberg@edu.vantaa.fi>\n"
-"Language-Team: Finnish\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Virhe avattaessa sis�llytett�v�� tiedostoa. Tarkista INI-asetukset. "
-"Keskeytet��n."
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Virhe avattaessa sis�llytett�v�� tiedostoa. Tarkista INI-asetukset. "
-"Keskeytet��n."
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Palvelu ei ole nyt saatavissa."
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-msgid "Connection to database failed. Please check configuration."
-msgstr ""
-"Tietokantayhteyden avaaminen ep�onnistui. Ole hyv� ja tarkista asetukset."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-"Edistymisesi t�h�n asti on tallennettu.\n"
-"Voit jatkaa t�st� eteenp�in milloin tahansa.\n"
-"Sinun tarvitsee vain ottaa yl�s oheinen linkki tai\n"
-"lis�t� se suosikkisivujesi joukkoon (kirjanmerkkeihin).\n"
-"Sinulta saatetaan kysy� k�ytt�j�tunnusta ja\n"
-"salasanaa p��st�ksesi jatkamaan kysely�."
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-msgid "Resume survey"
-msgstr "Palaa kyselyyn"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "kopio"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Virheellinen argumentti"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Virhe avattaessa kysely�."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Virhe avattaessa kyselyj�."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Yht��n vastausta ei l�ydetty."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "YHT."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Yht��n kysymyst� ei l�ytynyt."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr "Sivu %d/%d"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-msgid "Questions marked with a %s are required."
-msgstr "%s:ll� merkittyihin kysymyksiin pit�� vastata."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Kyll�"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Ei"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "N/A"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-msgid "Page"
-msgstr "Sivu"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-msgid "of"
-msgstr "/"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Raportti kyselyst�"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "Kpl"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Vaadittu"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Julkinen"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Sis�lt�"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-msgid "Previous"
-msgstr "Edellinen"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-msgid "Next"
-msgstr "Seuraava"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr "Tutki yksitt�isten vastaajien vastauksia"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Virhe ristiinanalysoinnissa: Kysymys ei ole oikentyyppinen."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-msgid "Cross analysis on QN:"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Virhe: Sinun tulee antaa v�hint��n nimi, ryhm� ja otsikko jatkaaksesi."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Virhe: Kyselyn nimi on jo k�yt�ss�. Ole hyv� ja valitse uusi nimi."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Virhe: Nimi on jo k�yt�ss�."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Varoitus: Tapahtui virhe."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Ole hyv� ja kirjoita kysymysteksti."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-msgid "Sorry, this question name is already in use."
-msgstr "Virhe: Nimi on jo k�yt�ss�."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Virhe: Sinun t�ytyy valita kysymyksen tyyppi."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Uusi kentt�"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-"Virhe: T�m�ntyyppisell� kysymyksell� on oltava v�hint��n yksi "
-"vastausvaihtoehto."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Virhe k�sitelt�ess� kysely�: Turvarikkomus."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"Virheellinen k�ytt�j�tunnus tai salasana. Tunnus saattaa olla my�s "
-"vanhentunut tai poistettu k�yt�st�."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr ""
-"Tunnuksesi on poistettu k�yt�st� tai t�ll� tunnuksella on jo vastattu "
-"kyselyyn."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Hallintapaneeli"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "T�ll� tunnuksella ei ole p��sy�"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Palaa hallintapaneeliin"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-msgid "This account does not have permission %s."
-msgstr "K�ytt�j�tunnuksellasi ei ole oikeutta suorittaa toimintoa %s."
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-msgid "Submit"
-msgstr "L�het�"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Vastaus"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Et ole vastannut seuraaviin vaadittuihin kysymyksiin:"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "Kyselyn suunnittelu on suoritettu"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Kyselyn laatiminen on nyt valmis. "
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Lis�t�ksesi t�m�n kyselyn www-sivulle, kopioi oheinen teksti ja liit� se "
-"sivusi HTML-koodiin."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"Aktivoinnin j�lkeen p��set kyselyysi\n"
-"suoraan seuraavasta osoitteesta."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Sinun t�ytyy aktivoida t�m� kysely ennen kuin voit ker�t� vastauksia.\n"
-"Kun kysely on aktivoitu, et voi en�� tehd� siihen muutoksia.\n"
-"Voit aktivoida t�m�n kyselyn valitsemalla kohdan \n"
-"<b>muuta olemassaolevan kyselyn tilaa</b> hallintapaneelista."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <b>Fields</b> tab to\n"
-"edit individual fields."
-msgstr ""
-"T�m�n v�lilehden tiedot koskevat koko kysely�.\n"
-"T�yt� t�m�n sivun tiedot ja siirry sitten <b>kysymykset/(questions)</b>-"
-"v�lilehdelle."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Nimi"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-msgid "Required"
-msgstr "Vaadittu"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Kyselyn tiedostonimi."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Tunnistat kyselysi jatkossa t�st� nimest�."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "ei v�lily�ntej�"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "vain alfanumeerisia kirjaimia"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Omistaja"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-msgid "User and Group that owns this survey."
-msgstr "K�ytt�j� ja ryhm�, joka omistaa t�m�n kyselyn."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Otsikko"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-msgid "Title of this survey."
-msgstr "T�m�n kyselyn otsikko."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-msgid "This appears at the top of every page of this survey."
-msgstr "T�m� n�kyy kyselyn jokaisen sivun yl�osassa."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "free-form, including spaces"
-msgstr "vapaamuotoinen, saa sis�lt�� v�lily�ntej�."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Alaotsikko"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-msgid "Subtitle of this survey."
-msgstr "T�m�n kyselyn alaotsikko."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "N�kyy otsikon alla."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Lis�tietoja"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr ""
-"T�m� teksti n�kyy kyselyss� ohjetekstin� ennen kyselykentti�.\n"
-"(Esim. t�ytt�ohjeita, taustatietoja jne.)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-msgid "Confirmation Page"
-msgstr "Vahvistussivu"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr "Internet-osoite"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr "Osoite, johon k�ytt�j�t ohjataan t�m�n kyselyn suorittamisen j�lkeen. "
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr "TAI"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr "(Otsikko)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr "(Oma tekstisi)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"Voit kirjoittaa t�h�n otsikon ja viestin joka n�kyy k�ytt�jille kyselyn "
-"suorittamisen j�lkeen.\n"
-"Otsikko n�kyy lihavoituna."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-"Jos olet antanut vahvistussivun Internet-osoitteen, sit� k�ytet��n "
-"vahvistustekstin sijasta."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "S�hk�posti"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"L�hett�� kopion jokaisesta vastauksesta t�h�n s�hk�postiosoitteeseen. (J�t� "
-"tyhj�ksi jos et halua s�hk�postivarmistusta.)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr "Teema"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr "Valitse teema (css-tiedosto) jota k�ytet��n t�ss� kyselyss�."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-msgid "Options"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-"Anna vastaajien tallettaa kysely ja jatkaa my�hemmin. (Vaatii kirjautumisen.)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr "Anna vastaajien siirty� edestakaisin kyselyn osien v�lill�."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Vaihda kysymysten esiintymisj�rjestyst�\n"
-"valitsemalla uusi sijainti alasvetovalikosta."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "----- Osion vaihto -----"
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Lis�� osion vaihto"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-msgid ""
-"This is a preview of how this survey will look.\n"
-"In the preview the survey navigation buttons are inactive, use\n"
-"the section number buttons to view different sections. Some\n"
-"navigation buttons may not appear on your final survey, depending\n"
-"on what access it is assigned. The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"T�m� on esikatselu siit� milt� kyselysi tulee n�ytt�m��n.\n"
-"Esikatselussa kyselyn siirtymis- ja l�hetyspainikkeet eiv�t toimi.\n"
-"K�yt� osionumeropainikkeita siirty�ksesi eri osioihin.\n"
-"Jotkut navigointipainikkeet eiv�t ehk� esiinny lopullisessa kyselyss�\n"
-"riippuen valitsemistasi k�ytt�oikeuksista. \n"
-"Kysely k�ytt�� sen sivun taustaa johon se tulleen sis�llytt�m��n.\n"
-"Jos et halua tehd� en�� muutoksia, paina <b>Valmis</b>-painiketta t�m�n "
-"sivun alaosassa."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Osio"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr "Edellinen sivu"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr "Tallenna"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Seuraava sivu"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "L�het� vastaus"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-msgid ""
-"Edit this field, or click the number of the field you would like to edit:"
-msgstr ""
-"Muokkaa t�t� kentt�� tai napsauta sen kent�n numeroa jota haluat muokata."
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-msgid "Field"
-msgstr "Kentt�"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-msgid "Field Name"
-msgstr "Kent�n nimi"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Tyyppi"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Pituus"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"Anna mahdolliset vastausvaihtoehdot.\n"
-"Kirjoita riville %s jos haluat luoda tyhj�n vastausvaihtoehdon t�m�n "
-"kysymyksen loppuun.\n"
-"Kaikki tyhj�t rivit j�tet��n huomiotta."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Lis�� uusi vastausrivi"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Valitse ryhm�"
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Yksityinen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Kyselyn k�ytt�oikeudet"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"T�st� voit valita keill� on oikeus vastata kyselyysi.\n"
-"Kuka tahansa voi vastata julkisiin kyselyihin.\n"
-"Yksityisten kyselyjen vastaajat rajataan vastaajaryhmitt�in."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Huom:"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-msgid "You must use %s when using private surveys."
-msgstr "Sinun t�ytyy k�ytt�� %s k�ytett�ess� yksityisi� kyselyj�."
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Ryhm�"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-msgid "Max Responses"
-msgstr "Max vastaukset"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr "Talletus/Paluu"
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr "Takaisin/Eteenp�in"
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Poista"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Lis��"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Tee julkiseksi"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Tee yksityiseksi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Ei voida poistaa tunnusta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "K�ytt�j�tunnus, salasana ja ryhm� vaaditaan."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Virhe lis�tt�ess� tunnusta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Tunnuksen tietoja ei voitu muuttaa."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Tunnusta ei l�ytynyt."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Suunnittelijatunnusten hallinta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "K�ytt�j�tunnus"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Salasana"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Etunimi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Sukunimi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Er��ntyminen"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "vuosi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "kuukausi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "p�iv�"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Poistettu k�yt�st�"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "P�ivit�"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Peruuta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Poista"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Voi luoda kyselyit�"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Voi muuttaa kyselyn tilaa"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Aktivoi/Lopeta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Voi vied� kyselyn vastausdatan"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Voi hallita ryhmi�"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "voi muokata <b>kaikkia</b> t�m�n ryhm�n omistamia kyselyit�"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Lis�� uusi suunnittelija"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Voi hallita vastaajaryhmi�"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Vastaajatunnuksen hallinta"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Virhe kopioitaessa kysely�."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Kopioi kysely"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Valitse kysely, josta haluat tehd� kopion. Kopio saa saman tilan kuin vasta "
-"luotu kysely,\n"
-"joten voit muokata sit� vapaasti. Sinun tulee aktivoida kysely ennen "
-"k�ytt��nottoa."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Tila"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Arkistoitu"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Lopetettu"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Aktiivinen"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Testauksessa"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Muokattavissa"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-msgid "Error cross-tabulating."
-msgstr "Virhe ristiintaulukoidessa."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-"Ole hyv� ja tarkista, ett� rivi- ja sarakevalintasi eiv�t ole samasta "
-"kysymyksest�."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr "Ole hyv� ja tarkista ett� teit sek� sarake- ett� rivivalinnan."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-"Yrit�t ristiinanalysoida ja -taulukoida samanaikaisesti. T�m� ei ole "
-"mahdollista!"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Hallitse suunnittelijatunnuksia"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr "Napsauta k�ytt�j�tunnusta muokataksesi, tai lis�� uusi tunnus."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "Poistettu k�yt�st�"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Lis�� uusi suunnittelija"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr "Tuo lista suunnittelijoita"
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "Virheellinen kyselyn ID."
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-msgid "DBF download not yet implemented."
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr "PHP:n dBase-laajennosta ei ole asennettu."
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Muokkaa kysely�"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Valitse muokattava kysely"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Vie kyselyn tulokset"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Muoto"
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-msgid "CSV"
-msgstr "CSV"
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-msgid "download"
-msgstr "lataa"
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-msgid "DBF"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Testataan kysely�..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Kyselyn tulokset on viety kohteeseen:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Virhe viet�ess� kyselyn tuloksia kohteeseen:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Virhe lis�tt�ess� ryhm��."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Virhe poistettaessa ryhm��."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Ryhm� ei ole tyhj�."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Hallitse ryhmi�"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Kuvaus"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "J�senet"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "K�ytt�opasta ei l�ytynyt"
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Kirjaudu takaisin sis��n."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "P��k�ytt�j�"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-msgid "Choose a function"
-msgstr "Valitse toiminto"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Tee uusi kysely"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Muokkaa olemassaolevaa kysely�"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Testaa kysely�"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Kopioi kysely"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Muuta kyselyn tila"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(aktivoi/lopeta/poista)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Muuta kyselyn k�ytt�oikeuksia"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Rajaa vastaajajoukkoa."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "N�yt� kyselyn tulokset"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-msgid "Cross Tabulate Survey Results"
-msgstr "Ristiintaulukoi kyselyn tuloksia"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "N�yt� kyselyn yhteenveto"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-msgid "Export Data to CSV"
-msgstr "Vie tulokset CSV-muotoon"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Muuta salasanasi"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Hallitse vastaajatunnuksia"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Hallitse suunnittelijatunnuksia"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(kehitysty�n tavoitteet)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "N�yt� k�ytt�j�n ja yll�pit�j�n opas"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Kirjaudu ulos"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-msgid "Error!"
-msgstr "Virhe!"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-msgid "You need to select at least two surveys!"
-msgstr "Sinun t�ytyy valita v�hint��n kaksi kysely�!"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Lista kyselyist�"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Muuta salasana"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Salasanasi on onnistuneesti muutettu."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Salasanaa ei muutettu. Olihan nykyinen salasanasi oikein kirjoitettu?"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "Uudet salasanat eiv�t t�sm�� tai ovat tyhj�t."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Nykyinen salasana"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Uusi salasana"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Vahvista uusi salasana"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Vain p��k�ytt�jille."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"T�t� sivua ei ole suoraan p��valikossa, koska se on vaarallinen.\n"
-"T�m� poistaa <b>t�ysin</b> kaiken kyselyyn liittyv�n tietokannasta\n"
-"<b>peruuttamattomasti</b>. Kaikki kyselyn ja kysymysten tiedot,\n"
-"vastaukset jne poistetaan tietokannasta. �l� tee mit��n t��ll� jollet\n"
-"ola t�ysin varma siit� mit� teet. T��ll� ei ole vahvistuksia eik� roskakoria."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Tyhjenn� valintaruudut"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "README-tiedostoa ei l�ytynyt."
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Palaa yhteenvetovalikkoon"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "N�yt� kyselyn yhteenveto"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Valitse n�ytett�v� kysely"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Lis�� uusi vastaaja"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-msgid "Bulk Upload Respondents"
-msgstr "Tuo listallinen vastaajia"
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-msgid "Cross Tabulation"
-msgstr "Ristiintaulukointi"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Testaa kysely�"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-msgid "Reset"
-msgstr "Nollaa"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr "Ristiintaulukoi"
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "N�yt� kyselyn tulokset"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Valitse n�ytett�v� kysely"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Valitse ristiintaulukoitava kysely"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-msgid "Respondent"
-msgstr "Vastaaja"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-msgid "Resp"
-msgstr "Vastauksia"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Ei voida muuttaa kyselyn tilaa."
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Kyselyn tila"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Testaa</b> muuttaa kyselyn testaustilaan. T�ll�in voit testata kyselyn\n"
-"toimivuutta k�yt�nn�ss� ja katsella testituloksia. Et voi en�� tehd�\n"
-"kyselyyn muutoksia sen j�lkeen kun olet muuttanut sen testitilaan."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Aktivoi</b> muuttaa kyselyn aktiiviseksi. T�ss� tilassa kysely odottaa\n"
-"vastauksia ja se voidaan julkaista tuotantok�ytt��n. Mahdolliset "
-"testausvaiheen\n"
-"vastaukset poistetaan. Kysely� ei voi en�� t�ss� vaiheessa muokata."
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Lopeta</b> muuttaa kyselyn lopetettuun tilaan. T�ss� tilassa kyselyn\n"
-"muokkaaminen ei ole mahdollista, kukaan ei voi vastata (kysely ei ole "
-"aktiivinen),\n"
-"mutta tuloksia voidaan silti tarkastella."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Arkistoi</b> poistaa t�m�n kyselyn. Kysely on silti j�ljell� "
-"tietokannassa,\n"
-"mutta sen tietoihin ei en�� p��se k�siksi. <b>Et</b> voi muokata etk�\n"
-"katsoa arkistoidun kyselyn tuloksia."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Testaa"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Aktivoi"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Lopeta"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Arkistoi"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Muokkaa"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-msgid "No tabs defined. Please check your INI settings."
-msgstr ""
-"V�lilehti� ei ole m��ritelty. Ole hyv� ja tarkista INI-tiedoston asetukset."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Ohjeet"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-msgid "General"
-msgstr "Yleiset"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-msgid "Questions"
-msgstr "Kysymykset"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-msgid "Order"
-msgstr "J�rjestys"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-msgid "Preview"
-msgstr "Esikatselu"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-msgid "Finish"
-msgstr "Valmis"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Paina peruuta jos haluat keskeytt�� kyselyn laatimisen tai seuraava "
-"edet�ksesi seuraavalle v�lilehdelle."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-msgid ""
-"The survey title and other general fields are on the <b>General</b> tab.\n"
-"Individual survey questions are added and modified on the <b>Questions</b> "
-"tab.\n"
-"Questions may be re-ordered or deleted from the <b>Order</b> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<b>Preview</b>\n"
-"tab. If you have no further changes click <b>Finish</b> to go back to the\n"
-"Management Interface."
-msgstr ""
-"Kyselyn otsikko ja muut yleiset tiedot ovat <b>Yleist�</b>-v�lilehdell�.\n"
-"Kysymyksi� muokataan <b>Kysymykset</b>-v�lilehdell�.\n"
-"Kysymyksi� voidaan j�rjestell� tai poistaa <b>J�rjestys</b>-v�lilehdell�.\n"
-"Voit esikatsella kysely�si milloin tahansa menem�ll� <b>Esikatseluun</b>.\n"
-"Klikkaa <b>Valmis</b>-painiketta kun kyselysi on valmis etk� en�� halua "
-"tehd� siihen muutoksia. P��set takaisin hallintapaneeliin."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Napsauta t�st� avataksesi ohjeikkunan."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "N�yt� tulokset"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Valitse testattava kysely"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Vie"
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Tulokset"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Teht�v�listaa ei l�ytynyt."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr "Virhe tuonnissa:  Seuraavien rivien tuonti ep�onnistui."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-"Virhe tuonnissa: Ole hyv� ja tarkista ett� tekstitiedostosi on oikein "
-"muotoiltu."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr "Virhe tuonnissa: Ole hyv� ja t�yt� kaikki vaaditut tietokent�t."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-msgid "Upload Account Information"
-msgstr "Lataa listallinen suunnittelijatunnuksia"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-msgid "All fields are required"
-msgstr "Kaikki tiedot vaaditaan."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-msgid "File Type"
-msgstr "Tiedoston tyyppi"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr "Sarkainerotettu"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-msgid "File to upload"
-msgstr "Viet�v� tiedosto"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr "Kiitos vastauksesta."
-#
-# File: phpESP/admin/phpESP.ini.php, line: 176
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back. Please click on the link below to return you to where\n"
-"you launched this survey."
-msgstr ""
-"Ole hyv� �l�k� k�yt� selaimesi takaisin/back-nappia, vaan napsauta oheista "
-"linkki� jatkaaksesi."
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-"PhpESP:n %s-hakemistoa ei l�ytynyt.\n"
-"\t\t\tOle hyv� ja tarkista %s varmistaaksesi ett� kaikki polut ovat oikein."
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr "%%%% Gettext-testi ep�onnistui"
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "Virhe k�sitelt�ess� kysely�: Kysely� ei ole m��ritelty."
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Virhe k�sitelt�ess� kysely�: Kysely ei ole aktiivinen."
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr "Tunnuspyynt�lomake on valitettavasti poistettu k�yt�st�."
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr "Ole hyv� ja anna kaikki vaaditut tiedot."
-#
-# File: phpESP/public/signup.php, line: 72
-msgid "Passwords do not match."
-msgstr "Salasanat eiv�t t�sm��."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr "Pyynt� ep�onnistui. Ole hyv� ja valitse toinen k�ytt�j�tunnus."
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr "K�ytt�j�tunnus %s on luotu!"
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr "K�ytt�j�tunnuksen hakeminen"
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-"Ole hyv� ja t�yt� oheinen lomake saadaksesi k�ytt�j�tunnuksen.\n"
-"Symbolilla %s merkitty tieto vaaditaan."
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr "S�hk�postiosoite"
-#
-# File: phpESP/public/signup.php, line: 157
-msgid "Confirm Password"
-msgstr "Vahvista salasana"
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Voi hallita ryhm�n j�seni�"
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "Ei kysely� valittuna."
Index: locale/fr_FR/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/fr_FR/LC_MESSAGES/messages.po
===================================================================
--- locale/fr_FR/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/fr_FR/LC_MESSAGES/messages.po	(working copy)
@@ -1,2513 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.7 2007/12/10 10:50:35 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-02-18 13:29-0500\n"
-"Last-Translator: Cedric Levasseur <cedric.levasseur@linux-at-business.com>, "
-"and olivier sevin <cjanson@ifrance.com>\n"
-"Language-Team: fr_FR <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Impossible d'ouvrir le fichier d'include: Vérifiez les paramètres INI. "
-"Annulation."
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Impossible d'ouvrir le fichier d'include: Vérifiez les paramètres INI. "
-"Annulation."
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Service non valide"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr "Pas d'onglets définis. Merci de vérifier vos paramètres INI."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Resume survey"
-msgstr "Tester l'étude"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Oui"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Non"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "N/A"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "copie"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Argument invalide."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Erreur lors de l'ouverture de l'étude"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Error lors de l'ouverture de l'étude"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Aucune réponse trouvée."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "TOTAL"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Aucune question trouvée"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr "Page %d sur %d"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-#, fuzzy
-msgid "Questions marked with a %s are required."
-msgstr "Questions marquées avec un %s sont obligatiores"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "Désolé, vous devez selectionner un type pour cette question."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "Erreur. La table système est corrompue."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Table"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Compte-rendu pour"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Oblig"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Publique"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Contenu"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-#, fuzzy
-msgid "Previous"
-msgstr "Apercu"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-#, fuzzy
-msgid "Next"
-msgstr "Page suivante"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Erreur d'anlyse croisée. La question n'a pas un type valide."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "Analyse croisée sur le QUID:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Désolé, vous devez remplir le nom, groupe, et titre avant de continuer"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Désole, ce nom est déjà utilisé. Choississez un nouveau nom."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Désolé, ce nom est déjà utilisé"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Attention, une erreur est apparue"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Merci d'entrez un texte pour cette question."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Désolé, vous devez selectionner un type pour cette question."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Nouveau champ"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"Désolé, vous ne pouvez échanger ces deux types de question. Créer plutôt une "
-"nouvelle question"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-"Désolé, Vous devez iajouter au moins une réponse possible pour ce type de "
-"question."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Merci d'entrez un texte pour cette question."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Erreur lors du traitement de l'étude: Violation de la sécurité"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Impossible d'éxécuter la demande d'accès"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Impossible d'accepter la réponse."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Accès non autorisé"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"ID utilisateur ou mot de passe incorrect. Votre compte est désactivé/expiré."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr "Votre compte est désactivé ou vous avez déjà répondu à cette étude."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "Impossible de charger les ACLs"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Interface d'administration"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Ce compte n'a pas la permission nécéssaire"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Retour à interface d'administration"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "Ce compte n'a pas la permission nécéssaire"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-#, fuzzy
-msgid "Submit"
-msgstr "Sous-titre."
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Rang"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Réponse"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Rang moyen"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Vous avez oublié les questions obligatoires suivantes:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Merci d'entrez un texte pour cette question."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Résultats"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "---- Saut de section ----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "Création de l'étude terminée"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Vous avez terminé la création de cette étude."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Pour insérer cette étude dans votre page web, copiez\n"
-"le texte suivant, et collez-le dans le code HTML de votre page."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Vous devez activer cette étude avant de pouvoir collecter les\n"
-"résultats. Une fois l'étude activée, vous ne pouvez plus y faire de\n"
-"changements. Vous devez activer cette étude en choississant\n"
-"<b>Changer le statut d'une étude existante</b> à partir de \n"
-"l'interface de l'administration."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"Les informations dans cet onglet s'appliquent à toute\n"
-"l'étude. Remplissez cette page et aller à l'onglet\n"
-"<b>champ</b> pour éditer les champs individuellement."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Nom"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-#, fuzzy
-msgid "Required"
-msgstr "Obligatoire?"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Nom du fichier de l'étude."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Mentionné pour tous vos futurs accès à l'étude"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "pas d'espaces"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "caractères alphanumériques uniquement"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Propriétaire"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "Groupe possédant l'étude."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Titre"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "Titre de l'étude."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-#, fuzzy
-msgid "This appears at the top of every page of this survey."
-msgstr "Apparait en haut de chaque page de l'étude."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-#, fuzzy
-msgid "free-form, including spaces"
-msgstr "espaces inclus"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Sous-titre."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "Sous-titre de l'étude."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Apparait sous le titre."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Informations complémentaires."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-#, fuzzy
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "Texte affiché sur l'étude avant les champs"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-#, fuzzy
-msgid "Confirmation Page"
-msgstr "Texte de confirmation"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-#, fuzzy
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"En-tête sur la page de 'confirmation' (apparait à la fin de l'étude). "
-"Affiché en gras."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "mél"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Envoi d'une copie de chaque réponse à cette l'adresse. (laissez vide "
-"n'envoie pas de mél)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr "Choisissez le thème (css) à utiliser pour votre Etude"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-#, fuzzy
-msgid "Options"
-msgstr "Questions"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Changez l'ordre des questions en\n"
-"choississant la position voulue dans la liste."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Ajouter un saut de section"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Ceci est l'aperçu de votre étude.\n"
-"Dans cet aperçu, 'Page suivante' et\n"
-"'Envoyer' sont inactifs.\n"
-"L'étude emploie la couleur de fond du document\n"
-"ou elle est contenue. Si vous n'avez plus de\n"
-"modifications à faire, cliquez sur <b>Fin</b> au bas\n"
-"de cette page."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Section"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Page suivante"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Envoyer"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr "Editer ce champ, ou cliquez sur le numéro de champ à éditer"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Questions"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Questions"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Questions"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Type"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Longueur"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Précision numérique"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-#, fuzzy
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"Entrer les réponses possibles (si il y a lieu). Entrez\n"
-"<tt>!other</tt> tel quel sur une ligne pour créér une réponse\n"
-"en saisie libre à la fin de la question\n"
-"Toutes les lignes vides seront supprimées"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Ajouter une autre ligne de réponse"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Merci de sélectionner un groupe"
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Privée"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Accès à l'étude"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Ceci vous permet de contrôler l'accès à l'étude.\n"
-"L'étude publique permet à chacun de répondre.\n"
-"L'étude privée est réservée à un groupe de personnes authorisé."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Note"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-#, fuzzy
-msgid "You must use %s when using private surveys."
-msgstr "quand vous utilisez des études privées"
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Groupe"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Max Responses"
-msgstr "Réponse"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Supprimer"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Ajout"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Rendre public"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Rendre privée"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "pour accèder à ce formulaire"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "pour accèder à ce groupe"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Je ne peux pas éffacer ce compte"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Nom d'utilisateur, mot de passe et groupe sont obligatoires"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Erreur lors de l'ajout d'un compte"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Impossible de changer les données du compte"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Compte introuvable"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Administration des comptes des créateurs"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Nom d'utilisateur"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Mot de passe"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Prénom"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Nom"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Expiration"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "année"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "mois"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "jour"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Désactivé"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Mise à jour"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Annuler"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Effacer"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Concevoir des études"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Changer le statut d'une étude"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Active/Terminée"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Exporter les données d'une étude"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Editeur de groupe"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "peut éditer <b>toutes</b> les questions appartenants à ce groupe"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Ajouter un nouvel utilisateur"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Administrer les personnes étudiées"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Administration des comptes des personnes étudiées"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "pour accéder à cette étude"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Erreur lors de la copie de l'étude"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Copier l'étude"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-#, fuzzy
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Choississez l'étude à copier. La copie aura le même statut qu'une étude\n"
-"nouvellement créée. Vous pourrez l'éditer, et devrez l'activer avant\n"
-"de pourvoir l'utiliser."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Statut"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Archivée"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Terminée"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Active"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "En test"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "En édition"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-#, fuzzy
-msgid "Error cross-tabulating."
-msgstr "Choississez une fonction"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Gérer le formulaire web des créateurs d'études"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Cliquez sur un utilisateur pour l'éditer, ou sur 'ajouter un nouvel "
-"utilisateur'"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "désactivée"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Ajouter un nouvel utilisateur"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-#, fuzzy
-msgid "Invalid survey ID."
-msgstr "Argument invalide."
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Editer une étude"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Choississez une étude à éditer"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Exporter les données"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Format"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "Télécharger"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "étude en test"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-#, fuzzy
-msgid "The PHP dBase Extension is not installed."
-msgstr "PHP: module dBase non installé"
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "étude exportée sous:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Erreur lors de l'export de l'étude sous:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Erreur lors de l'ajout d'un groupe"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Erreur lors de la suppression du groupe"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Le groupe n'est pas vide"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Gérer les groupes"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Description"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Membres"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "Manuel utilisateur introuvable."
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Se reconnecter"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Super-utilisateur"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Créer une nouvelle étude"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Editer une étude existante"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Tester une étude"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Copier une étude existante"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Purger les études"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Changer le statut d'une étude"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(activée/terminée/supprimée)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Modifier l'accès d'une étude"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Limiter les personnes sondées"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Voir les résultats de l'étude"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "Fusionner les résultats des études"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Voir le compte-rendu de l'étude"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Réponse"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Changer votre mot de passe"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Administration des comptes des personnes enquêtées"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Gérer les comptes créateurs"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "Voir la liste des choses restantes à faire"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(objectifs de développement)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "Voir le guide de l'utilisateur &amp; administrateur"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Cliquez ici pour ouvrir la fenêtre d'aide"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Se déconnecter"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Fusionner les résultats des études"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "Choissiissez les études à fusionner"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Liste des études"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "études à fusionner"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Changer le mot de passe"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Votre mot de passe a été changé avec succès"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Mot de passe inchangé, contrôler votre ancien mot de passe"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "Le nouveau mot de passe ne correspond pas ou est vide"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Ancien mot de passe"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Nouveau mot de passe"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Confirmer le nouveau mot de passe"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Seul les administrateurs sont autorisés"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Purger les études"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Cette page ne fait pas partie du menu principal, car elle est dangereuse.\n"
-"Elle efface <b>complètement</b> et définitivement l'étude de la base de "
-"données.\n"
-"Toutes les questions, informations générales, résultats, etc... sont "
-"détruits de\n"
-"la base de données. Ne faites rien ici dont vous ne soyez parfaitement "
-"certain\n"
-"Il n'y a pas de confirmation, il n'y a pas de retour possible."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "# Qs"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Remise à zéro des cases à cocher"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "README introuvable"
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Retour au menu compte-rendu "
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Voir le compte-rendu de l'étude"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Choisissez un formulaire à visionner"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Ajouter une nouvelle personne enquêtée"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-#, fuzzy
-msgid "Bulk Upload Respondents"
-msgstr "Ajouter une nouvelle personne enquêtée"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "Purger les études"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Cette page ne fait pas partie du menu principal, car elle est dangereuse.\n"
-"Elle efface <b>complètement</b> et définitivement l'étude de la base de "
-"données.\n"
-"Toutes les questions, informations générales, résultats, etc... sont "
-"détruits de\n"
-"la base de données. Ne faites rien ici dont vous ne soyez parfaitement "
-"certain\n"
-"Il n'y a pas de confirmation, il n'y a pas de retour possible."
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-#, fuzzy
-msgid "Cross Tabulation"
-msgstr "Choississez une fonction"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Tester l'étude"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-#, fuzzy
-msgid "Reset"
-msgstr "Réponse"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Voir les résultats de l'étude"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Choisissez l'étude à consulter"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Choisissez l'étude à tester"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "Réponse"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-#, fuzzy
-msgid "Resp"
-msgstr "Réponse"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Impossible de modifier les statuts des études."
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Statut de l'étude"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Test</b> passe l'étude dans le mode de test. A ce point vous pouvez "
-"faire\n"
-"un test grandeur nature en y répondant, et voir les résultats. Vous ne "
-"pourrez\n"
-"plus faire de modifications tant que vous êtes en mode de test."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-#, fuzzy
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Activer</b> passe l'étude en mode actif. Dans ce mode, l'étude\n"
-" est opérationnelle pour l'usage en production, et peut être mise en ligne. "
-"Ceci éfface\n"
-"tous les résultats de mode de test (s'il y a lieu). Plus aucune édition de "
-"l'étude\n"
-"n'est permise."
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Terminer</b> passe l'étude en mode terminée. Dans ce mode, plus aucune "
-"édition\n"
-"n'est possible, plus aucun utilisateur ne peut répondre (l'étude est "
-"désactivé),mais\n"
-"les résultats sont toujours visibles à partir du menu résultats."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Archiver</b> supprime l'étude. Elle est toujours stockée dans la base de "
-"données,\n"
-"mais plus aucune interaction n'est possible. Vous ne pouvez pas voir les "
-"résultats.\n"
-"d'une étude archivée."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Test"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Activer"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Terminer"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Archiver"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Editer"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Aide"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Appuyer sur 'Annuler' pour annuler cette étude ou 'continuer' pour passer à "
-"l'onglet suivant"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"Le titre de l'étude et les autres champs généraux font parties de l'onglet "
-"<b>Général</b>\n"
-"Les questions sont ajoutées ou modifiées une à une dans l'onglet "
-"<b>question</b>.\n"
-"Les questions peuvent être réordonnées ou effacées dans l'onglet <b>Order</"
-"b>.\n"
-"Vous pouvez prévisualiser votre étude dans l'onglet Aperçu.\n"
-"Si vous n'avez plus de changements, cliquez sur <b>Terminer</b> pour "
-"retourner\n"
-"à l'interface d'administration."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Voir les résultats"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Choisissez l'étude à tester"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Exporter"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Résultats"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "liste Todo non trouvée"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-#, fuzzy
-msgid "Upload Account Information"
-msgstr "Administration des comptes des personnes étudiées"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-#, fuzzy
-msgid "All fields are required"
-msgstr "sont obligatoires"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-#, fuzzy
-msgid "File Type"
-msgstr "Type"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-#, fuzzy
-msgid "File to upload"
-msgstr "Impossible de charger les ACLs"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr "Vous avez écrit un code incorrect. Veuillez compléter le code correct."
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "Erreur lors du traitement de l'étude: étude non spécificiée."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Vous avez déjà répondu à cette étude."
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Erreur lors du traitement de l'étude: L'étude n'est pas activée"
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr "Veuillez compléter le code montré ici."
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr "Désolée, la forme de demande de compte est disablée."
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr "Veuillez accomplir tous les champs requis."
-#
-# File: phpESP/public/signup.php, line: 72
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "Le nouveau mot de passe ne correspond pas ou est vide"
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr "La demande a échoué, choisissez un username différent."
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr "Votre compte, %s, a été crée."
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-#, fuzzy
-msgid "Confirm Password"
-msgstr "Confirmer le nouveau mot de passe"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr "Pas d'onglets définis. Merci de vérifier vos paramètres INI."
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "Général"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Questions"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Ordre"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Apercu"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Fin"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Page"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "sur"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "Désolé, ce nom est déjà utilisé"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Champ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Nom du champ"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-#~ msgid "DBF download not yet implemented."
-#~ msgstr "Téléchargement DBF pas encore effectué"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "Choississez une fonction"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Exporter les données en CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Erreur!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Vous devez sélectionner au moins deux études!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Administrer les membres du groupe"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "Pas d'Etude spécifiée"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "Total"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "are required."
-#~ msgstr "sont obligatoires"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Incorrect User ID or Password, or your account has been disabled."
-#~ msgstr "ID utilisateur, mot de passe, ou votre compte a été désactivé."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "free-form"
-#~ msgstr "formulaire libre"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "ie. instructions, informations complémentaires, etc."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Required?"
-#~ msgstr "Obligatoire?"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "You must use"
-#~ msgstr "Vous devez utilisez"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to access this menu"
-#~ msgstr "pour accéder à ce menu"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Purge"
-#~ msgstr "Purge"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "STATUT"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to design forms"
-#~ msgstr "pour créer le formulaire"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#, fuzzy
-#~ msgid "Survey Theme"
-#~ msgstr "Nom du fichier de l'étude."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "En-tête de la confirmation"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Body text on the &quot;Confirmation&quot; page. This is displayed below "
-#~ "the Confirmation Heading."
-#~ msgstr ""
-#~ "Corps de texte sur la page de 'confirmation'. Apparait en dessous de l'en-"
-#~ "tête."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Max Logins"
-#~ msgstr "Max de Logins"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Response from survey:"
-#~ msgstr "Réponse de l'étude:"
Index: locale/de_DE/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/de_DE/LC_MESSAGES/messages.po
===================================================================
--- locale/de_DE/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/de_DE/LC_MESSAGES/messages.po	(working copy)
@@ -1,2578 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.8 2007/12/10 10:50:34 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-02-18 13:29-0500\n"
-"Last-Translator: Robert <HEConsulting@t-online.de>\n"
-"Language-Team: de_DE <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Include Datei konnte nicht ge&ouml;ffnet werden. Bitte die INI pr&uuml;fen, "
-"Abbruch"
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Include Datei konnte nicht ge&ouml;ffnet werden. Bitte die INI pr&uuml;fen, "
-"Abbruch"
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Service nicht verf&uuml;gbar"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr "Keine TABS definiert. Bitte die INI pr&uuml;fen"
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-"Ihr aktueller Stand wurde gespeichert. Sie k&ouml;nnen die Umfrage\n"
-"jederzeit vervollst&auml;ndigen. F&uuml;gen Sie hierzu den folgenden\n"
-"Link zu Ihren Favoriten hinzu. Zur Fortf&uuml;hrung der Umfrage\n"
-"werden Sie nach Namen und Passwort gefragt."
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-msgid "Resume survey"
-msgstr "Umfrage fortsetzen"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Ja"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Nein"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "K.A."
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "kopie"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Ung&uuml;ltiges Argument"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Fehler beim &Ouml;ffnen der Umfrage"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Fehler beim &Ouml;ffnen der Umfragen"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Keine Antworten gefunden"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "Gesamt"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Keine Fragen gefunden"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr "Seite %d von %d"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-msgid "Questions marked with a %s are required."
-msgstr "Mit %s gekennzeichnete Fragen sind erforderlich."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr ""
-"Stop! Sie m&uuml;ssen den TYP dieser Frage angeben. (z.B: Checkbox, Text ..)"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "Fehler! System-Tabelle fehlerhaft"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Tabelle"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Bericht f&uuml;r"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "erford."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "&ouml;ffentlich"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Inhalt"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-msgid "Previous"
-msgstr "Vorherige"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-msgid "Next"
-msgstr "N&auml;chste"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Fehler bei der Kreuzanalyse. Fragen habe ung&uuml;ltigen Typ"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "Kreuzanalyse der QID"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr ""
-"Stop! Bitte f&uuml;llen Sie Namen, Gruppe und Titel aus bevor Sie fortfahren."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Stop! Name existiert bereits. Bitte einen anderen w&auml;hlen"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Stop! Dieser Name wird schon benutzt"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Warnung, ein Fehler ist aufgetreten."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Bitte geben Sie einen Text f&uuml;r diese Frage ein."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr ""
-"Stop! Sie m&uuml;ssen den TYP dieser Frage angeben. (z.B: Checkbox, Text ..)"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Neue Frage"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"Stop! Sie k&ouml;nnen f&uuml;r den TYP dieser Frage nicht &auml;ndern. "
-"Erstellen Sie eine weitere Frage."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-"Stop! Mindestens eine Antwort muss f&uuml;r diese Frage angegeben werden."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Bitte geben Sie einen Text f&uuml;r diese Frage ein."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Fehler beim ausf&uuml;hren der Umfrage: Sicherheitsverletzung!"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Zugriffsanfrage kann nicht ausgef&uuml;hrt werden."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Benutzeranfrage kann nicht ausgef&uuml;hrt werden."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Keine Zugriffsberechtigung"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"Benutzer ID oder Password falsch. Oder Account wurde deaktiviert/abgelaufen"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr ""
-"Der Account wurde deaktiviert oder die Umfrage wurde schon einmal get&auml;"
-"tigt."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "ACL kann nicht geladen werden."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Hauptmen&uuml;"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Sie habe nicht die erforderlichen Rechte um fortfahren zu k&ouml;nnen"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "zum Hauptmen&uuml;"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "Sie habe nicht die erforderlichen Rechte um fortfahren zu k&ouml;nnen"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-msgid "Submit"
-msgstr "Absenden"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Rank"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Antwort/en"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Durchschnitt"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Folgende ERFORDERLICHEN Angaben fehlen"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Bitte geben Sie einen Text f&uuml;r diese Frage ein."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Ergebnisse"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr "oder"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "----- Bereichs-Umbruch -----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "Umfragedesign fertiggestellt"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Sie haben die Umfrage fertiggestellt"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Um diese Umfrage online stellen zu k&ouml;nnen, kopieren Sie\n"
-"den folgenden Text in Ihre HTML Seite."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"Nach Aktivierung kann die Umfrage direkt &uuml;ber folgenden\n"
-"URL erreicht werden:"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Die Umfrage muss <u>aktiviert</u> werden, um Daten zu erfassen\n"
-"Nach der Aktivierung kann die Umfrage nicht mehr bearbeitet werden.\n"
-"Zum Aktivieren der Umfrage rufen Sie ensprechenden Link im Hauptmen&uuml; "
-"auf."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"Die Information an dieser Stelle wirkt sich auf die ganze Umfrage aus.F&uuml;"
-"llen Sie m&ouml;glichst alles an diese Stelle aus und gehen anschliessend "
-"zum Bereich  &quot;Felder&quot; um Ihre individuellen Fragen zu erstellen / "
-"bearbeiten."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Name"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-msgid "Required"
-msgstr "Erforderlich"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Dateiname der Umfrage"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Dies ist wichtig f&uuml;r alle weiteren Zugriffe auf diese Umfrage"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "keine Leerzeichen"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "NUR Alpha- Nummerisch"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Besitzer"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "Gruppe die dieser Umfrage angeh&ouml;ren soll."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Titel"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "Titel der Umfrage"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-msgid "This appears at the top of every page of this survey."
-msgstr "Dies erscheint am Anfang jeder Seite der Umfrage."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "free-form, including spaces"
-msgstr "Freitext, Leerzeichen m&ouml;glich"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Untertitel"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "Untertitel der Umfrage"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Erscheint unterhalb des Titels."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Zus&auml;tzliche Information, Beschreibung"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr ""
-"Text wird vor den Fragen als Einleitung erscheinen\n"
-"(z.B. Anweisungen, Hintergrundinformationen etc.)."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-msgid "Confirmation Page"
-msgstr "Best&auml;tigungsseite"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr "(URL)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr "URL, zu der der Befragte nach Beendigung der Umfrage geleitet wird."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr "Titel"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr "Text"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"Titel (fett) und Text werden nach Beendigung des Fragebogens angezeigt."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr "(URL, falls angegeben hat Vorrang vor dem manuellen Text)."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "Email"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Kopie einer der einzelnen Eing&auml;nge per Email versenden (leer lassen um "
-"keine Email zu erhalten)."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr "Design"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr "W&auml;hlen Sie ein Design (css) f&uuml;r diese Umfrage."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-msgid "Options"
-msgstr "Optionen"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-"Speichern/Fortsetzen der Umfrage erlauben (Umfrage Login erforderlich)."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr "Vor- und R&uuml;ckbl&auml;ttern in der Umfrage erlauben."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Ändern Sie die Reihenfolge der Fragen durch Auswahl\n"
-"der entsprechenden Position."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Bereichs-Umbruch hinzuf&uuml;gen"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Dies ist eine Vorschau der Umfrage. Die Funktionen &quot;Vorw&auml;"
-"rts&quot;\n"
-"und &quot;Absenden&quot; sind deaktiviert. Hintergrundfarben entsprechen "
-"nach Aktivierung der Umfrage den Angaben im\n"
-"Template. Wenn sie keine weiteren &Auml;nderungen vornehmen m&ouml;chten,"
-"klicken sie auf. <b>Fertig</b>"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Bereich"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr "Zur&uuml;ck"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr "Speichern"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Vorw&auml;rts"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Absenden"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-"Dieses Feld Bearbeiten oder die Feld-Nummer anklicken die bearbeitet werden "
-"soll."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Fragen"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Fragen"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Fragen"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Typ"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "L&auml;nge (breite)"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Genauigkeit (z.B. Zeilen, K.A.)"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-#, fuzzy
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"Geben Sie m&ouml;gliche Antworten ein (sofern anwendbar). Bei klickbaren/"
-"auw&auml;hlbaren \n"
-"Antworten k&ouml;nnen sie foldendes Zeichenfolge <tt>!other</tt> verwenden "
-"um ein extra \n"
-"Eingabefeld zu erstellen (!other steht f&uuml;r: Anderes). Leerzeichen in "
-"Leeren Feldern \n"
-"werden ignoriert und unterdr&uuml;ckt."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Eine weitere Zeile hinzuf&uuml;gen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Bitte eine Gruppe ausw&auml;hlen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Privat"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Zugangsart der Umfragen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Hier k&ouml;nnen Sie einstellen WER an Ihren \n"
-"Umfragen teilnehmen darf. Private Umfragen sind nur \n"
-"mit Gruppenberechtigungen des Benutzers zu erreichen."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Anmerkung"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-#, fuzzy
-msgid "You must use %s when using private surveys."
-msgstr "wenn &quot;Private Umfrage&quot; verwendet werden"
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Gruppe"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-msgid "Max Responses"
-msgstr "Max. Antworten"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr "Speichern/Wiederherstellen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr "R&uuml;ckw&auml;rts/Vorw&auml;rts"
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "l&ouml;schen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Hinzuf&uuml;gen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "&ouml;ffentlich machen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "privat machen"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "um dieses Formular zu erreichen"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "die Gruppe zu erreichen"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Account kann nicht gel&ouml;scht werden."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Benutzername, Passwort und Gruppe sind erforderlich."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Fehler beim Hinzuf&uuml;gen des Accounts"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Daten des Accounts k&ouml;nnen nicht ge&auml;ndert werden."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Account wurde nicht gefunden"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Designer Zugang administrieren"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Benutzername"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Passwort"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Vorname"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Nachname"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Verfallsdatum"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "Jahr"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "Monat"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "Tag"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "deaktiviert"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "aktualisieren"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Abbruch"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "l&ouml;schen"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Umfrage erstellen"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Umfrage Status &auml;ndern"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Aktivieren/Ende"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Umfragedaten exportieren"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Gruppen Editor"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "editiert <b>alle</b> Fragebogen dieser Gruppe"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Neuen Designer hinzuf&uuml;gen"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Mitglieder f&uuml;r Benutzer"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Benutzer hinzuf&uuml;gen/ bearbeiten"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "um diese Umfrage zu erreichen"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Fehler beim Kopieren der Umfrage"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Umfragen kopieren"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"W&auml;hle eine Umfrage, die kopiert werden soll. Die kopierte Umfrage hat \n"
-"den Status einer neu erstellten Umfrage. Sie k&ouml;nnen die Kopie "
-"bearbeiten, \n"
-"<u>Rechte verteilen!</u> und sie muss aktiviert werden bevor sie eingesetzt "
-"werden kann."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Status"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Archiviert"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Beendet"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Aktiv"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Test-Modus"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "in Bearbeitung"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-#, fuzzy
-msgid "Error cross-tabulating."
-msgstr "W&auml;hle eine Funktion"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-"Achten Sie darauf, dass Spalten- und Zeilenauswahl unterschiedlich sind."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr "Treffen Sie sowohl eine Spalten- als auch Zeilenauswahl."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr "Gleichzeitige Kreuzanalyse und Tabellierung nicht m&ouml;glich."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Designer Accounts administrieren"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Kicke auf den Benutzernamen um ihn zu bearbeiten oder auf <b>Neuen Benutzer "
-"hinzuf&uuml;gen</b> (siehe unten)"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "deaktiviert"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Neuen Designer hinzuf&uuml;gen"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr "Bulk Hochladen Designer"
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-#, fuzzy
-msgid "Invalid survey ID."
-msgstr "Ung&uuml;ltiges Argument"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Umfrage bearbeiten"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "W&auml;hle eine Umfrage zur Bearbeitung"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Daten exportieren"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Format"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "Download"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Umfrage testen"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-#, fuzzy
-msgid "The PHP dBase Extension is not installed."
-msgstr "PHP: dBase Module ist nicht installiert"
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Umfrage wurde exportiert nach:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Fehler beim Exportieren nach:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Fehler beim hinzuf&uuml;gen der Gruppe."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Fehler beim l&ouml;schen der Gruppe."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Die Gruppe ist nicht leer."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Gruppen Bearbeiten"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Beschreibung"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Mitglieder"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "Handbuch wurde nicht gefunden"
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Wieder Anmelden"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Superuser"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Umfrage erstellen"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Umfrage bearbeiten"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Umfrage testen "
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Umfrage kopieren"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Umfragen komplett l&ouml;schen"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Status einer Umfrage &auml;ndern"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(Aktiv/Ende/Archiv)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Umfragezugriff &auml;ndern"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Benutzerrechte f&uuml;r Umfragen."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Ergebnisse einer Umfrage ansehen"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "Ergebnisse von Umfragen zusammenf&uuml;gen"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Umfrage-Report ansehen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Max. Antworten"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Passwort &auml;ndern"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Benutzer bearbeiten"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Designer bearbeiten"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "TODO Liste aller Dinge die an diesem System"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(Ziele der Entwicklung)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "Benutzer & Administrations Handbuch"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Hier klicken um das Hilfe-Fenster zu &ouml;ffnen."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Abmelden"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Ergebnisse von Umfragen zusammenf&uuml;gen"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "W&auml;hle die Umfragen die zusammen gef&uuml;gt werden sollen"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Liste der Umfragen"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "Umfragen f&uuml;r die Zusammenstellung"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Passwort &auml;ndern"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Ihr Passwort wurde erfolgreich ge&auml;ndert"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr ""
-"Passwort wurde nicht gesetzt. Bitte das alte Passwort &uuml;berpr&uuml;fen"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "Die neuen Passw&ouml;rter stimmen nicht &uuml;berein."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Altes Passwort"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Neues Passwort"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Neues Passwort best&auml;tigen"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Nur SuperUser sind erlaubt"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Umfragen komplett l&ouml;schen"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Diese Seite ist nicht &uuml;ber das Hauptmen&uuml; zu erreichen,\n"
-"da es gef&auml;hrlich sein kann wenn Daten versehentlich abhanden kommen.\n"
-"ACHTUNG: Nach dem L&ouml;schen gibt es <b>kein</b> zur&uuml;ck mehr!!!\n"
-"Gehen Sie lieber zur&uuml;ck wenn Sie sich nicht 100%ig sicher sind."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "# Q's"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Checkboxen leeren"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "LIES MICH (README) Datei wurde nicht gefunden"
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Zur&uuml;ck zum Report"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Formular Report"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "W&auml;hle anzuzeigende Umfrage"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Neuen Teilnehmer hinzuf&uuml;gen"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-msgid "Bulk Upload Respondents"
-msgstr "Bulk Hochladen Teilnehmer"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "Umfragen komplett l&ouml;schen"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Diese Seite ist nicht &uuml;ber das Hauptmen&uuml; zu erreichen,\n"
-"da es gef&auml;hrlich sein kann wenn Daten versehentlich abhanden kommen.\n"
-"ACHTUNG: Nach dem L&ouml;schen gibt es <b>kein</b> zur&uuml;ck mehr!!!\n"
-"Gehen Sie lieber zur&uuml;ck wenn Sie sich nicht 100%ig sicher sind."
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-msgid "Cross Tabulation"
-msgstr "Kreuztabellierung"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Umfrage testen"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-msgid "Reset"
-msgstr "Reset"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr "Kreuztabellierung"
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Umfrage-Ergebnisse"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "W&auml;hle anzuzeigende Umfrage"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Umfragen testen."
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "Antwort/en"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-#, fuzzy
-msgid "Resp"
-msgstr "Antwort/en"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Kann den Umfage-Status nicht setzen"
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Umfrage Status"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Test</b>: Versetzen Sie Ihre Umfrage in den <b>Test-Modus</b>.  \n"
-"In diesem Modus k&ouml;nnen Sie die Umfrage nur noch testen oder die "
-"Ergebnisse \n"
-"ansehen! &Auml;nderungen an den Fragen sind in diesem Modus nicht m&ouml;"
-"glich."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-#, fuzzy
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Aktivieren</b> Sie Ihre Umfrage. In diesem Modus k&ouml;nnen nun andere "
-"an an dieser Umfrage \n"
-"teilnehmen (Z.B. im Internet). Bei Aktivierung werden alle Ergebnisse "
-"(sofern vorhanden) \n"
-"die durch den Test-Modus enstanden sind gel&ouml;scht! WICHTIG! die Umfrage "
-"kann r&uuml;ckwirkend \n"
-"nicht mehr bearbeitet oder in den Bearbeitungs-Modus geschaltet werden!!!"
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Ende</b>: Die Umfrage wird beendet. Eine Teilnahme ist nicht mehr m&ouml;"
-"glich.\n"
-"Die Ergebnisse sind aber dennoch &uuml;ber das Admin-Men&uuml; einsehbar. "
-"Bearbeitung oder Re-Aktivierung sind \n"
-"nicht mehr m&ouml;glich."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Archivieren</b>: Hiermit wird die Umfrage aus diesem Men&uuml; und dem "
-"Sytem \n"
-"entfernt. Die Informationen und Ergebnisse bleiben dennoch in der "
-"Datenbank \n"
-"gespeichert, sind aber nur mit gr&ouml;&szlig;erem Aufwand wieder "
-"herstellbar."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Test"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Aktivieren"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Ende"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Archivieren"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Bearbeiten"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Hilfe"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Abbrechen beendet die Umfrage, Fortfahren f&uuml;hrt um zum n&auml;chsten "
-"Schritt."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"Titel der Umfrage und allgemeine/ generelle Informationen sind unter "
-"<b>Allgemein</b> zu finden\n"
-"Individuelle Inhalte der Umfragen k&ouml;nnen im Bereich <b>Fragen</b> "
-"erstellt und bearbeitet werden\n"
-"Die Reihenfolge und Auswahl der Fragen kann im Berreich <b>Reihenfolge</b> "
-"bearbeitet werden.\n"
-"Eine Vor-Ansicht der Umfrage kann man im Berreich <b>Vorschau</b> "
-"erhalten. \n"
-"Wenn keine weiteren &Auml;nderungen gemacht werden m&uuml;ssen klicken Sie "
-"auf <b>Fertig</b> und von dort aus ins zur&uuml;ck ins Haupt Men&uuml;."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Ergebnisse ansehen"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Umfrage testen."
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Exportieren"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Ergebnisse"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "TODO Liste wurde nicht gefunden."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-"Ein Fehler ist beim Upload aufgetreten. Fehlgeschlagene Zeilen sind unten "
-"aufgef&uuml;hrt."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-"Fehler beim Upload. Bitte &uuml;berpr&uuml;fen Sie das Format Ihrer "
-"Textdatei."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr "Fehler beim Upload. Bitte f&uuml;llen Sie alle Formularfelder aus."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-#, fuzzy
-msgid "Upload Account Information"
-msgstr "Benutzer hinzuf&uuml;gen/ bearbeiten"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-#, fuzzy
-msgid "All fields are required"
-msgstr " markiert sind m&uuml;ssen beantwortet werden"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-msgid "File Type"
-msgstr "Dateityp"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr "TAB begrenzt"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-msgid "File to upload"
-msgstr "hochzuladende Datei"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr "Vielen Dank f&uuml;r die Teilnahme an dieser Befragung."
-#
-# File: phpESP/admin/phpESP.ini.php, line: 176
-#, fuzzy
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-"Bitte verwenden Sie nicht die Schaltfl&auml;che Zur&uuml;ck im "
-"BrowserKlicken Sie auf den folgenden Link um Sie zuruckzubringen."
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-"Bitte &uuml;berpr&uuml;fen Sie %s um sicherzustellen, dass alle Pfadangaben "
-"richtig sind."
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr "%%%% Gettext Test fehlgeschlagen"
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr ""
-"Fehler beim Ausf&uuml;hren der Umfrage: Umfrage wurde nicht spezifiziert"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Sie haben die Umfrage fertiggestellt"
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Fehler beim Ausf&uuml;hren der Umfrage: Umfrage ist nicht aktiviert."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr "Der angefragte Zugang wurde deaktiviert."
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr "Bitte vervollst&auml;ndigen Sie alle erforderlichen Felder."
-#
-# File: phpESP/public/signup.php, line: 72
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "Die neuen Passw&ouml;rter stimmen nicht &uuml;berein."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-"Anfrage fehlgeschlagen, bitte w&auml;hlen Sie einen anderen Benutzernamen"
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr "Ihr Zugang %s wurde eingerichtet"
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr "Zugangs Formular"
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr "Items mit %s sind erforderlich."
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr "Email Adresse"
-#
-# File: phpESP/public/signup.php, line: 157
-msgid "Confirm Password"
-msgstr "Passwort best&auml;tigen"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr "Keine TABS definiert. Bitte die INI pr&uuml;fen"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "Allgemein"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Fragen"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Reihenfolge"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Vorschau"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Fertig"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Seite"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "von"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "Stop! Dieser Name wird schon benutzt"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Feld"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Feldname"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-#~ msgid "DBF download not yet implemented."
-#~ msgstr "DBF Download noch nicht implementiert."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "W&auml;hle eine Funktion"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Daten nach CVS exportieren"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Fehler!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Mind. zwei Umfragen m&uuml;ssen gew&auml;lt werden!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Error cross-tabulating. Please ensure that your column\n"
-#~ "                                             and row selections are not "
-#~ "of the same question."
-#~ msgstr ""
-#~ "Fehler bei der Kreuztabellierung. Stellen Sie sicher, dass Spalten-\n"
-#~ "und Zeilenauswahl nicht aus der gleichen Frage stammen."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Error cross-tabulating. Please ensure you make both\n"
-#~ "                                     a column and row selection."
-#~ msgstr ""
-#~ "Fehler bei der Kreuztabellierung. Stellen Sie sicher, dass sowohl\n"
-#~ "                            Spalten und Zeilen ausgew&auml;hlt wurden."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Error cross-tabulating. You are attempting to cross analyse\n"
-#~ "                             and tabulate at the same time. This is not "
-#~ "possible!"
-#~ msgstr ""
-#~ "Fehler bei der Kreuztabellierung. Es ist nicht m&ouml;glich gleichzeitig\n"
-#~ "                                  zu analysieren und tabellieren."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Mitglieder f&uuml;r Gruppen administrieren"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "Keine Umfrage ausgew&auml;hlt"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "Gesamt"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "are required."
-#~ msgstr " markiert sind m&uuml;ssen beantwortet werden"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Incorrect User ID or Password, or your account has been disabled."
-#~ msgstr "Benutzer ID oder Password falsch. Oder Account wurde deaktiviert"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "free-form"
-#~ msgstr "Freies Format"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "z.B. Anweisungen, Hintergrundinformeationen etc."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Required?"
-#~ msgstr "Erforderlich?"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "You must use"
-#~ msgstr "Muss benutzt werden"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to access this menu"
-#~ msgstr "um dieses Men&uuml; zu erreichen"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Purge"
-#~ msgstr "l&ouml;schen"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "STATUS"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to design forms"
-#~ msgstr "um Formulare zu erstellen"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "Best&auml;tigungs- Kopfzeile"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Body text on the &quot;Confirmation&quot; page. This is displayed below "
-#~ "the Confirmation Heading."
-#~ msgstr ""
-#~ "Informationstext der unter der Best&auml;tigungs- Kopfzeile vorhanden "
-#~ "sein kann"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Max Logins"
-#~ msgstr "Max. Logins"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Response from survey:"
-#~ msgstr "Antwort der Umfrage"
Index: locale/da_DK/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/da_DK/LC_MESSAGES/messages.po
===================================================================
--- locale/da_DK/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/da_DK/LC_MESSAGES/messages.po	(working copy)
@@ -1,2497 +0,0 @@
-# phpESP.
-# By: James Flemer
-# <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.7 2007/12/10 10:50:34 liedekef Exp $
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-03-22 16:40-0500\n"
-"Last-Translator: Henrik <henrik@hornhaver.dk>\n"
-"Language-Team: da_DK <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Ikke i stand til at åbne include fil. Kontroller INI opsætning. Afslutter"
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Ikke i stand til at åbne include fil. Kontroller INI opsætning. Afslutter"
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Service ikke tilgængelig"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr "Ingen faneblade defineret. Kontroller venligst INI opsætning."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Resume survey"
-msgstr "Test survey"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Ja"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Nej"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "N/A"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "kopiering"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "forkert argument."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Fejl ved åbnim af survey"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Fejl ved åbning af survey."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Ingensvar fundet"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "TOTAL"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Ingen spørgsmål fundet"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-#, fuzzy
-msgid "Questions marked with a %s are required."
-msgstr "Spørgsmål mærket med en"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "Desværre, du skal vælge en type for dette spørgsmål."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "Fejl, system tabel er ødelagt."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Tabel"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Rapport for"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "Nr."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Ønsket"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Offentlig"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Indhold"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-#, fuzzy
-msgid "Previous"
-msgstr "Vis"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-#, fuzzy
-msgid "Next"
-msgstr "Næste side"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Fejl ved kryds-analyse. Spørgsmål er ikke af korrekt type."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "Kryds-analyse på QID"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Desværre, udfyld navn, gruppe og titel før du fortsætter."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Desværre, navnet er allerede i brug. Anvend et andet navn"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Desværre, navnet er allerede i brug."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Advarlsel, der er opstået en fejl."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Indtast venligst tekst til dette spørgsmål."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Desværre, du skal vælge en type for dette spørgsmål."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Nyt felt"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"Desværre, du kan ikke ændre type på spørgsmål . Opret et nyt spørgsmål med "
-"anden type i stedet."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr "Desværre, der skal være mindst et svar til denne type spørgsmål."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Indtast venligst tekst til dette spørgsmål."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Fejl ved afvikling af survey: Survey blokering"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Ikke i stand til at give adgang"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Ikke i stand til at åbne for brugere."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Uautoriseret"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"Forkert bruger ID eller adgangskode - eller din konto er spærret/udløbet."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr ""
-"Din konto er blevet spærret eller du har allerede gennemgået denne survey."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "Ikke i stand til at hente ACL"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Administrator side"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Denne konto har ikke tilladelse"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Retur til administrator side"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "Denne konto har ikke tilladelse"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-#, fuzzy
-msgid "Submit"
-msgstr "Undertitel"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Rang"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Response"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Gennemsnits rang"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Du har glemt følgende obligatoriske spørgsmål:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Indtast venligst tekst til dette spørgsmål."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Resultater"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "---- Side skift ----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Du har færdiggjort denne surveys design"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"For at indsætte denne survey på din webside, \n"
-"skal du kopiere teksten herunder og indsætte den i \n"
-"HTML koden på din side"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-#, fuzzy
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Du skal aktivere denne survey før du kan indsamle \n"
-"resultater. Når først en survey er aktiv, kan du ikke \n"
-"længere redigere den. Du kan aktivere survey ved at vælge \n"
-"<b>Skift status</b> på en eksisterende survey fra Administrator siden."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"Informationerne under dette faneblad gælder hele din survey.\n"
-"Udfyld denne side og gå til <b>Felter</b> for at \n"
-"redigere enkelte felter."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Navn"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-#, fuzzy
-msgid "Required"
-msgstr "Obligatorisk?"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Survey filnavn"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Denne bruges for al yderligere adgang til denne survey."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "ingen mellemrum"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "kun alfa-numerisk"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Ejer"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "Gruppe, der ejer denne survey."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Titel"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "Titel på survey"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-#, fuzzy
-msgid "This appears at the top of every page of this survey."
-msgstr "Dette optræder i toppen af alle sider i denne survey."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-#, fuzzy
-msgid "free-form, including spaces"
-msgstr "inklusive mellemrum"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Undertitel"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "Surveys undertitel."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Optræder under titlen."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Yderligere information"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-#, fuzzy
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "Tekst, der skal vises i survey før andre felter."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-#, fuzzy
-msgid "Confirmation Page"
-msgstr "Bekræftelses tekst"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-#, fuzzy
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"Heading på &quot;Bekræftelses&quot; side (optræder efter en bruger har "
-"fuldført en survey). Denne tekst vises i <b>fed</b>."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "Email"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-#, fuzzy
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr "Send en kopi af alle bekræftede surveys til adressen (eller "
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-#, fuzzy
-msgid "Options"
-msgstr "Spørgsmål"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Ret på spørgsmålenes rækkefølge\n"
-"ved at vælge ønsket postion fra listen."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Tilføj sideskift"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Dette viser hvordan den færdige survey vil se ud\n"
-"Vis er &quot;Next Page&quot; and \n"
-"&quot;Submit Survey&quot; deaktiveret.\n"
-"Survey'en vil have samme baggrundsfarve som det dokument en placeres i. Hvis "
-"du ikke har yderligere\n"
-"rettelser, så klik på <b>Afslut</b> i bunden af denne side."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Sektion"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Næste side"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Bekræft survey"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-"Rediger dette felt eller klik på feltnummeret på dte felt du vil redigere:"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Spørgsmål"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Spørgsmål"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Spørgsmål"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Type"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Længde"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Nøjagtighed"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-#, fuzzy
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"Indtast mulige svar (hvis nogle). Indtast \n"
-"<tt>!other</tt> på en linie for sig selv hvi du vil oprette et nfill-in-the-"
-"blank svar i slutningen af dette spørgsmål.\n"
-"Alle blanke linier vil blive undertrykket."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Tilføj yderligere en svar linie"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Væl venligst en gruppe."
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Privat"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Adgang til survey"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Her kan du kontrollere adgangen til at udfylde en formular.\n"
-"Offentlige surveys tillader alle at deltage.\n"
-"Private surveys er begrænset af bruger grupper."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-#, fuzzy
-msgid "Note"
-msgstr "Nej"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-msgid "You must use %s when using private surveys."
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Gruppe"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Max Responses"
-msgstr "Response"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Fjern"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Tilføj"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Offentliggør"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Gør privat"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "for at åbne denne formular"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "adgang til denne gruppe."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Kan ikke slette konto."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Brugernavn,adgangskode og gruppe kræves."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Fejl ved oprettelse af konto. "
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Kan ikke ændre konto oplysninger."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Konto ikke fundet."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Brugernavn"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Adgangsord"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Fornavn"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Efternavn"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Udløbsdato"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "år"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "måned"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "dag"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Deaktiveret"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Opdater"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Fortryd"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Slet"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-#, fuzzy
-msgid "Design Surveys"
-msgstr "Test survey"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-#, fuzzy
-msgid "Change Survey Status"
-msgstr "Skift formular status"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Aktiver/Afslut"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-#, fuzzy
-msgid "Export Survey Data"
-msgstr "Eksporter fra data"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-#, fuzzy
-msgid "Group Editor"
-msgstr "Gruppe formular redigering"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "kan redigere <b>alle</b> formularer ejet af denne gruppe"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Tilføj en ny designer"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Administrator gruppe brugere"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Bruger konto administration"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "for at åbne denne survey"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Fejl ved kopiering af survey"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Survey kopieret"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-#, fuzzy
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Vælg en survey til kopiering. Kopien vil have samme \n"
-"status som en ny survey. Du vil kunne redigere denne kopi og du skal "
-"aktivere den før dine brugere kan få adgang."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Status"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Arkiveret"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Afsluttet"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Aktiv"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Testes"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Redigerer"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-#, fuzzy
-msgid "Error cross-tabulating."
-msgstr "Vælg en funktion"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Administrer web formular designer konti"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Klik på brugernavnet for at redigere, eller klik herunder på Tilføj ny "
-"bruger."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "deaktiveret"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Tilføj en ny designer"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-#, fuzzy
-msgid "Invalid survey ID."
-msgstr "forkert argument."
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Rediger en survey"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Vælg survey til redigering"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Eksporter data"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Formater"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 99
-# File: phpESP/admin/include/where/test.inc, line: 144
-msgid "Download"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Tester survey..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-#, fuzzy
-msgid "The PHP dBase Extension is not installed."
-msgstr "PHP: dBase modul ikke installeret"
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Survey er eksporteret som:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Fej ved eksport af survey som:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Fej ved tilføjelse af gruppe."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Fejl ved sletning af gruppe"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Administrer grupper"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Beskrivelse"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Medlemmer"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "Bruger vejledning ikke fundet"
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Log in igen"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Superbruger"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-#, fuzzy
-msgid "Create a New Survey"
-msgstr "Opret en survey"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Rediger en bestående survey"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Test en survey"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Kopier en bestående survey"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Purge surveys"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Ret status på en survey"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(aktiver/afslut/slet)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Ret adgangen til en survey"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Begræns brugere"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Vis resultater fra en survey"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "Flet survey resultater"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Vis en survey rapport"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Response"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Ret din adgangskode"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Administrer bruger konti"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Administrator designer konti"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "Vis TODO liste"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(udviklingsmål)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "Vis bruger &amp; administrator vejledning"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Klik her for at åbne Hjælp (engelsk)."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Log ud"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Flet survey resultater"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "Vælg survey til fletning"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Liste over surveys"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "Surveys til fletning"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Skift adgangskode"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-#, fuzzy
-msgid "Your password has been successfully changed."
-msgstr "Din adgangskode er blevet ændret."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Adgangskode er ikke anført. kontroller gammel adgangskode."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "Ny adgangskode passer ikke - eller er blank."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Gammel adgangskode"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Ny adgangskode"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Bekræft ny adgangskode"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Kun tilladt for superbrugere."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Purge surveys"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "Sp. nummer"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Ryd checkbokse"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "README ikke fundet."
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Gå tilbage til Rapport menuen"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Vis formular rapport"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Vælg en form til fremvisning"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Tilføj ny bruger"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-#, fuzzy
-msgid "Bulk Upload Respondents"
-msgstr "Tilføj ny bruger"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "Purge surveys"
-#
-# File: phpESP/admin/include/where/response_purge.inc, line: 25
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-#, fuzzy
-msgid "Cross Tabulation"
-msgstr "Vælg en funktion"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Test survey"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-#, fuzzy
-msgid "Reset"
-msgstr "Test"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Vis survey resultater"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Vælg en survey til fremvisning"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Vælg survey til test"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "Response"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-#, fuzzy
-msgid "Resp"
-msgstr "Response"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Kan ikke sætte status for survey."
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Survey status"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Test</b> sætter en survey i testmode, hvorfra du kan tage en rigtig test "
-"af din survey og se resultatet. Du kan herefter ikke ænde yderligere i din "
-"survey."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-#, fuzzy
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Aktiver</b> sætter en survey i aktiv mode. Når surveyen er aktiveret er "
-"den åbnet for brug og kan lægges online. Dette vil slette resultaterne fra "
-"test mode (hvis der er nogle).\n"
-"Ingen yderligere redigering af survey er tilladt."
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Afslut</b> sætter een survey i afsluttet mode. Ingen rettelser kan "
-"foretages og ingen brugere kan tage survey, men resultaterne er stadig "
-"tilgængelige."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Arkiver</b> fjerner survey. Den er stadig gemt i databasen, \n"
-"men kan ikke længere håndteres, du kan dog se resultaterne."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Test"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Aktiver"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Afslut"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Arkiver"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Rediger"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Hjælp"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Klik på Fortryd for at afbryde denne survey eller klik på Fortsæt for at gå "
-"videre til næste faneblad."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"Survey titel og andre generelle felter er under <b>Generelt</b> faneblad.\n"
-"De enkelte survey spørgsmål tilføjes og redigeres under <b>Spørgsmål</b> "
-"fanebladet.\n"
-"Spørgsmål kan arrangeres under <b>Rækkefølge faneblad\n"
-"Du kan til enhver tid se en survey under <b>Vis</b> fanebladet. Hvis du ikke "
-"har yderligere rettelser klik på <b>Afslut</b> for at gå tilbage til \n"
-"Administrator siden."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Vis resultater"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Vælg survey til test"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Eksporter"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Resultater"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Todo liste er ikke fundet."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-#, fuzzy
-msgid "Upload Account Information"
-msgstr "Bruger konto administration"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-#, fuzzy
-msgid "All fields are required"
-msgstr "er obligatoriske"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-#, fuzzy
-msgid "File Type"
-msgstr "Type"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-#, fuzzy
-msgid "File to upload"
-msgstr "Ikke i stand til at hente ACL"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "Fejl ved afvikling af survey: Survey er ikke specificeret"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Du har færdiggjort denne surveys design"
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Fejl ved afvikling af survey: Survey er ikke aktiveret."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 72
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "Ny adgangskode passer ikke - eller er blank."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-#, fuzzy
-msgid "Confirm Password"
-msgstr "Bekræft ny adgangskode"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#, fuzzy
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr "Ingen faneblade defineret. Kontroller venligst INI opsætning."
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "Generelt"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Spørgsmål"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Rækkefølge"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Vis"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Afslut"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Side"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "af"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "Desværre, navnet er allerede i brug."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Felt"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Felt navn"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CVS"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "Vælg en funktion"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Eksporter data til CVS"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Fejl!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Du skal have mindst to surveys"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Administrator gruppe medlemmer"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "Total"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "are required."
-#~ msgstr "er obligatoriske"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Incorrect User ID or Password, or your account has been disabled."
-#~ msgstr "Forkert bruger ID eller adgangskode eller din konto er spærret."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "free-form"
-#~ msgstr "free-form"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "det vil sige instruktioner, informationer osv."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Required?"
-#~ msgstr "Obligatorisk?"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to access this menu"
-#~ msgstr "for at åbne denne menu"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Purge"
-#~ msgstr "Ryd"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "STATUS"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to design forms"
-#~ msgstr "for at designe formularer"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "Hoved til bekræftelse"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Body text on the &quot;Confirmation&quot; page. This is displayed below "
-#~ "the Confirmation Heading."
-#~ msgstr ""
-#~ "Body tekst i the &quot;Bekræftelses&quot; side. Dette vises under "
-#~ "Bekræftelsens hoved."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Max Logins"
-#~ msgstr "Maksimalt antal login"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Design Web Forms"
-#~ msgstr "Design Web formularer"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "NOTE: This does not currently work on embedded forms."
-#~ msgstr "Bemærk: Dette understøttes ikke i indlejrede (embedded) formularer."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Response from survey:"
-#~ msgstr "Respons fra survey"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Sorry, please fill out the name and title before proceeding."
-#~ msgstr "Beklager, udfyld venligst navn og titel før du fortsætter."
Index: locale/nl_NL/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/nl_NL/LC_MESSAGES/messages.po
===================================================================
--- locale/nl_NL/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/nl_NL/LC_MESSAGES/messages.po	(working copy)
@@ -1,1809 +0,0 @@
-# phpESP.
-# By: James Flemer
-# <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.10 2007/12/10 12:15:55 liedekef Exp $
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2003-03-07 20:42+0100\n"
-"Last-Translator: Klaas Chielens <klaas@chielens.net>\n"
-"Language-Team: nl_NL <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"kan de include file niet openen. Bekijk de INI instellingen. Bewerking wordt "
-"beeindigd."
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"kan de include file niet openen. Bekijk de INI instellingen. Bewerking wordt "
-"beeindigd."
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Service niet beschikbaar"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-msgid "Connection to database failed. Please check configuration."
-msgstr "Connectie met de database is mislukt. Kijk uw configuratie na."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-"Uw voortgang is opgeslagen. U kunt op elk moment terugkomen\n"
-"om deze vragenlijst af te maken. Hiervoor dient u terug te gaan\n"
-"naar onderstaande link (u kunt deze in uw Bookmarks opnemen).\n"
-"Het kan zijn dat u wordt gevraagd om uw gebruikersnaam en wachtwoord."
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-msgid "Resume survey"
-msgstr "Ga verder met de vragenlijst"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Ja"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Nee"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "N/A"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "Kopieer"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Ongeldig argument."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Fout bij het openen van de vragenlijst."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Fout bij het openen van de vragenlijsten."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Geen antwoorden gevonden."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "TOTAAL"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Geen vragen gevonden."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr "pagina %d van %d"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-msgid "Questions marked with a %s are required."
-msgstr "Vragen gemarkeerd met een %s zijn verplicht"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "In deze sectie zijn er geen vragen die u moet beantwoorden."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "Fout: de systeem tabel is corrupt."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Tabel"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Rapport voor"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Verplicht"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Publiek"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Inhoud"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-msgid "Previous"
-msgstr "Vorige"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-msgid "Next"
-msgstr "Kopieer"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr "Ongeldig argument."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Fout bij het kruislings analyseren. Vraag type is niet geldig."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-msgid "Cross analysis on QN:"
-msgstr "Kruislingse analyse op QID:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Sorry, vul eerst de naam, groep en titel in voordat je verder gaat."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Sorry, deze naam is al in gebruik. Kies een nieuwe naam."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Sorry, deze naam is al in gebruik."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Let op, er is een fout opgetreden."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Vul alsjeblieft tekst in voor deze vraag."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Sorry, je moet eerst een tekst selecteren voor deze vraag."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Nieuw veld"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"Sorry, je kan niet tussen deze soorten vragen wisselen. Maak in plaats "
-"daarvan een nieuwe vraag aan."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-"Sorry, je moet minimum één antwoord mogelijkheid ingeven voor dit soort "
-"vragen."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please select two different questions."
-msgstr "Kies 2 verschillende vragen aub."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Fout bij het verwerken van de vragenlijst: Veiligheids overtreding."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Kan de query voor toegang niet uitvoeren."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Kan de respondenten query niet uitvoeren."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Niet toegestaan"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"Foute login naam of wachtwoord, of je account is uitgeschakeld of verlopen."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr "Uw account is uigeschakeld of u heeft deze vragenlijst al ingevuld."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "Kan ACL niet laden."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Beheers menu"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Dit account heeft geen permissies"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Ga terug naar het beheers menu"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-msgid "This account does not have permission %s."
-msgstr "De permissie %s ontbreekt voor deze account."
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-msgid "Submit"
-msgstr "Verzend"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Plaats"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Antwoord"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Gemiddelde plaats"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Je hebt de volgende verplichte vragen niet ingevuld:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please only use numbers for the following questions:"
-msgstr "Gebruik aub enkel cijfers voor de volgende vragen:"
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "equals"
-msgstr "is gelijk aan"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr "is verschillend van"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr "kleiner dan"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr "groter dan"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr "Reeds bestaande voorwaarden"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr "of"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr "Toon enkel vraag "
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr "als het antwoord op vraag "
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-"Alle voorwaarden zijn \"OF\" voorwaarden, dus als 1 voorwaarde vervuld is, "
-"wordt de vraag getoond.<br />\n"
-"Een vraag die een voorwaarde heeft, moet een optionele vraag zijn. Dus, als "
-"u een voor definieert op een vraag, wordt de parameter \"Verplicht\" op \"No"
-"\" gezet.<br />\n"
-"Een vraag die een voorwaarde heeft, moet op de volgende pagina staan dan de "
-"vraag/waarde die gebruikt wordt om met te vergelijken. Gebruik de \"Order tab"
-"\" om een sectie-scheding toe te voegen waar gewenst (dit wordt <b>NIET</b> "
-"automatisch gedaan).<br />\n"
-"Een Ja/Nee vraag kan enkel vergeleken worden met de waarden \"Yes or \"No\"."
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr "Voeg voorwaarden toe aan een vraag."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "----- Sectie scheiding -----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "Vragenlijst ontwerp is klaar"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Het ontwerpen van de vragenlijst is klaar."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Om de vragenlijst in je web pagina te voegen moet je de tekst\n"
-"hieronder kopieren en in je HTML pagina plakken."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr "Eens de vragenlijst geactiveerd is kan je ze bereiken op dit adres:"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Je moet deze vragenlijst activeren voordat je de resultaten\n"
-"kan opvragen. Als een vragenlijst actief is, kun je geen wijzigingen\n"
-"meer aanbrengen. Je kan deze vragenlijst activeren op deze manier:\n"
-"<b>Verander de status van een bestaande vragenlijst</b> in het\n"
-"Mangement menu te kiezen."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"De informatie op deze tab geldt voor de hele vragenlijst.\n"
-"Vul deze pagina in en ga dan naar de <b>Velden</b> tab om\n"
-"individuele velden te wijzigen."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Naam"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-msgid "Required"
-msgstr "Vereist"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Vragenlijst bestandsnaam."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Dit wordt gebruikt voor alle verdere toegang tot deze vragenlijst."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "geen spaties"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "alleen alpha-numeriek"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Eigenaar"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-msgid "User and Group that owns this survey."
-msgstr "Groep die deze pagina bezit."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Titel"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-msgid "Title of this survey."
-msgstr "Titel van deze vragenlijst."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-msgid "This appears at the top of every page of this survey."
-msgstr "Dit verschijnt aan de top van elke pagina van deze vragenlijst."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "free-form, including spaces"
-msgstr "Naar keuze, mag spaties bevatten"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Subtitel"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-msgid "Subtitle of this survey."
-msgstr "Subtitel van de vragenlijst."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Verschijnt onder de titel."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Extra informatie"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "Tekst die moet verschijnen in de vragenlijst boven alle velden."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-msgid "Confirmation Page"
-msgstr "Bevestigings pagina"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr "(URL)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-"Het adres van de pagina waar de gebruiker wordt gestuurd na het beeindigen "
-"van de vragenlijst."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr "(kop tekst)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr "(inhouds tekst)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"Kop op de &quot;bevestigings&quot; pagina (verschijnt als een gebruiker de "
-"vragenlijst heeft ingevuld). Dit wordt vet weergegeven."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr "(URL, indien aanwezig wordt deze gekozen voor de bevestigingstekst)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "E-mail"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Verzend een kopie van elke ingevulde vragenlijst naar e-mail adres (of vul "
-"niet in voor geen e-mail backup)."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr "Stijl"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr "Kies een stijl (css) om te gebruiken met deze vragenlijst."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr "Automatische numering"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-"Kies dit als vragen automatisch genummerd moeten worden bij het tonen van de "
-"vragenlijst."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-msgid "Options"
-msgstr "Opties"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-"Geef toelating aan de gebruikers om de vragenlijst op te slaan en later te "
-"vervolledigen. (Hiervoor is een login noodzakelijk)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-"Geef toelating aan gebruikers om vooruit en achteruit te blikken tussen "
-"verschillende secties van de vragenlijst."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Verander de volgorde van de vragen die gepresenteerd worden\n"
-"door een vraag te kiezen uit de lijst. Gebruik dan de omhoog/omlaag \n"
-"knoppen om de positie te veranderen."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Voeg sectie scheiding toe"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Dit is een preview van hoe de vragenlijst er uit zal zien.\n"
-"De vragenlijst gebruikt de achtergrondkleur van het document\n"
-" waarin het is geintegreerd. Als je geen\n"
-"verdere wijzigingen wil maken, klik dan op <b>Finish</b> onderaan\n"
-"deze pagina."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Sectie"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr "Vorige pagina"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr "Opslaan"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Volgende"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Verzend antwoorden"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-"Wijzig deze vraag, of klik op het nummer van de vraag die je wilt wijzigen:"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-msgid "Edit Question"
-msgstr "Wijzig vraag"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-msgid "New Question"
-msgstr "Nieuwe vraag"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-msgid "Question Name"
-msgstr "Naam van de vraag"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Type"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Lengte"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Precisie"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"Voer de mogelijke antwoorden in (indien van toepassing). Vul\n"
-" %s in op een apart veld om een\n"
-"open antwoord aan het einde van deze vraag te creeren.\n"
-"Lege velden zullen niet worden weergegeven in de vragenlijst."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Voeg een antwoord veld toe"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Selecteer een groep."
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Prive"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Vragenlijst toegang"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Dit laat je de toegang controleren tot een respondenten formulier.\n"
-"Publieke vragenlijsten laat iedereen data invoeren.\n"
-"Prive vragenlijsten zijn beperkt tot respondenten groepen."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Bemerk"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-msgid "You must use %s when using private surveys."
-msgstr "U moet %s gebruiken indien u afgeschermde vragenlijsten maakt."
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Groep"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-msgid "Max Responses"
-msgstr "Max. Antwoorden"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr "Opslaan/Herstel"
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr "Terug/Volgende"
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Verwijder"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Voeg toe"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Maak Publiek"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Maak Prive"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "om toegang te krijgen tot dit formulier"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "om toegang te krijgen tot deze groep"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Kan dit account niet verwijderen."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Gebruikersnaam, Wachtwoord, and Groep zijn verplicht."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Fout bij het toevoegen van account."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Kan de account data niet wijzigen."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Account niet gevonden."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Ontwerper Account bewerkingen"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "gebruikersnaam"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Wachtwoord"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Voornaam"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Achternaam"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Verloop datum"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "jaar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "maand"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "dag"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Uitgeschakeld"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Ververs"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Annuleer"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Verwijder"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Vragenlijst maken"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Verander Status van Vragenlijst"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Activeer/Beeindig"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Exporteer Vragenlijst Data"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Groeps Editor"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr ""
-"mag <b>alle</b> formulieren veranderen die door deze groep worden bezeten"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-msgid "Administer Designers"
-msgstr "Beheer ontwerpers"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-msgid "Administer Respondents"
-msgstr "Beheer Respondenten"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Respondent Account Beheer"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "om toegang te krijgen tot deze vragenlijst"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Fout bij het kopieren vragenlijst."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Kopieer vragenlijst"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Kies een vragenlijst om een kopie van te maken. De kopie heeft dezelfde "
-"status als een nieuwe vragenlijst. Je kan de vragenlijst veranderen en moet "
-"deze activeren voor gebruik."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Status"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Opgeslagen"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Beeindigd"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Actief"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Wordt getest"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Wordt geWijzigd"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-msgid "Error cross-tabulating."
-msgstr "Fout in het gekruist tabelleren."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr "Zorg er voor dat de kolom en rij selecties niet dezelfde vraag zijn."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr "Zorg er voor dat je zowel een kolom als een rij selectie maakt."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-"Fout bij kruis-tabel uitrekenen. U probeert een kruistabel te maken en te "
-"berekenen op hetzelfde moment, dit is niet mogelijk!"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Beheer Web Formulieren ontwerper Accounts"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Klik op een gebruikersnaam om te wijzigen, of klik op nieuwe gebruiker "
-"toevoegen hieronder."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "uitgeschakeld"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Voeg een nieuwe ontwerper toe"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr "Upload een groot aantal Designers"
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "Ongeldige vragenlijst ID"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Verander een vragenlijst"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Kies een vragenlijst om te veranderen"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Exporteer Data"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Formaat"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr "Bewaar op de server"
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-msgid "Download"
-msgstr "Download"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Vragenlijst wordt getest..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr "De PHP dBase Module is niet geinstalleerd."
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Vragenlijst geexporteerd als:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Fout bij het exporteren van de vragenlijst als:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Fout bij het toevoegen van een groep."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Fout bij het verwijderen van een groep."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Groep is niet leeg."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Beheer groepen"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Beschrijving"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Leden"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "gebruikers handleiding niet gevonden."
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Log weer in."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Superuser"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Maak een nieuwe vragenlijst"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Wijzig een bestaande vragenlijst"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Test een vragenlijst"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Copieer een bestaande vragenlijst"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge a survey"
-msgstr "Verwijder een vragenlijst"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Verander de status van een vragenlijst"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(actief/beeindig/verwijder)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Verander toegang tot een vragenlijst"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Limiteer aantal respondenten."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Bekijk de resultaten van een vragenlijst"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-msgid "Cross Tabulate Survey Results"
-msgstr "Maak een gekruiste tabulatie van vragenlijstresultaten"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Bekijk een vragenlijst rapportage"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-msgid "Purge a response"
-msgstr "Verwijder een antwoord"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Verander je wachtwoord"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Beheer Respondenen Accounts"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Beheer ontwerp accounts"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "Bekijk de lijst van zaken die nog moeten worden gedaan"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(ontwikkel doelen)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "Bekijk de gebruikers &amp; beheer guide"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Klik hier om het help scherm te openen."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Log uit"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Voeg vragenlijst resultaten samen"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "Kies vragenlijsten om samen te voegen"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Lijst van vragenlijsten"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "Vragenlijsten om samen te voegen"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Verander Wachtwoord"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Je Wachtwoord is succesvol veranderd."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Wachtwoord niet ingestelds, Bekijk je oude Wachtwoord nog een keer."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "Nieuwe Wachtwoorden zien niet hetzelfde of zijn leeg."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Oud Wachtwoord"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Nieuw Wachtwoord"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Bevestig Nieuw Wachtwoord"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "alleen superusers toegestaan."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Ruim vragenlijsten op"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Deze pagina staat niet direct in het hoofdmenu omdat hij\n"
-"gevaarlijk is. Dit verwijdert alles over een vragenlijst <b>compleet</b> \n"
-"uit de database. Dit is <b>onomkeerbaar</b>. Alle informatie over de "
-"vragen,\n"
-"algemene informatie, resultaten, etc. worden uit de database verwijdert. "
-"Doe\n"
-"niets als je niet compleet zeker bent.\n"
-"Er wordt niet om bevestiging gevraagd en het is niet omkeerbaar."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "# Vragen"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Maak de Checkboxen leeg"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "README niet gevonden."
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Ga terug naar het rapportage menu"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Bekijk Formulier Rapport"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Kies een formulier om te bekijken"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Voeg een nieuwe Respondent toe"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-msgid "Bulk Upload Respondents"
-msgstr "Voeg een nieuwe Respondent toe"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge response"
-msgstr "Verwijder antwoord"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Deze pagina staat niet direct in het hoofdmenu omdat hij\n"
-"gevaarlijk is. Dit verwijdert alles over een vragenlijst <b>compleet</b> \n"
-"uit de database. Dit is <b>onomkeerbaar</b>. Alle informatie over de "
-"vragen,\n"
-"algemene informatie, resultaten, etc. worden uit de database verwijdert. "
-"Doe\n"
-"niets als je niet compleet zeker bent.\n"
-"Er wordt niet om bevestiging gevraagd en het is niet omkeerbaar."
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-msgid "Cross Tabulation"
-msgstr "gekruist tabuleren"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Test vragenlijst"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-msgid "Reset"
-msgstr "Beginwaarden"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr "Maak een gekruiste tabulatie."
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Bekijk vragenlijst resultaten Resultaten"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Kies een vragenlijst om te bekijken"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Kies een vragenlijst om gekruist te tabuleren"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-msgid "Respondent"
-msgstr "Respondent"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-msgid "Resp"
-msgstr "Respons"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Kan de status van de vragenlijst niet instellen."
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Vragenlijst Status"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Test</b> zorgt ervoor dat een vragenlijst in de test fase komt. Je kan de "
-"vragenlijst dan testen\n"
-"door de vragenlijst in te vullen, en de resultaten te bekijken. Je kan "
-"geen \n"
-"be wijzigingen meer aanbrengen in de vragenlijst als die in de\n"
-"test status is."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Activeer</b> maakt een vragenlijst actief. In deze mode is de vragenlijst "
-"open voor gebruik en kan deze online worden gezet. Dit zal alle data wissen "
-"van de testmodus (als die er is). Je kan de vragenlijst niet verder "
-"aanpassen."
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Beeindig</b> zorgt ervoor dat de vragenlijst gepubliceerd wordt. Je kan "
-"in deze modus\n"
-"geen wijzigingen meer aanbrengen, gebruikers kunnen de vragenlijst niet "
-"invullen (hij is inactief), maar resultaten zijn te bekijken\n"
-"in het resultaten menu."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Opslaan</b> verwijdert de vragenlijst. Het is dan nog opgeslagen in de "
-"database, maar\n"
-"er kan nikst meer worden gewijzigd. Je kan de resulteten van een opgeslagen "
-"vragenlijst <b>niet</b> bekijken."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Test"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Activeer"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Beeindig"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Opslaan"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Wijzig"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Help"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Klik annuleer om deze vragenlijst te annuleren, of klik doorgaan om verder "
-"te gaan naar de volgende tab."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"De vragenlijst titel en andere algemene velden zijn te vinden op het "
-"<b>Algemeen</b> tab.\n"
-"Individuele vragenlijst vragen worden toegevoegd en gewijzigd onder de "
-"<b>Vragen</b> tab.\n"
-"Vragen mogen worden gerangschikt of gewijzigd onder de <b>Volgorde</b> tab.\n"
-"Je kan op elk moment een preview zien , onder het <b>Preview</b>\n"
-"tab. Als je geen verdere wijzigingen wil aanbrengen klik dan op <b>Finish</"
-"b> om terug te gaan naar het\n"
-"Management Interface."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Bekijk resultaten"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Kies een vragenlijst om te testen"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Exporteer"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr "alleenstaand"
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Resultaten"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Te doen lijst niet gevonden."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-"Er deed zich een fout voor bij het uploaden. Rijen die niet werkten zijn "
-"hieronder weergegeven."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-"Er deed zich een fout voor bij het uploaden. Kijk het formaat van je "
-"tekstbestand na. "
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-"Er deed zich een fout voor tijdens het uploaden. Gelieve alle velden in het "
-"formulier te vervolledigen."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-msgid "Upload Account Information"
-msgstr "Upload account informatie"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-msgid "All fields are required"
-msgstr "Alle velden zijn verplict."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-msgid "File Type"
-msgstr "Bestandstype"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr "Tab begrensd"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-msgid "File to upload"
-msgstr "File die moet geupload worden"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr "Dank je wel voor het invullen van de vragenlijst."
-#
-# File: phpESP/admin/phpESP.ini.php, line: 176
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr "Gelieve de back toets van je browser niet te gebruiken."
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-"Kan de phpESP %s directory niet vinden. Gelieve %s te controlleren en ervoor "
-"te zorgen dat alle paden correct zijn ingevuld. "
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr "%%%%% Gettext Test Mislukt."
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr "U hebt een onjuiste code ingevuld. Vul aub de correcte code in."
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr ""
-"Fout bij het verwerken van de vragenlijst: geen vragenlijst gespecificeerd."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have already completed this survey."
-msgstr "U heeft deze vragenlijst al ingevuld."
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Fout bij het verwerken van de vragenlijst: Vragenlijst is niet actief."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr "Vul hier de weergegeven code in."
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr "Sorry, het account request formulier is niet bruikbaar."
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr "Gelieve alle noodzakelijke velden in te vullen."
-#
-# File: phpESP/public/signup.php, line: 72
-msgid "Passwords do not match."
-msgstr "Nieuwe Wachtwoorden zijn niet hetzelfde of zijn leeg."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-"Uw verzoek was niet mogelijk, gelieve een andere gebruikersnaam te kiezen."
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr "Uw account, %s, is aangemaakt!"
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr "Account aanmaak formulier"
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-"Gelieve het volgende formulier in te vullen om een account aan te vragen. "
-"Onderdelen waar %s bij staat zijn verplicht."
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr "Email adres"
-#
-# File: phpESP/public/signup.php, line: 157
-msgid "Confirm Password"
-msgstr "Bevestig Wachtwoord"
Index: locale/pt_BR/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/pt_BR/LC_MESSAGES/messages.po
===================================================================
--- locale/pt_BR/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/pt_BR/LC_MESSAGES/messages.po	(working copy)
@@ -1,2477 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.7 2007/12/10 10:50:36 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-02-18 13:29-0500\n"
-"Last-Translator: Ricardo Cavallini <ricardo@cavallini.com.br>\n"
-"Language-Team: pt_BR <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Incapaz de abrir o arquivo de include. Cheque o arquivo de configurações "
-"INI. Abortando."
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Incapaz de abrir o arquivo de include. Cheque o arquivo de configurações "
-"INI. Abortando."
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Serviço indisponível"
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr "Nenhuma aba foi definida. Por favor cheque as setagens INI."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Resume survey"
-msgstr "Testar o Questionário"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Sim"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Não"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "Não disponível"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "cópia"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Argumento inválido"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Erro abrindo o questionário"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Erro abrindo os questionários"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Não foi encontrada nenhuma resposta."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "TOTAL"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Nenhuma pergunta foi encontrada."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-#, fuzzy
-msgid "Questions marked with a %s are required."
-msgstr "Perguntas marcadas com a"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "Desculpe, você deve selecionar um tipo para esta pergunta."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "Erro. Tabela de sistema corrompida."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Tabela"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Relatório para"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Obrigatório"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Público"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Conteúdo"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-#, fuzzy
-msgid "Previous"
-msgstr "Preview"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-#, fuzzy
-msgid "Next"
-msgstr "Próxima Página"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Erro na análise cruzada. Pergunta não é um tipo válido."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "Análise cruzada em QID:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Por favor, preencha o nome, grupo e título antes de continuar."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Desculpe, este nome já foi usado. Escolha um novo nome."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Desculpe, este nome já foi usado."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Aviso. Um erro foi encontrado."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Por favor, entre o texto para esta pergunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Desculpe, você deve selecionar um tipo para esta pergunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Novo campo"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"Desculpe, você não pode mudar o tipo de pergunta. Cria uma nova pergunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-"Desculpe, você precisa de pelo menos uma resposta para este tipo de pergunta."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Por favor, entre o texto para esta pergunta."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Erro processando o questionário: Violação de Segurança."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Incapaz de executar a query para o acesso."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Incapaz de executar a query respondentes"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Não autorizado"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"O usuário e a senha estão incorretos ou sua conta foi desativada/expirou."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr "Sua conta foi desabilitada ou você já completou este questionário."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "Incapaz de carregar ACL"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Interface de Gerenciamento"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Esta conta não tem permissão"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Voltar para a Interface de Gerenciamento"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "Esta conta não tem permissão"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-#, fuzzy
-msgid "Submit"
-msgstr "Sub-Título"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Classificação"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Classificação Média"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Você não respondeu as perguntas abaixo:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Por favor, entre o texto para esta pergunta."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Resultados"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "----- Quebra de seção -----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "O design do questionário está completo"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Você completou o design do questionário."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Para inserir este questionário em sua página, copie o texto\n"
-"Abaixo e cole dentro do HTML da sua página."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"Uma vez ativado, você também poderá acessar o questionário\n"
-"diretament da seguinte URL."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Você precisa ativar o questionário antes de coletar\n"
-"os resultados. Uma vez ativado, você não poderá mais fazer\n"
-"nenhuma modificação no questionário. Você deve ativar este\n"
-"questionário escolhendo <b>Mudar o Status de um questionário</b> através da "
-"Interface de Gerenciamento."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"A informação desta aba se aplica a todo o questionário.\n"
-"Preencha esta página e depois siga para as abas dos <b>Campos</b> para "
-"editar os campos individualmente."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Nome"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-#, fuzzy
-msgid "Required"
-msgstr "Obrigatório?"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Nome do questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Isto é usado para todos os futuros acessos a este questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "sem espaços"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "somente alfa-numérico"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Dono"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "Grupo que mantém este questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Título"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "Título do questionário"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-#, fuzzy
-msgid "This appears at the top of every page of this survey."
-msgstr "Isto aparece no topo de todas as páginas do questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-#, fuzzy
-msgid "free-form, including spaces"
-msgstr "incluindo espaços"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Sub-Título"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "Sub-Título do questionário."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Aparece abaixo do título."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Informação Adicional"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-#, fuzzy
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "Texto para ser visto no questionário antes de qualquer campo."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-#, fuzzy
-msgid "Confirmation Page"
-msgstr "Texto de Confirmação"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-#, fuzzy
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"Cabeçalho na página de &quot;Confirmação&quot; (aparece depois de um usuário "
-"completar o questionário). É visto em negrito."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "Email"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Envia uma cópia de cada envio para o endereço (ou deixe em branco para não "
-"ter backup via email."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-#, fuzzy
-msgid "Options"
-msgstr "Perguntas"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Para mudar a ordem das perguntas escolha a posição\n"
-"desejada na lista."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Adicionar Quebra de Seção"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Este é um preview de como o questionário ficará.\n"
-"Neste preview, o &quot;Próxima Página&quot; e \n"
-"&quot;Enviar Questionário&quot; estão inativos.\n"
-"O questionário usurá a cor de fundo do documento\n"
-"que está inserido. Se você não precisa fazer nenhuma\n"
-"mudança clique <b>Finalizar</b> no final desta página."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Seção"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Próxima Página"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Enviar Questionário"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr "Edite este campo ou clique no número do campo que você deseja editar:"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Perguntas"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Perguntas"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Perguntas"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Tipo"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Comprimento"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Precisão"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-#, fuzzy
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr "Qualquer linha em branco será suprimida."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Adicione outra linha de resposta"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Por favor, selecione um grupo."
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Privado"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Acesso ao Questionário"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Isto deixa você controlar quem tem acesso para preencher o formulário.\n"
-"Questionários públicos deixam qualquer pessoa enviar dados.\n"
-"Questionários privados são restritos a Grupos de Respondentes."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Nota"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-#, fuzzy
-msgid "You must use %s when using private surveys."
-msgstr "quando está usando questionários privados."
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Grupo"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Max Responses"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Remover"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Adicionar"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Tornar Público"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Tornar Privado"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "para acessar este formulário"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "para acessar este grupo"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Não é possível deletar esta conta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Username, Senha, e Grupo são obrigatórios."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Erro adicionando a conta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Não é possível mudar os dados da conta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "A Conta não foi localizada."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Administração do Design da Conta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Username"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Senha"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Primeiro Nome"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Sobrenome"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Data de Expiração"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "ano"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "mês"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "dia"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Desabilitado"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Atualizar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Cancelar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Apagar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Design do Questionário"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Mudar o Status de um questionário"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Ativar/Terminar"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Exportar os Dados do Questionário"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Editor do Grupo"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "deve editar <a>todos</b> os formulários mantidos por este grupo."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Adicione um novo designer"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Administrar os Respondentes do Grupo"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Administração da Conta do Respondente"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "para acessar este questionário"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Erro copiando o questionário."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Copiar Questionário"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-#, fuzzy
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Escolha o questionário que será copiado. A cópia terá o mesmo\n"
-"status. Você poderá editar o questionário e terá que\n"
-"ativá-lo antes de usá-lo."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Status"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Arquivado"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Finalizado"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Ativo"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Testando"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Editando"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-#, fuzzy
-msgid "Error cross-tabulating."
-msgstr "Escolha uma função"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Gerenciamento contas dos Designers de formulários web"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Clique em um username para editar ou clique em adicionar novo usuário abaixo."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "desabilitado"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Adicione um novo designer"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "O ID do questionário é inválido."
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Editar o Questionário"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Escolha o Questionário para Editar"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Exportar Dados"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Formatar"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "download"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Testando o Questionário..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr "A extensão PHP dBase não está instalada."
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Questionário exportado como: "
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Erro exportando o questionário como: "
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Erro adicionando grupo"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Erro deletendo grupo"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Este grupo não está vazio."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Gerenciando grupos"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Descrição"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Membros"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "Guia do Usuário não foi encontrado."
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Refazer Log-in"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Super-usuário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Criar um Novo Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Editar um Questionário Existente"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Testar um Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Copiar um Questionário Existente"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Remover Questionários"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Mudar o Status de um Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(ativar/finalizar/apagar)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Mudar o Acesso a um Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Limitar Respondentes"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Ver Resultados de um Questionário."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "Fundir os resultados do Questionário"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Ver o Relatório do Questionário"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Mudar sua Senha"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Gerenciar a Conta dos Respondentes"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Gerenciar a Conta dos Designers"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "Ver a lista de coisa a fazer"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(objetivos de desenvolvimento)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "(Ver o Guia de Administração do Usuário)"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Clique aqui para abrir a janela de ajuda."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Encerrar sessão"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Fundir os resultados do Questionário"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "Escolha os Questionários que serão Fundidos"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Listagem dos Questionários"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "Questionários para Fundir"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Mudar Senha"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Sua senha foi trocada com sucesso."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Senha não foi configurada, cheque sua senha antiga."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "A nova senha não combinou ou está em branco."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Senha Antiga"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Nova Senha"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Confirmar Nova Senha"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Permitido somente para os super-usuários"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Remover Questionários"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Esta página não esta menu principal porque é perigosa.\n"
-"Ela remove <b>completamente</b> tudo sobre um Questionário\n"
-"no banco de dados <b>para sempre</b>. Todas as perguntas, \n"
-"informações genéricas, resultados, etc. serão removidos do banco \n"
-"de dados. Não faça nada aqui que você não tenha absoluta certeza.\n"
-"Nesta página não existe confirmação para suas escolhas e nem mesmo \n"
-"possibilidade para voltar atrás."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "Número de Perguntas"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Apagar Checkboxes"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "LEIAME não foi localizado."
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Voltar para Menu de Relatório"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Ver Relatório do Formulário"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Escolha um Formulário para ver"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Adicionar um novo Respondente"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-#, fuzzy
-msgid "Bulk Upload Respondents"
-msgstr "Adicionar um novo Respondente"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "Remover Questionários"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Esta página não esta menu principal porque é perigosa.\n"
-"Ela remove <b>completamente</b> tudo sobre um Questionário\n"
-"no banco de dados <b>para sempre</b>. Todas as perguntas, \n"
-"informações genéricas, resultados, etc. serão removidos do banco \n"
-"de dados. Não faça nada aqui que você não tenha absoluta certeza.\n"
-"Nesta página não existe confirmação para suas escolhas e nem mesmo \n"
-"possibilidade para voltar atrás."
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-#, fuzzy
-msgid "Cross Tabulation"
-msgstr "Escolha uma função"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Testar o Questionário"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-#, fuzzy
-msgid "Reset"
-msgstr "Teste"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Ver os Resultados de um Questionário"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Escolha um Questionário para ver"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Escolha o Questionário para Testar"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-#, fuzzy
-msgid "Resp"
-msgstr "Resposta"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Não é possível configurar o status do questionário."
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Status do Questionário"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Testar</b> muda o questionário para o modo de testes. Neste ponto você \n"
-"poderá fazer testes no questionário e ver os resultados. Você não poderá "
-"fazer \n"
-"nenhuma mudança futura no questionário uma vez que tenha mudado para o modo "
-"de teste."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-#, fuzzy
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Ativar</b> muda o questionário para o modo ativo. É o modo onde\n"
-"o questionário é aberto para uso em produção e pode ser colocado online.\n"
-"Isto irá apagar qualquer resultado inserido no modo de testes (se existir "
-"algum)./nNenhuma edição futura no questionário será permitida."
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Finalizar</b> muda o questionário para o modo Finalizado. É o modo onde\n"
-"nenhuma edição é possível. Nenhum usuário poderá usar o questionário (estará "
-"inativo),/nmas seus resultados poderão ser vistos através do menu de "
-"resultados."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Arquivar</b> remove o questionário. Ele continuará armazenado no banco de "
-"dados,\n"
-" mas nenhuma interação futura será permitida. Você <b>não</b> poderá ver os "
-"resultados de um/nquestionário arquivado."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Teste"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Ativar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Finalizar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Arquivar"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Editar"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Ajuda"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Clique em cancelar para cancelar esse questionário ou clique em continue "
-"para proceder a próxima aba"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"O título do questionário e outros campos genéricos estão na aba <b>Geral</"
-"b>.\n"
-"Perguntas individuais são adicionadas e modificadas na aba <b>Perguntas</"
-"b>.\n"
-"Perguntas podem ser reordenadas ou apagadas na aba <b>Ordenar</b>.\n"
-"Você pode ver um preview do questionário a qualquer momento indo no "
-"<b>Preview</b>.\n"
-"Se você não tiver nenhuma mudança a fazer, clique em <b>Finalizar</b> para "
-"voltar\n"
-"a Interface de Gerenciamento"
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Ver os Resultados"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Escolha o Questionário para Testar"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Exportar"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Resultados"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Listagem de coisas a fazer não foi localizada."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-#, fuzzy
-msgid "Upload Account Information"
-msgstr "Administração da Conta do Respondente"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-#, fuzzy
-msgid "All fields are required"
-msgstr "são obrigatórias."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-#, fuzzy
-msgid "File Type"
-msgstr "Tipo"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-#, fuzzy
-msgid "File to upload"
-msgstr "Incapaz de carregar ACL"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "Erro processando o questionário: Questionário não especificado."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Você completou o design do questionário."
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Erro processando o questionário: Questionário não está ativo."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 72
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "A nova senha não combinou ou está em branco."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-#, fuzzy
-msgid "Confirm Password"
-msgstr "Confirmar Nova Senha"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr "Nenhuma aba foi definida. Por favor cheque as setagens INI."
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "Geral"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Perguntas"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Ordenar"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Preview"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Finalizar"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Página"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "de"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "Desculpe, este nome já foi usado."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Campo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Nome do Campo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-#~ msgid "DBF download not yet implemented."
-#~ msgstr "O download do DBF não foi implementado."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "Escolha uma função"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Exportar dados no formato CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Erro!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Você precisa selecionar no mínimo dois questionários"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Administrar os Membros do Grupo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "Nenhum questionário foi especificado."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "Total"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "are required."
-#~ msgstr "são obrigatórias."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Incorrect User ID or Password, or your account has been disabled."
-#~ msgstr "O usuário e a senha estão incorretos ou sua conta foi desativada."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "free-form"
-#~ msgstr "free-form"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "ex.: instruções, background info, etc."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Required?"
-#~ msgstr "Obrigatório?"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "You must use"
-#~ msgstr "Você tem que usar"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to access this menu"
-#~ msgstr "para acessar este menu"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Purge"
-#~ msgstr "Remover"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "STATUS"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to design forms"
-#~ msgstr "para fazer o design dos formulários"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "Cabeçalho de Confirmação"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Body text on the &quot;Confirmation&quot; page. This is displayed below "
-#~ "the Confirmation Heading."
-#~ msgstr ""
-#~ "Body text na página de &quot;Confirmação&quot;. Aparece abaixo do "
-#~ "Cabeçalho de Confirmação."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Max Logins"
-#~ msgstr "Logins máximos"
Index: locale/new.po
===================================================================
--- locale/new.po	(revision 6370)
+++ locale/new.po	(working copy)
@@ -1,1663 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 114
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 75
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 185
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 186
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 188
-msgid "Service Unavailable"
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 78
-msgid "Connection to database failed. Please check configuration."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 167
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 171
-msgid "Resume survey"
-msgstr ""
-#
-# File: phpESP/admin/include/function/question_render.inc, line: 82
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 306
-# File: phpESP/admin/include/function/survey_results.inc, line: 320
-# File: phpESP/admin/include/tab/general.inc, line: 154
-# File: phpESP/admin/include/where/access.inc, line: 185
-# File: phpESP/admin/include/where/access.inc, line: 186
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admdesigner.inc, line: 329
-# File: phpESP/admin/include/where/admdesigner.inc, line: 334
-# File: phpESP/admin/include/where/admrespondent.inc, line: 257
-msgid "Yes"
-msgstr ""
-#
-# File: phpESP/admin/include/function/question_render.inc, line: 86
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 306
-# File: phpESP/admin/include/function/survey_results.inc, line: 322
-# File: phpESP/admin/include/tab/general.inc, line: 154
-# File: phpESP/admin/include/where/access.inc, line: 185
-# File: phpESP/admin/include/where/access.inc, line: 186
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admdesigner.inc, line: 329
-# File: phpESP/admin/include/where/admdesigner.inc, line: 334
-# File: phpESP/admin/include/where/admrespondent.inc, line: 257
-msgid "No"
-msgstr ""
-#
-# File: phpESP/admin/include/function/question_render.inc, line: 209
-msgid "1"
-msgstr ""
-#
-# File: phpESP/admin/include/function/question_render.inc, line: 210
-msgid "2"
-msgstr ""
-#
-# File: phpESP/admin/include/function/question_render.inc, line: 211
-msgid "3"
-msgstr ""
-#
-# File: phpESP/admin/include/function/question_render.inc, line: 212
-msgid "4"
-msgstr ""
-#
-# File: phpESP/admin/include/function/question_render.inc, line: 213
-msgid "5"
-msgstr ""
-#
-# File: phpESP/admin/include/function/question_render.inc, line: 214
-# File: phpESP/admin/include/function/question_render.inc, line: 237
-msgid "N/A"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 127
-# File: phpESP/admin/include/function/survey_results.inc, line: 140
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-# File: phpESP/admin/include/function/survey_results.inc, line: 203
-msgid "Error opening survey."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 203
-msgid "No responses found."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 140
-msgid "No questions found."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 60
-# File: phpESP/admin/include/function/survey_render.inc, line: 98
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 66
-msgid "Questions marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 92
-msgid "Sorry, no questions for you to answer in this section."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 114
-msgid "Error system table corrupt."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 114
-# File: phpESP/admin/include/function/survey_results.inc, line: 155
-msgid "Table"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 295
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 67
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/response_purge.inc, line: 35
-# File: phpESP/admin/include/where/results.inc, line: 160
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 103
-msgid "ID"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 171
-# File: phpESP/admin/include/where/access.inc, line: 208
-# File: phpESP/admin/include/where/access.inc, line: 239
-msgid "Public"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-msgid "Previous"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-msgid "Next"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 155
-msgid "Error cross-analyzing. Question not valid type."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 232
-msgid "Cross analysis on QN:"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 72
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 86
-msgid "Sorry, that name is already in use."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 100
-# File: phpESP/admin/include/function/survey_update.inc, line: 246
-# File: phpESP/admin/include/function/survey_update.inc, line: 286
-# File: phpESP/admin/include/function/survey_update.inc, line: 359
-# File: phpESP/admin/include/function/survey_update.inc, line: 364
-# File: phpESP/admin/include/function/survey_update.inc, line: 370
-msgid "Warning, error encountered."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 114
-msgid "Please enter text for this question."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 139
-msgid "Sorry, you must select a type for this question."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 145
-msgid "New Field"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 158
-msgid "Sorry, you cannot change between those types of question. Create a new question instead."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 294
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 350
-msgid "Please select two different questions."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 31
-# File: phpESP/public/handler-prefix.php, line: 60
-msgid "Error processing survey: Security violation."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 46
-msgid "Unable to execute query for access."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 63
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 108
-msgid "Unable to execute query respondents."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 80
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 117
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 204
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 205
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 206
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 125
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 164
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 265
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 266
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 267
-msgid "Unauthorized"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 81
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 207
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 126
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 268
-msgid "Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 118
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 165
-msgid "Your account has been disabled or you have already completed this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 189
-msgid "Unable to load ACL."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 203
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 264
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 307
-msgid "This account does not have permission"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 309
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 361
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 160
-# File: phpESP/admin/include/where/access.inc, line: 196
-# File: phpESP/admin/include/where/access.inc, line: 256
-# File: phpESP/admin/include/where/admdesigner.inc, line: 346
-# File: phpESP/admin/include/where/admrespondent.inc, line: 267
-# File: phpESP/admin/include/where/copy.inc, line: 30
-# File: phpESP/admin/include/where/copy.inc, line: 39
-# File: phpESP/admin/include/where/copy.inc, line: 107
-# File: phpESP/admin/include/where/designers.inc, line: 142
-# File: phpESP/admin/include/where/edit.inc, line: 64
-# File: phpESP/admin/include/where/export.inc, line: 23
-# File: phpESP/admin/include/where/export.inc, line: 112
-# File: phpESP/admin/include/where/export.inc, line: 189
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 96
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 47
-# File: phpESP/admin/include/where/merge.inc, line: 103
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 143
-# File: phpESP/admin/include/where/response_purge.inc, line: 13
-# File: phpESP/admin/include/where/response_purge.inc, line: 56
-# File: phpESP/admin/include/where/results.inc, line: 118
-# File: phpESP/admin/include/where/results.inc, line: 246
-# File: phpESP/admin/include/where/status.inc, line: 136
-# File: phpESP/admin/include/where/status.inc, line: 242
-# File: phpESP/admin/include/where/test.inc, line: 64
-# File: phpESP/admin/include/where/test.inc, line: 156
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 143
-msgid "Go back to Management Interface"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 359
-msgid "This account does not have permission %s."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-msgid "Submit"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-# File: phpESP/admin/include/where/response_purge.inc, line: 35
-msgid "Response"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 65
-msgid "You are missing the following required questions:"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 74
-msgid "Please only use numbers for the following questions:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 14
-msgid "equals"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 28
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you define a condition on a question, the \"Required\" parameter is set to \"No\".<br />\n"
-"A question that has a condition must be on the next page than the question/value that is used to compare it with. Use the \"Order tab\" to insert a section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 98
-# File: phpESP/admin/include/tab/conditions.inc, line: 121
-# File: phpESP/admin/include/tab/order.inc, line: 91
-msgid "----- Section Break -----"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 167
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Name"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/general.inc, line: 154
-# File: phpESP/admin/include/tab/questions.inc, line: 107
-msgid "Required"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 206
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 36
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 142
-# File: phpESP/admin/include/where/test.inc, line: 106
-msgid "Owner"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-msgid "User and Group that owns this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 168
-# File: phpESP/admin/include/where/access.inc, line: 205
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 168
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Title"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-msgid "Title of this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-msgid "This appears at the top of every page of this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "free-form, including spaces"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-msgid "Subtitle of this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-msgid "Confirmation Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 240
-msgid "Email"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid "Sends a copy of each submission to address (or leave blank for no email backup)."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid "Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 161
-msgid "Options"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 163
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 168
-msgid "Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 98
-msgid "Add Section Break"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 49
-msgid "Section"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 74
-# File: phpESP/public/handler.php, line: 205
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 76
-# File: phpESP/public/handler.php, line: 208
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-# File: phpESP/public/handler.php, line: 220
-msgid "Next Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 81
-# File: phpESP/public/handler.php, line: 218
-msgid "Submit Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 63
-msgid "Edit this question, or click the number of the question you would like to edit:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 92
-msgid "Edit Question"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 93
-# File: phpESP/admin/include/tab/questions.inc, line: 97
-msgid "New Question"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 103
-msgid "Question Name"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 104
-msgid "Type"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 105
-msgid "Length"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-msgid "Precision"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Private"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 144
-msgid "Survey Access"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 154
-msgid "Note"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 155
-msgid "You must use %s when using private surveys."
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-# File: phpESP/admin/include/where/access.inc, line: 173
-# File: phpESP/admin/include/where/access.inc, line: 207
-# File: phpESP/admin/include/where/admdesigner.inc, line: 241
-# File: phpESP/admin/include/where/admrespondent.inc, line: 204
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 37
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 98
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 143
-# File: phpESP/admin/include/where/test.inc, line: 107
-msgid "Group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 174
-msgid "Max Responses"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 175
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 176
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 188
-msgid "Remove"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 194
-# File: phpESP/admin/include/where/groups.inc, line: 93
-msgid "Add"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 237
-msgid "Make Public"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 240
-msgid "Make Private"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 17
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 16
-# File: phpESP/admin/include/where/tab.inc, line: 66
-# File: phpESP/admin/include/where/tab.inc, line: 75
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 49
-# File: phpESP/admin/include/where/admdesigner.inc, line: 113
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 53
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 120
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 128
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 164
-# File: phpESP/admin/include/where/admrespondent.inc, line: 134
-msgid "Cannot change account data."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 215
-# File: phpESP/admin/include/where/admrespondent.inc, line: 177
-msgid "Account not found."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 221
-msgid "Designer Account Administration"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 227
-# File: phpESP/admin/include/where/admrespondent.inc, line: 190
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 150
-msgid "Username"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 236
-# File: phpESP/admin/include/where/admrespondent.inc, line: 199
-# File: phpESP/public/signup.php, line: 155
-msgid "Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 270
-# File: phpESP/admin/include/where/admrespondent.inc, line: 230
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/public/signup.php, line: 135
-msgid "First Name"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 235
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 97
-# File: phpESP/public/signup.php, line: 140
-msgid "Last Name"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admrespondent.inc, line: 245
-msgid "Expiration"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "year"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "month"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 292
-# File: phpESP/admin/include/where/admrespondent.inc, line: 252
-msgid "day"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Disabled"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-# File: phpESP/admin/include/where/admdesigner.inc, line: 338
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Update"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 339
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-msgid "Cancel"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 303
-# File: phpESP/admin/include/where/admdesigner.inc, line: 341
-# File: phpESP/admin/include/where/admrespondent.inc, line: 263
-# File: phpESP/admin/include/where/groups.inc, line: 77
-msgid "Delete"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Design Surveys"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 311
-msgid "Change Survey Status"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-msgid "Activate/End"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-msgid "Export Survey Data"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-msgid "Group Editor"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-msgid "Administer Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 333
-msgid "Administer Respondents"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 184
-msgid "Respondent Account Administration"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 23
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 131
-# File: phpESP/admin/include/where/export.inc, line: 143
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 101
-# File: phpESP/admin/include/where/test.inc, line: 32
-msgid "to access this survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 29
-msgid "Error copying survey."
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 60
-msgid "Copy Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 62
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/export.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 107
-# File: phpESP/admin/include/where/status.inc, line: 144
-msgid "Status"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 78
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 183
-msgid "Archived"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 80
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 187
-msgid "Ended"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 82
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 190
-msgid "Active"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 84
-# File: phpESP/admin/include/where/export.inc, line: 70
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Testing"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 86
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Editing"
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-msgid "Error cross-tabulating."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid "Please ensure that your column and row selections are not of the same question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid "You are attempting to cross analyze and tabulate at the same time. This is not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 92
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 107
-msgid "disabled"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 135
-msgid "Add a new Designer"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr ""
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 22
-# File: phpESP/admin/include/where/manage.inc, line: 51
-msgid "Export Data"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 39
-msgid "Format"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 97
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 144
-msgid "Download"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 134
-# File: phpESP/admin/include/where/export.inc, line: 181
-# File: phpESP/admin/include/where/merge.inc, line: 29
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 50
-msgid "Testing Survey..."
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 134
-# File: phpESP/admin/include/where/export.inc, line: 181
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 50
-msgid "SID"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 170
-msgid "The PHP dBase Extension is not installed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 184
-msgid "Survey exported as:"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 186
-msgid "Error exporting survey as:"
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 79
-msgid "Manage Groups"
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr ""
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr ""
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-msgid "Create a New Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 29
-msgid "Edit an Existing Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 30
-# File: phpESP/admin/include/where/test.inc, line: 99
-msgid "Test a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 31
-msgid "Copy an Existing Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 33
-msgid "Purge a survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-msgid "Change the Status of a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "(active/end/delete)"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 40
-msgid "Change Access To a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 40
-msgid "Limit Respondents."
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-msgid "Cross Tabulate Survey Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 53
-msgid "Purge a response"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 64
-msgid "Change Your Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 71
-# File: phpESP/admin/include/where/respondents.inc, line: 91
-msgid "Manage Respondent Accounts"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "Manage Designer Accounts"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 89
-msgid "View the list of things still to do"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 90
-msgid "(development goals)"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 91
-msgid "View the User &amp; Administrator Guide"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 92
-# File: phpESP/admin/include/where/tab.inc, line: 162
-msgid "Click here to open the Help window."
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 100
-msgid "Log out"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 29
-msgid "SIDS"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 70
-msgid "Merge Survey Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 71
-msgid "Pick Surveys to Merge"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 77
-msgid "List of Surveys"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 79
-msgid "Surveys to Merge"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-# File: phpESP/admin/include/where/response_purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr ""
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr ""
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr ""
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr ""
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr ""
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 136
-msgid "Add a new Respondent"
-msgstr ""
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 139
-msgid "Bulk Upload Respondents"
-msgstr ""
-#
-# File: phpESP/admin/include/where/response_purge.inc, line: 23
-# File: phpESP/admin/include/where/response_purge.inc, line: 52
-msgid "Purge response"
-msgstr ""
-#
-# File: phpESP/admin/include/where/response_purge.inc, line: 25
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 154
-msgid "Cross Tabulation"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 103
-msgid "Test Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 111
-msgid "Reset"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 112
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 146
-msgid "View Survey Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 147
-msgid "Pick Survey to View"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 155
-msgid "Pick Survey to Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 162
-msgid "Respondent"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 171
-msgid "Resp"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 106
-msgid "Can not set survey status."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 113
-msgid "Survey Status"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 117
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 121
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 126
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are still\n"
-"viewable from the results menu."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 130
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of an\n"
-"archived survey."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "Test"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Activate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 179
-msgid "End"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 180
-msgid "Archive"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 195
-msgid "Edit"
-msgstr ""
-#
-# File: phpESP/admin/include/where/tab.inc, line: 129
-# File: phpESP/admin/include/where/upload.inc, line: 119
-msgid "Help"
-msgstr ""
-#
-# File: phpESP/admin/include/where/tab.inc, line: 149
-msgid "Click cancel to cancel this survey, or click continue to proceed to the next tab."
-msgstr ""
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-msgid ""
-"The survey title and other general fields are on the <strong>General</strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the <strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back to the\n"
-"Management Interface."
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 63
-msgid "View Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 100
-msgid "Pick Survey to Test"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Export"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 128
-msgid "Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 81
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-msgid "An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 111
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 115
-msgid "Upload Account Information"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 116
-msgid "All fields are required"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 124
-msgid "File Type"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 125
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 126
-msgid "File to upload"
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 217
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 218
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 222
-# File: phpESP/admin/phpESP.ini.php, line: 228
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 12
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 72
-msgid "Error processing survey: Survey not specified."
-msgstr ""
-#
-# File: phpESP/public/handler.php, line: 56
-msgid "You have already completed this survey."
-msgstr ""
-#
-# File: phpESP/public/handler.php, line: 112
-# File: phpESP/public/handler.php, line: 117
-msgid "Error processing survey: Survey is not active."
-msgstr ""
-#
-# File: phpESP/public/handler.php, line: 215
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 55
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 64
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 73
-msgid "Passwords do not match."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 103
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 110
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 123
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 129
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 145
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 160
-msgid "Confirm Password"
-msgstr ""
Index: locale/hu_HU/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/hu_HU/LC_MESSAGES/messages.po
===================================================================
--- locale/hu_HU/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/hu_HU/LC_MESSAGES/messages.po	(working copy)
@@ -1,2362 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.6 2007/12/10 10:50:35 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2003-08-13 13:29-0500\n"
-"Last-Translator: Monika Berze <monika@proaction.hu>\n"
-"Language-Team: hu_HU <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Nem lehet az &quot;include&quot; fájlt megnyitni. Ellenõrize az INI "
-"beállításokat! Mûvelet megszakítása!"
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Nem lehet az &quot;include&quot; fájlt megnyitni. Ellenõrize az INI "
-"beállításokat! Mûvelet megszakítása!"
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "A szolgáltatás nem érhetõ el"
-#
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-msgid "Connection to database failed. Please check configuration."
-msgstr "Hibás adatbáziscsatlakozás. Kérem ellenõrizze a beállításokat!"
-#
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-"Munkája el lett mentve. Bármikor vissza tud\n"
-"térni, hogy ezt a kérdõívet befejezze. Ezt az alábbi webcímen\n"
-"teheti meg. Adja meg felhasználó nevét és jelszavát, hogy \n"
-"a kérdõívet befejezze."
-#
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-msgid "Resume survey"
-msgstr "Kérdõív folytatása"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Igen"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Nem"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "-"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "másolás"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Érvénytelen érték."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Hiba a kérdõív megnyitásakor."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Hiba a kérdõívek megnyitásakor."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Nincs válasz."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "Teljes"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Nincs kérdés."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr "%d oldal %d -ból/bõl"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-msgid "Questions marked with a %s are required."
-msgstr "A %s -sel jelölt mezõk kitöltése kötelezõ."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "Ehhez a kérdéshez választani kell egy típust!"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "Hiba, a rendszer tábla sérült."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Tábla"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Riport"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Kötelezõ"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Nyilvános"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Kérdés"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-msgid "Previous"
-msgstr "Elõzõ"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-msgid "Next"
-msgstr "Következõ"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr "Navigáció az egyéni válaszadók között."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Hiba a kereszt-elemzés során. A kérdésnek nem érvényes a típusa."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "Keresztelemzés a következõ kérdésen:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Kérem töltse ki a név, csoport és cím mezõket a folytatás elõtt!"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Sajnos a név már foglalt. Válasszon egy másikat!"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Sajnos a név már foglalt."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Figyelmeztetés: ütközési hiba!"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Kérem írja be a kérdést!"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Ehhez a kérdéshez választani kell egy típust!"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Új kérdés"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"Sajnos nem tudja megváltoztatni a kérdés típusát. Készítsen egy újabb "
-"kérdést helyette!"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr "Legalább egy választ meg kell adnia ehhez a kérdéstípushoz!"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Kérem írja be a kérdést!"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Hiba a kérdõív feldolgozásban: biztonsági szabály megsértése."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Lehetetlen a belépési utasítás végrehajtása."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Lehetetlen a válasz utasítás végrehajtása."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Jogosulatlan"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"Helytelen felhasználó ID vagy jelszó, vagy az Ön hozzáférési joga le van "
-"tiltva/\n"
-"lejárt."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr "AZ Ön hozzáférési joga lejárt, vagy már ezt a kérdõívet befejezte."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "Lehetetlen az ACL futtatása."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Kezelõ Felület"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Hozzáférés letiltva"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Vissza a Kezelõ Felülethez"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-msgid "This account does not have permission %s."
-msgstr "Ennek a hozzáférési jognak nincs engedélye %s."
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-msgid "Submit"
-msgstr "OK"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Rangsor"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Válasz"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Átlag rangsor"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "A következõ kötelezõ kérdésre nem válaszolt:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Kérem írja be a kérdést!"
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Eredmények"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr "vagy"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "----- Töréspont -----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "A kérdõív elõállítása kész."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Befejezte a kédõív létrehozását."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Ahhoz, hogy ezt a kérdõívet felhasználja a saját oldalán,\n"
-"másolja ki az alábbi szöveget és helyezze el a HTML-be."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"Ha egyszer már aktiválva van, akkor a következõ URL \n"
-"címrõl közvetlenül is elérheti a kérdõívet."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Aktiválnia kell a kérdõívet mielõtt kigyûjtené az eredményeket.Ha egy "
-"kérdõív már aktív, akkor nem lehet többé módosítani.Ezt a kérdõívet "
-"aktiválhatja a Kezelõ Felületen lévõ\n"
-"<b>Kérdõív állapotának módosítása</b> linkre kattintva."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"Ezen a fülön lévõ információk az egész kérdõívre vonatkoznak.\n"
-"Töltse ki ezt az oldalt, aztán menjen a <b>Kérdések</b> fülre,\n"
-"hogy a kérdéseket megszerkessze!"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Név"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-msgid "Required"
-msgstr "Kötelezõ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Kérdõív fájl neve"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Minden további hivatkozásban ez szerepel."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "szóköz nélkül"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "csak betû és szám szerepelhet"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Tulajdonos"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-msgid "User and Group that owns this survey."
-msgstr "Kérdõív felhasználója és csoportja"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Cím"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-msgid "Title of this survey."
-msgstr "A kérdõív címe"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-msgid "This appears at the top of every page of this survey."
-msgstr "A kérdõív minden oldalán felül ez fog látszódni."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "free-form, including spaces"
-msgstr "szabadon választható, szóközt tartalmazhat"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Alcím"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-msgid "Subtitle of this survey."
-msgstr "A kérdõív alcíme"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "A cím alatt helyezkedik le."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Kiegészítõ információ"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr ""
-"A kérdõíven még a kérdések elõtt szereplõ szöveg.\n"
-"(pl. instrukciók, háttér információk stb.)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-msgid "Confirmation Page"
-msgstr "Nyugtázó oldal"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr "(URL)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-"Kérdõív kitöltése után a felhasználót erre az URL címre irányítjuk tovább."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr "(fejléc)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr "(szövegtörzs)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"A féjléc (félkövér) és a szövegtörzs a &quot;Nyugtázó&quot; oldalon\n"
-"jelenik meg, miután a kérdõívet kitöltötték."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr "(URL, ha létezik, elsõbbséget élvez a nyugtázó  szöveggel szemben.)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "Email"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Másolat küldése erre a címre minden válasz esetén (vagy hagyja üresen,hogy "
-"ne kapjon email másolatot)."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr "Stílus"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr "Válasszon egy stílus (css), amit a kérdõívhez használ."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-msgid "Options"
-msgstr "Opciók"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-"Kérdõív válaszainak mentésének/folytatásának engedélyezése.\n"
-"(Belépés szükséges)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-"Kérdõív válaszok engedélyezése, hogy a kérdõív részek között elõre és vissza "
-"lehessen menni."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Megváltoztathatja a kérdések sorrendjét,\n"
-"ha a listából kiválasztja a kívánt poziciót."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Töréspont hozzáadása"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Ez egy elõnézeti oldal, ahogyan a kérdõív ki fog kinézni.\n"
-"Elõnézetben a kérdõív navigációs gombjai inaktívak,\n"
-"ezért használja az oldalszám gombokat, hogy a többi oldalt is láthasssa.\n"
-"Néhány navigációs gomb az Ön kérdõívén nem biztos, hogy látszódni fog.\n"
-"Ez attól függ, hogy milyen hozzáférés lett meghatározva. A kérdõív háttere "
-"olyan,\n"
-" mint amilyet korábban meghatározott. Ha nem akar a kérdõíven változtatni, "
-"kattintson\n"
-"az oldal alján található <b>Vége</b> gombra."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Oldal"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr "Elõzõ oldal"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr "Mentés"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Következõ oldal"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Kérdõív elküldése"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-"Változtassa meg ezt a kérdést, vagy kattinson arra a számra, amelyik kérdést "
-"meg szeretné változtatni:"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Kérdések"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Kérdések"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Kérdések"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Típus"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Hossz"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Pontosság"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"Írja be a lehetséges válaszokat (ha szükséges). Az egyik sorba írja be, "
-"hogy\n"
-"%s, hogy automatikusan létrehozzon egy üres válaszmezõt a kérdés végén."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Újabb válaszsor hozzáadása"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Válasszon egy csoportot!"
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Privát"
-#
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Kérdõív hozzáférés"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Itt van rá lehetõsége, hogy kiossza a hozzáférési jogosultságokat\n"
-"az egyes kérdõívhezekhez.\n"
-"A publikus kérdõíveket bárki kitöltheti.\n"
-"A privát kérdõívek csak a Válaszadók Csoportjára vonatkozik."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Megjegyzés:"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-msgid "You must use %s when using private surveys."
-msgstr ""
-"Ha privát kérdõívet akar használni, akkor a %s fájlokat kell használnia!"
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Csoport"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-msgid "Max Responses"
-msgstr "Max. válaszok"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr "Mentés/Helyreállítás"
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr "Vissza/Tovább"
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Eltávolít"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Hozzáad"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Nyilvánossá tétel"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Priváttá tétel"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "ehhez az ûrlaphoz való hozzáférés"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "ehhez a csoporthoz való hozzáférés"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "A hozzáférés nem lett törölve."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Felhasználó név, jelszó és csoport megadása kötelezõ!"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Hiba a hozzáférés hozzáadásakor."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "A hozzáférés adatait nem lett megváltoztatva."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "A hozzáférés nem található."
-#
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Kérdõív létrehozók hozzáférésének adminisztációja."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Felhasználó név"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Jelszó"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Keresztnév"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Vezetéknév"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Lejárat"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "év"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "hónap"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "nap"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Letilt"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Felvitel"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Mégse"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Töröl"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Kérdõívek létrehozása"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Kérdõív állapotának módosítása"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Aktív/Vége"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Kérdõív adatok exportálása"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Csoport szerkesztõ"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "<b>Minden</b> kérdõív szerkeszthetõ, amit ez a csoport birtokol"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Új készítõ létrehozása"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Válaszadók Csoportjának adminisztrátora"
-#
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Válszadó hozzáférési jogának adminisztrációja"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "ehhez a kérdõívhez való hozzáférés"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Hiba a kérdõív másolásakor."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Kérdõív másolása"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Válassza ki azt a kérdõívet, amit másolni szeretne. A másolatnak az állapota "
-"meg fog\n"
-"egyezni egy újonnan létrehozott kérdõív állapotával. A kérdõívet "
-"szerkesztheti és\n"
-"aktiválhatja, mielõtt használná."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Állapot"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Archivált"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Befejezett"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Aktív"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Tesztelt"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Szerkeztett"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-msgid "Error cross-tabulating."
-msgstr "Hiba a keresztbevetésnél."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-"Kérem ellenõrizze, hogy a kiválasztott oszlop és sor nem tartozik-e\n"
-"ugyanahhoz a kérdéshez!"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr "Kérem ellenõrizze, hogy kiválaszott-e egy sort és egy oszlopot!"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-"Ön egyszerre akar kersztbevetést és kersztbe elemzést végrehajtani. Ez "
-"lehetetlen!"
-#
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Kérdõív készítõk jogosultságainak kezelése"
-#
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Kattinson egy felhasználóra, hogy módosítsa, vagy kattinson az új "
-"felhasználó gombra."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "letilt"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Új készítõ létrehozása"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr "Készitõk feltöltése"
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "Érvénytelen kérdõív ID."
-#
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Kérdõív szerkesztése"
-#
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Válasszon ki egy kérdõívet a szerkesztéshez."
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Adatok exportálása"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Formátum"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "letöltés"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Kérdõív tesztelése..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr "A PHP dBase kiterjesztés még nincs insallálva."
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "A kérdõív exportálva:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Hiba a kérdõív exportálásnál."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Hiba a csoport hozzáadásánál."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Hiba a csoport törlésénél"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "A csoport nem üres."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Csoport kezelése"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Leírás"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Tagok"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "A Felhasználói kézikönyv nem található!"
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Belépés"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Szuper felhasználó"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Új kérdõív létrehozása"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Egy létezõ kérdõív szerkesztése"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Kérdõív tesztelése"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Létezõ kérdõív másolása"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Kérdõívek ûrítése"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Kérdõív állapotának megváltoztatása"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(aktív/vége/törlés)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Kérdõív hozzáférési jogainak megváltozatása"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Válaszadók limitálása"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "A kérdõív eredméynének megtekintése"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-msgid "Cross Tabulate Survey Results"
-msgstr "Kérdõív keresztbevetésének eredménye"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Kérdõív riport megtekintése"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Max. válaszok"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Jelszó megváltoztatása"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Válaszadók jogainak kezelése"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Készítõk jogainak kezelése"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "Az eddig csinált dolgok listájának megtekintése"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(fejlesztési célok)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "Felhasználói és adminisztrátori kézikönyv megtekintése"
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Kattinson ide, hogy a Segítség ablak megnyíljon!"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Kilépés"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Kérdõív eredmények egyesítése"
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "Válasszon ki kérdõívket az egyesítéshez!"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Kérdõívek listája"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "Kérdõívek egyesítése"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Jelszó megváltoztatása"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Jelszavát sikeresen megváltoztattuk."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "A jelszó nem lett módosítva. Kérem ellenõrizze a régi jelszavát!"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "Az új jelszó és az új jelszó megerõsítése nem egyezik meg!"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Régi jelszó"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Új jelszó"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Új jelszó megerõsítése"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Csak szuper felhasználóknak engedélyezett!"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Kérdõívek ûrítése"
-#
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Ez az oldal nincs közvetlenül a fõmenüben, mert veszélyes.\n"
-"Egy kérdõívrõl mindent <b>teljesen</b> eltávolít <b>örökre</b> az "
-"adatbázisból.\n"
-"Minden kérdés, az általános információ, az eredmények stb. törlõdnek\n"
-"az adatbázisból. Ne változtasson semmit, ha nem biztos teljesen a \n"
-"dolgában. Ez nem egy megerõsítés, nem lehet visszafordítani!"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "Kérdés szám"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Check boxok törlése"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "README nem található."
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Vissza a Riport menübe"
-#
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Riport megtekintése"
-#
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Válasszon ki egy kérdõívet a megtekintéshez!"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Új válaszadó hozzáadása"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-msgid "Bulk Upload Respondents"
-msgstr "Válaszadók feltöltése"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "Kérdõívek ûrítése"
-#
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Ez az oldal nincs közvetlenül a fõmenüben, mert veszélyes.\n"
-"Egy kérdõívrõl mindent <b>teljesen</b> eltávolít <b>örökre</b> az "
-"adatbázisból.\n"
-"Minden kérdés, az általános információ, az eredmények stb. törlõdnek\n"
-"az adatbázisból. Ne változtasson semmit, ha nem biztos teljesen a \n"
-"dolgában. Ez nem egy megerõsítés, nem lehet visszafordítani!"
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-msgid "Cross Tabulation"
-msgstr "Keresztbevetés"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Kérdõív tesztelése"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-msgid "Reset"
-msgstr "Visszaállít"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr "Keresztbe vetni"
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Kérdõív eredményeinek megtekintése"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Válasszon ki egy kérdõívet a megtekintéshez!"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Válasszon ki egy kérdõívet a keresztbevetéshez!"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-msgid "Respondent"
-msgstr "Válasz"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-msgid "Resp"
-msgstr "Válasz"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Nem lehet a kérdõív állapotát beállítani"
-#
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Kérdõív állapota"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Teszt</b> állapot a kérdõívet tesztelõ üzemmódba helyezi át. Így "
-"lehetõsége\n"
-"nyílik egy a kérdõív élesben történõ tesztelésére, és az eredmények "
-"megtekintésére.\n"
-"Nem tud a kérdõíven változtatásokat eszközölni, ha tesztelõ állapotban van."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Aktív</b> állapot a kérdõívet aktív állapotba helyezi át. Ebben a módban\n"
-"a kérdõív átkerül on-line használatba. A tesztmódban képzõdött válaszok "
-"törlõdnek\n"
-"(ha vannak). A kérdõíven nem lehet többé változtatni!"
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-#, fuzzy
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Vége</b> állapot a kérdõívet befejezett állapotba helyezi át. Ebben a "
-"módban\n"
-"nem lehet szerkeszteni, nem érik el a felhasználók (inaktív), de az "
-"eredmények\n"
-"még mindig megtekinthetõek az eredmények menüben."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-#, fuzzy
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Archív</b> mód eltávolítja a kérdõívet. Még mindig tárolódik az "
-"adatbázisban, \n"
-"de további hozzáférésre nincs mód. Egy archív kérdõívnek az eredményeit "
-"<b>nem</b> tudja megtekinteni."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Teszt"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Aktív"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Vége"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Archív"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Szerkeszt"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Segítség"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Kattintson a Mégse gombra, ha mégsem hozza létre a kérdõívet, vagy "
-"kattintson\n"
-"a Tovább gombra, ha a folytatni akarja."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"A kérdõív címe és egyéb általános mezõk a <b>Általános</b> fülön van.\n"
-"A kérdõívhez kérdéseket hozzáadni vagy módosítani a <b>Kérdések</b> fül\n"
-"alatt teheti meg. A kérdéseket a <b>Sorrend</b> fül alatt tudja sorrendbe\n"
-"rakni, vagy törölni. A kérdõívrõl bármikor megtekintheti az elõnézetet az\n"
-"<b>Elõnézet</b> fül alatt. Ha nincs már változtatnivaló, akkor kattinson a\n"
-"<b>Befejezés</b>-re, hogy visszatérhessen a Kezelõ Felülethez."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Eredmények megtekintése"
-#
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Kattinston a kérdõívre a teszteléshez!"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Export"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Eredmények"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "A tennivalók listája nem található."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-"Egy hiba lépett fel a feltöltéskor. Az alábbi listában találja a hiányzó "
-"sorokat:"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-"Egy hiba lépett fel a feltöltéskor. Kérem ellenõrizze a text fájl formátumát!"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-"Egy hiba lépett fel a feltöltéskor. Kérem egészítse ki mindegyik mezõt!"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-msgid "Upload Account Information"
-msgstr "Feltöltési jogosultsági információk"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-msgid "All fields are required"
-msgstr "Minden mezõ kitöltése kötelezõ!"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-msgid "File Type"
-msgstr "Fájl típus"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr "Meghatározatlan fül"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-msgid "File to upload"
-msgstr "Fájl helye:"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr "Köszönjük, hogy kitöltötte a kérdõívet!"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 176
-#, fuzzy
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-"Kérem ne használja a böngészõjének a Vissza gombját, hogy visszalépjen! \n"
-"Kérem kattinson az alábbi linkre, hogy visszatérjen oda, ahonnan a "
-"kérdõívet\n"
-"elindította!"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-"A phpESp %s könyvtára nem található.\n"
-"\t\t\tKérem ellenõrizze  %s könyvtárat, hogy az összes elérés helyesen lett "
-"beállítva!"
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr "A Gettext tesztelése hiányzik"
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "Hiba a kérdõív folyamatban: Kérdõív nem lett létrehozva."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Befejezte a kédõív létrehozását."
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Hiba a kérdõív folyamatban: Kérdõív nem aktív."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr "Elnézést, de a jogosultság kérési ûrlap le van tíltva!"
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr "Kérem töltse ki az összes kötelezõ mezõt!"
-#
-# File: phpESP/public/signup.php, line: 72
-msgid "Passwords do not match."
-msgstr "A jelszó és a jelszó megerõsítése nem egyezik meg"
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr "A kérés hibás, kérem válasszon egy másik felhasználó nevet!"
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-"A felhasználói jogosultsága, %s, létre lett hozva! Felhasználói "
-"jogosultságát létrehoztuk!"
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr "Hozzáférési jogosultság kérési ûrlap"
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-"Kérem töltse ki az alábbi ûrlapot a jogosultág igényléséhez.A %s-gal jelölt "
-"mezõk kitöltése kötelezõ!"
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr "Email cím"
-#
-# File: phpESP/public/signup.php, line: 157
-msgid "Confirm Password"
-msgstr "Jelszó megerõsítése"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr "Nincs fül definiálva. Kérem ellenõrizze az INI beállításait!"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "Általános"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Kérdések"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Sorrend"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Elõnézet"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Befejezés"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Oldal"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "-ból/-bõl"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "Sajnos a név már foglalt."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Kérdés"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Kérdés neve"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-#~ msgid "DBF download not yet implemented."
-#~ msgstr "DBF letöltés még nincs megvalósítva."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "Válasszon funkciót!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Adat exportálása CSV-be"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Hiba!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Legalább 2 kérdõívet ki kell választania!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Error cross-tabulating. Please ensure that your column\n"
-#~ "                                             and row selections are not "
-#~ "of the same question."
-#~ msgstr ""
-#~ "Hiba a keresztbevetésnél. Kérem ellenõrizze, hogy az oszlop\n"
-#~ "                                             és a sor választása nem "
-#~ "tartozik-eugyanahhoz a kérdéshez!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Error cross-tabulating. Please ensure you make both\n"
-#~ "                                     a column and row selection."
-#~ msgstr ""
-#~ "Hiba a keresztbevetésnél. Kérem ellenõrizze, hogy kiválaszott-e\n"
-#~ "                                     egy oszlopot és egy sort."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Error cross-tabulating. You are attempting to cross analyse\n"
-#~ "                             and tabulate at the same time. This is not "
-#~ "possible!"
-#~ msgstr ""
-#~ "Hiba a keresztbevetésnél. Egyszerre akart keresztbevetést és keresztbe "
-#~ "elemzést\n"
-#~ "                              végrehajtani. Erre nincs lehetõség!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Csoport tagok adminisztrátora"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "Nincs kérdõív létrehozva."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#, fuzzy
-#~ msgid "active"
-#~ msgstr "Aktív"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#, fuzzy
-#~ msgid "Action"
-#~ msgstr "Oldal"
Index: locale/it_IT/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/it_IT/LC_MESSAGES/messages.po
===================================================================
--- locale/it_IT/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/it_IT/LC_MESSAGES/messages.po	(working copy)
@@ -1,2521 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.7 2007/12/10 10:50:35 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-02-18 13:29-0500\n"
-"Last-Translator: <info@cawi.it>\n"
-"Language-Team: it_IT <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Non abilitato ad aprire il file incluso. Controlla INI settaggi. Il "
-"programma verrà terminato."
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Non abilitato ad aprire il file incluso. Controlla INI settaggi. Il "
-"programma verrà terminato."
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Servizio non disponibile."
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-#, fuzzy
-msgid "Connection to database failed. Please check configuration."
-msgstr ""
-"Non sono definiti tabs. Controlla per cortesia il tuo settaggio di INI."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Resume survey"
-msgstr "Verifica la Indagine"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Si"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "No"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "Non disponibile"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "copia"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Argomento non valido"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Errore di apertura indagine."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Errore di apertura indagine"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Risposte non trovate."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "TOTALE"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Domande non trovate."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-#, fuzzy
-msgid "Questions marked with a %s are required."
-msgstr "Domande segnate con "
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "Spiacentee, devi scegliere un tipo per questa domanda."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr "Errore tabella di sistema corrotta"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr "Tabella"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Rapporto per"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "#"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Richiesto"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Pubblico"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Contenuto"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-#, fuzzy
-msgid "Previous"
-msgstr "Anteprima"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-#, fuzzy
-msgid "Next"
-msgstr "Prossima pagina"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Errore di analisi incrociate. Domanda di tipo non valido."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-#, fuzzy
-msgid "Cross analysis on QN:"
-msgstr "Analisi incrociate su QID:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr ""
-"Spiacente, per piacere riempire il nome, gruppo, e titolo prima di "
-"continuare."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Spiacente, nome gia' in uso. Scegli un nuovo nome."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Spiacente, questo nome e' gia' in uso."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Attenzione, incontrato errore."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Per piacere introduci il testo per questa domanda."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Spiacentee, devi scegliere un tipo per questa domanda."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Nuovo campo"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-"Spiacente, non puoi cambiare tra questi tipi di domande. Creare invece una "
-"nuova domanda."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-"Spiacente, hai bisogno di almeno una opzione di risposta per questa tipo di "
-"domanda."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Per piacere introduci il testo per questa domanda."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Errore elaborando l'indagine: violazione di Sicurezza."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr "Incapace di eseguire la richiesta di accesso"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr "Incapace di eseguire la richiesta dei rispondenti."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr "Non autorizzato"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"Non coretto User ID o Password, o la tua account e stata disadilitata/"
-"scaduta."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr ""
-"La tua account e stata disabilitata o hai gia' completato questa indagine."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr "Incapace di caricare ACL."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Interfaccia di gestione."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Questa account non ha permessi"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Vai giu nella interfaccia di gestione"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-#, fuzzy
-msgid "This account does not have permission %s."
-msgstr "Questa account non ha permessi"
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-#, fuzzy
-msgid "Submit"
-msgstr "Sottotitolo"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr "Riga"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Risposta"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr "Riga media"
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Stai saltando la seguente domanda richiesta:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Per piacere introduci il testo per questa domanda."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Risultati"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "Sezione interrotta"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "Questionario completato."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Hai completato questo questionario."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Per inserire questa indagine nella tua pagine web, copia il testo sotto, e "
-"incollalo nella HTML della tua pagina."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"Una volta attivato puoi anche accedere all' indagine direttamente dal "
-"seguente URL."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Devi attivare questa indagine prima di raccogliere risultati. Una volta che "
-"l'indagine è attivata, non si potranno più effettuare cambiamenti. Puoi "
-"attivare questa indagine scegliendo <b>Cambia lo stato di un esistente "
-"indagine</B> dalla interfaccia di gestione."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"Le informazioni in queste linguette si applicano all'intera indagine.Riempi "
-"questa pagina poi vai nel <b>Campo</b>tab per correggere campi individuali."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Nome"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-#, fuzzy
-msgid "Required"
-msgstr "Richiesta?"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Nome indagine."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Questo e usato per tutti i futuri acessi a questa indagine."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "no spazi"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "solo caratteri alfanumerici"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Propietario"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-#, fuzzy
-msgid "User and Group that owns this survey."
-msgstr "Gruppo che possiede questa indagine."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Titolo "
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-#, fuzzy
-msgid "Title of this survey."
-msgstr "Titolo dell' indagine"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-#, fuzzy
-msgid "This appears at the top of every page of this survey."
-msgstr "Questo appare all'apice di ogni pagina dell' indagine."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-#, fuzzy
-msgid "free-form, including spaces"
-msgstr "includendo spazi"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Sottotitolo"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-#, fuzzy
-msgid "Subtitle of this survey."
-msgstr "Sottotitolo dell' indagine."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Appare sotto il titolo."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Informazioni aggiuntive"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-#, fuzzy
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr "Testo che apparirà nell' indagine prima di ogni campo."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-#, fuzzy
-msgid "Confirmation Page"
-msgstr "Conferma testo"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-#, fuzzy
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"Intestazione nel &quot;Confirmation&quot; pagina (appare dopo che un utente "
-"completa un indagine). Questo appare in grasetto."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "Email"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Spedidci una copia di ogni presentazione all' indirizzo (o lascia vuoto per "
-"non inviare nessuna email di backup)."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr "Scegli un tema (css) da utilizzare con questa indagine."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-#, fuzzy
-msgid "Options"
-msgstr "Domande"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Cambia l'ordine della presentazione delle domande scegliendo la posizione "
-"desiderata dalla lista. "
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Sezione aggiunta interotta"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Questa è antrprima di come l'indagine apparirà. Nell'anteprima la &quot,"
-"Prossima pagina&quot; e &quot; Indagine&quot; sono disabilitate. L'indagine "
-"userà i colori di backround del documento in cui è inserito. Se non hai "
-"ulteriori cambiamenti clicca <b>Fine</b> al fondo di questa pagina. "
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Sezione"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Prossima pagina"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Indagine sottoposta."
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-"Correggi questo campo, o clicca il numero del campo che vorresti correggere:"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Domande"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Domande"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Domande"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Tipo"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Lunghezza"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr "Precisione"
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-#, fuzzy
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"Introduci le possibili risposte (se applicabile). Introduci <tt>!altrimenti</"
-"tt> in una linea stessa per creare a fill nella risposta vuota alla fine "
-"della domanda. Tutte le linee vuote veranno eliminate."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Aggiungi un altra linea di risposta."
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Per piacere seleziona un gruppo."
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Privato"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Acesso all' indagine"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Questo lascia controllare chi ha acesso di riempire una forma. Le indagie "
-"pubbliche permettono a tutti di inviare dati. Le indagini private sono "
-"ristrette dal Gruppo di Rispondenti."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Note"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-#, fuzzy
-msgid "You must use %s when using private surveys."
-msgstr "quando si utilizzano indagini personali."
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "gruppo"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Max Responses"
-msgstr "Risposta"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Rimuovere"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Aggiungi"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Fai pubblico"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Fai privato"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr "per accedere a questo questionario"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr "per accedere a questo gruppo"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Non e possibile cancellare account"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Usename, Password, e Gruppo sono richiesti."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Errore accordando account."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Non è possibile cambiare la data dell'account. "
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Account non trovata."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Disignare amministratore dell account"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Username"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Password"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Nome"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Cognome"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Scadenza"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "anno"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "mese "
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "giorno"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Disabilitato"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Aggiornare"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Cancellare"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Cancella"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Questionario"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Cambia stati dell' indagine"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Attivato/Fine"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Esportazione dati indagine"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Gruppo di controllo"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "per correggere<b>all</b>forme propie del gruppo"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Aggiungi un nuovo Designer"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Gruppo di Amministrazione dei Rispondenti"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Account di Amministrazione dei Rispondenti"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr "per accedere a l'indagine"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Errore copiando indagine."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Copia l'indagine"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-#, fuzzy
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Scegli un indagine della quale fare una copia. La copia avrà lo stesso stato "
-"di una indagine appena creata. Puoi correggere l'indagine, e devi attivarla "
-"prima di uttilizzarla."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Stato"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Archiviato"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Fine"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Attivo"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Testing"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Editing"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-#, fuzzy
-msgid "Error cross-tabulating."
-msgstr "Scegli una funzione"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Gestione del Designer degli Accounts Web"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-"Clicca nell' username per modificare, o clicca sotto per aggiungere un nuovo "
-"utente."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "Disabilitato"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Aggiungi un nuovo Designer"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr "Upload massivo dei Designers"
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "Invalido ID indagine."
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Modifica un indagine"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Scegli l'indagine per modificarla."
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Esportazione Dati"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Formatto"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "download"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Testing indagine..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr "SID"
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr "L'estensione del PHP dBase non è installato."
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Esportazione indagine come:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Errore esportando l'indagine come:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Errore di aggiunta gruppo"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Errore di cancellazione gruppo"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Gruppo non vuoto"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Gruppi di amministrazione"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Descrizione"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Membri"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "Guida utenti non trovata."
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Log back in."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Amministratore"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Crea una nuova indagine"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Controlla una indagine esistente"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Collauda un indagine"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Copia un' indagine esistente"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Ripulire Indagini."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Cambia lo stato di un indagine"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(attivo/fine/cancella)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Cambia Acesso a un indagine"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Numero massimo dei rispondenti."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Vedi Risultati dall' indagine"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-#, fuzzy
-msgid "Cross Tabulate Survey Results"
-msgstr "Assemblare i risultati dell' indagine"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Vedi Report di un' indagine"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Risposta"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Cambia la tua Password"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Accounts della Gestione dei rispondenti"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Accounts del Designer di Gestione"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr "Vista della lista delle cose ancora da fare"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(sviluppo degli obbiettivi)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "Vista dell Utente &amp; Guia dell' amministratore"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Click qui per aprire la finestra di Help."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Disconetitti"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr "SIDS"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr "Assemblare i risultati dell' indagine"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr "Scegli l'indagine per assemblare"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Lista delle indagini"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr "Indagine da assemblare"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Cambia Password"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "La tua password e stata con sucesso cambiata"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Password non fissata, controlla la tua vecchia password."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "Nuova passwords non accopiata o vuota."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Vecchia password"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Nuova password"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Conferma la nuova Password"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Permesso solo all' amministratore"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr "Ripulire Indagini."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Questa pagina non è direttamente nel menu principale perchè e pericolosa. "
-"Questo <b>completly</b> rimuove qualsiasi cosa di un ingagine dal database "
-"<b>forever</b>. Tutte le domande informazioni, informazioni generali, "
-"risultati, etc. sono ripuliti dal database. Non fare nulla qui, di cui non "
-"sei completamente certo. Non ci sono  conferme, non si puo' tornare indietro."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr "#Q's"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Pulisci le Caselle di Controllo"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "README non trovato"
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Torna al Report Menu"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Guarda il Form Report"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Prendi un questionario per Vederlo"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Aggiungi un nuovo Rispondente"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-msgid "Bulk Upload Respondents"
-msgstr "Carica una grande quantità di Rispondenti"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-#, fuzzy
-msgid "Purge response"
-msgstr "Ripulire Indagini."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Questa pagina non è direttamente nel menu principale perchè e pericolosa. "
-"Questo <b>completly</b> rimuove qualsiasi cosa di un ingagine dal database "
-"<b>forever</b>. Tutte le domande informazioni, informazioni generali, "
-"risultati, etc. sono ripuliti dal database. Non fare nulla qui, di cui non "
-"sei completamente certo. Non ci sono  conferme, non si puo' tornare indietro."
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-#, fuzzy
-msgid "Cross Tabulation"
-msgstr "Scegli una funzione"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Verifica la Indagine"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-#, fuzzy
-msgid "Reset"
-msgstr "Risposta"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Guarda i Risultati dell'Indagine"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Seleziona Indagine per Guardarla"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-#, fuzzy
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Prendi un'indagine per testarla"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-#, fuzzy
-msgid "Respondent"
-msgstr "Risposta"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-msgid "Resp"
-msgstr "Rispondente"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Non posso settare lo stato dell'Indagine"
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Stato dell'Indagine"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Test</b> una indagine va nel modo verifica. A quel punto puoi eseguire "
-"una verifica dal vivo scegliendo l'indagine, e guardando i risultati. Quando "
-"passi al modo Verifica non potrai introdurre ulteriori cambiamento "
-"all'indagine."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Activate</b> una indagine va nel modo attivo. In questo modo l'indagine è "
-"aperta per l'immissione dei questionari, e puoi metterla online. Questo "
-"pulira' tutti i dati, se ve ne sono, del modo test. Non sono permessi "
-"ulteriori cambiamenti nell'indagine."
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Fine</b> una indagine va nel modo finito. In questo modo non sono "
-"possibili correzioni, gli utenti non possono rispondere all'indagine (è "
-"inattiva), ma i risultati sono ancora guardabili dal menu results."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Archive</b> rimuove questa indagine. Sara' memorizzata nel database, ma "
-"non saranno permesse ulteriori interazioni. Tu puoi b>not</b> guardare i "
-"risultati di una indagine archiviata."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Test"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Attiva"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Fine"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Archivia"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Correggere"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Aiuto"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Click cancel per cancellare questa indagine, oppure click continue per "
-"procedere alla prossima tab."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"Il titolo dell'Indagine e altri campi generali sono nel <b>General</b> tab. "
-"Le domande dell'indagine vengono aggiunte o modificate nel <b>Questions</b> "
-"tab. Le domande possono essere cancellate o cambiate di ordine nel <b>Order</"
-"b> tab. Tu puoi vedere un'anteprima della tua indagine in ogni momento col "
-"<b>Preview</b> tab. Se non hai altri cambiamenti click su <b>Finish</b> per "
-"tornare all'Interfaccia di Gestione."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Guarda i Risultati"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Prendi un'indagine per testarla"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Esporta"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Risultati"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Lista Todo non trovata."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-"Incontrato un errore nel caricamento. Le Righe che hanno dato problemi sono "
-"elencate sotto."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-"Incontrato un errore durante il caricamento. Controlla per cortesia il "
-"formato del tuo file di testo."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-"Incontrato un errore durante il caricamento. Completa per cortesia tutti i "
-"campi del questionario."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-msgid "Upload Account Information"
-msgstr "Caricamento Informazioni Account"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-msgid "All fields are required"
-msgstr "Sono obbligatori tutti i campi"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-msgid "File Type"
-msgstr "Tipo File"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr "Delimitato da Tab"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-msgid "File to upload"
-msgstr "File da caricare"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr ""
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "Errore elaborando l'indagine: non e' specificata l'Indagine."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Hai completato questo questionario."
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Errore elaborando l'indagine: Indagine non attiva."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 72
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "Nuova passwords non accopiata o vuota."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-#, fuzzy
-msgid "Confirm Password"
-msgstr "Conferma la nuova Password"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr ""
-#~ "Non sono definiti tabs. Controlla per cortesia il tuo settaggio di INI."
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "Generale"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Domande"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Ordine"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Anteprima"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Finito"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Pagina"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "di"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "Spiacente, questo nome e' gia' in uso."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Campo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Nome del campo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/download.inc, line: 60
-#~ msgid "DBF download not yet implemented."
-#~ msgstr "DBF download non ancora completata."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 88
-# File: phpESP/admin/include/where/test.inc, line: 136
-#~ msgid "DBF"
-#~ msgstr "DBF"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "Scegli una funzione"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Esporta dati da CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Errore!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Hai bisogno di scegliere almeno due indagini!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Membri Gruppo di Amministrazione"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "Nessuna indagine specificata."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Total"
-#~ msgstr "Totale"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "are required."
-#~ msgstr "sono richiesti."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Incorrect User ID or Password, or your account has been disabled."
-#~ msgstr ""
-#~ "Non corretta User ID o Password, o la tua account è stata disabilitata. "
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "free-form"
-#~ msgstr "forma libera"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "ie. instructions, background info, etc."
-#~ msgstr "ie. istruzioni, informazioni di sfondo, etc."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Required?"
-#~ msgstr "Richiesta?"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "You must use"
-#~ msgstr "Devi utilizzarlo"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to access this menu"
-#~ msgstr "per accedere a questo menu"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Purge"
-#~ msgstr "Pulisci"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "STATUS"
-#~ msgstr "Stato"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "to design forms"
-#~ msgstr "al design questionari "
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "%s"
-#~ msgstr "%s"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Survey Theme"
-#~ msgstr "Tema dell' indagine"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Confirmation Heading"
-#~ msgstr "Conferma intestazione "
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid ""
-#~ "Body text on the &quot;Confirmation&quot; page. This is displayed below "
-#~ "the Confirmation Heading."
-#~ msgstr ""
-#~ "Corpo del testo in &quot;Confirmation&quot; pagina. Questo appare sotto "
-#~ "l' intestazione di conferma"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Max Logins"
-#~ msgstr "Numero massimo di accessi."
Index: locale/en_US/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/en_US/LC_MESSAGES/messages.po
===================================================================
--- locale/en_US/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/en_US/LC_MESSAGES/messages.po	(working copy)
@@ -1,1681 +0,0 @@
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.7 2007/12/10 10:50:35 liedekef Exp $
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2002-02-18 13:29-0500\n"
-"Last-Translator: James Flemer <jflemer@alum.rpi.edu>\n"
-"Language-Team: en_US <jflemer@alum.rpi.edu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-msgid "Connection to database failed. Please check configuration."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-msgid "Resume survey"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-msgid "Questions marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 92
-msgid "Sorry, no questions for you to answer in this section."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-msgid "Previous"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-msgid "Next"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-msgid "Cross analysis on QN:"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 350
-msgid "Please select two different questions."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-msgid "This account does not have permission %s."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-msgid "Submit"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 74
-msgid "Please only use numbers for the following questions:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 14
-msgid "equals"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-msgid "Required"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-msgid "User and Group that owns this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-msgid "Title of this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-msgid "This appears at the top of every page of this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "free-form, including spaces"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-msgid "Subtitle of this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-msgid "Confirmation Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-msgid "Options"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 87
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 92
-msgid "Edit Question"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 92
-# File: phpESP/admin/include/tab/questions.inc, line: 96
-msgid "New Question"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 103
-msgid "Question Name"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-msgid "You must use %s when using private surveys."
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-msgid "Max Responses"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr ""
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-msgid "Administer Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-msgid "Administer Respondents"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-msgid "Error cross-tabulating."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr ""
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr ""
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr ""
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 99
-# File: phpESP/admin/include/where/test.inc, line: 144
-msgid "Download"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr ""
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr ""
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr ""
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 33
-msgid "Purge a survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-msgid "Cross Tabulate Survey Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 53
-msgid "Purge a response"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr ""
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr ""
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr ""
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr ""
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr ""
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr ""
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr ""
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-msgid "Bulk Upload Respondents"
-msgstr ""
-#
-# File: phpESP/admin/include/where/response_purge.inc, line: 23
-# File: phpESP/admin/include/where/response_purge.inc, line: 52
-msgid "Purge response"
-msgstr ""
-#
-# File: phpESP/admin/include/where/response_purge.inc, line: 25
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-msgid "Cross Tabulation"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-msgid "Reset"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-msgid "Pick Survey to Cross Tabulate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-msgid "Respondent"
-msgstr ""
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-msgid "Resp"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr ""
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr ""
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr ""
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-msgid "Upload Account Information"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-msgid "All fields are required"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-msgid "File Type"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr ""
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-msgid "File to upload"
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 172
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr "Passed"
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr ""
-#
-# File: phpESP/public/handler.php, line: 46
-msgid "You have already completed this survey."
-msgstr ""
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr ""
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 72
-msgid "Passwords do not match."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 157
-msgid "Confirm Password"
-msgstr ""
Index: locale/fi_FI/LC_MESSAGES/messages.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: locale/fi_FI/LC_MESSAGES/messages.po
===================================================================
--- locale/fi_FI/LC_MESSAGES/messages.po	(revision 6370)
+++ locale/fi_FI/LC_MESSAGES/messages.po	(working copy)
@@ -1,2097 +0,0 @@
-# translation of messages.po to Finnish
-# phpESP
-# By James Flemer <jflemer@alum.rpi.edu>
-# $Id: messages.po,v 1.5 2007/12/10 10:50:35 liedekef Exp $
-# Tom Ingberg <tom.ingberg@edu.vantaa.fi>, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: phpESP-1.7\n"
-"POT-Creation-Date: 2007-12-10 11:49+0100\n"
-"PO-Revision-Date: 2004-05-26 14:12+0300\n"
-"Last-Translator: Tom Ingberg <tom.ingberg@edu.vantaa.fi>\n"
-"Language-Team: Finnish\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
-#
-# File: phpESP/admin/include/funcs.inc, line: 40
-# File: phpESP/admin/include/where/tab.inc, line: 134
-msgid "Unable to open include file. Check INI settings. Aborting."
-msgstr ""
-"Virhe avattaessa sisällytettävää tiedostoa. Tarkista INI-asetukset. "
-"Keskeytetään."
-#
-# File: phpESP/admin/include/funcs.inc, line: 49
-#, fuzzy
-msgid "Unable to open ADODB include file. Check INI settings. Aborting."
-msgstr ""
-"Virhe avattaessa sisällytettävää tiedostoa. Tarkista INI-asetukset. "
-"Keskeytetään."
-#
-# File: phpESP/admin/include/funcs.inc, line: 76
-# File: phpESP/admin/include/funcs.inc, line: 77
-# File: phpESP/admin/include/funcs.inc, line: 78
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 139
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 140
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 142
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 176
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 177
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 179
-msgid "Service Unavailable"
-msgstr "Palvelu ei ole nyt saatavissa."
-#
-# File: phpESP/admin/include/funcs.inc, line: 79
-msgid "Connection to database failed. Please check configuration."
-msgstr ""
-"Tietokantayhteyden avaaminen epäonnistui. Ole hyvä ja tarkista asetukset."
-#
-# File: phpESP/admin/include/funcs.inc, line: 135
-msgid ""
-"Your progress has been saved.  You may return at any\n"
-"time to complete this survey.  To do so, simply bookmark\n"
-"the link below.  You may be prompted for your username\n"
-"and password to complete the survey."
-msgstr ""
-"Edistymisesi tähän asti on tallennettu.\n"
-"Voit jatkaa tästä eteenpäin milloin tahansa.\n"
-"Sinun tarvitsee vain ottaa ylös oheinen linkki tai\n"
-"lisätä se suosikkisivujesi joukkoon (kirjanmerkkeihin).\n"
-"Sinulta saatetaan kysyä käyttäjätunnusta ja\n"
-"salasanaa päästäksesi jatkamaan kyselyä."
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-msgid "Resume survey"
-msgstr "Palaa kyselyyn"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 142
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 313
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "Yes"
-msgstr "Kyllä"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 146
-# File: phpESP/admin/include/function/survey_report.inc, line: 71
-# File: phpESP/admin/include/function/survey_report.inc, line: 73
-# File: phpESP/admin/include/function/survey_results.inc, line: 301
-# File: phpESP/admin/include/function/survey_results.inc, line: 315
-# File: phpESP/admin/include/where/access.inc, line: 181
-# File: phpESP/admin/include/where/access.inc, line: 182
-# File: phpESP/admin/include/where/admdesigner.inc, line: 281
-# File: phpESP/admin/include/where/admdesigner.inc, line: 291
-# File: phpESP/admin/include/where/admdesigner.inc, line: 296
-# File: phpESP/admin/include/where/admdesigner.inc, line: 302
-# File: phpESP/admin/include/where/admdesigner.inc, line: 307
-# File: phpESP/admin/include/where/admdesigner.inc, line: 313
-# File: phpESP/admin/include/where/admdesigner.inc, line: 318
-# File: phpESP/admin/include/where/admrespondent.inc, line: 256
-msgid "No"
-msgstr "Ei"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 261
-msgid "1"
-msgstr "1"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 262
-msgid "2"
-msgstr "2"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 263
-msgid "3"
-msgstr "3"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 264
-msgid "4"
-msgstr "4"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 265
-msgid "5"
-msgstr "5"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 266
-# File: phpESP/admin/include/function/survey_render.inc, line: 289
-msgid "N/A"
-msgstr "N/A"
-#
-# File: phpESP/admin/include/function/survey_copy.inc, line: 30
-msgid "copy"
-msgstr "kopio"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 21
-# File: phpESP/admin/include/function/survey_merge.inc, line: 26
-msgid "Invalid argument."
-msgstr "Virheellinen argumentti"
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 44
-# File: phpESP/admin/include/function/survey_report.inc, line: 37
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 126
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-# File: phpESP/admin/include/function/survey_results.inc, line: 193
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "Error opening survey."
-msgstr "Virhe avattaessa kyselyä."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 57
-# File: phpESP/admin/include/function/survey_merge.inc, line: 62
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-msgid "Error opening surveys."
-msgstr "Virhe avattaessa kyselyjä."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/function/survey_results.inc, line: 198
-msgid "No responses found."
-msgstr "Yhtään vastausta ei löydetty."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 63
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 61
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 118
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 157
-msgid "TOTAL"
-msgstr "YHT."
-#
-# File: phpESP/admin/include/function/survey_merge.inc, line: 87
-# File: phpESP/admin/include/function/survey_report.inc, line: 48
-# File: phpESP/admin/include/function/survey_results.inc, line: 139
-msgid "No questions found."
-msgstr "Yhtään kysymystä ei löytynyt."
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 61
-msgid "Page %d of %d"
-msgstr "Sivu %d/%d"
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 67
-msgid "Questions marked with a %s are required."
-msgstr "%s:llä merkittyihin kysymyksiin pitää vastata."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-#, fuzzy
-msgid "Sorry, no questions for you to answer in this section."
-msgstr "Virhe: Sinun täytyy valita kysymyksen tyyppi."
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-msgid "Error system table corrupt."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 24
-# File: phpESP/admin/include/function/survey_results.inc, line: 113
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Table"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-msgid "Report for"
-msgstr "Raportti kyselystä"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 52
-# File: phpESP/admin/include/function/survey_report.inc, line: 58
-# File: phpESP/admin/include/function/survey_update.inc, line: 311
-# File: phpESP/admin/include/where/access.inc, line: 162
-# File: phpESP/admin/include/where/access.inc, line: 199
-# File: phpESP/admin/include/where/copy.inc, line: 68
-# File: phpESP/admin/include/where/edit.inc, line: 35
-# File: phpESP/admin/include/where/export.inc, line: 30
-# File: phpESP/admin/include/where/purge.inc, line: 53
-# File: phpESP/admin/include/where/report.inc, line: 69
-# File: phpESP/admin/include/where/results.inc, line: 162
-# File: phpESP/admin/include/where/status.inc, line: 137
-# File: phpESP/admin/include/where/test.inc, line: 108
-msgid "ID"
-msgstr "ID"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 57
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "#"
-msgstr "Kpl"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 59
-msgid "Req'd"
-msgstr "Vaadittu"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 60
-# File: phpESP/admin/include/where/access.inc, line: 106
-# File: phpESP/admin/include/where/access.inc, line: 167
-# File: phpESP/admin/include/where/access.inc, line: 204
-# File: phpESP/admin/include/where/access.inc, line: 235
-msgid "Public"
-msgstr "Julkinen"
-#
-# File: phpESP/admin/include/function/survey_report.inc, line: 61
-msgid "Content"
-msgstr "Sisältö"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 53
-msgid "Previous"
-msgstr "Edellinen"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 64
-msgid "Next"
-msgstr "Seuraava"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 68
-msgid "Navigate Individual Respondent Submissions"
-msgstr "Tutki yksittäisten vastaajien vastauksia"
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 154
-msgid "Error cross-analyzing. Question not valid type."
-msgstr "Virhe ristiinanalysoinnissa: Kysymys ei ole oikentyyppinen."
-#
-# File: phpESP/admin/include/function/survey_results.inc, line: 227
-msgid "Cross analysis on QN:"
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 36
-# File: phpESP/admin/include/function/survey_update.inc, line: 73
-msgid "Sorry, please fill out the name, group, and title before proceeding."
-msgstr "Virhe: Sinun tulee antaa vähintään nimi, ryhmä ja otsikko jatkaaksesi."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 56
-msgid "Sorry, name already in use. Pick a new name."
-msgstr "Virhe: Kyselyn nimi on jo käytössä. Ole hyvä ja valitse uusi nimi."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 87
-msgid "Sorry, that name is already in use."
-msgstr "Virhe: Nimi on jo käytössä."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 101
-# File: phpESP/admin/include/function/survey_update.inc, line: 262
-# File: phpESP/admin/include/function/survey_update.inc, line: 302
-msgid "Warning, error encountered."
-msgstr "Varoitus: Tapahtui virhe."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-msgid "Please enter text for this question."
-msgstr "Ole hyvä ja kirjoita kysymysteksti."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 164
-msgid "Sorry, you must select a type for this question."
-msgstr "Virhe: Sinun täytyy valita kysymyksen tyyppi."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 169
-# File: phpESP/admin/include/tab/questions.inc, line: 47
-# File: phpESP/admin/include/tab/questions.inc, line: 111
-# File: phpESP/admin/include/tab/questions.inc, line: 115
-msgid "New Field"
-msgstr "Uusi kenttä"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 182
-msgid ""
-"Sorry, you cannot change between those types of question. Create a new "
-"question instead."
-msgstr ""
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 310
-msgid "Sorry, you need at least one answer option for this question type."
-msgstr ""
-"Virhe: Tämäntyyppisellä kysymyksellä on oltava vähintään yksi "
-"vastausvaihtoehto."
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please select two different questions."
-msgstr "Ole hyvä ja kirjoita kysymysteksti."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 19
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 29
-# File: phpESP/public/handler-prefix.php, line: 56
-# File: phpESP/public/handler-prefix.php, line: 61
-msgid "Error processing survey: Security violation."
-msgstr "Virhe käsiteltäessä kyselyä: Turvarikkomus."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 33
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 44
-msgid "Unable to execute query for access."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 60
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 72
-msgid "Unable to execute query respondents."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 76
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 92
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 158
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 159
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 160
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 88
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 104
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 221
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 222
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 223
-msgid "Unauthorized"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 77
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 161
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 89
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 224
-msgid ""
-"Incorrect User ID or Password, or your account has been disabled/expired."
-msgstr ""
-"Virheellinen käyttäjätunnus tai salasana. Tunnus saattaa olla myös "
-"vanhentunut tai poistettu käytöstä."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 93
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 105
-msgid ""
-"Your account has been disabled or you have already completed this survey."
-msgstr ""
-"Tunnuksesi on poistettu käytöstä tai tällä tunnuksella on jo vastattu "
-"kyselyyn."
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 143
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 180
-msgid "Unable to load ACL."
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 157
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 220
-# File: phpESP/admin/include/where/manage.inc, line: 14
-msgid "Management Interface"
-msgstr "Hallintapaneeli"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 248
-msgid "This account does not have permission"
-msgstr "Tällä tunnuksella ei ole pääsyä"
-#
-# File: phpESP/admin/include/lib/espauth-default.inc, line: 250
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 313
-# File: phpESP/admin/include/tab/finish.inc, line: 52
-# File: phpESP/admin/include/where/access.inc, line: 156
-# File: phpESP/admin/include/where/access.inc, line: 192
-# File: phpESP/admin/include/where/access.inc, line: 252
-# File: phpESP/admin/include/where/admdesigner.inc, line: 328
-# File: phpESP/admin/include/where/admrespondent.inc, line: 266
-# File: phpESP/admin/include/where/copy.inc, line: 31
-# File: phpESP/admin/include/where/copy.inc, line: 40
-# File: phpESP/admin/include/where/copy.inc, line: 108
-# File: phpESP/admin/include/where/designers.inc, line: 151
-# File: phpESP/admin/include/where/edit.inc, line: 63
-# File: phpESP/admin/include/where/export.inc, line: 20
-# File: phpESP/admin/include/where/export.inc, line: 94
-# File: phpESP/admin/include/where/export.inc, line: 156
-# File: phpESP/admin/include/where/groups.inc, line: 50
-# File: phpESP/admin/include/where/groups.inc, line: 95
-# File: phpESP/admin/include/where/guide.inc, line: 12
-# File: phpESP/admin/include/where/guide.inc, line: 22
-# File: phpESP/admin/include/where/merge.inc, line: 42
-# File: phpESP/admin/include/where/merge.inc, line: 153
-# File: phpESP/admin/include/where/passwd.inc, line: 23
-# File: phpESP/admin/include/where/passwd.inc, line: 60
-# File: phpESP/admin/include/where/purge.inc, line: 13
-# File: phpESP/admin/include/where/purge.inc, line: 49
-# File: phpESP/admin/include/where/purge.inc, line: 107
-# File: phpESP/admin/include/where/readme.inc, line: 12
-# File: phpESP/admin/include/where/readme.inc, line: 22
-# File: phpESP/admin/include/where/report.inc, line: 38
-# File: phpESP/admin/include/where/report.inc, line: 97
-# File: phpESP/admin/include/where/respondents.inc, line: 150
-# File: phpESP/admin/include/where/results.inc, line: 120
-# File: phpESP/admin/include/where/results.inc, line: 248
-# File: phpESP/admin/include/where/status.inc, line: 134
-# File: phpESP/admin/include/where/status.inc, line: 228
-# File: phpESP/admin/include/where/test.inc, line: 71
-# File: phpESP/admin/include/where/test.inc, line: 143
-# File: phpESP/admin/include/where/todo.inc, line: 8
-# File: phpESP/admin/include/where/todo.inc, line: 18
-# File: phpESP/admin/include/where/upload.inc, line: 133
-msgid "Go back to Management Interface"
-msgstr "Palaa hallintapaneeliin"
-#
-# File: phpESP/admin/include/lib/espauth-ldap.inc, line: 311
-msgid "This account does not have permission %s."
-msgstr "Käyttäjätunnuksellasi ei ole oikeutta suorittaa toimintoa %s."
-#
-# File: phpESP/admin/include/lib/esphtml.forms.inc, line: 145
-msgid "Submit"
-msgstr "Lähetä"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 83
-msgid "Rank"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-msgid "Response"
-msgstr "Vastaus"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 199
-msgid "Average rank"
-msgstr ""
-#
-# File: phpESP/admin/include/lib/espresponse.inc, line: 59
-msgid "You are missing the following required questions:"
-msgstr "Et ole vastannut seuraaviin vaadittuihin kysymyksiin:"
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 115
-#, fuzzy
-msgid "Please only use numbers for the following questions:"
-msgstr "Ole hyvä ja kirjoita kysymysteksti."
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-#, fuzzy
-msgid "equals"
-msgstr "Tulokset"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 15
-msgid "is different from"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 16
-msgid "smaller than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 17
-msgid "bigger than"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 22
-msgid "Current conditions defined:"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 111
-msgid "OR"
-msgstr "TAI"
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 33
-# File: phpESP/admin/include/tab/conditions.inc, line: 82
-msgid "Only show question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 41
-# File: phpESP/admin/include/tab/conditions.inc, line: 104
-msgid "if answer to question "
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 65
-msgid ""
-"All conditions are \"OR\" conditions, so if one conditions is fullfilled, "
-"the question is shown.<br />\n"
-"A question that has a condition must be an optional question. So, if you "
-"define a condition on a question, the \"Required\" parameter is set to \"No"
-"\".<br />\n"
-"A question that has a condition must be on the next page than the question/"
-"value that is used to compare it with. Use the \"Order tab\" to insert a "
-"section break where wanted (this is <b>NOT</b> done automatically).<br />\n"
-"A Yes/No question can only be compared using the values \"Yes or \"No\"."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/conditions.inc, line: 73
-msgid "Add conditions to a question."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/order.inc, line: 89
-msgid "----- Section Break -----"
-msgstr "----- Osion vaihto -----"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 27
-msgid "Survey Design Completed"
-msgstr "Kyselyn suunnittelu on suoritettu"
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-msgid "You have completed this survey design."
-msgstr "Kyselyn laatiminen on nyt valmis. "
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 31
-msgid ""
-"To insert this survey into your web page, copy the text\n"
-"below, and paste it into the HTML of your page."
-msgstr ""
-"Lisätäksesi tämän kyselyn www-sivulle, kopioi oheinen teksti ja liitä se "
-"sivusi HTML-koodiin."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 39
-msgid ""
-"Once activated you can also access the survey directly\n"
-"from the following URL."
-msgstr ""
-"Aktivoinnin jälkeen pääset kyselyysi\n"
-"suoraan seuraavasta osoitteesta."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 45
-msgid ""
-"You must activate this survey before you can collect\n"
-"results. Once a survey is active, you may no longer make any\n"
-"changes to it. You may activate this survey by choosing\n"
-"<b>Change the Status of an Existing Survey</b> from the\n"
-"Management Interface."
-msgstr ""
-"Sinun täytyy aktivoida tämä kysely ennen kuin voit kerätä vastauksia.\n"
-"Kun kysely on aktivoitu, et voi enää tehdä siihen muutoksia.\n"
-"Voit aktivoida tämän kyselyn valitsemalla kohdan \n"
-"<b>muuta olemassaolevan kyselyn tilaa</b> hallintapaneelista."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 31
-#, fuzzy
-msgid ""
-"The information on this tab applies to the whole survey.\n"
-"Fill out this page then go to the <strong>Fields</strong> tab to\n"
-"edit individual fields."
-msgstr ""
-"Tämän välilehden tiedot koskevat koko kyselyä.\n"
-"Täytä tämän sivun tiedot ja siirry sitten <b>kysymykset/(questions)</b>-"
-"välilehdelle."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 44
-# File: phpESP/admin/include/where/access.inc, line: 163
-# File: phpESP/admin/include/where/access.inc, line: 200
-# File: phpESP/admin/include/where/copy.inc, line: 69
-# File: phpESP/admin/include/where/edit.inc, line: 36
-# File: phpESP/admin/include/where/export.inc, line: 31
-# File: phpESP/admin/include/where/purge.inc, line: 54
-# File: phpESP/admin/include/where/report.inc, line: 70
-# File: phpESP/admin/include/where/results.inc, line: 169
-# File: phpESP/admin/include/where/status.inc, line: 138
-# File: phpESP/admin/include/where/test.inc, line: 109
-msgid "Name"
-msgstr "Nimi"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 47
-# File: phpESP/admin/include/tab/general.inc, line: 72
-# File: phpESP/admin/include/tab/general.inc, line: 80
-# File: phpESP/admin/include/tab/questions.inc, line: 126
-msgid "Required"
-msgstr "Vaadittu"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 49
-msgid "Survey filename."
-msgstr "Kyselyn tiedostonimi."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 50
-msgid "This is used for all further access to this survey."
-msgstr "Tunnistat kyselysi jatkossa tästä nimestä."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "no spaces"
-msgstr "ei välilyöntejä"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 51
-msgid "alpha-numeric only"
-msgstr "vain alfanumeerisia kirjaimia"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 55
-# File: phpESP/admin/include/where/access.inc, line: 165
-# File: phpESP/admin/include/where/access.inc, line: 202
-# File: phpESP/admin/include/where/copy.inc, line: 72
-# File: phpESP/admin/include/where/edit.inc, line: 38
-# File: phpESP/admin/include/where/export.inc, line: 33
-# File: phpESP/admin/include/where/purge.inc, line: 56
-# File: phpESP/admin/include/where/report.inc, line: 72
-# File: phpESP/admin/include/where/results.inc, line: 171
-# File: phpESP/admin/include/where/status.inc, line: 140
-# File: phpESP/admin/include/where/test.inc, line: 111
-msgid "Owner"
-msgstr "Omistaja"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 73
-msgid "User and Group that owns this survey."
-msgstr "Käyttäjä ja ryhmä, joka omistaa tämän kyselyn."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 77
-# File: phpESP/admin/include/where/access.inc, line: 164
-# File: phpESP/admin/include/where/access.inc, line: 201
-# File: phpESP/admin/include/where/copy.inc, line: 70
-# File: phpESP/admin/include/where/edit.inc, line: 37
-# File: phpESP/admin/include/where/export.inc, line: 32
-# File: phpESP/admin/include/where/purge.inc, line: 55
-# File: phpESP/admin/include/where/report.inc, line: 71
-# File: phpESP/admin/include/where/results.inc, line: 170
-# File: phpESP/admin/include/where/status.inc, line: 139
-# File: phpESP/admin/include/where/test.inc, line: 110
-msgid "Title"
-msgstr "Otsikko"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 81
-msgid "Title of this survey."
-msgstr "Tämän kyselyn otsikko."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 82
-msgid "This appears at the top of every page of this survey."
-msgstr "Tämä näkyy kyselyn jokaisen sivun yläosassa."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 83
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "free-form, including spaces"
-msgstr "vapaamuotoinen, saa sisältää välilyöntejä."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 88
-msgid "Subtitle"
-msgstr "Alaotsikko"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 91
-msgid "Subtitle of this survey."
-msgstr "Tämän kyselyn alaotsikko."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 92
-msgid "Appears below the title."
-msgstr "Näkyy otsikon alla."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 97
-msgid "Additional Info"
-msgstr "Lisätietoja"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 100
-msgid ""
-"Text to be displayed on this survey before any fields.\n"
-"(i.e. instructions, background info, etc.)"
-msgstr ""
-"Tämä teksti näkyy kyselyssä ohjetekstinä ennen kyselykenttiä.\n"
-"(Esim. täyttöohjeita, taustatietoja jne.)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 106
-msgid "Confirmation Page"
-msgstr "Vahvistussivu"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 109
-msgid "(URL)"
-msgstr "Internet-osoite"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 110
-msgid "The URL to which a user is redirected after completing this survey."
-msgstr "Osoite, johon käyttäjät ohjataan tämän kyselyn suorittamisen jälkeen. "
-#
-# File: phpESP/admin/include/tab/general.inc, line: 113
-msgid "(heading text)"
-msgstr "(Otsikko)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 115
-msgid "(body text)"
-msgstr "(Oma tekstisi)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 116
-msgid ""
-"Heading (in bold) and body text for the &quot;Confirmation&quot; page\n"
-"displayed after a user completes this survey."
-msgstr ""
-"Voit kirjoittaa tähän otsikon ja viestin joka näkyy käyttäjille kyselyn "
-"suorittamisen jälkeen.\n"
-"Otsikko näkyy lihavoituna."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 118
-msgid "(URL, if present, takes precedent over confirmation text.)"
-msgstr ""
-"Jos olet antanut vahvistussivun Internet-osoitteen, sitä käytetään "
-"vahvistustekstin sijasta."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 123
-# File: phpESP/admin/include/where/admdesigner.inc, line: 264
-# File: phpESP/admin/include/where/admrespondent.inc, line: 239
-msgid "Email"
-msgstr "Sähköposti"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 126
-msgid ""
-"Sends a copy of each submission to address (or leave blank for no email "
-"backup)."
-msgstr ""
-"Lähettää kopion jokaisesta vastauksesta tähän sähköpostiosoitteeseen. (Jätä "
-"tyhjäksi jos et halua sähköpostivarmistusta.)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 130
-msgid "Theme"
-msgstr "Teema"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 145
-msgid "Select a theme (css) to use with this survey."
-msgstr "Valitse teema (css-tiedosto) jota käytetään tässä kyselyssä."
-#
-# File: phpESP/admin/include/tab/general.inc, line: 149
-msgid "Automatic numbering"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 155
-msgid ""
-"Select if questions are to be numbered automatically when showing the survey."
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 150
-msgid "Options"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/general.inc, line: 152
-msgid "Allow survey respondents to save/resume. (Survey login required.)"
-msgstr ""
-"Anna vastaajien tallettaa kysely ja jatkaa myöhemmin. (Vaatii kirjautumisen.)"
-#
-# File: phpESP/admin/include/tab/general.inc, line: 157
-msgid ""
-"Allow survey respondents to go forward and back between survey sections."
-msgstr "Anna vastaajien siirtyä edestakaisin kyselyn osien välillä."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 18
-#, fuzzy
-msgid ""
-"Change the order that questions are\n"
-"presented by selecting a question from the list, then use the up/down \n"
-"buttons to change its position."
-msgstr ""
-"Vaihda kysymysten esiintymisjärjestystä\n"
-"valitsemalla uusi sijainti alasvetovalikosta."
-#
-# File: phpESP/admin/include/tab/order.inc, line: 96
-msgid "Add Section Break"
-msgstr "Lisää osion vaihto"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 43
-#, fuzzy
-msgid ""
-"This is a preview of how this survey will look.\n"
-"The survey will use the background\n"
-"color of the document in which it is embedded. If you have no\n"
-"further changes click <b>Finish</b> at the bottom of\n"
-"this page."
-msgstr ""
-"Tämä on esikatselu siitä miltä kyselysi tulee näyttämään.\n"
-"Esikatselussa kyselyn siirtymis- ja lähetyspainikkeet eivät toimi.\n"
-"Käytä osionumeropainikkeita siirtyäksesi eri osioihin.\n"
-"Jotkut navigointipainikkeet eivät ehkä esiinny lopullisessa kyselyssä\n"
-"riippuen valitsemistasi käyttöoikeuksista. \n"
-"Kysely käyttää sen sivun taustaa johon se tulleen sisällyttämään.\n"
-"Jos et halua tehdä enää muutoksia, paina <b>Valmis</b>-painiketta tämän "
-"sivun alaosassa."
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 52
-msgid "Section"
-msgstr "Osio"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 77
-msgid "Previous Page"
-msgstr "Edellinen sivu"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 79
-msgid "Save"
-msgstr "Tallenna"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 82
-msgid "Next Page"
-msgstr "Seuraava sivu"
-#
-# File: phpESP/admin/include/tab/preview.inc, line: 84
-msgid "Submit Survey"
-msgstr "Lähetä vastaus"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 106
-#, fuzzy
-msgid ""
-"Edit this question, or click the number of the question you would like to "
-"edit:"
-msgstr ""
-"Muokkaa tätä kenttää tai napsauta sen kentän numeroa jota haluat muokata."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Edit Question"
-msgstr "Kysymykset"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "New Question"
-msgstr "Kysymykset"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#, fuzzy
-msgid "Question Name"
-msgstr "Kysymykset"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 123
-msgid "Type"
-msgstr "Tyyppi"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 124
-msgid "Length"
-msgstr "Pituus"
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 125
-msgid "Precision"
-msgstr ""
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 38
-msgid ""
-"Enter the possible answers (if applicable). Enter\n"
-"%s on an line by itself to create a\n"
-"fill-in-the-blank answer at the end of this question.\n"
-"Any blank lines will be suppressed."
-msgstr ""
-"Anna mahdolliset vastausvaihtoehdot.\n"
-"Kirjoita riville %s jos haluat luoda tyhjän vastausvaihtoehdon tämän "
-"kysymyksen loppuun.\n"
-"Kaikki tyhjät rivit jätetään huomiotta."
-#
-# File: phpESP/admin/include/tab/questions_options.inc, line: 70
-msgid "Add another answer line"
-msgstr "Lisää uusi vastausrivi"
-#
-# File: phpESP/admin/include/where/access.inc, line: 83
-msgid "Please select a group."
-msgstr "Valitse ryhmä"
-#
-# File: phpESP/admin/include/where/access.inc, line: 104
-# File: phpESP/admin/include/where/access.inc, line: 232
-msgid "Private"
-msgstr "Yksityinen"
-#
-# File: phpESP/admin/include/where/access.inc, line: 140
-msgid "Survey Access"
-msgstr "Kyselyn käyttöoikeudet"
-#
-# File: phpESP/admin/include/where/access.inc, line: 146
-msgid ""
-"This lets you control who has access to fill out a form.\n"
-"Public surveys let anyone submit data.\n"
-"Private surveys are restricted by Respondent Groups."
-msgstr ""
-"Tästä voit valita keillä on oikeus vastata kyselyysi.\n"
-"Kuka tahansa voi vastata julkisiin kyselyihin.\n"
-"Yksityisten kyselyjen vastaajat rajataan vastaajaryhmittäin."
-#
-# File: phpESP/admin/include/where/access.inc, line: 150
-msgid "Note"
-msgstr "Huom:"
-#
-# File: phpESP/admin/include/where/access.inc, line: 151
-msgid "You must use %s when using private surveys."
-msgstr "Sinun täytyy käyttää %s käytettäessä yksityisiä kyselyjä."
-#
-# File: phpESP/admin/include/where/access.inc, line: 166
-# File: phpESP/admin/include/where/access.inc, line: 169
-# File: phpESP/admin/include/where/access.inc, line: 203
-# File: phpESP/admin/include/where/admdesigner.inc, line: 228
-# File: phpESP/admin/include/where/admrespondent.inc, line: 203
-# File: phpESP/admin/include/where/copy.inc, line: 73
-# File: phpESP/admin/include/where/designers.inc, line: 97
-# File: phpESP/admin/include/where/edit.inc, line: 39
-# File: phpESP/admin/include/where/export.inc, line: 34
-# File: phpESP/admin/include/where/groups.inc, line: 54
-# File: phpESP/admin/include/where/purge.inc, line: 57
-# File: phpESP/admin/include/where/report.inc, line: 73
-# File: phpESP/admin/include/where/respondents.inc, line: 96
-# File: phpESP/admin/include/where/results.inc, line: 172
-# File: phpESP/admin/include/where/status.inc, line: 141
-# File: phpESP/admin/include/where/test.inc, line: 112
-msgid "Group"
-msgstr "Ryhmä"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-msgid "Max Responses"
-msgstr "Max vastaukset"
-#
-# File: phpESP/admin/include/where/access.inc, line: 171
-msgid "Save/Restore"
-msgstr "Talletus/Paluu"
-#
-# File: phpESP/admin/include/where/access.inc, line: 172
-msgid "Back/Forward"
-msgstr "Takaisin/Eteenpäin"
-#
-# File: phpESP/admin/include/where/access.inc, line: 184
-msgid "Remove"
-msgstr "Poista"
-#
-# File: phpESP/admin/include/where/access.inc, line: 190
-# File: phpESP/admin/include/where/groups.inc, line: 92
-msgid "Add"
-msgstr "Lisää"
-#
-# File: phpESP/admin/include/where/access.inc, line: 233
-msgid "Make Public"
-msgstr "Tee julkiseksi"
-#
-# File: phpESP/admin/include/where/access.inc, line: 236
-msgid "Make Private"
-msgstr "Tee yksityiseksi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 14
-# File: phpESP/admin/include/where/admrespondent.inc, line: 14
-# File: phpESP/admin/include/where/designers.inc, line: 14
-# File: phpESP/admin/include/where/groups.inc, line: 13
-# File: phpESP/admin/include/where/report.inc, line: 24
-# File: phpESP/admin/include/where/respondents.inc, line: 14
-# File: phpESP/admin/include/where/tab.inc, line: 77
-# File: phpESP/admin/include/where/tab.inc, line: 86
-# File: phpESP/admin/include/where/upload.inc, line: 19
-msgid "to access this form"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 41
-# File: phpESP/admin/include/where/admdesigner.inc, line: 106
-# File: phpESP/admin/include/where/admrespondent.inc, line: 41
-# File: phpESP/admin/include/where/admrespondent.inc, line: 99
-msgid "to access this group"
-msgstr ""
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 45
-# File: phpESP/admin/include/where/admrespondent.inc, line: 45
-msgid "Cannot delete account."
-msgstr "Ei voida poistaa tunnusta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 111
-# File: phpESP/admin/include/where/admrespondent.inc, line: 104
-msgid "Username, Password, and Group are required."
-msgstr "Käyttäjätunnus, salasana ja ryhmä vaaditaan."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 119
-# File: phpESP/admin/include/where/admrespondent.inc, line: 112
-msgid "Error adding account."
-msgstr "Virhe lisättäessä tunnusta."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 154
-# File: phpESP/admin/include/where/admrespondent.inc, line: 136
-msgid "Cannot change account data."
-msgstr "Tunnuksen tietoja ei voitu muuttaa."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 202
-# File: phpESP/admin/include/where/admrespondent.inc, line: 176
-msgid "Account not found."
-msgstr "Tunnusta ei löytynyt."
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 208
-msgid "Designer Account Administration"
-msgstr "Suunnittelijatunnusten hallinta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 214
-# File: phpESP/admin/include/where/admrespondent.inc, line: 189
-# File: phpESP/admin/include/where/designers.inc, line: 94
-# File: phpESP/admin/include/where/manage.inc, line: 20
-# File: phpESP/admin/include/where/passwd.inc, line: 36
-# File: phpESP/admin/include/where/respondents.inc, line: 93
-# File: phpESP/public/signup.php, line: 147
-msgid "Username"
-msgstr "Käyttäjätunnus"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 223
-# File: phpESP/admin/include/where/admrespondent.inc, line: 198
-# File: phpESP/public/signup.php, line: 152
-msgid "Password"
-msgstr "Salasana"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 254
-# File: phpESP/admin/include/where/admrespondent.inc, line: 229
-# File: phpESP/admin/include/where/designers.inc, line: 95
-# File: phpESP/admin/include/where/respondents.inc, line: 94
-# File: phpESP/public/signup.php, line: 132
-msgid "First Name"
-msgstr "Etunimi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 259
-# File: phpESP/admin/include/where/admrespondent.inc, line: 234
-# File: phpESP/admin/include/where/designers.inc, line: 96
-# File: phpESP/admin/include/where/respondents.inc, line: 95
-# File: phpESP/public/signup.php, line: 137
-msgid "Last Name"
-msgstr "Sukunimi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 269
-# File: phpESP/admin/include/where/admrespondent.inc, line: 244
-msgid "Expiration"
-msgstr "Erääntyminen"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 274
-# File: phpESP/admin/include/where/admrespondent.inc, line: 249
-msgid "year"
-msgstr "vuosi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 275
-# File: phpESP/admin/include/where/admrespondent.inc, line: 250
-msgid "month"
-msgstr "kuukausi"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 276
-# File: phpESP/admin/include/where/admrespondent.inc, line: 251
-msgid "day"
-msgstr "päivä"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 280
-# File: phpESP/admin/include/where/admrespondent.inc, line: 255
-msgid "Disabled"
-msgstr "Poistettu käytöstä"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 285
-# File: phpESP/admin/include/where/admdesigner.inc, line: 322
-# File: phpESP/admin/include/where/admrespondent.inc, line: 260
-msgid "Update"
-msgstr "Päivitä"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 286
-# File: phpESP/admin/include/where/admdesigner.inc, line: 323
-# File: phpESP/admin/include/where/admrespondent.inc, line: 261
-msgid "Cancel"
-msgstr "Peruuta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 287
-# File: phpESP/admin/include/where/admdesigner.inc, line: 324
-# File: phpESP/admin/include/where/admrespondent.inc, line: 262
-# File: phpESP/admin/include/where/groups.inc, line: 76
-msgid "Delete"
-msgstr "Poista"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 290
-msgid "Design Surveys"
-msgstr "Voi luoda kyselyitä"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 295
-msgid "Change Survey Status"
-msgstr "Voi muuttaa kyselyn tilaa"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 297
-msgid "Activate/End"
-msgstr "Aktivoi/Lopeta"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 301
-msgid "Export Survey Data"
-msgstr "Voi viedä kyselyn vastausdatan"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 306
-msgid "Group Editor"
-msgstr "Voi hallita ryhmiä"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 308
-msgid "may edit <b>all</b> forms owned by this group"
-msgstr "voi muokata <b>kaikkia</b> tämän ryhmän omistamia kyselyitä"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 312
-#, fuzzy
-msgid "Administer Designers"
-msgstr "Lisää uusi suunnittelija"
-#
-# File: phpESP/admin/include/where/admdesigner.inc, line: 317
-#, fuzzy
-msgid "Administer Respondents"
-msgstr "Voi hallita vastaajaryhmiä"
-#
-# File: phpESP/admin/include/where/admrespondent.inc, line: 183
-msgid "Respondent Account Administration"
-msgstr "Vastaajatunnuksen hallinta"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 24
-# File: phpESP/admin/include/where/download.inc, line: 38
-# File: phpESP/admin/include/where/download.inc, line: 49
-# File: phpESP/admin/include/where/export.inc, line: 113
-# File: phpESP/admin/include/where/export.inc, line: 125
-# File: phpESP/admin/include/where/results.inc, line: 30
-# File: phpESP/admin/include/where/results.inc, line: 42
-# File: phpESP/admin/include/where/status.inc, line: 100
-# File: phpESP/admin/include/where/test.inc, line: 35
-msgid "to access this survey"
-msgstr ""
-#
-# File: phpESP/admin/include/where/copy.inc, line: 30
-msgid "Error copying survey."
-msgstr "Virhe kopioitaessa kyselyä."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 61
-msgid "Copy Survey"
-msgstr "Kopioi kysely"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 63
-msgid ""
-"Choose a survey of which to make a copy. The copy will have the same\n"
-"status of a newly created survey. You will be able to edit the\n"
-"survey, and will have to activate it before use."
-msgstr ""
-"Valitse kysely, josta haluat tehdä kopion. Kopio saa saman tilan kuin vasta "
-"luotu kysely,\n"
-"joten voit muokata sitä vapaasti. Sinun tulee aktivoida kysely ennen "
-"käyttöönottoa."
-#
-# File: phpESP/admin/include/where/copy.inc, line: 71
-# File: phpESP/admin/include/where/export.inc, line: 35
-# File: phpESP/admin/include/where/purge.inc, line: 59
-# File: phpESP/admin/include/where/status.inc, line: 105
-# File: phpESP/admin/include/where/status.inc, line: 142
-msgid "Status"
-msgstr "Tila"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 79
-# File: phpESP/admin/include/where/export.inc, line: 61
-# File: phpESP/admin/include/where/purge.inc, line: 65
-# File: phpESP/admin/include/where/status.inc, line: 181
-msgid "Archived"
-msgstr "Arkistoitu"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 81
-# File: phpESP/admin/include/where/export.inc, line: 64
-# File: phpESP/admin/include/where/purge.inc, line: 67
-# File: phpESP/admin/include/where/status.inc, line: 185
-msgid "Ended"
-msgstr "Lopetettu"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 83
-# File: phpESP/admin/include/where/export.inc, line: 66
-# File: phpESP/admin/include/where/purge.inc, line: 69
-# File: phpESP/admin/include/where/status.inc, line: 188
-msgid "Active"
-msgstr "Aktiivinen"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 85
-# File: phpESP/admin/include/where/export.inc, line: 68
-# File: phpESP/admin/include/where/purge.inc, line: 71
-# File: phpESP/admin/include/where/status.inc, line: 191
-msgid "Testing"
-msgstr "Testauksessa"
-#
-# File: phpESP/admin/include/where/copy.inc, line: 87
-# File: phpESP/admin/include/where/export.inc, line: 58
-# File: phpESP/admin/include/where/purge.inc, line: 73
-# File: phpESP/admin/include/where/status.inc, line: 174
-msgid "Editing"
-msgstr "Muokattavissa"
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 19
-# File: phpESP/admin/include/where/crosstab.inc, line: 27
-# File: phpESP/admin/include/where/crosstab.inc, line: 32
-msgid "Error cross-tabulating."
-msgstr "Virhe ristiintaulukoidessa."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 20
-msgid ""
-"Please ensure that your column and row selections are not of the same "
-"question."
-msgstr ""
-"Ole hyvä ja tarkista, että rivi- ja sarakevalintasi eivät ole samasta "
-"kysymyksestä."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 28
-msgid "Please ensure you make both a column and row selection."
-msgstr "Ole hyvä ja tarkista että teit sekä sarake- että rivivalinnan."
-#
-# File: phpESP/admin/include/where/crosstab.inc, line: 33
-msgid ""
-"You are attempting to cross analyze and tabulate at the same time. This is "
-"not possible!"
-msgstr ""
-"Yrität ristiinanalysoida ja -taulukoida samanaikaisesti. Tämä ei ole "
-"mahdollista!"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 90
-msgid "Manage Web Form Designer Accounts"
-msgstr "Hallitse suunnittelijatunnuksia"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 91
-# File: phpESP/admin/include/where/respondents.inc, line: 90
-msgid "Click on a username to edit, or click on add new user below."
-msgstr "Napsauta käyttäjätunnusta muokataksesi, tai lisää uusi tunnus."
-#
-# File: phpESP/admin/include/where/designers.inc, line: 106
-# File: phpESP/admin/include/where/respondents.inc, line: 105
-msgid "disabled"
-msgstr "Poistettu käytöstä"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 138
-msgid "Add a new Designer"
-msgstr "Lisää uusi suunnittelija"
-#
-# File: phpESP/admin/include/where/designers.inc, line: 143
-msgid "Bulk Upload Designers"
-msgstr "Tuo lista suunnittelijoita"
-#
-# File: phpESP/admin/include/where/download.inc, line: 22
-msgid "Invalid survey ID."
-msgstr "Virheellinen kyselyn ID."
-#
-# File: phpESP/admin/include/where/edit.inc, line: 31
-msgid "Edit a Survey"
-msgstr "Muokkaa kyselyä"
-#
-# File: phpESP/admin/include/where/edit.inc, line: 32
-msgid "Pick Survey to Edit"
-msgstr "Valitse muokattava kysely"
-#
-# File: phpESP/admin/include/where/export.inc, line: 19
-msgid "Export Data"
-msgstr "Vie kyselyn tulokset"
-#
-# File: phpESP/admin/include/where/export.inc, line: 36
-msgid "Format"
-msgstr "Muoto"
-#
-# File: phpESP/admin/include/where/export.inc, line: 96
-# File: phpESP/admin/include/where/test.inc, line: 141
-msgid "Save On Server"
-msgstr ""
-#
-# File: phpESP/admin/include/where/export.inc, line: 86
-# File: phpESP/admin/include/where/test.inc, line: 135
-#, fuzzy
-msgid "Download"
-msgstr "lataa"
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/merge.inc, line: 24
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "Testing Survey..."
-msgstr "Testataan kyselyä..."
-#
-# File: phpESP/admin/include/where/export.inc, line: 116
-# File: phpESP/admin/include/where/export.inc, line: 148
-# File: phpESP/admin/include/where/results.inc, line: 33
-# File: phpESP/admin/include/where/test.inc, line: 52
-msgid "SID"
-msgstr ""
-#
-# File: phpESP/admin/include/where/download.inc, line: 62
-# File: phpESP/admin/include/where/export.inc, line: 139
-msgid "The PHP dBase Extension is not installed."
-msgstr "PHP:n dBase-laajennosta ei ole asennettu."
-#
-# File: phpESP/admin/include/where/export.inc, line: 151
-msgid "Survey exported as:"
-msgstr "Kyselyn tulokset on viety kohteeseen:"
-#
-# File: phpESP/admin/include/where/export.inc, line: 153
-msgid "Error exporting survey as:"
-msgstr "Virhe vietäessä kyselyn tuloksia kohteeseen:"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 23
-msgid "Error adding group."
-msgstr "Virhe lisättäessä ryhmää."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 27
-# File: phpESP/admin/include/where/groups.inc, line: 36
-msgid "Error deleting group."
-msgstr "Virhe poistettaessa ryhmää."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 32
-msgid "Group is not empty."
-msgstr "Ryhmä ei ole tyhjä."
-#
-# File: phpESP/admin/include/where/groups.inc, line: 48
-# File: phpESP/admin/include/where/manage.inc, line: 69
-msgid "Manage Groups"
-msgstr "Hallitse ryhmiä"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 55
-msgid "Description"
-msgstr "Kuvaus"
-#
-# File: phpESP/admin/include/where/groups.inc, line: 56
-msgid "Members"
-msgstr "Jäsenet"
-#
-# File: phpESP/admin/include/where/guide.inc, line: 19
-msgid "User's guide not found."
-msgstr "Käyttöopasta ei löytynyt"
-#
-# File: phpESP/admin/include/where/logout.inc, line: 16
-msgid "Log back in."
-msgstr "Kirjaudu takaisin sisään."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 18
-msgid "Superuser"
-msgstr "Pääkäyttäjä"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 35
-msgid "Create a New Survey"
-msgstr "Tee uusi kysely"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 36
-msgid "Edit an Existing Survey"
-msgstr "Muokkaa olemassaolevaa kyselyä"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 37
-# File: phpESP/admin/include/where/test.inc, line: 104
-msgid "Test a Survey"
-msgstr "Testaa kyselyä"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 38
-msgid "Copy an Existing Survey"
-msgstr "Kopioi kysely"
-#
-# File: phpESP/admin/include/funcs.inc, line: 139
-#, fuzzy
-msgid "Purge a survey"
-msgstr "Palaa kyselyyn"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 41
-msgid "Change the Status of a Survey"
-msgstr "Muuta kyselyn tila"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 42
-msgid "(active/end/delete)"
-msgstr "(aktivoi/lopeta/poista)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Change Access To a Survey"
-msgstr "Muuta kyselyn käyttöoikeuksia"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 44
-msgid "Limit Respondents."
-msgstr "Rajaa vastaajajoukkoa."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 48
-msgid "View Results from a Survey"
-msgstr "Näytä kyselyn tulokset"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 49
-msgid "Cross Tabulate Survey Results"
-msgstr "Ristiintaulukoi kyselyn tuloksia"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 50
-msgid "View a Survey Report"
-msgstr "Näytä kyselyn yhteenveto"
-#
-# File: phpESP/admin/include/where/access.inc, line: 170
-#, fuzzy
-msgid "Purge a response"
-msgstr "Max vastaukset"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 58
-msgid "Change Your Password"
-msgstr "Muuta salasanasi"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 63
-# File: phpESP/admin/include/where/respondents.inc, line: 89
-msgid "Manage Respondent Accounts"
-msgstr "Hallitse vastaajatunnuksia"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 67
-msgid "Manage Designer Accounts"
-msgstr "Hallitse suunnittelijatunnuksia"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 76
-msgid "View the list of things still to do"
-msgstr ""
-#
-# File: phpESP/admin/include/where/manage.inc, line: 77
-msgid "(development goals)"
-msgstr "(kehitystyön tavoitteet)"
-#
-# File: phpESP/admin/include/where/manage.inc, line: 78
-msgid "View the User &amp; Administrator Guide"
-msgstr "Näytä käyttäjän ja ylläpitäjän opas"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 183
-msgid "Click here to open the Help window."
-msgstr "Napsauta tästä avataksesi ohjeikkunan."
-#
-# File: phpESP/admin/include/where/manage.inc, line: 83
-msgid "Log out"
-msgstr "Kirjaudu ulos"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 24
-msgid "SIDS"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 124
-msgid "Merge Survey Results"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 125
-msgid "Pick Surveys to Merge"
-msgstr ""
-#
-# File: phpESP/admin/include/where/merge.inc, line: 128
-msgid "List of Surveys"
-msgstr "Lista kyselyistä"
-#
-# File: phpESP/admin/include/where/merge.inc, line: 130
-msgid "Surveys to Merge"
-msgstr ""
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 13
-# File: phpESP/admin/include/where/passwd.inc, line: 56
-msgid "Change Password"
-msgstr "Muuta salasana"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 22
-msgid "Your password has been successfully changed."
-msgstr "Salasanasi on onnistuneesti muutettu."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 26
-msgid "Password not set, check your old password."
-msgstr "Salasanaa ei muutettu. Olihan nykyinen salasanasi oikein kirjoitettu?"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 29
-msgid "New passwords do not match or are blank."
-msgstr "Uudet salasanat eivät täsmää tai ovat tyhjät."
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 41
-msgid "Old Password"
-msgstr "Nykyinen salasana"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 46
-msgid "New Password"
-msgstr "Uusi salasana"
-#
-# File: phpESP/admin/include/where/passwd.inc, line: 51
-msgid "Confirm New Password"
-msgstr "Vahvista uusi salasana"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 12
-msgid "Only superusers allowed."
-msgstr "Vain pääkäyttäjille."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 38
-# File: phpESP/admin/include/where/purge.inc, line: 103
-msgid "Purge Surveys"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"survey from the database <b>forever</b>. All question info,\n"
-"general info, results, etc. are purged from the database. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Tätä sivua ei ole suoraan päävalikossa, koska se on vaarallinen.\n"
-"Tämä poistaa <b>täysin</b> kaiken kyselyyn liittyvän tietokannasta\n"
-"<b>peruuttamattomasti</b>. Kaikki kyselyn ja kysymysten tiedot,\n"
-"vastaukset jne poistetaan tietokannasta. Älä tee mitään täällä jollet\n"
-"ola täysin varma siitä mitä teet. Täällä ei ole vahvistuksia eikä roskakoria."
-#
-# File: phpESP/admin/include/where/purge.inc, line: 58
-msgid "# Q's"
-msgstr ""
-#
-# File: phpESP/admin/include/where/purge.inc, line: 102
-msgid "Clear Checkboxes"
-msgstr "Tyhjennä valintaruudut"
-#
-# File: phpESP/admin/include/where/readme.inc, line: 19
-msgid "README not found."
-msgstr "README-tiedostoa ei löytynyt."
-#
-# File: phpESP/admin/include/where/report.inc, line: 37
-msgid "Go back to Report Menu"
-msgstr "Palaa yhteenvetovalikkoon"
-#
-# File: phpESP/admin/include/where/report.inc, line: 65
-msgid "View Form Report"
-msgstr "Näytä kyselyn yhteenveto"
-#
-# File: phpESP/admin/include/where/report.inc, line: 66
-msgid "Pick Form to View"
-msgstr "Valitse näytettävä kysely"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 137
-msgid "Add a new Respondent"
-msgstr "Lisää uusi vastaaja"
-#
-# File: phpESP/admin/include/where/respondents.inc, line: 142
-msgid "Bulk Upload Respondents"
-msgstr "Tuo listallinen vastaajia"
-#
-# File: phpESP/admin/include/lib/esphtml.results.inc, line: 174
-#, fuzzy
-msgid "Purge response"
-msgstr "Vastaus"
-#
-# File: phpESP/admin/include/where/purge.inc, line: 40
-#, fuzzy
-msgid ""
-"\n"
-"This page is not directly on the main menu because it is\n"
-"dangerous. This <b>completely</b> removes everything about a\n"
-"response from the database <b>forever</b>. Do\n"
-"not do anything here that you are not completely certain\n"
-"about. There is no confirmation, there is no turning\n"
-"back."
-msgstr ""
-"\n"
-"Tätä sivua ei ole suoraan päävalikossa, koska se on vaarallinen.\n"
-"Tämä poistaa <b>täysin</b> kaiken kyselyyn liittyvän tietokannasta\n"
-"<b>peruuttamattomasti</b>. Kaikki kyselyn ja kysymysten tiedot,\n"
-"vastaukset jne poistetaan tietokannasta. Älä tee mitään täällä jollet\n"
-"ola täysin varma siitä mitä teet. Täällä ei ole vahvistuksia eikä roskakoria."
-#
-# File: phpESP/admin/include/where/results.inc, line: 48
-# File: phpESP/admin/include/where/results.inc, line: 156
-msgid "Cross Tabulation"
-msgstr "Ristiintaulukointi"
-#
-# File: phpESP/admin/include/where/results.inc, line: 105
-msgid "Test Survey"
-msgstr "Testaa kyselyä"
-#
-# File: phpESP/admin/include/where/results.inc, line: 113
-msgid "Reset"
-msgstr "Nollaa"
-#
-# File: phpESP/admin/include/where/results.inc, line: 114
-msgid "Cross Tabulate"
-msgstr "Ristiintaulukoi"
-#
-# File: phpESP/admin/include/where/results.inc, line: 148
-msgid "View Survey Results"
-msgstr "Näytä kyselyn tulokset"
-#
-# File: phpESP/admin/include/where/results.inc, line: 149
-msgid "Pick Survey to View"
-msgstr "Valitse näytettävä kysely"
-#
-# File: phpESP/admin/include/where/results.inc, line: 157
-msgid "Pick Survey to Cross Tabulate"
-msgstr "Valitse ristiintaulukoitava kysely"
-#
-# File: phpESP/admin/include/where/results.inc, line: 164
-msgid "Respondent"
-msgstr "Vastaaja"
-#
-# File: phpESP/admin/include/where/results.inc, line: 173
-msgid "Resp"
-msgstr "Vastauksia"
-#
-# File: phpESP/admin/include/where/status.inc, line: 104
-msgid "Can not set survey status."
-msgstr "Ei voida muuttaa kyselyn tilaa."
-#
-# File: phpESP/admin/include/where/status.inc, line: 111
-msgid "Survey Status"
-msgstr "Kyselyn tila"
-#
-# File: phpESP/admin/include/where/status.inc, line: 115
-#, fuzzy
-msgid ""
-"<b>Test</b> transitions a survey into testing mode. At which point you may\n"
-"perform a live test by taking the survey, and viewing the results. The "
-"survey may be switched \n"
-"back into <b>Edit</b> mode if additional edits are needed."
-msgstr ""
-"<b>Testaa</b> muuttaa kyselyn testaustilaan. Tällöin voit testata kyselyn\n"
-"toimivuutta käytännössä ja katsella testituloksia. Et voi enää tehdä\n"
-"kyselyyn muutoksia sen jälkeen kun olet muuttanut sen testitilaan."
-#
-# File: phpESP/admin/include/where/status.inc, line: 119
-msgid ""
-"<b>Activate</b> transitions a survey into active mode. In this mode the\n"
-"survey is open for production use, and may be put online. This will clear "
-"any\n"
-"results from testing mode (if any). No further editing of survey is\n"
-"allowed."
-msgstr ""
-"<b>Aktivoi</b> muuttaa kyselyn aktiiviseksi. Tässä tilassa kysely odottaa\n"
-"vastauksia ja se voidaan julkaista tuotantokäyttöön. Mahdolliset "
-"testausvaiheen\n"
-"vastaukset poistetaan. Kyselyä ei voi enää tässä vaiheessa muokata."
-#
-# File: phpESP/admin/include/where/status.inc, line: 124
-msgid ""
-"<b>End</b> transitions a survey into ended mode. In this mode, no edits are\n"
-"possible, no users may take the survey (it is inactive), but results are "
-"still\n"
-"viewable from the results menu."
-msgstr ""
-"<b>Lopeta</b> muuttaa kyselyn lopetettuun tilaan. Tässä tilassa kyselyn\n"
-"muokkaaminen ei ole mahdollista, kukaan ei voi vastata (kysely ei ole "
-"aktiivinen),\n"
-"mutta tuloksia voidaan silti tarkastella."
-#
-# File: phpESP/admin/include/where/status.inc, line: 128
-msgid ""
-"<b>Archive</b> removes this survey. It is still stored in the database, but\n"
-"no further interaction is allowed. You may <b>not</b> view the results of "
-"an\n"
-"archived survey."
-msgstr ""
-"<b>Arkistoi</b> poistaa tämän kyselyn. Kysely on silti jäljellä "
-"tietokannassa,\n"
-"mutta sen tietoihin ei enää pääse käsiksi. <b>Et</b> voi muokata etkä\n"
-"katsoa arkistoidun kyselyn tuloksia."
-#
-# File: phpESP/admin/include/where/status.inc, line: 175
-# File: phpESP/admin/include/where/test.inc, line: 132
-msgid "Test"
-msgstr "Testaa"
-#
-# File: phpESP/admin/include/where/status.inc, line: 176
-msgid "Activate"
-msgstr "Aktivoi"
-#
-# File: phpESP/admin/include/where/status.inc, line: 177
-msgid "End"
-msgstr "Lopeta"
-#
-# File: phpESP/admin/include/where/status.inc, line: 178
-msgid "Archive"
-msgstr "Arkistoi"
-#
-# File: phpESP/admin/include/where/status.inc, line: 193
-msgid "Edit"
-msgstr "Muokkaa"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 144
-# File: phpESP/admin/include/where/upload.inc, line: 110
-msgid "Help"
-msgstr "Ohjeet"
-#
-# File: phpESP/admin/include/where/tab.inc, line: 170
-msgid ""
-"Click cancel to cancel this survey, or click continue to proceed to the next "
-"tab."
-msgstr ""
-"Paina peruuta jos haluat keskeyttää kyselyn laatimisen tai seuraava "
-"edetäksesi seuraavalle välilehdelle."
-#
-# File: phpESP/admin/include/where/tab.inc, line: 177
-#, fuzzy
-msgid ""
-"The survey title and other general fields are on the <strong>General</"
-"strong> tab.\n"
-"Individual survey questions are added and modified on the <strong>Questions</"
-"strong> tab.\n"
-"Questions may be re-ordered or deleted from the <strong>Order</strong> tab.\n"
-"You may see a preview of your survey at any time, by going to the "
-"<strong>Preview</strong>\n"
-"tab. If you have no further changes click <strong>Finish</strong> to go back "
-"to the\n"
-"Management Interface."
-msgstr ""
-"Kyselyn otsikko ja muut yleiset tiedot ovat <b>Yleistä</b>-välilehdellä.\n"
-"Kysymyksiä muokataan <b>Kysymykset</b>-välilehdellä.\n"
-"Kysymyksiä voidaan järjestellä tai poistaa <b>Järjestys</b>-välilehdellä.\n"
-"Voit esikatsella kyselyäsi milloin tahansa menemällä <b>Esikatseluun</b>.\n"
-"Klikkaa <b>Valmis</b>-painiketta kun kyselysi on valmis etkä enää halua "
-"tehdä siihen muutoksia. Pääset takaisin hallintapaneeliin."
-#
-# File: phpESP/admin/include/where/test.inc, line: 70
-msgid "View Results"
-msgstr "Näytä tulokset"
-#
-# File: phpESP/admin/include/where/test.inc, line: 105
-msgid "Pick Survey to Test"
-msgstr "Valitse testattava kysely"
-#
-# File: phpESP/admin/include/where/test.inc, line: 115
-msgid "Export"
-msgstr "Vie"
-#
-# File: phpESP/admin/include/where/test.inc, line: 127
-msgid "standalone"
-msgstr ""
-#
-# File: phpESP/admin/include/where/test.inc, line: 133
-msgid "Results"
-msgstr "Tulokset"
-#
-# File: phpESP/admin/include/where/todo.inc, line: 15
-msgid "Todo list not found."
-msgstr "Tehtävälistaa ei löytynyt."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 72
-msgid "An error occurred during upload.  Rows that failed are listed below."
-msgstr "Virhe tuonnissa:  Seuraavien rivien tuonti epäonnistui."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 98
-msgid ""
-"An error occurred during upload.  Please check the format of your text file."
-msgstr ""
-"Virhe tuonnissa: Ole hyvä ja tarkista että tekstitiedostosi on oikein "
-"muotoiltu."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 102
-msgid "An error occurred during upload.  Please complete all form fields."
-msgstr "Virhe tuonnissa: Ole hyvä ja täytä kaikki vaaditut tietokentät."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 106
-msgid "Upload Account Information"
-msgstr "Lataa listallinen suunnittelijatunnuksia"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 107
-msgid "All fields are required"
-msgstr "Kaikki tiedot vaaditaan."
-#
-# File: phpESP/admin/include/where/upload.inc, line: 120
-msgid "File Type"
-msgstr "Tiedoston tyyppi"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 121
-msgid "Tab Delimited"
-msgstr "Sarkainerotettu"
-#
-# File: phpESP/admin/include/where/upload.inc, line: 122
-msgid "File to upload"
-msgstr "Vietävä tiedosto"
-#
-# File: phpESP/admin/phpESP.ini.php, line: 175
-msgid "Thank You For Completing This Survey."
-msgstr "Kiitos vastauksesta."
-#
-# File: phpESP/admin/phpESP.ini.php, line: 176
-#, fuzzy
-msgid ""
-"Please do not use the back button on your browser to go\n"
-"back."
-msgstr ""
-"Ole hyvä äläkä käytä selaimesi takaisin/back-nappia, vaan napsauta oheista "
-"linkkiä jatkaaksesi."
-#
-# File: phpESP/admin/phpESP.ini.php, line: 181
-# File: phpESP/admin/phpESP.ini.php, line: 187
-msgid ""
-"Unable to find the phpESP %s directory.\n"
-"\t\t\tPlease check %s to ensure that all paths are set correctly."
-msgstr ""
-"PhpESP:n %s-hakemistoa ei löytynyt.\n"
-"\t\t\tOle hyvä ja tarkista %s varmistaaksesi että kaikki polut ovat oikein."
-#
-# File: phpESP/admin/test.php, line: 146
-msgid "%%%% Gettext Test Failed"
-msgstr "%%%% Gettext-testi epäonnistui"
-#
-# File: phpESP/public/captcha_check.php, line: 4
-msgid "You entered an incorrect code. Please fill in the correct code."
-msgstr ""
-#
-# File: phpESP/public/handler-prefix.php, line: 71
-msgid "Error processing survey: Survey not specified."
-msgstr "Virhe käsiteltäessä kyselyä: Kyselyä ei ole määritelty."
-#
-# File: phpESP/admin/include/tab/finish.inc, line: 29
-#, fuzzy
-msgid "You have already completed this survey."
-msgstr "Kyselyn laatiminen on nyt valmis. "
-#
-# File: phpESP/public/handler.php, line: 64
-# File: phpESP/public/handler.php, line: 69
-msgid "Error processing survey: Survey is not active."
-msgstr "Virhe käsiteltäessä kyselyä: Kysely ei ole aktiivinen."
-#
-# File: phpESP/public/handler.php, line: 207
-msgid "Please fill in the code displayed here."
-msgstr ""
-#
-# File: phpESP/public/signup.php, line: 54
-msgid "Sorry, the account request form is disabled."
-msgstr "Tunnuspyyntölomake on valitettavasti poistettu käytöstä."
-#
-# File: phpESP/public/signup.php, line: 63
-msgid "Please complete all required fields."
-msgstr "Ole hyvä ja anna kaikki vaaditut tiedot."
-#
-# File: phpESP/public/signup.php, line: 72
-msgid "Passwords do not match."
-msgstr "Salasanat eivät täsmää."
-#
-# File: phpESP/public/signup.php, line: 100
-msgid "Request failed, please choose a different username."
-msgstr "Pyyntö epäonnistui. Ole hyvä ja valitse toinen käyttäjätunnus."
-#
-# File: phpESP/public/signup.php, line: 107
-msgid "Your account, %s, has been created!"
-msgstr "Käyttäjätunnus %s on luotu!"
-#
-# File: phpESP/public/signup.php, line: 120
-msgid "Account Request Form"
-msgstr "Käyttäjätunnuksen hakeminen"
-#
-# File: phpESP/public/signup.php, line: 126
-msgid ""
-"Please complete the following form to request an account.\n"
-"Items marked with a %s are required."
-msgstr ""
-"Ole hyvä ja täytä oheinen lomake saadaksesi käyttäjätunnuksen.\n"
-"Symbolilla %s merkitty tieto vaaditaan."
-#
-# File: phpESP/public/signup.php, line: 142
-msgid "Email Address"
-msgstr "Sähköpostiosoite"
-#
-# File: phpESP/public/signup.php, line: 157
-msgid "Confirm Password"
-msgstr "Vahvista salasana"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 92
-#~ msgid "No tabs defined. Please check your INI settings."
-#~ msgstr ""
-#~ "Välilehtiä ei ole määritelty. Ole hyvä ja tarkista INI-tiedoston "
-#~ "asetukset."
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 153
-#~ msgid "General"
-#~ msgstr "Yleiset"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 154
-#~ msgid "Questions"
-#~ msgstr "Kysymykset"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 155
-#~ msgid "Order"
-#~ msgstr "Järjestys"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 156
-#~ msgid "Preview"
-#~ msgstr "Esikatselu"
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/tab.inc, line: 157
-#~ msgid "Finish"
-#~ msgstr "Valmis"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "Page"
-#~ msgstr "Sivu"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_render.inc, line: 352
-#~ msgid "of"
-#~ msgstr "/"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/function/survey_update.inc, line: 154
-#, fuzzy
-#~ msgid "Sorry, this question name is already in use."
-#~ msgstr "Virhe: Nimi on jo käytössä."
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 117
-#~ msgid "Field"
-#~ msgstr "Kenttä"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/tab/questions.inc, line: 122
-#~ msgid "Field Name"
-#~ msgstr "Kentän nimi"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/export.inc, line: 84
-# File: phpESP/admin/include/where/test.inc, line: 134
-#~ msgid "CSV"
-#~ msgstr "CSV"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 28
-#~ msgid "Choose a function"
-#~ msgstr "Valitse toiminto"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/manage.inc, line: 51
-#~ msgid "Export Data to CSV"
-#~ msgstr "Vie tulokset CSV-muotoon"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 86
-#~ msgid "Error!"
-#~ msgstr "Virhe!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# File: phpESP/admin/include/where/merge.inc, line: 87
-#~ msgid "You need to select at least two surveys!"
-#~ msgstr "Sinun täytyy valita vähintään kaksi kyselyä!"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "Administer Group Members"
-#~ msgstr "Voi hallita ryhmän jäseniä"
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#~ msgid "No survey specified."
-#~ msgstr "Ei kyselyä valittuna."
Index: locale/map
===================================================================
--- locale/map	(revision 6370)
+++ locale/map	(working copy)
@@ -1,17 +0,0 @@
-# phpESP Locale Map
-# Maps two letter codes onto locales
-# By: James Flemer <jflemer@alum.rpi.edu>
-#
-da	da_DK
-de	de_DE
-el	el_GR
-en	en_US
-es	es_ES
-fi	fi_FI
-fr	fr_FR
-it	it_IT
-ja	ja_JP
-nl	nl_NL
-#pt	pt_BR
-pt	pt_PT
-sv	sv_SE
Index: LICENSE.txt
===================================================================
--- LICENSE.txt	(revision 6370)
+++ LICENSE.txt	(working copy)
@@ -1,94 +0,0 @@
-VULab is based on modifications of the phpESP survey tool. phpESP is licensed under a BSD license, available in the phpESP-LICENSE.txt file.
-
-The modified portions of VULab are covered under a dual ECL 2/BSD License:
-
-Educational Community License, Version 2.0
-*************************************
-Copyright 2008 York University 
-
-Educational Community License, Version 2.0, April 2007
-
-The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. The original Apache 2.0 license can be found at: http://www.apache.org/licenses/LICENSE-2.0
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. Any patent license granted hereby with respect to contributions by an individual employed by an institution or organization is limited to patent claims where the individual that is the author of the Work is also the inventor of the patent claims licensed, and where the organization or institution has the right to grant such license under applicable grant and research funding agreements. No other express or implied licenses are granted.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-   1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
-   2. You must cause any modified files to carry prominent notices stating that You changed the files; and
-   3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-   4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS FOR ECL 2.0
-
-The New BSD license
-**********************
-
-Copyright 2008 York University.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the University of Toronto nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-END OF TERMS AND CONDITIONS FOR THE NEW BSD LICENSE
Index: tests/allservices.test.php
===================================================================
--- tests/allservices.test.php	(revision 6370)
+++ tests/allservices.test.php	(working copy)
@@ -1,5 +0,0 @@
-<?php
-	include('../admin/include_all.php');
-	require_once('../services/core.service.php');
-	$CoreService = new CoreService;
-?>
Index: images/hbar.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/conditions_d.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/knobs_white.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/save.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/surveyimages/phpespHeader.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/finish_a.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/required.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/preview_a.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/hbar_yellow_l.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/hbar_blue.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/finish_d.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/preview_d.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/hbar_yellow_r.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/world_delete.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/copy.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps1_on.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/world_go.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps3_on.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps1_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps5_on.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps3_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps5_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/edit.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/hbar_red.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/checkmark.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/add.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/hbar_yellow.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/openvulablogo2.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/order_a.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/knobs.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/general_a.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/loadingAnimation.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/order_d.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/activate.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/glasses.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/general_d.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/delete.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/cross_tabulate.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/hbar_l.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/exit.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/README
===================================================================
--- images/README	(revision 6370)
+++ images/README	(working copy)
@@ -1,27 +0,0 @@
-# $Id: README,v 1.3 2003/01/30 20:14:55 jimmerman Exp $
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-phpESP/images/:
-  Images used by the package.
-
-  images used for tabs on admin pages: (a=active, d=deactive)
-	finish_a.gif
-	finish_d.gif
-	general_a.gif
-	general_d.gif
-	order_a.gif
-	order_d.gif
-	preview_a.gif
-	preview_d.gif
-	questions_a.gif
-	questions_d.gif
-
-  images used for percentage bars:
-	hbar.gif	middle image (should be stretchable left-right)
-	hbar_l.gif	left end image
-	hbar_r.gif	right end image
-
-  knobs.gif		used on the "order" tab
Index: images/steps/steps2_on.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps4_off.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps3_on.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps1_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps4_on.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps2_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps3_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps4_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps5_on2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps5_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps1_off.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps2_off.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps1_on.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps/steps3_off.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/questions_a.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps2_on.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/hbar_r.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/questions_d.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps4_on.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/user.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/hbar_blue_l.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps2_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/steps4_.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/hbar_blue_r.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/cross_tabulate_result1.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/cross_analysis_result.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/cross_tabulate_result2.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/cross_analysis.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/cross_tabulate2.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/calendar.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/conditions_a.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: images/OpenVULab.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/default.js
===================================================================
--- js/default.js	(revision 6370)
+++ js/default.js	(working copy)
@@ -1,109 +0,0 @@
-<!--
-function activateConfirm() {
-    if (confirm("Warning! Once activated, this survey can no longer be edited.  Any further changes must be done on a copy.")) {
-        return true;
-    }
-    return false;
-}
-
-function cancelConfirm() {
-    if (confirm("Warning! This survey has not been saved.  Canceling now will remove any changes.")) {
-        return true;
-    }
-    return false;
-}
-
-function exportSubmit(type, f) {
-    f.where.value=type;
-    f.submit();
-}
-
-function clearTextInputs() {
-    var i = 1;
-    while (document.forms[1].elements["choice_content_" + i]) {
-        document.forms[1].elements["choice_content_" + i].value = "";
-        i++;
-    }
-}
-
-function addAnswerLine() {
-    var el = document.getElementById('answerlines');
-    var numchoice = document.getElementById('num_choices').value;
-    numchoice++;
-    var tablerow = el.insertRow(numchoice+1);
-    var tablecell = tablerow.insertCell(-1);
-    tablecell.innerHTML = numchoice+".";
-    tablecell.className = "numbered";
-    tablecell = tablerow.insertCell(-1);
-    var text = "<input type=\"hidden\" name=\"choice_id_"+numchoice+"\" value=\"\" />\n";
-    text = text+"<input type=\"text\" size=\"60\" name=\"choice_content_"+numchoice+"\" value=\"\" />\n";
-    tablecell.innerHTML = text;
-    tablecell.className = "left";
-    document.getElementById('num_choices').value = numchoice;
-}
-
-
-function validate() {
-    return true;
-}
-
-function other_check(name)
-{
-    other = name.split("_");
-    var f = document.phpesp_response;
-    for (var i=0; i<=f.elements.length; i++) {
-        if (f.elements[i].value == "other_"+other[1]) {
-            f.elements[i].checked=true;
-            break;
-        }
-    }
-}
-
-function merge(box) {
-    if(box.options.length >= 2){
-        ml = new Array();
-        for(var i=0; i<box.options.length; i++) {
-            ml[i] = box.options[i].value;
-            sidsArray=ml;
-        }
-        sids = sidsArray.join("+");
-        document.getElementById('sids').value = sids; 
-        form = document.getElementById('merge');
-        form.submit();
-    } else {
-        document.getElementById('error').innerHTML = "<h2>You must select at least two surveys before you can merge</h2>";
-    }
-}
-
-function move(fbox,tbox) {
-    for(var i=0; i<fbox.options.length; i++) {
-        if(fbox.options[i].selected && fbox.options[i].value != "") {
-            var no = new Option();
-            no.value = fbox.options[i].value;
-            no.text = fbox.options[i].text;
-            tbox.options[tbox.options.length] = no;
-            fbox.options[i].value = "";
-            fbox.options[i].text = "";
-        }
-    }
-    BumpUp(fbox);
-}
-
-function BumpUp(box)  {
-    for(var i=0; i<box.options.length; i++) {
-        if(box.options[i].value == "")  {
-            for(var j=i; j<box.options.length-1; j++)  {
-                box.options[j].value = box.options[j+1].value;
-                box.options[j].text = box.options[j+1].text;
-            }
-            var ln = i;
-            break;
-        }
-    }
-    if(ln < box.options.length)  {
-        box.options.length -= 1;
-        BumpUp(box);
-    }
-}
-
--->
Index: js/loadingAnimation.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/jqModal.js
===================================================================
--- js/jqModal.js	(revision 6370)
+++ js/jqModal.js	(working copy)
@@ -1,69 +0,0 @@
-/*
- * jqModal - Minimalist Modaling with jQuery
- *   (http://dev.iceburg.net/jquery/jqmodal/)
- *
- * Copyright (c) 2007,2008 Brice Burgess <bhb@iceburg.net>
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- * 
- * $Version: 06/22/2008 +r12
- * 
- */
-(function($) {
-$.fn.jqm=function(o){
-var _o = {
-overlay: 50,
-overlayClass: 'jqmOverlay',
-closeClass: 'jqmClose',
-trigger: '.jqModal',
-ajax: false,
-ajaxText: '',
-target: false,
-modal: false,
-toTop: false,
-onShow: false,
-onHide: false,
-onLoad: false
-};
-return this.each(function(){if(this._jqm)return H[this._jqm].c=$.extend({},H[this._jqm].c,o); s++; this._jqm=s;
-H[s]={c:$.extend(_o, o),a:false,w:$(this).addClass('jqmID'+s),s:s};
-if(_o.trigger)$(this).jqmAddTrigger(_o.trigger);
-});};
-
-$.fn.jqmAddClose=function(e){hs(this,e,'jqmHide'); return this;};
-$.fn.jqmAddTrigger=function(e){hs(this,e,'jqmShow'); return this;};
-$.fn.jqmShow=function(t){return this.each(function(){if(!H[this._jqm].a)$.jqm.open(this._jqm,t)});};
-$.fn.jqmHide=function(t){return this.each(function(){if(H[this._jqm].a)$.jqm.close(this._jqm,t)});};
-
-$.jqm = {
-hash:{},
-open:function(s,t){var h=H[s],c=h.c,cc='.'+c.closeClass,z=(parseInt(h.w.css('z-index'))),z=(z>0)?z:3000,o=$('<div></div>').css({height:'100%',width:'100%',position:'fixed',left:0,top:0,'z-index':z-1,opacity:c.overlay/100});h.t=t;h.a=true;h.w.css('z-index',z);
- if(c.modal) {if(!A[0])F('bind');A.push(s);o.css('cursor','wait');}
- else if(c.overlay > 0)h.w.jqmAddClose(o);
- else o=false;
-
- h.o=(o)?o.addClass(c.overlayClass).prependTo('body'):false;
- if(ie6){$('html,body').css({height:'100%',width:'100%'});if(o){o=o.css({position:'absolute'})[0];for(var y in {Top:1,Left:1})o.style.setExpression(y.toLowerCase(),"(_=(document.documentElement.scroll"+y+" || document.body.scroll"+y+"))+'px'");}}
-
- if(c.ajax) {var r=c.target||h.w,u=c.ajax,r=(typeof r == 'string')?$(r,h.w):$(r),u=(u.substr(0,1) == '@')?$(t).attr(u.substring(1)):u;
-  r.html(c.ajaxText).load(u,function(){if(c.onLoad)c.onLoad.call(this,h);if(cc)h.w.jqmAddClose($(cc,h.w));e(h);});}
- else if(cc)h.w.jqmAddClose($(cc,h.w));
-
- if(c.toTop&&h.o)h.w.before('<span id="jqmP'+h.w[0]._jqm+'"></span>').insertAfter(h.o);	
- (c.onShow)?c.onShow(h):h.w.show();e(h);return false;
-},
-close:function(s){var h=H[s];h.a=false;
- if(A[0]){A.pop();if(!A[0])F('unbind');}
- if(h.c.toTop&&h.o)$('#jqmP'+h.w[0]._jqm).after(h.w).remove();
- if(h.c.onHide)h.c.onHide(h);else{h.w.hide();if(h.o)h.o.remove();} return false;
-}};
-var s=0,H=$.jqm.hash,A=[],ie6=$.browser.msie&&($.browser.version == "6.0"),
-i=$('<iframe src="javascript:false;document.write(\'\');" class="jqm"></iframe>').css({opacity:0}),
-e=function(h){if(ie6)if(h.o)h.o.html('<p style="width:100%;height:100%"/>').prepend(i);else if(!$('iframe.jqm',h.w)[0])h.w.prepend(i); f(h);},
-f=function(h){try{$(':input:visible',h.w)[0].focus();}catch(e){}},
-F=function(t){$()[t]("keypress",m)[t]("keydown",m)[t]("mousedown",m);},
-m=function(e){var h=H[A[A.length-1]],r=(!$(e.target).parents('.jqmID'+h.s)[0]);if(r)f(h);return !r;},
-hs=function(w,e,y){var s=[];w.each(function(){s.push(this._jqm)});
- $(e).each(function(){if(this[y])$.extend(this[y],s);else{this[y]=s;$(this).click(function(){for(var i in {jqmShow:1,jqmHide:1})for(var s in this[i])if(H[this[i][s]])H[this[i][s]].w[i](this);return false;});}});};
-})(jQuery);
\ No newline at end of file
Index: js/thickbox.css
===================================================================
--- js/thickbox.css	(revision 6370)
+++ js/thickbox.css	(working copy)
@@ -1,163 +0,0 @@
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-*{padding: 0; margin: 0;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_window {
-	font: 12px Arial, Helvetica, sans-serif;
-	color: #333333;
-}
-
-#TB_secondLine {
-	font: 10px Arial, Helvetica, sans-serif;
-	color:#666666;
-}
-
-#TB_window a:link {color: #666666;}
-#TB_window a:visited {color: #666666;}
-#TB_window a:hover {color: #000;}
-#TB_window a:active {color: #666666;}
-#TB_window a:focus{color: #666666;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_overlay {
-	position: fixed;
-	z-index:100;
-	top: 0px;
-	left: 0px;
-	height:100%;
-	width:100%;
-}
-
-.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
-.TB_overlayBG {
-	background-color:#000;
-	filter:alpha(opacity=75);
-	-moz-opacity: 0.75;
-	opacity: 0.75;
-}
-
-* html #TB_overlay { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_window {
-	position: fixed;
-	background: #ffffff;
-	z-index: 102;
-	color:#000000;
-	display:none;
-	border: 4px solid #525252;
-	text-align:left;
-	top:50%;
-	left:50%;
-}
-
-* html #TB_window { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_window img#TB_Image {
-	display:block;
-	margin: 15px 0 0 15px;
-	border-right: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
-	border-top: 1px solid #666;
-	border-left: 1px solid #666;
-}
-
-#TB_caption{
-	height:25px;
-	padding:7px 30px 10px 25px;
-	float:left;
-}
-
-#TB_closeWindow{
-	height:25px;
-	padding:11px 25px 10px 0;
-	float:right;
-}
-
-#TB_closeAjaxWindow{
-	padding:7px 10px 5px 0;
-	margin-bottom:1px;
-	text-align:right;
-	float:right;
-}
-
-#TB_ajaxWindowTitle{
-	float:left;
-	padding:7px 0 5px 10px;
-	margin-bottom:1px;
-}
-
-#TB_title{
-	background-color:#e8e8e8;
-	height:27px;
-}
-
-#TB_ajaxContent{
-	clear:both;
-	padding:2px 15px 15px 15px;
-	overflow:auto;
-	text-align:left;
-	line-height:1.4em;
-}
-
-#TB_ajaxContent.TB_modal{
-	padding:15px;
-}
-
-#TB_ajaxContent p{
-	padding:5px 0px 5px 0px;
-}
-
-#TB_load{
-	position: fixed;
-	display:none;
-	height:13px;
-	width:208px;
-	z-index:103;
-	top: 50%;
-	left: 50%;
-	margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
-}
-
-* html #TB_load { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_HideSelect{
-	z-index:99;
-	position:fixed;
-	top: 0;
-	left: 0;
-	background-color:#fff;
-	border:none;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-	height:100%;
-	width:100%;
-}
-
-* html #TB_HideSelect { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_iframeContent{
-	clear:both;
-	border:none;
-	margin-bottom:-1px;
-	margin-top:1px;
-	_margin-bottom:1px;
-}
Index: js/jquery-latest.js
===================================================================
--- js/jquery-latest.js	(revision 6370)
+++ js/jquery-latest.js	(working copy)
@@ -1,11 +0,0 @@
-/*
- * jQuery 1.2.6 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
- */
-eval(function(p,a,c,k,e,r){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--)r[e(c)]=k[c]||e(c);k=[function(e){return r[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}('(H(){J w=1b.4M,3m$=1b.$;J D=1b.4M=1b.$=H(a,b){I 2B D.17.5j(a,b)};J u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/,62=/^.[^:#\\[\\.]*$/,12;D.17=D.44={5j:H(d,b){d=d||S;G(d.16){7[0]=d;7.K=1;I 7}G(1j d=="23"){J c=u.2D(d);G(c&&(c[1]||!b)){G(c[1])d=D.4h([c[1]],b);N{J a=S.61(c[3]);G(a){G(a.2v!=c[3])I D().2q(d);I D(a)}d=[]}}N I D(b).2q(d)}N G(D.1D(d))I D(S)[D.17.27?"27":"43"](d);I 7.6Y(D.2d(d))},5w:"1.2.6",8G:H(){I 7.K},K:0,3p:H(a){I a==12?D.2d(7):7[a]},2I:H(b){J a=D(b);a.5n=7;I a},6Y:H(a){7.K=0;2p.44.1p.1w(7,a);I 7},P:H(a,b){I D.P(7,a,b)},5i:H(b){J a=-1;I D.2L(b&&b.5w?b[0]:b,7)},1K:H(c,a,b){J d=c;G(c.1q==56)G(a===12)I 7[0]&&D[b||"1K"](7[0],c);N{d={};d[c]=a}I 7.P(H(i){R(c 1n d)D.1K(b?7.V:7,c,D.1i(7,d[c],b,i,c))})},1g:H(b,a){G((b==\'2h\'||b==\'1Z\')&&3d(a)<0)a=12;I 7.1K(b,a,"2a")},1r:H(b){G(1j b!="49"&&b!=U)I 7.4E().3v((7[0]&&7[0].2z||S).5F(b));J a="";D.P(b||7,H(){D.P(7.3t,H(){G(7.16!=8)a+=7.16!=1?7.76:D.17.1r([7])})});I a},5z:H(b){G(7[0])D(b,7[0].2z).5y().39(7[0]).2l(H(){J a=7;1B(a.1x)a=a.1x;I a}).3v(7);I 7},8Y:H(a){I 7.P(H(){D(7).6Q().5z(a)})},8R:H(a){I 7.P(H(){D(7).5z(a)})},3v:H(){I 7.3W(19,M,Q,H(a){G(7.16==1)7.3U(a)})},6F:H(){I 7.3W(19,M,M,H(a){G(7.16==1)7.39(a,7.1x)})},6E:H(){I 7.3W(19,Q,Q,H(a){7.1d.39(a,7)})},5q:H(){I 7.3W(19,Q,M,H(a){7.1d.39(a,7.2H)})},3l:H(){I 7.5n||D([])},2q:H(b){J c=D.2l(7,H(a){I D.2q(b,a)});I 7.2I(/[^+>] [^+>]/.11(b)||b.1h("..")>-1?D.4r(c):c)},5y:H(e){J f=7.2l(H(){G(D.14.1f&&!D.4n(7)){J a=7.6o(M),5h=S.3h("1v");5h.3U(a);I D.4h([5h.4H])[0]}N I 7.6o(M)});J d=f.2q("*").5c().P(H(){G(7[E]!=12)7[E]=U});G(e===M)7.2q("*").5c().P(H(i){G(7.16==3)I;J c=D.L(7,"3w");R(J a 1n c)R(J b 1n c[a])D.W.1e(d[i],a,c[a][b],c[a][b].L)});I f},1E:H(b){I 7.2I(D.1D(b)&&D.3C(7,H(a,i){I b.1k(a,i)})||D.3g(b,7))},4Y:H(b){G(b.1q==56)G(62.11(b))I 7.2I(D.3g(b,7,M));N b=D.3g(b,7);J a=b.K&&b[b.K-1]!==12&&!b.16;I 7.1E(H(){I a?D.2L(7,b)<0:7!=b})},1e:H(a){I 7.2I(D.4r(D.2R(7.3p(),1j a==\'23\'?D(a):D.2d(a))))},3F:H(a){I!!a&&D.3g(a,7).K>0},7T:H(a){I 7.3F("."+a)},6e:H(b){G(b==12){G(7.K){J c=7[0];G(D.Y(c,"2A")){J e=c.64,63=[],15=c.15,2V=c.O=="2A-2V";G(e<0)I U;R(J i=2V?e:0,2f=2V?e+1:15.K;i<2f;i++){J d=15[i];G(d.2W){b=D.14.1f&&!d.at.2x.an?d.1r:d.2x;G(2V)I b;63.1p(b)}}I 63}N I(7[0].2x||"").1o(/\\r/g,"")}I 12}G(b.1q==4L)b+=\'\';I 7.P(H(){G(7.16!=1)I;G(b.1q==2p&&/5O|5L/.11(7.O))7.4J=(D.2L(7.2x,b)>=0||D.2L(7.34,b)>=0);N G(D.Y(7,"2A")){J a=D.2d(b);D("9R",7).P(H(){7.2W=(D.2L(7.2x,a)>=0||D.2L(7.1r,a)>=0)});G(!a.K)7.64=-1}N 7.2x=b})},2K:H(a){I a==12?(7[0]?7[0].4H:U):7.4E().3v(a)},7b:H(a){I 7.5q(a).21()},79:H(i){I 7.3s(i,i+1)},3s:H(){I 7.2I(2p.44.3s.1w(7,19))},2l:H(b){I 7.2I(D.2l(7,H(a,i){I b.1k(a,i,a)}))},5c:H(){I 7.1e(7.5n)},L:H(d,b){J a=d.1R(".");a[1]=a[1]?"."+a[1]:"";G(b===12){J c=7.5C("9z"+a[1]+"!",[a[0]]);G(c===12&&7.K)c=D.L(7[0],d);I c===12&&a[1]?7.L(a[0]):c}N I 7.1P("9u"+a[1]+"!",[a[0],b]).P(H(){D.L(7,d,b)})},3b:H(a){I 7.P(H(){D.3b(7,a)})},3W:H(g,f,h,d){J e=7.K>1,3x;I 7.P(H(){G(!3x){3x=D.4h(g,7.2z);G(h)3x.9o()}J b=7;G(f&&D.Y(7,"1T")&&D.Y(3x[0],"4F"))b=7.3H("22")[0]||7.3U(7.2z.3h("22"));J c=D([]);D.P(3x,H(){J a=e?D(7).5y(M)[0]:7;G(D.Y(a,"1m"))c=c.1e(a);N{G(a.16==1)c=c.1e(D("1m",a).21());d.1k(b,a)}});c.P(6T)})}};D.17.5j.44=D.17;H 6T(i,a){G(a.4d)D.3Y({1a:a.4d,31:Q,1O:"1m"});N D.5u(a.1r||a.6O||a.4H||"");G(a.1d)a.1d.37(a)}H 1z(){I+2B 8J}D.1l=D.17.1l=H(){J b=19[0]||{},i=1,K=19.K,4x=Q,15;G(b.1q==8I){4x=b;b=19[1]||{};i=2}G(1j b!="49"&&1j b!="H")b={};G(K==i){b=7;--i}R(;i<K;i++)G((15=19[i])!=U)R(J c 1n 15){J a=b[c],2w=15[c];G(b===2w)6M;G(4x&&2w&&1j 2w=="49"&&!2w.16)b[c]=D.1l(4x,a||(2w.K!=U?[]:{}),2w);N G(2w!==12)b[c]=2w}I b};J E="4M"+1z(),6K=0,5r={},6G=/z-?5i|8B-?8A|1y|6B|8v-?1Z/i,3P=S.3P||{};D.1l({8u:H(a){1b.$=3m$;G(a)1b.4M=w;I D},1D:H(a){I!!a&&1j a!="23"&&!a.Y&&a.1q!=2p&&/^[\\s[]?H/.11(a+"")},4n:H(a){I a.1C&&!a.1c||a.2j&&a.2z&&!a.2z.1c},5u:H(a){a=D.3k(a);G(a){J b=S.3H("6w")[0]||S.1C,1m=S.3h("1m");1m.O="1r/4t";G(D.14.1f)1m.1r=a;N 1m.3U(S.5F(a));b.39(1m,b.1x);b.37(1m)}},Y:H(b,a){I b.Y&&b.Y.2r()==a.2r()},1Y:{},L:H(c,d,b){c=c==1b?5r:c;J a=c[E];G(!a)a=c[E]=++6K;G(d&&!D.1Y[a])D.1Y[a]={};G(b!==12)D.1Y[a][d]=b;I d?D.1Y[a][d]:a},3b:H(c,b){c=c==1b?5r:c;J a=c[E];G(b){G(D.1Y[a]){2U D.1Y[a][b];b="";R(b 1n D.1Y[a])1X;G(!b)D.3b(c)}}N{1U{2U c[E]}1V(e){G(c.5l)c.5l(E)}2U D.1Y[a]}},P:H(d,a,c){J e,i=0,K=d.K;G(c){G(K==12){R(e 1n d)G(a.1w(d[e],c)===Q)1X}N R(;i<K;)G(a.1w(d[i++],c)===Q)1X}N{G(K==12){R(e 1n d)G(a.1k(d[e],e,d[e])===Q)1X}N R(J b=d[0];i<K&&a.1k(b,i,b)!==Q;b=d[++i]){}}I d},1i:H(b,a,c,i,d){G(D.1D(a))a=a.1k(b,i);I a&&a.1q==4L&&c=="2a"&&!6G.11(d)?a+"2X":a},1F:{1e:H(c,b){D.P((b||"").1R(/\\s+/),H(i,a){G(c.16==1&&!D.1F.3T(c.1F,a))c.1F+=(c.1F?" ":"")+a})},21:H(c,b){G(c.16==1)c.1F=b!=12?D.3C(c.1F.1R(/\\s+/),H(a){I!D.1F.3T(b,a)}).6s(" "):""},3T:H(b,a){I D.2L(a,(b.1F||b).6r().1R(/\\s+/))>-1}},6q:H(b,c,a){J e={};R(J d 1n c){e[d]=b.V[d];b.V[d]=c[d]}a.1k(b);R(J d 1n c)b.V[d]=e[d]},1g:H(d,e,c){G(e=="2h"||e=="1Z"){J b,3X={30:"5x",5g:"1G",18:"3I"},35=e=="2h"?["5e","6k"]:["5G","6i"];H 5b(){b=e=="2h"?d.8f:d.8c;J a=0,2C=0;D.P(35,H(){a+=3d(D.2a(d,"57"+7,M))||0;2C+=3d(D.2a(d,"2C"+7+"4b",M))||0});b-=29.83(a+2C)}G(D(d).3F(":4j"))5b();N D.6q(d,3X,5b);I 29.2f(0,b)}I D.2a(d,e,c)},2a:H(f,l,k){J e,V=f.V;H 3E(b){G(!D.14.2k)I Q;J a=3P.54(b,U);I!a||a.52("3E")==""}G(l=="1y"&&D.14.1f){e=D.1K(V,"1y");I e==""?"1":e}G(D.14.2G&&l=="18"){J d=V.50;V.50="0 7Y 7W";V.50=d}G(l.1I(/4i/i))l=y;G(!k&&V&&V[l])e=V[l];N G(3P.54){G(l.1I(/4i/i))l="4i";l=l.1o(/([A-Z])/g,"-$1").3y();J c=3P.54(f,U);G(c&&!3E(f))e=c.52(l);N{J g=[],2E=[],a=f,i=0;R(;a&&3E(a);a=a.1d)2E.6h(a);R(;i<2E.K;i++)G(3E(2E[i])){g[i]=2E[i].V.18;2E[i].V.18="3I"}e=l=="18"&&g[2E.K-1]!=U?"2F":(c&&c.52(l))||"";R(i=0;i<g.K;i++)G(g[i]!=U)2E[i].V.18=g[i]}G(l=="1y"&&e=="")e="1"}N G(f.4g){J h=l.1o(/\\-(\\w)/g,H(a,b){I b.2r()});e=f.4g[l]||f.4g[h];G(!/^\\d+(2X)?$/i.11(e)&&/^\\d/.11(e)){J j=V.1A,66=f.65.1A;f.65.1A=f.4g.1A;V.1A=e||0;e=V.aM+"2X";V.1A=j;f.65.1A=66}}I e},4h:H(l,h){J k=[];h=h||S;G(1j h.3h==\'12\')h=h.2z||h[0]&&h[0].2z||S;D.P(l,H(i,d){G(!d)I;G(d.1q==4L)d+=\'\';G(1j d=="23"){d=d.1o(/(<(\\w+)[^>]*?)\\/>/g,H(b,a,c){I c.1I(/^(aK|4f|7E|aG|4T|7A|aB|3n|az|ay|av)$/i)?b:a+"></"+c+">"});J f=D.3k(d).3y(),1v=h.3h("1v");J e=!f.1h("<au")&&[1,"<2A 7w=\'7w\'>","</2A>"]||!f.1h("<ar")&&[1,"<7v>","</7v>"]||f.1I(/^<(aq|22|am|ak|ai)/)&&[1,"<1T>","</1T>"]||!f.1h("<4F")&&[2,"<1T><22>","</22></1T>"]||(!f.1h("<af")||!f.1h("<ad"))&&[3,"<1T><22><4F>","</4F></22></1T>"]||!f.1h("<7E")&&[2,"<1T><22></22><7q>","</7q></1T>"]||D.14.1f&&[1,"1v<1v>","</1v>"]||[0,"",""];1v.4H=e[1]+d+e[2];1B(e[0]--)1v=1v.5T;G(D.14.1f){J g=!f.1h("<1T")&&f.1h("<22")<0?1v.1x&&1v.1x.3t:e[1]=="<1T>"&&f.1h("<22")<0?1v.3t:[];R(J j=g.K-1;j>=0;--j)G(D.Y(g[j],"22")&&!g[j].3t.K)g[j].1d.37(g[j]);G(/^\\s/.11(d))1v.39(h.5F(d.1I(/^\\s*/)[0]),1v.1x)}d=D.2d(1v.3t)}G(d.K===0&&(!D.Y(d,"3V")&&!D.Y(d,"2A")))I;G(d[0]==12||D.Y(d,"3V")||d.15)k.1p(d);N k=D.2R(k,d)});I k},1K:H(d,f,c){G(!d||d.16==3||d.16==8)I 12;J e=!D.4n(d),40=c!==12,1f=D.14.1f;f=e&&D.3X[f]||f;G(d.2j){J g=/5Q|4d|V/.11(f);G(f=="2W"&&D.14.2k)d.1d.64;G(f 1n d&&e&&!g){G(40){G(f=="O"&&D.Y(d,"4T")&&d.1d)7p"O a3 a1\'t 9V 9U";d[f]=c}G(D.Y(d,"3V")&&d.7i(f))I d.7i(f).76;I d[f]}G(1f&&e&&f=="V")I D.1K(d.V,"9T",c);G(40)d.9Q(f,""+c);J h=1f&&e&&g?d.4G(f,2):d.4G(f);I h===U?12:h}G(1f&&f=="1y"){G(40){d.6B=1;d.1E=(d.1E||"").1o(/7f\\([^)]*\\)/,"")+(3r(c)+\'\'=="9L"?"":"7f(1y="+c*7a+")")}I d.1E&&d.1E.1h("1y=")>=0?(3d(d.1E.1I(/1y=([^)]*)/)[1])/7a)+\'\':""}f=f.1o(/-([a-z])/9H,H(a,b){I b.2r()});G(40)d[f]=c;I d[f]},3k:H(a){I(a||"").1o(/^\\s+|\\s+$/g,"")},2d:H(b){J a=[];G(b!=U){J i=b.K;G(i==U||b.1R||b.4I||b.1k)a[0]=b;N 1B(i)a[--i]=b[i]}I a},2L:H(b,a){R(J i=0,K=a.K;i<K;i++)G(a[i]===b)I i;I-1},2R:H(a,b){J i=0,T,2S=a.K;G(D.14.1f){1B(T=b[i++])G(T.16!=8)a[2S++]=T}N 1B(T=b[i++])a[2S++]=T;I a},4r:H(a){J c=[],2o={};1U{R(J i=0,K=a.K;i<K;i++){J b=D.L(a[i]);G(!2o[b]){2o[b]=M;c.1p(a[i])}}}1V(e){c=a}I c},3C:H(c,a,d){J b=[];R(J i=0,K=c.K;i<K;i++)G(!d!=!a(c[i],i))b.1p(c[i]);I b},2l:H(d,a){J c=[];R(J i=0,K=d.K;i<K;i++){J b=a(d[i],i);G(b!=U)c[c.K]=b}I c.7d.1w([],c)}});J v=9B.9A.3y();D.14={5B:(v.1I(/.+(?:9y|9x|9w|9v)[\\/: ]([\\d.]+)/)||[])[1],2k:/75/.11(v),2G:/2G/.11(v),1f:/1f/.11(v)&&!/2G/.11(v),42:/42/.11(v)&&!/(9s|75)/.11(v)};J y=D.14.1f?"7o":"72";D.1l({71:!D.14.1f||S.70=="6Z",3X:{"R":"9n","9k":"1F","4i":y,72:y,7o:y,9h:"9f",9e:"9d",9b:"99"}});D.P({6W:H(a){I a.1d},97:H(a){I D.4S(a,"1d")},95:H(a){I D.3a(a,2,"2H")},91:H(a){I D.3a(a,2,"4l")},8Z:H(a){I D.4S(a,"2H")},8X:H(a){I D.4S(a,"4l")},8W:H(a){I D.5v(a.1d.1x,a)},8V:H(a){I D.5v(a.1x)},6Q:H(a){I D.Y(a,"8U")?a.8T||a.8S.S:D.2d(a.3t)}},H(c,d){D.17[c]=H(b){J a=D.2l(7,d);G(b&&1j b=="23")a=D.3g(b,a);I 7.2I(D.4r(a))}});D.P({6P:"3v",8Q:"6F",39:"6E",8P:"5q",8O:"7b"},H(c,b){D.17[c]=H(){J a=19;I 7.P(H(){R(J i=0,K=a.K;i<K;i++)D(a[i])[b](7)})}});D.P({8N:H(a){D.1K(7,a,"");G(7.16==1)7.5l(a)},8M:H(a){D.1F.1e(7,a)},8L:H(a){D.1F.21(7,a)},8K:H(a){D.1F[D.1F.3T(7,a)?"21":"1e"](7,a)},21:H(a){G(!a||D.1E(a,[7]).r.K){D("*",7).1e(7).P(H(){D.W.21(7);D.3b(7)});G(7.1d)7.1d.37(7)}},4E:H(){D(">*",7).21();1B(7.1x)7.37(7.1x)}},H(a,b){D.17[a]=H(){I 7.P(b,19)}});D.P(["6N","4b"],H(i,c){J b=c.3y();D.17[b]=H(a){I 7[0]==1b?D.14.2G&&S.1c["5t"+c]||D.14.2k&&1b["5s"+c]||S.70=="6Z"&&S.1C["5t"+c]||S.1c["5t"+c]:7[0]==S?29.2f(29.2f(S.1c["4y"+c],S.1C["4y"+c]),29.2f(S.1c["2i"+c],S.1C["2i"+c])):a==12?(7.K?D.1g(7[0],b):U):7.1g(b,a.1q==56?a:a+"2X")}});H 25(a,b){I a[0]&&3r(D.2a(a[0],b,M),10)||0}J C=D.14.2k&&3r(D.14.5B)<8H?"(?:[\\\\w*3m-]|\\\\\\\\.)":"(?:[\\\\w\\8F-\\8E*3m-]|\\\\\\\\.)",6L=2B 4v("^>\\\\s*("+C+"+)"),6J=2B 4v("^("+C+"+)(#)("+C+"+)"),6I=2B 4v("^([#.]?)("+C+"*)");D.1l({6H:{"":H(a,i,m){I m[2]=="*"||D.Y(a,m[2])},"#":H(a,i,m){I a.4G("2v")==m[2]},":":{8D:H(a,i,m){I i<m[3]-0},8C:H(a,i,m){I i>m[3]-0},3a:H(a,i,m){I m[3]-0==i},79:H(a,i,m){I m[3]-0==i},3o:H(a,i){I i==0},3S:H(a,i,m,r){I i==r.K-1},6D:H(a,i){I i%2==0},6C:H(a,i){I i%2},"3o-4u":H(a){I a.1d.3H("*")[0]==a},"3S-4u":H(a){I D.3a(a.1d.5T,1,"4l")==a},"8z-4u":H(a){I!D.3a(a.1d.5T,2,"4l")},6W:H(a){I a.1x},4E:H(a){I!a.1x},8y:H(a,i,m){I(a.6O||a.8x||D(a).1r()||"").1h(m[3])>=0},4j:H(a){I"1G"!=a.O&&D.1g(a,"18")!="2F"&&D.1g(a,"5g")!="1G"},1G:H(a){I"1G"==a.O||D.1g(a,"18")=="2F"||D.1g(a,"5g")=="1G"},8w:H(a){I!a.3R},3R:H(a){I a.3R},4J:H(a){I a.4J},2W:H(a){I a.2W||D.1K(a,"2W")},1r:H(a){I"1r"==a.O},5O:H(a){I"5O"==a.O},5L:H(a){I"5L"==a.O},5p:H(a){I"5p"==a.O},3Q:H(a){I"3Q"==a.O},5o:H(a){I"5o"==a.O},6A:H(a){I"6A"==a.O},6z:H(a){I"6z"==a.O},2s:H(a){I"2s"==a.O||D.Y(a,"2s")},4T:H(a){I/4T|2A|6y|2s/i.11(a.Y)},3T:H(a,i,m){I D.2q(m[3],a).K},8t:H(a){I/h\\d/i.11(a.Y)},8s:H(a){I D.3C(D.3O,H(b){I a==b.T}).K}}},6x:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,2B 4v("^([:.#]*)("+C+"+)")],3g:H(a,c,b){J d,1t=[];1B(a&&a!=d){d=a;J f=D.1E(a,c,b);a=f.t.1o(/^\\s*,\\s*/,"");1t=b?c=f.r:D.2R(1t,f.r)}I 1t},2q:H(t,o){G(1j t!="23")I[t];G(o&&o.16!=1&&o.16!=9)I[];o=o||S;J d=[o],2o=[],3S,Y;1B(t&&3S!=t){J r=[];3S=t;t=D.3k(t);J l=Q,3j=6L,m=3j.2D(t);G(m){Y=m[1].2r();R(J i=0;d[i];i++)R(J c=d[i].1x;c;c=c.2H)G(c.16==1&&(Y=="*"||c.Y.2r()==Y))r.1p(c);d=r;t=t.1o(3j,"");G(t.1h(" ")==0)6M;l=M}N{3j=/^([>+~])\\s*(\\w*)/i;G((m=3j.2D(t))!=U){r=[];J k={};Y=m[2].2r();m=m[1];R(J j=0,3i=d.K;j<3i;j++){J n=m=="~"||m=="+"?d[j].2H:d[j].1x;R(;n;n=n.2H)G(n.16==1){J g=D.L(n);G(m=="~"&&k[g])1X;G(!Y||n.Y.2r()==Y){G(m=="~")k[g]=M;r.1p(n)}G(m=="+")1X}}d=r;t=D.3k(t.1o(3j,""));l=M}}G(t&&!l){G(!t.1h(",")){G(o==d[0])d.4s();2o=D.2R(2o,d);r=d=[o];t=" "+t.6v(1,t.K)}N{J h=6J;J m=h.2D(t);G(m){m=[0,m[2],m[3],m[1]]}N{h=6I;m=h.2D(t)}m[2]=m[2].1o(/\\\\/g,"");J f=d[d.K-1];G(m[1]=="#"&&f&&f.61&&!D.4n(f)){J p=f.61(m[2]);G((D.14.1f||D.14.2G)&&p&&1j p.2v=="23"&&p.2v!=m[2])p=D(\'[@2v="\'+m[2]+\'"]\',f)[0];d=r=p&&(!m[3]||D.Y(p,m[3]))?[p]:[]}N{R(J i=0;d[i];i++){J a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];G(a=="*"&&d[i].Y.3y()=="49")a="3n";r=D.2R(r,d[i].3H(a))}G(m[1]==".")r=D.5m(r,m[2]);G(m[1]=="#"){J e=[];R(J i=0;r[i];i++)G(r[i].4G("2v")==m[2]){e=[r[i]];1X}r=e}d=r}t=t.1o(h,"")}}G(t){J b=D.1E(t,r);d=r=b.r;t=D.3k(b.t)}}G(t)d=[];G(d&&o==d[0])d.4s();2o=D.2R(2o,d);I 2o},5m:H(r,m,a){m=" "+m+" ";J c=[];R(J i=0;r[i];i++){J b=(" "+r[i].1F+" ").1h(m)>=0;G(!a&&b||a&&!b)c.1p(r[i])}I c},1E:H(t,r,h){J d;1B(t&&t!=d){d=t;J p=D.6x,m;R(J i=0;p[i];i++){m=p[i].2D(t);G(m){t=t.8r(m[0].K);m[2]=m[2].1o(/\\\\/g,"");1X}}G(!m)1X;G(m[1]==":"&&m[2]=="4Y")r=62.11(m[3])?D.1E(m[3],r,M).r:D(r).4Y(m[3]);N G(m[1]==".")r=D.5m(r,m[2],h);N G(m[1]=="["){J g=[],O=m[3];R(J i=0,3i=r.K;i<3i;i++){J a=r[i],z=a[D.3X[m[2]]||m[2]];G(z==U||/5Q|4d|2W/.11(m[2]))z=D.1K(a,m[2])||\'\';G((O==""&&!!z||O=="="&&z==m[5]||O=="!="&&z!=m[5]||O=="^="&&z&&!z.1h(m[5])||O=="$="&&z.6v(z.K-m[5].K)==m[5]||(O=="*="||O=="~=")&&z.1h(m[5])>=0)^h)g.1p(a)}r=g}N G(m[1]==":"&&m[2]=="3a-4u"){J e={},g=[],11=/(-?)(\\d*)n((?:\\+|-)?\\d*)/.2D(m[3]=="6D"&&"2n"||m[3]=="6C"&&"2n+1"||!/\\D/.11(m[3])&&"8q+"+m[3]||m[3]),3o=(11[1]+(11[2]||1))-0,d=11[3]-0;R(J i=0,3i=r.K;i<3i;i++){J j=r[i],1d=j.1d,2v=D.L(1d);G(!e[2v]){J c=1;R(J n=1d.1x;n;n=n.2H)G(n.16==1)n.4q=c++;e[2v]=M}J b=Q;G(3o==0){G(j.4q==d)b=M}N G((j.4q-d)%3o==0&&(j.4q-d)/3o>=0)b=M;G(b^h)g.1p(j)}r=g}N{J f=D.6H[m[1]];G(1j f=="49")f=f[m[2]];G(1j f=="23")f=6u("Q||H(a,i){I "+f+";}");r=D.3C(r,H(a,i){I f(a,i,m,r)},h)}}I{r:r,t:t}},4S:H(b,c){J a=[],1t=b[c];1B(1t&&1t!=S){G(1t.16==1)a.1p(1t);1t=1t[c]}I a},3a:H(a,e,c,b){e=e||1;J d=0;R(;a;a=a[c])G(a.16==1&&++d==e)1X;I a},5v:H(n,a){J r=[];R(;n;n=n.2H){G(n.16==1&&n!=a)r.1p(n)}I r}});D.W={1e:H(f,i,g,e){G(f.16==3||f.16==8)I;G(D.14.1f&&f.4I)f=1b;G(!g.24)g.24=7.24++;G(e!=12){J h=g;g=7.3M(h,H(){I h.1w(7,19)});g.L=e}J j=D.L(f,"3w")||D.L(f,"3w",{}),1H=D.L(f,"1H")||D.L(f,"1H",H(){G(1j D!="12"&&!D.W.5k)I D.W.1H.1w(19.3L.T,19)});1H.T=f;D.P(i.1R(/\\s+/),H(c,b){J a=b.1R(".");b=a[0];g.O=a[1];J d=j[b];G(!d){d=j[b]={};G(!D.W.2t[b]||D.W.2t[b].4p.1k(f)===Q){G(f.3K)f.3K(b,1H,Q);N G(f.6t)f.6t("4o"+b,1H)}}d[g.24]=g;D.W.26[b]=M});f=U},24:1,26:{},21:H(e,h,f){G(e.16==3||e.16==8)I;J i=D.L(e,"3w"),1L,5i;G(i){G(h==12||(1j h=="23"&&h.8p(0)=="."))R(J g 1n i)7.21(e,g+(h||""));N{G(h.O){f=h.2y;h=h.O}D.P(h.1R(/\\s+/),H(b,a){J c=a.1R(".");a=c[0];G(i[a]){G(f)2U i[a][f.24];N R(f 1n i[a])G(!c[1]||i[a][f].O==c[1])2U i[a][f];R(1L 1n i[a])1X;G(!1L){G(!D.W.2t[a]||D.W.2t[a].4A.1k(e)===Q){G(e.6p)e.6p(a,D.L(e,"1H"),Q);N G(e.6n)e.6n("4o"+a,D.L(e,"1H"))}1L=U;2U i[a]}}})}R(1L 1n i)1X;G(!1L){J d=D.L(e,"1H");G(d)d.T=U;D.3b(e,"3w");D.3b(e,"1H")}}},1P:H(h,c,f,g,i){c=D.2d(c);G(h.1h("!")>=0){h=h.3s(0,-1);J a=M}G(!f){G(7.26[h])D("*").1e([1b,S]).1P(h,c)}N{G(f.16==3||f.16==8)I 12;J b,1L,17=D.1D(f[h]||U),W=!c[0]||!c[0].32;G(W){c.6h({O:h,2J:f,32:H(){},3J:H(){},4C:1z()});c[0][E]=M}c[0].O=h;G(a)c[0].6m=M;J d=D.L(f,"1H");G(d)b=d.1w(f,c);G((!17||(D.Y(f,\'a\')&&h=="4V"))&&f["4o"+h]&&f["4o"+h].1w(f,c)===Q)b=Q;G(W)c.4s();G(i&&D.1D(i)){1L=i.1w(f,b==U?c:c.7d(b));G(1L!==12)b=1L}G(17&&g!==Q&&b!==Q&&!(D.Y(f,\'a\')&&h=="4V")){7.5k=M;1U{f[h]()}1V(e){}}7.5k=Q}I b},1H:H(b){J a,1L,38,5f,4m;b=19[0]=D.W.6l(b||1b.W);38=b.O.1R(".");b.O=38[0];38=38[1];5f=!38&&!b.6m;4m=(D.L(7,"3w")||{})[b.O];R(J j 1n 4m){J c=4m[j];G(5f||c.O==38){b.2y=c;b.L=c.L;1L=c.1w(7,19);G(a!==Q)a=1L;G(1L===Q){b.32();b.3J()}}}I a},6l:H(b){G(b[E]==M)I b;J d=b;b={8o:d};J c="8n 8m 8l 8k 2s 8j 47 5d 6j 5E 8i L 8h 8g 4K 2y 5a 59 8e 8b 58 6f 8a 88 4k 87 86 84 6d 2J 4C 6c O 82 81 35".1R(" ");R(J i=c.K;i;i--)b[c[i]]=d[c[i]];b[E]=M;b.32=H(){G(d.32)d.32();d.80=Q};b.3J=H(){G(d.3J)d.3J();d.7Z=M};b.4C=b.4C||1z();G(!b.2J)b.2J=b.6d||S;G(b.2J.16==3)b.2J=b.2J.1d;G(!b.4k&&b.4K)b.4k=b.4K==b.2J?b.6c:b.4K;G(b.58==U&&b.5d!=U){J a=S.1C,1c=S.1c;b.58=b.5d+(a&&a.2e||1c&&1c.2e||0)-(a.6b||0);b.6f=b.6j+(a&&a.2c||1c&&1c.2c||0)-(a.6a||0)}G(!b.35&&((b.47||b.47===0)?b.47:b.5a))b.35=b.47||b.5a;G(!b.59&&b.5E)b.59=b.5E;G(!b.35&&b.2s)b.35=(b.2s&1?1:(b.2s&2?3:(b.2s&4?2:0)));I b},3M:H(a,b){b.24=a.24=a.24||b.24||7.24++;I b},2t:{27:{4p:H(){55();I},4A:H(){I}},3D:{4p:H(){G(D.14.1f)I Q;D(7).2O("53",D.W.2t.3D.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("53",D.W.2t.3D.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3D";I D.W.1H.1w(7,19)}},3N:{4p:H(){G(D.14.1f)I Q;D(7).2O("51",D.W.2t.3N.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("51",D.W.2t.3N.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3N";I D.W.1H.1w(7,19)}}}};D.17.1l({2O:H(c,a,b){I c=="4X"?7.2V(c,a,b):7.P(H(){D.W.1e(7,c,b||a,b&&a)})},2V:H(d,b,c){J e=D.W.3M(c||b,H(a){D(7).4e(a,e);I(c||b).1w(7,19)});I 7.P(H(){D.W.1e(7,d,e,c&&b)})},4e:H(a,b){I 7.P(H(){D.W.21(7,a,b)})},1P:H(c,a,b){I 7.P(H(){D.W.1P(c,a,7,M,b)})},5C:H(c,a,b){I 7[0]&&D.W.1P(c,a,7[0],Q,b)},2m:H(b){J c=19,i=1;1B(i<c.K)D.W.3M(b,c[i++]);I 7.4V(D.W.3M(b,H(a){7.4Z=(7.4Z||0)%i;a.32();I c[7.4Z++].1w(7,19)||Q}))},7X:H(a,b){I 7.2O(\'3D\',a).2O(\'3N\',b)},27:H(a){55();G(D.2Q)a.1k(S,D);N D.3A.1p(H(){I a.1k(7,D)});I 7}});D.1l({2Q:Q,3A:[],27:H(){G(!D.2Q){D.2Q=M;G(D.3A){D.P(D.3A,H(){7.1k(S)});D.3A=U}D(S).5C("27")}}});J x=Q;H 55(){G(x)I;x=M;G(S.3K&&!D.14.2G)S.3K("69",D.27,Q);G(D.14.1f&&1b==1S)(H(){G(D.2Q)I;1U{S.1C.7V("1A")}1V(3e){3B(19.3L,0);I}D.27()})();G(D.14.2G)S.3K("69",H(){G(D.2Q)I;R(J i=0;i<S.4W.K;i++)G(S.4W[i].3R){3B(19.3L,0);I}D.27()},Q);G(D.14.2k){J a;(H(){G(D.2Q)I;G(S.3f!="68"&&S.3f!="1J"){3B(19.3L,0);I}G(a===12)a=D("V, 7A[7U=7S]").K;G(S.4W.K!=a){3B(19.3L,0);I}D.27()})()}D.W.1e(1b,"43",D.27)}D.P(("7R,7Q,43,85,4y,4X,4V,7P,"+"7O,7N,89,53,51,7M,2A,"+"5o,7L,7K,8d,3e").1R(","),H(i,b){D.17[b]=H(a){I a?7.2O(b,a):7.1P(b)}});J F=H(a,c){J b=a.4k;1B(b&&b!=c)1U{b=b.1d}1V(3e){b=c}I b==c};D(1b).2O("4X",H(){D("*").1e(S).4e()});D.17.1l({67:D.17.43,43:H(g,d,c){G(1j g!=\'23\')I 7.67(g);J e=g.1h(" ");G(e>=0){J i=g.3s(e,g.K);g=g.3s(0,e)}c=c||H(){};J f="2P";G(d)G(D.1D(d)){c=d;d=U}N{d=D.3n(d);f="6g"}J h=7;D.3Y({1a:g,O:f,1O:"2K",L:d,1J:H(a,b){G(b=="1W"||b=="7J")h.2K(i?D("<1v/>").3v(a.4U.1o(/<1m(.|\\s)*?\\/1m>/g,"")).2q(i):a.4U);h.P(c,[a.4U,b,a])}});I 7},aL:H(){I D.3n(7.7I())},7I:H(){I 7.2l(H(){I D.Y(7,"3V")?D.2d(7.aH):7}).1E(H(){I 7.34&&!7.3R&&(7.4J||/2A|6y/i.11(7.Y)||/1r|1G|3Q/i.11(7.O))}).2l(H(i,c){J b=D(7).6e();I b==U?U:b.1q==2p?D.2l(b,H(a,i){I{34:c.34,2x:a}}):{34:c.34,2x:b}}).3p()}});D.P("7H,7G,7F,7D,7C,7B".1R(","),H(i,o){D.17[o]=H(f){I 7.2O(o,f)}});J B=1z();D.1l({3p:H(d,b,a,c){G(D.1D(b)){a=b;b=U}I D.3Y({O:"2P",1a:d,L:b,1W:a,1O:c})},aE:H(b,a){I D.3p(b,U,a,"1m")},aD:H(c,b,a){I D.3p(c,b,a,"3z")},aC:H(d,b,a,c){G(D.1D(b)){a=b;b={}}I D.3Y({O:"6g",1a:d,L:b,1W:a,1O:c})},aA:H(a){D.1l(D.60,a)},60:{1a:5Z.5Q,26:M,O:"2P",2T:0,7z:"4R/x-ax-3V-aw",7x:M,31:M,L:U,5Y:U,3Q:U,4Q:{2N:"4R/2N, 1r/2N",2K:"1r/2K",1m:"1r/4t, 4R/4t",3z:"4R/3z, 1r/4t",1r:"1r/as",4w:"*/*"}},4z:{},3Y:H(s){s=D.1l(M,s,D.1l(M,{},D.60,s));J g,2Z=/=\\?(&|$)/g,1u,L,O=s.O.2r();G(s.L&&s.7x&&1j s.L!="23")s.L=D.3n(s.L);G(s.1O=="4P"){G(O=="2P"){G(!s.1a.1I(2Z))s.1a+=(s.1a.1I(/\\?/)?"&":"?")+(s.4P||"7u")+"=?"}N G(!s.L||!s.L.1I(2Z))s.L=(s.L?s.L+"&":"")+(s.4P||"7u")+"=?";s.1O="3z"}G(s.1O=="3z"&&(s.L&&s.L.1I(2Z)||s.1a.1I(2Z))){g="4P"+B++;G(s.L)s.L=(s.L+"").1o(2Z,"="+g+"$1");s.1a=s.1a.1o(2Z,"="+g+"$1");s.1O="1m";1b[g]=H(a){L=a;1W();1J();1b[g]=12;1U{2U 1b[g]}1V(e){}G(i)i.37(h)}}G(s.1O=="1m"&&s.1Y==U)s.1Y=Q;G(s.1Y===Q&&O=="2P"){J j=1z();J k=s.1a.1o(/(\\?|&)3m=.*?(&|$)/,"$ap="+j+"$2");s.1a=k+((k==s.1a)?(s.1a.1I(/\\?/)?"&":"?")+"3m="+j:"")}G(s.L&&O=="2P"){s.1a+=(s.1a.1I(/\\?/)?"&":"?")+s.L;s.L=U}G(s.26&&!D.4O++)D.W.1P("7H");J n=/^(?:\\w+:)?\\/\\/([^\\/?#]+)/;G(s.1O=="1m"&&O=="2P"&&n.11(s.1a)&&n.2D(s.1a)[1]!=5Z.al){J i=S.3H("6w")[0];J h=S.3h("1m");h.4d=s.1a;G(s.7t)h.aj=s.7t;G(!g){J l=Q;h.ah=h.ag=H(){G(!l&&(!7.3f||7.3f=="68"||7.3f=="1J")){l=M;1W();1J();i.37(h)}}}i.3U(h);I 12}J m=Q;J c=1b.7s?2B 7s("ae.ac"):2B 7r();G(s.5Y)c.6R(O,s.1a,s.31,s.5Y,s.3Q);N c.6R(O,s.1a,s.31);1U{G(s.L)c.4B("ab-aa",s.7z);G(s.5S)c.4B("a9-5R-a8",D.4z[s.1a]||"a7, a6 a5 a4 5N:5N:5N a2");c.4B("X-9Z-9Y","7r");c.4B("9W",s.1O&&s.4Q[s.1O]?s.4Q[s.1O]+", */*":s.4Q.4w)}1V(e){}G(s.7m&&s.7m(c,s)===Q){s.26&&D.4O--;c.7l();I Q}G(s.26)D.W.1P("7B",[c,s]);J d=H(a){G(!m&&c&&(c.3f==4||a=="2T")){m=M;G(f){7k(f);f=U}1u=a=="2T"&&"2T"||!D.7j(c)&&"3e"||s.5S&&D.7h(c,s.1a)&&"7J"||"1W";G(1u=="1W"){1U{L=D.6X(c,s.1O,s.9S)}1V(e){1u="5J"}}G(1u=="1W"){J b;1U{b=c.5I("7g-5R")}1V(e){}G(s.5S&&b)D.4z[s.1a]=b;G(!g)1W()}N D.5H(s,c,1u);1J();G(s.31)c=U}};G(s.31){J f=4I(d,13);G(s.2T>0)3B(H(){G(c){c.7l();G(!m)d("2T")}},s.2T)}1U{c.9P(s.L)}1V(e){D.5H(s,c,U,e)}G(!s.31)d();H 1W(){G(s.1W)s.1W(L,1u);G(s.26)D.W.1P("7C",[c,s])}H 1J(){G(s.1J)s.1J(c,1u);G(s.26)D.W.1P("7F",[c,s]);G(s.26&&!--D.4O)D.W.1P("7G")}I c},5H:H(s,a,b,e){G(s.3e)s.3e(a,b,e);G(s.26)D.W.1P("7D",[a,s,e])},4O:0,7j:H(a){1U{I!a.1u&&5Z.9O=="5p:"||(a.1u>=7e&&a.1u<9N)||a.1u==7c||a.1u==9K||D.14.2k&&a.1u==12}1V(e){}I Q},7h:H(a,c){1U{J b=a.5I("7g-5R");I a.1u==7c||b==D.4z[c]||D.14.2k&&a.1u==12}1V(e){}I Q},6X:H(a,c,b){J d=a.5I("9J-O"),2N=c=="2N"||!c&&d&&d.1h("2N")>=0,L=2N?a.9I:a.4U;G(2N&&L.1C.2j=="5J")7p"5J";G(b)L=b(L,c);G(c=="1m")D.5u(L);G(c=="3z")L=6u("("+L+")");I L},3n:H(a){J s=[];G(a.1q==2p||a.5w)D.P(a,H(){s.1p(3u(7.34)+"="+3u(7.2x))});N R(J j 1n a)G(a[j]&&a[j].1q==2p)D.P(a[j],H(){s.1p(3u(j)+"="+3u(7))});N s.1p(3u(j)+"="+3u(D.1D(a[j])?a[j]():a[j]));I s.6s("&").1o(/%20/g,"+")}});D.17.1l({1N:H(c,b){I c?7.2g({1Z:"1N",2h:"1N",1y:"1N"},c,b):7.1E(":1G").P(H(){7.V.18=7.5D||"";G(D.1g(7,"18")=="2F"){J a=D("<"+7.2j+" />").6P("1c");7.V.18=a.1g("18");G(7.V.18=="2F")7.V.18="3I";a.21()}}).3l()},1M:H(b,a){I b?7.2g({1Z:"1M",2h:"1M",1y:"1M"},b,a):7.1E(":4j").P(H(){7.5D=7.5D||D.1g(7,"18");7.V.18="2F"}).3l()},78:D.17.2m,2m:H(a,b){I D.1D(a)&&D.1D(b)?7.78.1w(7,19):a?7.2g({1Z:"2m",2h:"2m",1y:"2m"},a,b):7.P(H(){D(7)[D(7).3F(":1G")?"1N":"1M"]()})},9G:H(b,a){I 7.2g({1Z:"1N"},b,a)},9F:H(b,a){I 7.2g({1Z:"1M"},b,a)},9E:H(b,a){I 7.2g({1Z:"2m"},b,a)},9D:H(b,a){I 7.2g({1y:"1N"},b,a)},9M:H(b,a){I 7.2g({1y:"1M"},b,a)},9C:H(c,a,b){I 7.2g({1y:a},c,b)},2g:H(k,j,i,g){J h=D.77(j,i,g);I 7[h.36===Q?"P":"36"](H(){G(7.16!=1)I Q;J f=D.1l({},h),p,1G=D(7).3F(":1G"),46=7;R(p 1n k){G(k[p]=="1M"&&1G||k[p]=="1N"&&!1G)I f.1J.1k(7);G(p=="1Z"||p=="2h"){f.18=D.1g(7,"18");f.33=7.V.33}}G(f.33!=U)7.V.33="1G";f.45=D.1l({},k);D.P(k,H(c,a){J e=2B D.28(46,f,c);G(/2m|1N|1M/.11(a))e[a=="2m"?1G?"1N":"1M":a](k);N{J b=a.6r().1I(/^([+-]=)?([\\d+-.]+)(.*)$/),2b=e.1t(M)||0;G(b){J d=3d(b[2]),2M=b[3]||"2X";G(2M!="2X"){46.V[c]=(d||1)+2M;2b=((d||1)/e.1t(M))*2b;46.V[c]=2b+2M}G(b[1])d=((b[1]=="-="?-1:1)*d)+2b;e.3G(2b,d,2M)}N e.3G(2b,a,"")}});I M})},36:H(a,b){G(D.1D(a)||(a&&a.1q==2p)){b=a;a="28"}G(!a||(1j a=="23"&&!b))I A(7[0],a);I 7.P(H(){G(b.1q==2p)A(7,a,b);N{A(7,a).1p(b);G(A(7,a).K==1)b.1k(7)}})},9X:H(b,c){J a=D.3O;G(b)7.36([]);7.P(H(){R(J i=a.K-1;i>=0;i--)G(a[i].T==7){G(c)a[i](M);a.7n(i,1)}});G(!c)7.5A();I 7}});J A=H(b,c,a){G(b){c=c||"28";J q=D.L(b,c+"36");G(!q||a)q=D.L(b,c+"36",D.2d(a))}I q};D.17.5A=H(a){a=a||"28";I 7.P(H(){J q=A(7,a);q.4s();G(q.K)q[0].1k(7)})};D.1l({77:H(b,a,c){J d=b&&b.1q==a0?b:{1J:c||!c&&a||D.1D(b)&&b,2u:b,41:c&&a||a&&a.1q!=9t&&a};d.2u=(d.2u&&d.2u.1q==4L?d.2u:D.28.5K[d.2u])||D.28.5K.74;d.5M=d.1J;d.1J=H(){G(d.36!==Q)D(7).5A();G(D.1D(d.5M))d.5M.1k(7)};I d},41:{73:H(p,n,b,a){I b+a*p},5P:H(p,n,b,a){I((-29.9r(p*29.9q)/2)+0.5)*a+b}},3O:[],48:U,28:H(b,c,a){7.15=c;7.T=b;7.1i=a;G(!c.3Z)c.3Z={}}});D.28.44={4D:H(){G(7.15.2Y)7.15.2Y.1k(7.T,7.1z,7);(D.28.2Y[7.1i]||D.28.2Y.4w)(7);G(7.1i=="1Z"||7.1i=="2h")7.T.V.18="3I"},1t:H(a){G(7.T[7.1i]!=U&&7.T.V[7.1i]==U)I 7.T[7.1i];J r=3d(D.1g(7.T,7.1i,a));I r&&r>-9p?r:3d(D.2a(7.T,7.1i))||0},3G:H(c,b,d){7.5V=1z();7.2b=c;7.3l=b;7.2M=d||7.2M||"2X";7.1z=7.2b;7.2S=7.4N=0;7.4D();J e=7;H t(a){I e.2Y(a)}t.T=7.T;D.3O.1p(t);G(D.48==U){D.48=4I(H(){J a=D.3O;R(J i=0;i<a.K;i++)G(!a[i]())a.7n(i--,1);G(!a.K){7k(D.48);D.48=U}},13)}},1N:H(){7.15.3Z[7.1i]=D.1K(7.T.V,7.1i);7.15.1N=M;7.3G(0,7.1t());G(7.1i=="2h"||7.1i=="1Z")7.T.V[7.1i]="9m";D(7.T).1N()},1M:H(){7.15.3Z[7.1i]=D.1K(7.T.V,7.1i);7.15.1M=M;7.3G(7.1t(),0)},2Y:H(a){J t=1z();G(a||t>7.15.2u+7.5V){7.1z=7.3l;7.2S=7.4N=1;7.4D();7.15.45[7.1i]=M;J b=M;R(J i 1n 7.15.45)G(7.15.45[i]!==M)b=Q;G(b){G(7.15.18!=U){7.T.V.33=7.15.33;7.T.V.18=7.15.18;G(D.1g(7.T,"18")=="2F")7.T.V.18="3I"}G(7.15.1M)7.T.V.18="2F";G(7.15.1M||7.15.1N)R(J p 1n 7.15.45)D.1K(7.T.V,p,7.15.3Z[p])}G(b)7.15.1J.1k(7.T);I Q}N{J n=t-7.5V;7.4N=n/7.15.2u;7.2S=D.41[7.15.41||(D.41.5P?"5P":"73")](7.4N,n,0,1,7.15.2u);7.1z=7.2b+((7.3l-7.2b)*7.2S);7.4D()}I M}};D.1l(D.28,{5K:{9l:9j,9i:7e,74:9g},2Y:{2e:H(a){a.T.2e=a.1z},2c:H(a){a.T.2c=a.1z},1y:H(a){D.1K(a.T.V,"1y",a.1z)},4w:H(a){a.T.V[a.1i]=a.1z+a.2M}}});D.17.2i=H(){J b=0,1S=0,T=7[0],3q;G(T)ao(D.14){J d=T.1d,4a=T,1s=T.1s,1Q=T.2z,5U=2k&&3r(5B)<9c&&!/9a/i.11(v),1g=D.2a,3c=1g(T,"30")=="3c";G(T.7y){J c=T.7y();1e(c.1A+29.2f(1Q.1C.2e,1Q.1c.2e),c.1S+29.2f(1Q.1C.2c,1Q.1c.2c));1e(-1Q.1C.6b,-1Q.1C.6a)}N{1e(T.5X,T.5W);1B(1s){1e(1s.5X,1s.5W);G(42&&!/^t(98|d|h)$/i.11(1s.2j)||2k&&!5U)2C(1s);G(!3c&&1g(1s,"30")=="3c")3c=M;4a=/^1c$/i.11(1s.2j)?4a:1s;1s=1s.1s}1B(d&&d.2j&&!/^1c|2K$/i.11(d.2j)){G(!/^96|1T.*$/i.11(1g(d,"18")))1e(-d.2e,-d.2c);G(42&&1g(d,"33")!="4j")2C(d);d=d.1d}G((5U&&(3c||1g(4a,"30")=="5x"))||(42&&1g(4a,"30")!="5x"))1e(-1Q.1c.5X,-1Q.1c.5W);G(3c)1e(29.2f(1Q.1C.2e,1Q.1c.2e),29.2f(1Q.1C.2c,1Q.1c.2c))}3q={1S:1S,1A:b}}H 2C(a){1e(D.2a(a,"6V",M),D.2a(a,"6U",M))}H 1e(l,t){b+=3r(l,10)||0;1S+=3r(t,10)||0}I 3q};D.17.1l({30:H(){J a=0,1S=0,3q;G(7[0]){J b=7.1s(),2i=7.2i(),4c=/^1c|2K$/i.11(b[0].2j)?{1S:0,1A:0}:b.2i();2i.1S-=25(7,\'94\');2i.1A-=25(7,\'aF\');4c.1S+=25(b,\'6U\');4c.1A+=25(b,\'6V\');3q={1S:2i.1S-4c.1S,1A:2i.1A-4c.1A}}I 3q},1s:H(){J a=7[0].1s;1B(a&&(!/^1c|2K$/i.11(a.2j)&&D.1g(a,\'30\')==\'93\'))a=a.1s;I D(a)}});D.P([\'5e\',\'5G\'],H(i,b){J c=\'4y\'+b;D.17[c]=H(a){G(!7[0])I;I a!=12?7.P(H(){7==1b||7==S?1b.92(!i?a:D(1b).2e(),i?a:D(1b).2c()):7[c]=a}):7[0]==1b||7[0]==S?46[i?\'aI\':\'aJ\']||D.71&&S.1C[c]||S.1c[c]:7[0][c]}});D.P(["6N","4b"],H(i,b){J c=i?"5e":"5G",4f=i?"6k":"6i";D.17["5s"+b]=H(){I 7[b.3y()]()+25(7,"57"+c)+25(7,"57"+4f)};D.17["90"+b]=H(a){I 7["5s"+b]()+25(7,"2C"+c+"4b")+25(7,"2C"+4f+"4b")+(a?25(7,"6S"+c)+25(7,"6S"+4f):0)}})})();',62,669,'|||||||this|||||||||||||||||||||||||||||||||||if|function|return|var|length|data|true|else|type|each|false|for|document|elem|null|style|event||nodeName|||test|undefined||browser|options|nodeType|fn|display|arguments|url|window|body|parentNode|add|msie|css|indexOf|prop|typeof|call|extend|script|in|replace|push|constructor|text|offsetParent|cur|status|div|apply|firstChild|opacity|now|left|while|documentElement|isFunction|filter|className|hidden|handle|match|complete|attr|ret|hide|show|dataType|trigger|doc|split|top|table|try|catch|success|break|cache|height||remove|tbody|string|guid|num|global|ready|fx|Math|curCSS|start|scrollTop|makeArray|scrollLeft|max|animate|width|offset|tagName|safari|map|toggle||done|Array|find|toUpperCase|button|special|duration|id|copy|value|handler|ownerDocument|select|new|border|exec|stack|none|opera|nextSibling|pushStack|target|html|inArray|unit|xml|bind|GET|isReady|merge|pos|timeout|delete|one|selected|px|step|jsre|position|async|preventDefault|overflow|name|which|queue|removeChild|namespace|insertBefore|nth|removeData|fixed|parseFloat|error|readyState|multiFilter|createElement|rl|re|trim|end|_|param|first|get|results|parseInt|slice|childNodes|encodeURIComponent|append|events|elems|toLowerCase|json|readyList|setTimeout|grep|mouseenter|color|is|custom|getElementsByTagName|block|stopPropagation|addEventListener|callee|proxy|mouseleave|timers|defaultView|password|disabled|last|has|appendChild|form|domManip|props|ajax|orig|set|easing|mozilla|load|prototype|curAnim|self|charCode|timerId|object|offsetChild|Width|parentOffset|src|unbind|br|currentStyle|clean|float|visible|relatedTarget|previousSibling|handlers|isXMLDoc|on|setup|nodeIndex|unique|shift|javascript|child|RegExp|_default|deep|scroll|lastModified|teardown|setRequestHeader|timeStamp|update|empty|tr|getAttribute|innerHTML|setInterval|checked|fromElement|Number|jQuery|state|active|jsonp|accepts|application|dir|input|responseText|click|styleSheets|unload|not|lastToggle|outline|mouseout|getPropertyValue|mouseover|getComputedStyle|bindReady|String|padding|pageX|metaKey|keyCode|getWH|andSelf|clientX|Left|all|visibility|container|index|init|triggered|removeAttribute|classFilter|prevObject|submit|file|after|windowData|inner|client|globalEval|sibling|jquery|absolute|clone|wrapAll|dequeue|version|triggerHandler|oldblock|ctrlKey|createTextNode|Top|handleError|getResponseHeader|parsererror|speeds|checkbox|old|00|radio|swing|href|Modified|ifModified|lastChild|safari2|startTime|offsetTop|offsetLeft|username|location|ajaxSettings|getElementById|isSimple|values|selectedIndex|runtimeStyle|rsLeft|_load|loaded|DOMContentLoaded|clientTop|clientLeft|toElement|srcElement|val|pageY|POST|unshift|Bottom|clientY|Right|fix|exclusive|detachEvent|cloneNode|removeEventListener|swap|toString|join|attachEvent|eval|substr|head|parse|textarea|reset|image|zoom|odd|even|before|prepend|exclude|expr|quickClass|quickID|uuid|quickChild|continue|Height|textContent|appendTo|contents|open|margin|evalScript|borderTopWidth|borderLeftWidth|parent|httpData|setArray|CSS1Compat|compatMode|boxModel|cssFloat|linear|def|webkit|nodeValue|speed|_toggle|eq|100|replaceWith|304|concat|200|alpha|Last|httpNotModified|getAttributeNode|httpSuccess|clearInterval|abort|beforeSend|splice|styleFloat|throw|colgroup|XMLHttpRequest|ActiveXObject|scriptCharset|callback|fieldset|multiple|processData|getBoundingClientRect|contentType|link|ajaxSend|ajaxSuccess|ajaxError|col|ajaxComplete|ajaxStop|ajaxStart|serializeArray|notmodified|keypress|keydown|change|mouseup|mousedown|dblclick|focus|blur|stylesheet|hasClass|rel|doScroll|black|hover|solid|cancelBubble|returnValue|wheelDelta|view|round|shiftKey|resize|screenY|screenX|relatedNode|mousemove|prevValue|originalTarget|offsetHeight|keyup|newValue|offsetWidth|eventPhase|detail|currentTarget|cancelable|bubbles|attrName|attrChange|altKey|originalEvent|charAt|0n|substring|animated|header|noConflict|line|enabled|innerText|contains|only|weight|font|gt|lt|uFFFF|u0128|size|417|Boolean|Date|toggleClass|removeClass|addClass|removeAttr|replaceAll|insertAfter|prependTo|wrap|contentWindow|contentDocument|iframe|children|siblings|prevAll|wrapInner|nextAll|outer|prev|scrollTo|static|marginTop|next|inline|parents|able|cellSpacing|adobeair|cellspacing|522|maxLength|maxlength|readOnly|400|readonly|fast|600|class|slow|1px|htmlFor|reverse|10000|PI|cos|compatible|Function|setData|ie|ra|it|rv|getData|userAgent|navigator|fadeTo|fadeIn|slideToggle|slideUp|slideDown|ig|responseXML|content|1223|NaN|fadeOut|300|protocol|send|setAttribute|option|dataFilter|cssText|changed|be|Accept|stop|With|Requested|Object|can|GMT|property|1970|Jan|01|Thu|Since|If|Type|Content|XMLHTTP|th|Microsoft|td|onreadystatechange|onload|cap|charset|colg|host|tfoot|specified|with|1_|thead|leg|plain|attributes|opt|embed|urlencoded|www|area|hr|ajaxSetup|meta|post|getJSON|getScript|marginLeft|img|elements|pageYOffset|pageXOffset|abbr|serialize|pixelLeft'.split('|'),0,{}))
\ No newline at end of file
Index: js/jquery.datePicker.js
===================================================================
--- js/jquery.datePicker.js	(revision 6370)
+++ js/jquery.datePicker.js	(working copy)
@@ -1,1056 +0,0 @@
-/**
- * Copyright (c) 2007 Kelvin Luck (http://www.kelvinluck.com/)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- *
- * $Id: jquery.datePicker.js 3739 2007-10-25 13:55:30Z kelvin.luck $
- **/
-
-(function($){
-    
-	$.fn.extend({
-/**
- * Render a calendar table into any matched elements.
- * 
- * @param Object s (optional) Customize your calendars.
- * @option Number month The month to render (NOTE that months are zero based). Default is today's month.
- * @option Number year The year to render. Default is today's year.
- * @option Function renderCallback A reference to a function that is called as each cell is rendered and which can add classes and event listeners to the created nodes. Default is no callback.
- * @option Number showHeader Whether or not to show the header row, possible values are: $.dpConst.SHOW_HEADER_NONE (no header), $.dpConst.SHOW_HEADER_SHORT (first letter of each day) and $.dpConst.SHOW_HEADER_LONG (full name of each day). Default is $.dpConst.SHOW_HEADER_SHORT.
- * @option String hoverClass The class to attach to each cell when you hover over it (to allow you to use hover effects in IE6 which doesn't support the :hover pseudo-class on elements other than links). Default is dp-hover. Pass false if you don't want a hover class.
- * @type jQuery
- * @name renderCalendar
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('#calendar-me').renderCalendar({month:0, year:2007});
- * @desc Renders a calendar displaying January 2007 into the element with an id of calendar-me.
- *
- * @example
- * var testCallback = function($td, thisDate, month, year)
- * {
- * if ($td.is('.current-month') && thisDate.getDay() == 4) {
- *		var d = thisDate.getDate();
- *		$td.bind(
- *			'click',
- *			function()
- *			{
- *				alert('You clicked on ' + d + '/' + (Number(month)+1) + '/' + year);
- *			}
- *		).addClass('thursday');
- *	} else if (thisDate.getDay() == 5) {
- *		$td.html('Friday the ' + $td.html() + 'th');
- *	}
- * }
- * $('#calendar-me').renderCalendar({month:0, year:2007, renderCallback:testCallback});
- * 
- * @desc Renders a calendar displaying January 2007 into the element with an id of calendar-me. Every Thursday in the current month has a class of "thursday" applied to it, is clickable and shows an alert when clicked. Every Friday on the calendar has the number inside replaced with text.
- **/
-		renderCalendar  :   function(s)
-		{
-			var dc = function(a)
-			{
-				return document.createElement(a);
-			};
-			
-			s = $.extend(
-				{
-					month			: null,
-					year			: null,
-					renderCallback	: null,
-					showHeader		: $.dpConst.SHOW_HEADER_SHORT,
-					dpController	: null,
-					hoverClass		: 'dp-hover'
-				}
-				, s
-			);
-			
-			if (s.showHeader != $.dpConst.SHOW_HEADER_NONE) {
-				var headRow = $(dc('tr'));
-				for (var i=Date.firstDayOfWeek; i<Date.firstDayOfWeek+7; i++) {
-					var weekday = i%7;
-					var day = Date.dayNames[weekday];
-					headRow.append(
-						jQuery(dc('th')).attr({'scope':'col', 'abbr':day, 'title':day, 'class':(weekday == 0 || weekday == 6 ? 'weekend' : 'weekday')}).html(s.showHeader == $.dpConst.SHOW_HEADER_SHORT ? day.substr(0, 1) : day)
-					);
-				}
-			};
-			
-			var calendarTable = $(dc('table'))
-									.attr(
-										{
-											'cellspacing':2,
-											'className':'jCalendar'
-										}
-									)
-									.append(
-										(s.showHeader != $.dpConst.SHOW_HEADER_NONE ? 
-											$(dc('thead'))
-												.append(headRow)
-											:
-											dc('thead')
-										)
-									);
-			var tbody = $(dc('tbody'));
-			
-			var today = (new Date()).zeroTime();
-			
-			var month = s.month == undefined ? today.getMonth() : s.month;
-			var year = s.year || today.getFullYear();
-			
-			var currentDate = new Date(year, month, 1);
-			
-			
-			var firstDayOffset = Date.firstDayOfWeek - currentDate.getDay() + 1;
-			if (firstDayOffset > 1) firstDayOffset -= 7;
-			var weeksToDraw = Math.ceil(( (-1*firstDayOffset+1) + currentDate.getDaysInMonth() ) /7);
-			currentDate.addDays(firstDayOffset-1);
-			
-			var doHover = function()
-			{
-				if (s.hoverClass) {
-					$(this).addClass(s.hoverClass);
-				}
-			};
-			var unHover = function()
-			{
-				if (s.hoverClass) {
-					$(this).removeClass(s.hoverClass);
-				}
-			};
-			
-			var w = 0;
-			while (w++<weeksToDraw) {
-				var r = jQuery(dc('tr'));
-				for (var i=0; i<7; i++) {
-					var thisMonth = currentDate.getMonth() == month;
-					var d = $(dc('td'))
-								.text(currentDate.getDate() + '')
-								.attr('className', (thisMonth ? 'current-month ' : 'other-month ') +
-													(currentDate.isWeekend() ? 'weekend ' : 'weekday ') +
-													(thisMonth && currentDate.getTime() == today.getTime() ? 'today ' : '')
-								)
-								.hover(doHover, unHover)
-							;
-					if (s.renderCallback) {
-						s.renderCallback(d, currentDate, month, year);
-					}
-					r.append(d);
-					currentDate.addDays(1);
-				}
-				tbody.append(r);
-			}
-			calendarTable.append(tbody);
-			
-			return this.each(
-				function()
-				{
-					$(this).empty().append(calendarTable);
-				}
-			);
-		},
-/**
- * Create a datePicker associated with each of the matched elements.
- *
- * The matched element will receive a few custom events with the following signatures:
- *
- * dateSelected(event, date, $td, status)
- * Triggered when a date is selected. event is a reference to the event, date is the Date selected, $td is a jquery object wrapped around the TD that was clicked on and status is whether the date was selected (true) or deselected (false)
- * 
- * dpClosed(event, selected)
- * Triggered when the date picker is closed. event is a reference to the event and selected is an Array containing Date objects.
- *
- * dpMonthChanged(event, displayedMonth, displayedYear)
- * Triggered when the month of the popped up calendar is changed. event is a reference to the event, displayedMonth is the number of the month now displayed (zero based) and displayedYear is the year of the month.
- *
- * dpDisplayed(event, $datePickerDiv)
- * Triggered when the date picker is created. $datePickerDiv is the div containing the date picker. Use this event to add custom content/ listeners to the popped up date picker.
- *
- * @param Object s (optional) Customize your date pickers.
- * @option Number month The month to render when the date picker is opened (NOTE that months are zero based). Default is today's month.
- * @option Number year The year to render when the date picker is opened. Default is today's year.
- * @option String startDate The first date date can be selected.
- * @option String endDate The last date that can be selected.
- * @option Boolean inline Whether to create the datePicker as inline (e.g. always on the page) or as a model popup. Default is false (== modal popup)
- * @option Boolean createButton Whether to create a .dp-choose-date anchor directly after the matched element which when clicked will trigger the showing of the date picker. Default is true.
- * @option Boolean showYearNavigation Whether to display buttons which allow the user to navigate through the months a year at a time. Default is true.
- * @option Boolean closeOnSelect Whether to close the date picker when a date is selected. Default is true.
- * @option Boolean displayClose Whether to create a "Close" button within the date picker popup. Default is false.
- * @option Boolean selectMultiple Whether a user should be able to select multiple dates with this date picker. Default is false.
- * @option Boolean clickInput If the matched element is an input type="text" and this option is true then clicking on the input will cause the date picker to appear.
- * @option Number verticalPosition The vertical alignment of the popped up date picker to the matched element. One of $.dpConst.POS_TOP and $.dpConst.POS_BOTTOM. Default is $.dpConst.POS_TOP.
- * @option Number horizontalPosition The horizontal alignment of the popped up date picker to the matched element. One of $.dpConst.POS_LEFT and $.dpConst.POS_RIGHT.
- * @option Number verticalOffset The number of pixels offset from the defined verticalPosition of this date picker that it should pop up in. Default in 0.
- * @option Number horizontalOffset The number of pixels offset from the defined horizontalPosition of this date picker that it should pop up in. Default in 0.
- * @option (Function|Array) renderCallback A reference to a function (or an array of seperate functions) that is called as each cell is rendered and which can add classes and event listeners to the created nodes. Each callback function will receive four arguments; a jquery object wrapping the created TD, a Date object containing the date this TD represents, a number giving the currently rendered month and a number giving the currently rendered year. Default is no callback.
- * @option String hoverClass The class to attach to each cell when you hover over it (to allow you to use hover effects in IE6 which doesn't support the :hover pseudo-class on elements other than links). Default is dp-hover. Pass false if you don't want a hover class.
- * @type jQuery
- * @name datePicker
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('input.date-picker').datePicker();
- * @desc Creates a date picker button next to all matched input elements. When the button is clicked on the value of the selected date will be placed in the corresponding input (formatted according to Date.format).
- *
- * @example demo/index.html
- * @desc See the projects homepage for many more complex examples...
- **/
-		datePicker : function(s)
-		{			
-			if (!$.event._dpCache) $.event._dpCache = [];
-			
-			// initialise the date picker controller with the relevant settings...
-			s = $.extend(
-				{
-					month				: undefined,
-					year				: undefined,
-					startDate			: undefined,
-					endDate				: undefined,
-					inline				: false,
-					renderCallback		: [],
-					createButton		: true,
-					showYearNavigation	: true,
-					closeOnSelect		: true,
-					displayClose		: false,
-					selectMultiple		: false,
-					clickInput			: false,
-					verticalPosition	: $.dpConst.POS_TOP,
-					horizontalPosition	: $.dpConst.POS_LEFT,
-					verticalOffset		: 0,
-					horizontalOffset	: 0,
-					hoverClass			: 'dp-hover'
-				}
-				, s
-			);
-			
-			return this.each(
-				function()
-				{
-					var $this = $(this);
-					var alreadyExists = true;
-					
-					if (!this._dpId) {
-						this._dpId = $.event.guid++;
-						$.event._dpCache[this._dpId] = new DatePicker(this);
-						alreadyExists = false;
-					}
-					
-					if (s.inline) {
-						s.createButton = false;
-						s.displayClose = false;
-						s.closeOnSelect = false;
-						$this.empty();
-					}
-					
-					var controller = $.event._dpCache[this._dpId];
-					
-					controller.init(s);
-					
-					if (!alreadyExists && s.createButton) {
-						// create it!
-						controller.button = $('<a href="#" class="dp-choose-date" title="' + $.dpText.TEXT_CHOOSE_DATE + '">' + $.dpText.TEXT_CHOOSE_DATE + '</a>')
-								.bind(
-									'click',
-									function()
-									{
-										$this.dpDisplay(this);
-										this.blur();
-										return false;
-									}
-								);
-						$this.after(controller.button);
-					}
-					
-					if (!alreadyExists && $this.is(':text')) {
-						$this
-							.bind(
-								'dateSelected',
-								function(e, selectedDate, $td)
-								{
-									this.value = selectedDate.asString();
-								}
-							).bind(
-								'change',
-								function()
-								{
-									var d = Date.fromString(this.value);
-									if (d) {
-										controller.setSelected(d, true, true);
-									}
-								}
-							);
-						if (s.clickInput) {
-							$this.bind(
-								'click',
-								function()
-								{
-									$this.dpDisplay();
-								}
-							);
-						}
-						var d = Date.fromString(this.value);
-						if (this.value != '' && d) {
-							controller.setSelected(d, true, true);
-						}
-					}
-					
-					$this.addClass('dp-applied');
-					
-				}
-			)
-		},
-/**
- * Disables or enables this date picker
- *
- * @param Boolean s Whether to disable (true) or enable (false) this datePicker
- * @type jQuery
- * @name dpSetDisabled
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('.date-picker').datePicker();
- * $('.date-picker').dpSetDisabled(true);
- * @desc Prevents this date picker from displaying and adds a class of dp-disabled to it (and it's associated button if it has one) for styling purposes. If the matched element is an input field then it will also set the disabled attribute to stop people directly editing the field.
- **/
-		dpSetDisabled : function(s)
-		{
-			return _w.call(this, 'setDisabled', s);
-		},
-/**
- * Updates the first selectable date for any date pickers on any matched elements.
- *
- * @param String d A string representing the first selectable date (formatted according to Date.format).
- * @type jQuery
- * @name dpSetStartDate
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('.date-picker').datePicker();
- * $('.date-picker').dpSetStartDate('01/01/2000');
- * @desc Creates a date picker associated with all elements with a class of "date-picker" then sets the first selectable date for each of these to the first day of the millenium.
- **/
-		dpSetStartDate : function(d)
-		{
-			return _w.call(this, 'setStartDate', d);
-		},
-/**
- * Updates the last selectable date for any date pickers on any matched elements.
- *
- * @param String d A string representing the last selectable date (formatted according to Date.format).
- * @type jQuery
- * @name dpSetEndDate
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('.date-picker').datePicker();
- * $('.date-picker').dpSetEndDate('01/01/2010');
- * @desc Creates a date picker associated with all elements with a class of "date-picker" then sets the last selectable date for each of these to the first Janurary 2010.
- **/
-		dpSetEndDate : function(d)
-		{
-			return _w.call(this, 'setEndDate', d);
-		},
-/**
- * Gets a list of Dates currently selected by this datePicker. This will be an empty array if no dates are currently selected or NULL if there is no datePicker associated with the matched element.
- *
- * @type Array
- * @name dpGetSelected
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('.date-picker').datePicker();
- * alert($('.date-picker').dpGetSelected());
- * @desc Will alert an empty array (as nothing is selected yet)
- **/
-		dpGetSelected : function()
-		{
-			var c = _getController(this[0]);
-			if (c) {
-				return c.getSelected();
-			}
-			return null;
-		},
-/**
- * Selects or deselects a date on any matched element's date pickers. Deselcting is only useful on date pickers where selectMultiple==true. Selecting will only work if the passed date is within the startDate and endDate boundries for a given date picker.
- *
- * @param String d A string representing the date you want to select (formatted according to Date.format).
- * @param Boolean v Whether you want to select (true) or deselect (false) this date. Optional - default = true.
- * @param Boolean m Whether you want the date picker to open up on the month of this date when it is next opened. Optional - default = true.
- * @type jQuery
- * @name dpSetSelected
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('.date-picker').datePicker();
- * $('.date-picker').dpSetSelected('01/01/2010');
- * @desc Creates a date picker associated with all elements with a class of "date-picker" then sets the selected date on these date pickers to the first Janurary 2010. When the date picker is next opened it will display Janurary 2010.
- **/
-		dpSetSelected : function(d, v, m)
-		{
-			if (v == undefined) v=true;
-			if (m == undefined) m=true;
-			return _w.call(this, 'setSelected', Date.fromString(d), v, m);
-		},
-/**
- * Sets the month that will be displayed when the date picker is next opened. If the passed month is before startDate then the month containing startDate will be displayed instead. If the passed month is after endDate then the month containing the endDate will be displayed instead.
- *
- * @param Number m The month you want the date picker to display. Optional - defaults to the currently displayed month.
- * @param Number y The year you want the date picker to display. Optional - defaults to the currently displayed year.
- * @type jQuery
- * @name dpSetDisplayedMonth
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('.date-picker').datePicker();
- * $('.date-picker').dpSetDisplayedMonth(10, 2008);
- * @desc Creates a date picker associated with all elements with a class of "date-picker" then sets the selected date on these date pickers to the first Janurary 2010. When the date picker is next opened it will display Janurary 2010.
- **/
-		dpSetDisplayedMonth : function(m, y)
-		{
-			return _w.call(this, 'setDisplayedMonth', Number(m), Number(y));
-		},
-/**
- * Displays the date picker associated with the matched elements. Since only one date picker can be displayed at once then the date picker associated with the last matched element will be the one that is displayed.
- *
- * @param HTMLElement e An element that you want the date picker to pop up relative in position to. Optional - default behaviour is to pop up next to the element associated with this date picker.
- * @type jQuery
- * @name dpDisplay
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('#date-picker').datePicker();
- * $('#date-picker').dpDisplay();
- * @desc Creates a date picker associated with the element with an id of date-picker and then causes it to pop up.
- **/
-		dpDisplay : function(e)
-		{
-			return _w.call(this, 'display', e);
-		},
-/**
- * Sets a function or array of functions that is called when each TD of the date picker popup is rendered to the page
- *
- * @param (Function|Array) a A function or an array of functions that are called when each td is rendered. Each function will receive four arguments; a jquery object wrapping the created TD, a Date object containing the date this TD represents, a number giving the currently rendered month and a number giving the currently rendered year.
- * @type jQuery
- * @name dpSetRenderCallback
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('#date-picker').datePicker();
- * $('#date-picker').dpSetRenderCallback(function($td, thisDate, month, year)
- * {
- * 	// do stuff as each td is rendered dependant on the date in the td and the displayed month and year
- * });
- * @desc Creates a date picker associated with the element with an id of date-picker and then creates a function which is called as each td is rendered when this date picker is displayed.
- **/
-		dpSetRenderCallback : function(a)
-		{
-			return _w.call(this, 'setRenderCallback', a);
-		},
-/**
- * Sets the position that the datePicker will pop up (relative to it's associated element)
- *
- * @param Number v The vertical alignment of the created date picker to it's associated element. Possible values are $.dpConst.POS_TOP and $.dpConst.POS_BOTTOM
- * @param Number h The horizontal alignment of the created date picker to it's associated element. Possible values are $.dpConst.POS_LEFT and $.dpConst.POS_RIGHT
- * @type jQuery
- * @name dpSetPosition
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('#date-picker').datePicker();
- * $('#date-picker').dpSetPosition($.dpConst.POS_BOTTOM, $.dpConst.POS_RIGHT);
- * @desc Creates a date picker associated with the element with an id of date-picker and makes it so that when this date picker pops up it will be bottom and right aligned to the #date-picker element.
- **/
-		dpSetPosition : function(v, h)
-		{
-			return _w.call(this, 'setPosition', v, h);
-		},
-/**
- * Sets the offset that the popped up date picker will have from it's default position relative to it's associated element (as set by dpSetPosition)
- *
- * @param Number v The vertical offset of the created date picker.
- * @param Number h The horizontal offset of the created date picker.
- * @type jQuery
- * @name dpSetOffset
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('#date-picker').datePicker();
- * $('#date-picker').dpSetOffset(-20, 200);
- * @desc Creates a date picker associated with the element with an id of date-picker and makes it so that when this date picker pops up it will be 20 pixels above and 200 pixels to the right of it's default position.
- **/
-		dpSetOffset : function(v, h)
-		{
-			return _w.call(this, 'setOffset', v, h);
-		},
-/**
- * Closes the open date picker associated with this element.
- *
- * @type jQuery
- * @name dpClose
- * @cat plugins/datePicker
- * @author Kelvin Luck (http://www.kelvinluck.com/)
- *
- * @example $('.date-pick')
- *		.datePicker()
- *		.bind(
- *			'focus',
- *			function()
- *			{
- *				$(this).dpDisplay();
- *			}
- *		).bind(
- *			'blur',
- *			function()
- *			{
- *				$(this).dpClose();
- *			}
- *		);
- * @desc Creates a date picker and makes it appear when the relevant element is focused and disappear when it is blurred.
- **/
-		dpClose : function()
-		{
-			return _w.call(this, '_closeCalendar', false, this[0]);
-		},
-		// private function called on unload to clean up any expandos etc and prevent memory links...
-		_dpDestroy : function()
-		{
-			// TODO - implement this?
-		}
-	});
-	
-	// private internal function to cut down on the amount of code needed where we forward
-	// dp* methods on the jQuery object on to the relevant DatePicker controllers...
-	var _w = function(f, a1, a2, a3)
-	{
-		return this.each(
-			function()
-			{
-				var c = _getController(this);
-				if (c) {
-					c[f](a1, a2, a3);
-				}
-			}
-		);
-	};
-	
-	function DatePicker(ele)
-	{
-		this.ele = ele;
-		
-		// initial values...
-		this.displayedMonth		=	null;
-		this.displayedYear		=	null;
-		this.startDate			=	null;
-		this.endDate			=	null;
-		this.showYearNavigation	=	null;
-		this.closeOnSelect		=	null;
-		this.displayClose		=	null;
-		this.selectMultiple		=	null;
-		this.verticalPosition	=	null;
-		this.horizontalPosition	=	null;
-		this.verticalOffset		=	null;
-		this.horizontalOffset	=	null;
-		this.button				=	null;
-		this.renderCallback		=	[];
-		this.selectedDates		=	{};
-		this.inline				=	null;
-		this.context			=	'#dp-popup';
-	};
-	$.extend(
-		DatePicker.prototype,
-		{	
-			init : function(s)
-			{
-				this.setStartDate(s.startDate);
-				this.setEndDate(s.endDate);
-				this.setDisplayedMonth(Number(s.month), Number(s.year));
-				this.setRenderCallback(s.renderCallback);
-				this.showYearNavigation = s.showYearNavigation;
-				this.closeOnSelect = s.closeOnSelect;
-				this.displayClose = s.displayClose;
-				this.selectMultiple = s.selectMultiple;
-				this.verticalPosition = s.verticalPosition;
-				this.horizontalPosition = s.horizontalPosition;
-				this.hoverClass = s.hoverClass;
-				this.setOffset(s.verticalOffset, s.horizontalOffset);
-				this.inline = s.inline;
-				if (this.inline) {
-					this.context = this.ele;
-					this.display();
-				}
-			},
-			setStartDate : function(d)
-			{
-				if (d) {
-					this.startDate = Date.fromString(d);
-				}
-				if (!this.startDate) {
-					this.startDate = (new Date()).zeroTime();
-				}
-				this.setDisplayedMonth(this.displayedMonth, this.displayedYear);
-			},
-			setEndDate : function(d)
-			{
-				if (d) {
-					this.endDate = Date.fromString(d);
-				}
-				if (!this.endDate) {
-					this.endDate = (new Date('12/31/2999')); // using the JS Date.parse function which expects mm/dd/yyyy
-				}
-				if (this.endDate.getTime() < this.startDate.getTime()) {
-					this.endDate = this.startDate;
-				}
-				this.setDisplayedMonth(this.displayedMonth, this.displayedYear);
-			},
-			setPosition : function(v, h)
-			{
-				this.verticalPosition = v;
-				this.horizontalPosition = h;
-			},
-			setOffset : function(v, h)
-			{
-				this.verticalOffset = parseInt(v) || 0;
-				this.horizontalOffset = parseInt(h) || 0;
-			},
-			setDisabled : function(s)
-			{
-				$e = $(this.ele);
-				$e[s ? 'addClass' : 'removeClass']('dp-disabled');
-				if (this.button) {
-					$but = $(this.button);
-					$but[s ? 'addClass' : 'removeClass']('dp-disabled');
-					$but.attr('title', s ? '' : $.dpText.TEXT_CHOOSE_DATE);
-				}
-				if ($e.is(':text')) {
-					$e.attr('disabled', s ? 'disabled' : '');
-				}
-			},
-			setDisplayedMonth : function(m, y)
-			{
-				if (this.startDate == undefined || this.endDate == undefined) {
-					return;
-				}
-				var s = new Date(this.startDate.getTime());
-				s.setDate(1);
-				var e = new Date(this.endDate.getTime());
-				e.setDate(1);
-				
-				var t;
-				if ((!m && !y) || (isNaN(m) && isNaN(y))) {
-					// no month or year passed - default to current month
-					t = new Date().zeroTime();
-					t.setDate(1);
-				} else if (isNaN(m)) {
-					// just year passed in - presume we want the displayedMonth
-					t = new Date(y, this.displayedMonth, 1);
-				} else if (isNaN(y)) {
-					// just month passed in - presume we want the displayedYear
-					t = new Date(this.displayedYear, m, 1);
-				} else {
-					// year and month passed in - that's the date we want!
-					t = new Date(y, m, 1)
-				}
-				
-				// check if the desired date is within the range of our defined startDate and endDate
-				if (t.getTime() < s.getTime()) {
-					t = s;
-				} else if (t.getTime() > e.getTime()) {
-					t = e;
-				}
-				this.displayedMonth = t.getMonth();
-				this.displayedYear = t.getFullYear();
-			},
-			setSelected : function(d, v, moveToMonth)
-			{
-				if (this.selectMultiple == false) {
-					this.selectedDates = {};
-					$('td.selected', this.context).removeClass('selected');
-				}
-				if (moveToMonth) {
-					this.setDisplayedMonth(d.getMonth(), d.getFullYear());
-				}
-				this.selectedDates[d.toString()] = v;
-			},
-			isSelected : function(d)
-			{
-				return this.selectedDates[d.toString()];
-			},
-			getSelected : function()
-			{
-				var r = [];
-				for(s in this.selectedDates) {
-					if (this.selectedDates[s] == true) {
-						r.push(Date.parse(s));
-					}
-				}
-				return r;
-			},
-			display : function(eleAlignTo)
-			{
-				if ($(this.ele).is('.dp-disabled')) return;
-				
-				eleAlignTo = eleAlignTo || this.ele;
-				var c = this;
-				var $ele = $(eleAlignTo);
-				var eleOffset = $ele.offset();
-				
-				var $createIn;
-				var attrs;
-				var attrsCalendarHolder;
-				var cssRules;
-				
-				if (c.inline) {
-					$createIn = $(this.ele);
-					attrs = {
-						'id'		:	'calendar-' + this.ele._dpId,
-						'className'	:	'dp-popup dp-popup-inline'
-					};
-					cssRules = {
-					};
-				} else {
-					$createIn = $('body');
-					attrs = {
-						'id'		:	'dp-popup',
-						'className'	:	'dp-popup'
-					};
-					cssRules = {
-						'top'	:	eleOffset.top + c.verticalOffset,
-						'left'	:	eleOffset.left + c.horizontalOffset
-					};
-					
-					var _checkMouse = function(e)
-					{
-						var el = e.target;
-						var cal = $('#dp-popup')[0];
-						
-						while (true){
-							if (el == cal) {
-								return true;
-							} else if (el == document) {
-								c._closeCalendar();
-								return false;
-							} else {
-								el = $(el).parent()[0];
-							}
-						}
-					};
-					this._checkMouse = _checkMouse;
-				
-					this._closeCalendar(true);
-				}
-				
-				
-				$createIn
-					.append(
-						$('<div></div>')
-							.attr(attrs)
-							.css(cssRules)
-							.append(
-								$('<h2></h2>'),
-								$('<div class="dp-nav-prev"></div>')
-									.append(
-										$('<a class="dp-nav-prev-year" href="#" title="' + $.dpText.TEXT_PREV_YEAR + '">&lt;&lt;</a>')
-											.bind(
-												'click',
-												function()
-												{
-													return c._displayNewMonth.call(c, this, 0, -1);
-												}
-											),
-										$('<a class="dp-nav-prev-month" href="#" title="' + $.dpText.TEXT_PREV_MONTH + '">&lt;</a>')
-											.bind(
-												'click',
-												function()
-												{
-													return c._displayNewMonth.call(c, this, -1, 0);
-												}
-											)
-									),
-								$('<div class="dp-nav-next"></div>')
-									.append(
-										$('<a class="dp-nav-next-year" href="#" title="' + $.dpText.TEXT_NEXT_YEAR + '">&gt;&gt;</a>')
-											.bind(
-												'click',
-												function()
-												{
-													return c._displayNewMonth.call(c, this, 0, 1);
-												}
-											),
-										$('<a class="dp-nav-next-month" href="#" title="' + $.dpText.TEXT_NEXT_MONTH + '">&gt;</a>')
-											.bind(
-												'click',
-												function()
-												{
-													return c._displayNewMonth.call(c, this, 1, 0);
-												}
-											)
-									),
-								$('<div></div>')
-									.attr('className', 'dp-calendar')
-							)
-							.bgIframe()
-						);
-					
-				var $pop = this.inline ? $('.dp-popup', this.context) : $('#dp-popup');
-				
-				if (this.showYearNavigation == false) {
-					$('.dp-nav-prev-year, .dp-nav-next-year', c.context).css('display', 'none');
-				}
-				if (this.displayClose) {
-					$pop.append(
-						$('<a href="#" id="dp-close">' + $.dpText.TEXT_CLOSE + '</a>')
-							.bind(
-								'click',
-								function()
-								{
-									c._closeCalendar();
-									return false;
-								}
-							)
-					);
-				}
-				c._renderCalendar();
-				
-				$(this.ele).trigger('dpDisplayed', $pop);
-				
-				if (!c.inline) {
-					if (this.verticalPosition == $.dpConst.POS_BOTTOM) {
-						$pop.css('top', eleOffset.top + $ele.height() - $pop.height() + c.verticalOffset);
-					}
-					if (this.horizontalPosition == $.dpConst.POS_RIGHT) {
-						$pop.css('left', eleOffset.left + $ele.width() - $pop.width() + c.horizontalOffset);
-					}
-					$(document).bind('mousedown', this._checkMouse);
-				}
-			},
-			setRenderCallback : function(a)
-			{
-				if (a && typeof(a) == 'function') {
-					a = [a];
-				}
-				this.renderCallback = this.renderCallback.concat(a);
-			},
-			cellRender : function ($td, thisDate, month, year) {
-				var c = this.dpController;
-				var d = new Date(thisDate.getTime());
-				
-				// add our click handlers to deal with it when the days are clicked...
-				
-				$td.bind(
-					'click',
-					function()
-					{
-						var $this = $(this);
-						if (!$this.is('.disabled')) {
-							c.setSelected(d, !$this.is('.selected') || !c.selectMultiple);
-							var s = c.isSelected(d);
-							$(c.ele).trigger('dateSelected', [d, $td, s]);
-							$(c.ele).trigger('change');
-							if (c.closeOnSelect) {
-								c._closeCalendar();
-							} else {
-								$this[s ? 'addClass' : 'removeClass']('selected');
-							}
-						}
-					}
-				);
-				
-				if (c.isSelected(d)) {
-					$td.addClass('selected');
-				}
-				
-				// call any extra renderCallbacks that were passed in
-				for (var i=0; i<c.renderCallback.length; i++) {
-					c.renderCallback[i].apply(this, arguments);
-				}
-				
-				
-			},
-			// ele is the clicked button - only proceed if it doesn't have the class disabled...
-			// m and y are -1, 0 or 1 depending which direction we want to go in...
-			_displayNewMonth : function(ele, m, y) 
-			{
-				if (!$(ele).is('.disabled')) {
-					this.setDisplayedMonth(this.displayedMonth + m, this.displayedYear + y);
-					this._clearCalendar();
-					this._renderCalendar();
-					$(this.ele).trigger('dpMonthChanged', [this.displayedMonth, this.displayedYear]);
-				}
-				ele.blur();
-				return false;
-			},
-			_renderCalendar : function()
-			{
-				// set the title...
-				$('h2', this.context).html(Date.monthNames[this.displayedMonth] + ' ' + this.displayedYear);
-				
-				// render the calendar...
-				$('.dp-calendar', this.context).renderCalendar(
-					{
-						month			: this.displayedMonth,
-						year			: this.displayedYear,
-						renderCallback	: this.cellRender,
-						dpController	: this,
-						hoverClass		: this.hoverClass
-					}
-				);
-				
-				// update the status of the control buttons and disable dates before startDate or after endDate...
-				// TODO: When should the year buttons be disabled? When you can't go forward a whole year from where you are or is that annoying?
-				if (this.displayedYear == this.startDate.getFullYear() && this.displayedMonth == this.startDate.getMonth()) {
-					$('.dp-nav-prev-year', this.context).addClass('disabled');
-					$('.dp-nav-prev-month', this.context).addClass('disabled');
-					$('.dp-calendar td.other-month', this.context).each(
-						function()
-						{
-							var $this = $(this);
-							if (Number($this.text()) > 20) {
-								$this.addClass('disabled');
-							}
-						}
-					);
-					var d = this.startDate.getDate();
-					$('.dp-calendar td.current-month', this.context).each(
-						function()
-						{
-							var $this = $(this);
-							if (Number($this.text()) < d) {
-								$this.addClass('disabled');
-							}
-						}
-					);
-				} else {
-					$('.dp-nav-prev-year', this.context).removeClass('disabled');
-					$('.dp-nav-prev-month', this.context).removeClass('disabled');
-					var d = this.startDate.getDate();
-					if (d > 20) {
-						// check if the startDate is last month as we might need to add some disabled classes...
-						var sd = new Date(this.startDate.getTime());
-						sd.addMonths(1);
-						if (this.displayedYear == sd.getFullYear() && this.displayedMonth == sd.getMonth()) {
-							$('dp-calendar td.other-month', this.context).each(
-								function()
-								{
-									var $this = $(this);
-									if (Number($this.text()) < d) {
-										$this.addClass('disabled');
-									}
-								}
-							);
-						}
-					}
-				}
-				if (this.displayedYear == this.endDate.getFullYear() && this.displayedMonth == this.endDate.getMonth()) {
-					$('.dp-nav-next-year', this.context).addClass('disabled');
-					$('.dp-nav-next-month', this.context).addClass('disabled');
-					$('.dp-calendar td.other-month', this.context).each(
-						function()
-						{
-							var $this = $(this);
-							if (Number($this.text()) < 14) {
-								$this.addClass('disabled');
-							}
-						}
-					);
-					var d = this.endDate.getDate();
-					$('.dp-calendar td.current-month', this.context).each(
-						function()
-						{
-							var $this = $(this);
-							if (Number($this.text()) > d) {
-								$this.addClass('disabled');
-							}
-						}
-					);
-				} else {
-					$('.dp-nav-next-year', this.context).removeClass('disabled');
-					$('.dp-nav-next-month', this.context).removeClass('disabled');
-					var d = this.endDate.getDate();
-					if (d < 13) {
-						// check if the endDate is next month as we might need to add some disabled classes...
-						var ed = new Date(this.endDate.getTime());
-						ed.addMonths(-1);
-						if (this.displayedYear == ed.getFullYear() && this.displayedMonth == ed.getMonth()) {
-							$('.dp-calendar td.other-month', this.context).each(
-								function()
-								{
-									var $this = $(this);
-									if (Number($this.text()) > d) {
-										$this.addClass('disabled');
-									}
-								}
-							);
-						}
-					}
-				}
-			},
-			_closeCalendar : function(programatic, ele)
-			{
-				if (!ele || ele == this.ele)
-				{
-					$(document).unbind('mousedown', this._checkMouse);
-					this._clearCalendar();
-					$('#dp-popup a').unbind();
-					$('#dp-popup').empty().remove();
-					if (!programatic) {
-						$(this.ele).trigger('dpClosed', [this.getSelected()]);
-					}
-				}
-			},
-			// empties the current dp-calendar div and makes sure that all events are unbound
-			// and expandos removed to avoid memory leaks...
-			_clearCalendar : function()
-			{
-				// TODO.
-				$('.dp-calendar td', this.context).unbind();
-				$('.dp-calendar', this.context).empty();
-			}
-		}
-	);
-	
-	// static constants
-	$.dpConst = {
-		SHOW_HEADER_NONE	:	0,
-		SHOW_HEADER_SHORT	:	1,
-		SHOW_HEADER_LONG	:	2,
-		POS_TOP				:	0,
-		POS_BOTTOM			:	1,
-		POS_LEFT			:	0,
-		POS_RIGHT			:	1
-	};
-	// localisable text
-	$.dpText = {
-		TEXT_PREV_YEAR		:	'Previous year',
-		TEXT_PREV_MONTH		:	'Previous month',
-		TEXT_NEXT_YEAR		:	'Next year',
-		TEXT_NEXT_MONTH		:	'Next month',
-		TEXT_CLOSE			:	'Close',
-		TEXT_CHOOSE_DATE	:	'Choose date'
-	};
-	// version
-	$.dpVersion = '$Id: jquery.datePicker.js 3739 2007-10-25 13:55:30Z kelvin.luck $';
-
-	function _getController(ele)
-	{
-		if (ele._dpId) return $.event._dpCache[ele._dpId];
-		return false;
-	};
-	
-	// make it so that no error is thrown if bgIframe plugin isn't included (allows you to use conditional
-	// comments to only include bgIframe where it is needed in IE without breaking this plugin).
-	if ($.fn.bgIframe == undefined) {
-		$.fn.bgIframe = function() {return this; };
-	};
-
-
-	// clean-up
-	$(window)
-		.bind('unload', function() {
-			var els = $.event._dpCache || [];
-			for (var i in els) {
-				$(els[i].ele)._dpDestroy();
-			}
-		});
-		
-	
-})(jQuery);
Index: js/themes/flora/flora.all.css
===================================================================
--- js/themes/flora/flora.all.css	(revision 6370)
+++ js/themes/flora/flora.all.css	(working copy)
@@ -1,7 +0,0 @@
-@import "flora.css";
-@import "flora.accordion.css";
-@import "flora.datepicker.css";
-@import "flora.dialog.css";
-@import "flora.resizable.css";
-@import "flora.slider.css";
-@import "flora.tabs.css";
Index: js/themes/flora/flora.tabs.css
===================================================================
--- js/themes/flora/flora.tabs.css	(revision 6370)
+++ js/themes/flora/flora.tabs.css	(working copy)
@@ -1,104 +0,0 @@
-@import "flora.css";
-
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-    .ui-tabs-hide {
-        display: none !important;
-    }
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-    .ui-tabs-nav {
-        display: none;
-    }
-}
-
-/* Skin */
-.ui-tabs-nav, .ui-tabs-panel {
-    font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
-    font-size: 12px;
-}
-.ui-tabs-nav {
-    list-style: none;
-    margin: 0;
-    padding: 0 0 0 3px;
-}
-.ui-tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-    display: block;
-    clear: both;
-    content: " ";
-}
-.ui-tabs-nav li {
-    float: left;
-    margin: 0 0 0 2px;
-    font-weight: bold;
-}
-.ui-tabs-nav a, .ui-tabs-nav a span {
-    float: left; /* fixes dir=ltr problem and other quirks IE */
-    padding: 0 12px;
-    background: url(i/tabs.png) no-repeat;
-}
-.ui-tabs-nav a {
-    margin: 5px 0 0; /* position: relative makes opacity fail for disabled tab in IE */
-    padding-left: 0;
-    background-position: 100% 0;
-    text-decoration: none;
-    white-space: nowrap; /* @ IE 6 */
-    outline: 0; /* @ Firefox, prevent dotted border after click */    
-}
-.ui-tabs-nav a:link, .ui-tabs-nav a:visited {
-    color: #fff;
-}
-.ui-tabs-nav .ui-tabs-selected a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    margin-top: 0;
-    background-position: 100% -23px;
-}
-.ui-tabs-nav a span {
-    padding-top: 1px;
-    padding-right: 0;
-    height: 20px;
-    background-position: 0 0;
-    line-height: 20px;
-}
-.ui-tabs-nav .ui-tabs-selected a span {
-    padding-top: 0;
-    height: 27px;
-    background-position: 0 -23px;
-    line-height: 27px;
-}
-.ui-tabs-nav .ui-tabs-selected a:link, .ui-tabs-nav .ui-tabs-selected a:visited,
-.ui-tabs-nav .ui-tabs-disabled a:link, .ui-tabs-nav .ui-tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-    cursor: text;
-}
-.ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active,
-.ui-tabs-nav .ui-tabs-unselect a:hover, .ui-tabs-nav .ui-tabs-unselect a:focus, .ui-tabs-nav .ui-tabs-unselect a:active { /* @ Opera, we need to be explicit again here now... */
-    cursor: pointer;
-}
-.ui-tabs-disabled {
-    opacity: .4;
-    filter: alpha(opacity=40);
-}
-.ui-tabs-nav .ui-tabs-disabled a:link, .ui-tabs-nav .ui-tabs-disabled a:visited {
-    color: #000;
-}
-.ui-tabs-panel {
-    border: 1px solid #519e2d;
-    padding: 10px;
-    background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-/*.ui-tabs-loading em {
-    padding: 0 0 0 20px;
-    background: url(loading.gif) no-repeat 0 50%;
-}*/
-
-/* Additional IE specific bug fixes... */
-* html .ui-tabs-nav { /* auto clear @ IE 6 & IE 7 Quirks Mode */
-    display: inline-block;
-}
-*:first-child+html .ui-tabs-nav  { /* auto clear @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */
-    display: inline-block;
-}
Index: js/themes/flora/flora.datepicker.css
===================================================================
--- js/themes/flora/flora.datepicker.css	(revision 6370)
+++ js/themes/flora/flora.datepicker.css	(working copy)
@@ -1,216 +0,0 @@
-/* Main Flora Style Sheet for jQuery UI ui-datepicker */
-#ui-datepicker-div, .ui-datepicker-inline {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 14px;
-	padding: 0;
-	margin: 0;
-	background: #E0F4D7;
-	width: 185px;
-}
-#ui-datepicker-div {
-	display: none;
-	border: 1px solid #FF9900;
-	z-index: 10;
-}
-.ui-datepicker-inline {
-	float: left;
-	display: block;
-	border: 0;
-}
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-dialog {
-	padding: 5px !important;
-	border: 4px ridge #83C948 !important;
-}
-button.ui-datepicker-trigger {
-	width: 25px;
-}
-img.ui-datepicker-trigger {
-	margin: 2px;
-	vertical-align: middle;
-}
-.ui-datepicker-prompt {
-	float: left;
-	padding: 2px;
-	background: #E0F4D7;
-	color: #000;
-}
-*html .ui-datepicker-prompt {
-	width: 185px;
-}
-.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
-	clear: both;
-	float: left;
-	width: 100%;
-	color: #FFF;
-}
-.ui-datepicker-control {
-	background: #FF9900;
-	padding: 2px 0px;
-}
-.ui-datepicker-links {
-	background: #E0F4D7;
-	padding: 2px 0px;
-}
-.ui-datepicker-control, .ui-datepicker-links {
-	font-weight: bold;
-	font-size: 80%;
-	letter-spacing: 1px;
-}
-.ui-datepicker-links label {
-	padding: 2px 5px;
-	color: #888;
-}
-.ui-datepicker-clear, .ui-datepicker-prev {
-	float: left;
-	width: 34%;
-}
-.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
-	float: right;
-	text-align: right;
-}
-.ui-datepicker-current {
-	float: left;
-	width: 30%;
-	text-align: center;
-}
-.ui-datepicker-close, .ui-datepicker-next {
-	float: right;
-	width: 34%;
-	text-align: right;
-}
-.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl .ui-datepicker-next {
-	float: left;
-	text-align: left;
-}
-.ui-datepicker-header {
-	padding: 1px 0 3px;
-	background: #83C948;
-	text-align: center;
-	font-weight: bold;
-	height: 1.3em;
-}
-.ui-datepicker-header select {
-	background: #83C948;
-	color: #000;
-	border: 0px;
-	font-weight: bold;
-}
-.ui-datepicker {
-	background: #CCC;
-	text-align: center;
-	font-size: 100%;
-}
-.ui-datepicker a {
-	display: block;
-	width: 100%;
-}
-.ui-datepicker-title-row {
-	background: #B1DB87;
-	color: #000;
-}
-.ui-datepicker-title-row .ui-datepicker-week-end-cell {
-	background: #B1DB87;
-}
-.ui-datepicker-days-row {
-	background: #FFF;
-	color: #666;
-}
-.ui-datepicker-week-col {
-	background: #B1DB87;
-	color: #000;
-}
-.ui-datepicker-days-cell {
-	color: #000;
-	border: 1px solid #DDD;
-}
-.ui-datepicker-days-cell a {
-	display: block;
-}
-.ui-datepicker-week-end-cell {
-	background: #E0F4D7;
-}
-.ui-datepicker-unselectable {
-	color: #888;
-}
-.ui-datepicker-week-over, .ui-datepicker-week-over .ui-datepicker-week-end-cell {
-	background: #B1DB87 !important;
-}
-.ui-datepicker-days-cell-over, .ui-datepicker-days-cell-over.ui-datepicker-week-end-cell {
-	background: #FFF !important;
-	border: 1px solid #777;
-}
-* html .ui-datepicker-title-row .ui-datepicker-week-end-cell {
-	background: #B1DB87 !important;
-}
-* html .ui-datepicker-week-end-cell {
-	background: #E0F4D7 !important;
-	border: 1px solid #DDD !important;
-}
-* html .ui-datepicker-days-cell-over {
-	background: #FFF !important;
-	border: 1px solid #777 !important;
-}
-* html .ui-datepicker-current-day {
-	background: #83C948 !important;
-}
-.ui-datepicker-today {
-	background: #B1DB87 !important;
-}
-.ui-datepicker-current-day {
-	background: #83C948 !important;
-}
-.ui-datepicker-status {
-	background: #E0F4D7;
-	width: 100%;
-	font-size: 80%;
-	text-align: center;
-}
-#ui-datepicker-div a, .ui-datepicker-inline a {
-	cursor: pointer;
-	margin: 0;
-	padding: 0;
-	background: none;
-	color: #000;
-}
-.ui-datepicker-inline .ui-datepicker-links a {
-	padding: 0 5px !important;
-}
-.ui-datepicker-control a, .ui-datepicker-links a {
-	padding: 2px 5px !important;
-	color: #000 !important;
-}
-.ui-datepicker-title-row a {
-	color: #000 !important;
-}
-.ui-datepicker-control a:hover {
-	background: #FDD !important;
-	color: #333 !important;
-}
-.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
-	background: #FFF !important;
-	color: #333 !important;
-}
-.ui-datepicker-multi .ui-datepicker {
-	border: 1px solid #83C948;
-}
-.ui-datepicker-one-month {
-	float: left;
-	width: 185px;
-}
-.ui-datepicker-new-row {
-	clear: left;
-}
-.ui-datepicker-cover {
-	display: none;
-	display/**/: block;
-	position: absolute;
-	z-index: -1;
-	filter: mask();
-	top: -4px;
-	left: -4px;
-	width: 193px;
-	height: 200px;
-}
Index: js/themes/flora/i/accordion-middle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/accordion-left-act.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-title.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/resizable-ne.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/accordion-left-over.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-nw.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/accordion-right.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/resizable-nw.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/resizable-e.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/accordion-right-over.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-se.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-titlebar-close-hover.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/tabs.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/accordion-left.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/resizable-n.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/slider-handle.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/resizable-s.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-e.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/accordion-middle-act.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/resizable-w.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/accordion-middle-over.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-titlebar-close.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/resizable-se.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/slider-bg-1.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-sw.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/slider-bg-2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-n.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-s.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-ne.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/accordion-right-act.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/dialog-w.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/i/resizable-sw.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: js/themes/flora/flora.dialog.css
===================================================================
--- js/themes/flora/flora.dialog.css	(revision 6370)
+++ js/themes/flora/flora.dialog.css	(working copy)
@@ -1,100 +0,0 @@
-/* This file skins dialog */
-
-.flora .ui-dialog,
-.flora.ui-dialog {
-	background-color: #e6f7d4;
-}
-
-.flora .ui-dialog .ui-dialog-titlebar,
-.flora.ui-dialog .ui-dialog-titlebar {
-	border-bottom: 1px solid #d8d2aa;
-	background: #ff9900 url(i/dialog-title.gif) repeat-x;
-	padding: 0px;
-	height: 28px;
-	_height: 29px;
-}
-
-.flora .ui-draggable .ui-dialog-titlebar,
-.flora.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-
-.flora .ui-draggable-disabled .ui-dialog-titlebar,
-.flora.ui-draggable-disabled .ui-dialog-titlebar {
-	cursor: default;
-}
-
-.flora .ui-dialog .ui-dialog-titlebar-close,
-.flora.ui-dialog .ui-dialog-titlebar-close {
-	width: 16px;
-	height: 16px;
-	background: url(i/dialog-titlebar-close.png) no-repeat;
-	position:absolute;
-	top: 6px;
-	right: 7px;
-	cursor: default;
-}
-
-.flora .ui-dialog .ui-dialog-titlebar-close span,
-.flora.ui-dialog .ui-dialog-titlebar-close span {
-	display: none;
-}
-
-.flora .ui-dialog .ui-dialog-titlebar-close-hover,
-.flora.ui-dialog .ui-dialog-titlebar-close-hover {
-	background: url(i/dialog-titlebar-close-hover.png) no-repeat;
-}
-
-.flora .ui-dialog .ui-dialog-title,
-.flora.ui-dialog .ui-dialog-title {
-	margin-left: 5px;
-	color: white;
-	font-weight: bold;
-	position: relative;
-	top: 7px;
-	left: 4px;
-}
-
-.flora .ui-dialog .ui-dialog-content,
-.flora.ui-dialog .ui-dialog-content {
-	margin: 1.2em;
-}
-
-.flora .ui-dialog .ui-dialog-buttonpane,
-.flora.ui-dialog .ui-dialog-buttonpane {
-	position: absolute;
-	bottom: 8px;
-	right: 12px;
-	width: 100%;
-	text-align: right;
-}
-
-.flora .ui-dialog .ui-dialog-buttonpane button,
-.flora.ui-dialog .ui-dialog-buttonpane button {
-	margin: 6px;
-}
-
-/* Dialog handle styles */
-.flora .ui-dialog .ui-resizable-n,
-.flora.ui-dialog .ui-resizable-n { cursor: n-resize; height: 6px; width: 100%; top: 0px; left: 0px; background: transparent url(i/dialog-n.gif) repeat scroll center top; }
-
-.flora .ui-dialog .ui-resizable-s,
-.flora.ui-dialog .ui-resizable-s { cursor: s-resize; height: 8px; width: 100%; bottom: 0px; left: 0px; background: transparent url(i/dialog-s.gif) repeat scroll center top; }
-
-.flora .ui-dialog .ui-resizable-e,
-.flora.ui-dialog .ui-resizable-e { cursor: e-resize; width: 7px; right: 0px; top: 0px; height: 100%; background: transparent url(i/dialog-e.gif) repeat scroll right center; }
-
-.flora .ui-dialog .ui-resizable-w,
-.flora.ui-dialog .ui-resizable-w { cursor: w-resize; width: 7px; left: 0px; top: 0px; height: 100%; background: transparent url(i/dialog-w.gif) repeat scroll right center; }
-
-.flora .ui-dialog .ui-resizable-se,
-.flora.ui-dialog .ui-resizable-se { cursor: se-resize; width: 9px; height: 9px; right: 0px; bottom: 0px; background: transparent url(i/dialog-se.gif); }
-
-.flora .ui-dialog .ui-resizable-sw,
-.flora.ui-dialog .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: 0px; bottom: 0px; background: transparent url(i/dialog-sw.gif); }
-
-.flora .ui-dialog .ui-resizable-nw,
-.flora.ui-dialog .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 29px; left: 0px; top: 0px; background: transparent url(i/dialog-nw.gif); }
-
-.flora .ui-dialog .ui-resizable-ne,
-.flora.ui-dialog .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 29px; right: 0px; top: 0px; background: transparent url(i/dialog-ne.gif); }
Index: js/themes/flora/flora.resizable.css
===================================================================
--- js/themes/flora/flora.resizable.css	(revision 6370)
+++ js/themes/flora/flora.resizable.css	(working copy)
@@ -1,20 +0,0 @@
-/* This file skins resizables */
-
-.ui-resizable { position: relative; }
-
-/* Global handle styles */
-.ui-resizable-handle { position: absolute; display: none; font-size: 0.1px; }
-.ui-resizable .ui-resizable-handle { display: block; }
-body .ui-resizable-disabled .ui-resizable-handle { display: none; } /* use 'body' to make it more specific (css order) */
-body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body' to make it more specific (css order) */
-
-.ui-resizable-n { cursor: n-resize; height: 6px; width: 100%; top: 0px; left: 0px; background: transparent url(i/resizable-n.gif) repeat scroll center top; }
-.ui-resizable-s { cursor: s-resize; height: 6px; width: 100%; bottom: 0px; left: 0px; background: transparent url(i/resizable-s.gif) repeat scroll center top; }
-
-.ui-resizable-e { cursor: e-resize; width: 6px; right: 0px; top: 0px; height: 100%; background: transparent url(i/resizable-e.gif) repeat scroll right center; }
-.ui-resizable-w { cursor: w-resize; width: 6px; left: 0px; top: 0px; height: 100%; background: transparent url(i/resizable-w.gif) repeat scroll right center; }
-
-.ui-resizable-se { cursor: se-resize; width: 9px; height: 9px; right: 0px; bottom: 0px; background: transparent url(i/resizable-se.gif); }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: 0px; bottom: 0px; background: transparent url(i/resizable-sw.gif); }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: 0px; top: 0px; background: transparent url(i/resizable-nw.gif); }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: 0px; top: 0px; background: transparent url(i/resizable-ne.gif); }
Index: js/themes/flora/flora.accordion.css
===================================================================
--- js/themes/flora/flora.accordion.css	(revision 6370)
+++ js/themes/flora/flora.accordion.css	(working copy)
@@ -1,39 +0,0 @@
-.ui-accordion { margin: 0; padding: 0; list-style-type: none; }
-.ui-accordion li { margin: 0; margin-bottom: 2px; padding: 0; }
-.ui-accordion li .ui-accordion-header {
-	display: block;
-	padding-left: 5px;
-	margin-right: 3px;
-	height: 28px;
-	background-image: url(i/accordion-middle.png);
-	color: #000;
-	text-decoration: none;
-	line-height: 28px;
-	position: relative;
-	left: 3px;
-}
-.ui-accordion li .ui-accordion-right {
-	display: block;
-	background-image: url(i/accordion-right.png);
-	position: absolute;
-	top: 0px;
-	right: -3px;
-	height: 28px;
-	width: 3px;
-}
-.ui-accordion li .ui-accordion-left {
-	display: block;
-	background-image: url(i/accordion-left.png);
-	background-repeat: no-repeat;
-	position: absolute;
-	height: 28px;
-	width: 3px;
-}
-
-.ui-accordion li:hover .ui-accordion-left { background-image: url(i/accordion-left-over.png); }
-.ui-accordion li:hover .ui-accordion-header { background-image: url(i/accordion-middle-over.png); }
-.ui-accordion li:hover .ui-accordion-right { background-image: url(i/accordion-right-over.png); }
-
-.ui-accordion li.selected .ui-accordion-left { background-image: url(i/accordion-left-act.png); }
-.ui-accordion li.selected .ui-accordion-header { background-image: url(i/accordion-middle-act.png); }
-.ui-accordion li.selected .ui-accordion-right { background-image: url(i/accordion-right-act.png); }
Index: js/themes/flora/flora.css
===================================================================
--- js/themes/flora/flora.css	(revision 6370)
+++ js/themes/flora/flora.css	(working copy)
@@ -1,2 +0,0 @@
-.ui-wrapper { border: 1px solid #50A029; }
-.ui-wrapper input, .ui-wrapper textarea { border: 0; }
Index: js/themes/flora/flora.slider.css
===================================================================
--- js/themes/flora/flora.slider.css	(revision 6370)
+++ js/themes/flora/flora.slider.css	(working copy)
@@ -1,11 +0,0 @@
-/* This file skins sliders */
-
-.ui-slider { width: 200px; height: 23px; position: relative; background-repeat: no-repeat; background-position: center center; }
-.ui-slider-handle { position: absolute; z-index: 1; height: 23px; width: 12px; top: 0px; left: 0px; background-image: url(i/slider-handle.gif);  }
-.ui-slider-handle-active { border: 1px dotted black;  }
-.ui-slider-disabled .ui-slider-handle { opacity: 0.5; filter: alpha(opacity=50); }
-.ui-slider-range { position: absolute; background: #50A029; opacity: 0.3; filter: alpha(opacity=30); width: 100%; height: 100%; }
-
-/* Default slider backgrounds */
-.ui-slider, .ui-slider-1 { background-image: url(i/slider-bg-1.png); }
-.ui-slider-2 { background-image: url(i/slider-bg-2.png); }
Index: js/themes/ui.datepicker.css
===================================================================
--- js/themes/ui.datepicker.css	(revision 6370)
+++ js/themes/ui.datepicker.css	(working copy)
@@ -1,207 +0,0 @@
-/* Main Style Sheet for jQuery UI date picker */
-#ui-datepicker-div, .ui-datepicker-inline {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	padding: 0;
-	margin: 0;
-	background: #ddd;
-	width: 185px;
-}
-#ui-datepicker-div {
-	display: none;
-	border: 1px solid #777;
-	z-index: 9999; /*must have*/
-}
-.ui-datepicker-inline {
-	float: left;
-	display: block;
-	border: 0;
-}
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-dialog {
-	padding: 5px !important;
-	border: 4px ridge #ddd !important;
-}
-button.ui-datepicker-trigger {
-	width: 25px;
-}
-img.ui-datepicker-trigger {
-	margin: 2px;
-	vertical-align: middle;
-}
-.ui-datepicker-prompt {
-	float: left;
-	padding: 2px;
-	background: #ddd;
-	color: #000;
-}
-* html .ui-datepicker-prompt {
-	width: 185px;
-}
-.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
-	clear: both;
-	float: left;
-	width: 100%;
-	color: #fff;
-}
-.ui-datepicker-control {
-	background: #400;
-	padding: 2px 0px;
-}
-.ui-datepicker-links {
-	background: #000;
-	padding: 2px 0px;
-}
-.ui-datepicker-control, .ui-datepicker-links {
-	font-weight: bold;
-	font-size: 80%;
-}
-.ui-datepicker-links label { /* disabled links */
-	padding: 2px 5px;
-	color: #888;
-}
-.ui-datepicker-clear, .ui-datepicker-prev {
-	float: left;
-	width: 34%;
-}
-.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
-	float: right;
-	text-align: right;
-}
-.ui-datepicker-current {
-	float: left;
-	width: 30%;
-	text-align: center;
-}
-.ui-datepicker-close, .ui-datepicker-next {
-	float: right;
-	width: 34%;
-	text-align: right;
-}
-.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl .ui-datepicker-next {
-	float: left;
-	text-align: left;
-}
-.ui-datepicker-header {
-	padding: 1px 0 3px;
-	background: #333;
-	text-align: center;
-	font-weight: bold;
-	height: 1.3em;
-}
-.ui-datepicker-header select {
-	background: #333;
-	color: #fff;
-	border: 0px;
-	font-weight: bold;
-}
-.ui-datepicker {
-	background: #ccc;
-	text-align: center;
-	font-size: 100%;
-}
-.ui-datepicker a {
-	display: block;
-	width: 100%;
-}
-.ui-datepicker-title-row {
-	background: #777;
-}
-.ui-datepicker-days-row {
-	background: #eee;
-	color: #666;
-}
-.ui-datepicker-week-col {
-	background: #777;
-	color: #fff;
-}
-.ui-datepicker-days-cell {
-	color: #000;
-	border: 1px solid #ddd;
-}
-.ui-datepicker-days-cell a{
-	display: block;
-}
-.ui-datepicker-week-end-cell {
-	background: #ddd;
-}
-.ui-datepicker-title-row .ui-datepicker-week-end-cell {
-	background: #777;
-}
-.ui-datepicker-days-cell-over {
-	background: #fff;
-	border: 1px solid #777;
-}
-.ui-datepicker-unselectable {
-	color: #888;
-}
-.ui-datepicker-today {
-	background: #fcc !important;
-}
-.ui-datepicker-current-day {
-	background: #999 !important;
-}
-.ui-datepicker-status {
-	background: #ddd;
-	width: 100%;
-	font-size: 80%;
-	text-align: center;
-}
-
-/* ________ Datepicker Links _______
-
-** Reset link properties and then override them with !important */
-#ui-datepicker-div a, .ui-datepicker-inline a {
-	cursor: pointer;
-	margin: 0;
-	padding: 0;
-	background: none;
-	color: #000;
-}
-.ui-datepicker-inline .ui-datepicker-links a {
-	padding: 0 5px !important;
-}
-.ui-datepicker-control a, .ui-datepicker-links a {
-	padding: 2px 5px !important;
-	color: #eee !important;
-}
-.ui-datepicker-title-row a {
-	color: #eee !important;
-}
-.ui-datepicker-control a:hover {
-	background: #fdd !important;
-	color: #333 !important;
-}
-.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
-	background: #ddd !important;
-	color: #333 !important;
-}
-
-/* ___________ MULTIPLE MONTHS _________*/
-
-.ui-datepicker-multi .ui-datepicker {
-	border: 1px solid #777;
-}
-.ui-datepicker-one-month {
-	float: left;
-	width: 185px;
-}
-.ui-datepicker-new-row {
-	clear: left;
-}
-
-/* ___________ IE6 IFRAME FIX ________ */
-
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}
Index: js/thickbox.js
===================================================================
--- js/thickbox.js	(revision 6370)
+++ js/thickbox.js	(working copy)
@@ -1,319 +0,0 @@
-/*
- * Thickbox 3.1 - One Box To Rule Them All.
- * By Cody Lindley (http://www.codylindley.com)
- * Copyright (c) 2007 cody lindley
- * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
-*/
-		  
-var tb_pathToImage = "../images/loadingAnimation.gif";
-
-/*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/
-
-//on page load call tb_init
-$(document).ready(function(){   
-	tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
-	imgLoader = new Image();// preload image
-	imgLoader.src = tb_pathToImage;
-});
-
-//add thickbox to href & area elements that have a class of .thickbox
-function tb_init(domChunk){
-	$(domChunk).click(function(){
-	var t = this.title || this.name || null;
-	var a = this.href || this.alt;
-	var g = this.rel || false;
-	tb_show(t,a,g);
-	this.blur();
-	return false;
-	});
-}
-
-function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link
-
-	try {
-		if (typeof document.body.style.maxHeight === "undefined") {//if IE 6
-			$("body","html").css({height: "100%", width: "100%"});
-			$("html").css("overflow","hidden");
-			if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
-				$("body").append("<iframe id='TB_HideSelect'></iframe><div id='TB_overlay'></div><div id='TB_window'></div>");
-				$("#TB_overlay").click(tb_remove);
-			}
-		}else{//all others
-			if(document.getElementById("TB_overlay") === null){
-				$("body").append("<div id='TB_overlay'></div><div id='TB_window'></div>");
-				$("#TB_overlay").click(tb_remove);
-			}
-		}
-		
-		if(tb_detectMacXFF()){
-			$("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash
-		}else{
-			$("#TB_overlay").addClass("TB_overlayBG");//use background and opacity
-		}
-		
-		if(caption===null){caption="";}
-		$("body").append("<div id='TB_load'><img src='"+imgLoader.src+"' /></div>");//add loader to the page
-		$('#TB_load').show();//show loader
-		
-		var baseURL;
-	   if(url.indexOf("?")!==-1){ //ff there is a query string involved
-			baseURL = url.substr(0, url.indexOf("?"));
-	   }else{ 
-	   		baseURL = url;
-	   }
-	   
-	   var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/;
-	   var urlType = baseURL.toLowerCase().match(urlString);
-
-		if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images
-				
-			TB_PrevCaption = "";
-			TB_PrevURL = "";
-			TB_PrevHTML = "";
-			TB_NextCaption = "";
-			TB_NextURL = "";
-			TB_NextHTML = "";
-			TB_imageCount = "";
-			TB_FoundURL = false;
-			if(imageGroup){
-				TB_TempArray = $("a[@rel="+imageGroup+"]").get();
-				for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) {
-					var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString);
-						if (!(TB_TempArray[TB_Counter].href == url)) {						
-							if (TB_FoundURL) {
-								TB_NextCaption = TB_TempArray[TB_Counter].title;
-								TB_NextURL = TB_TempArray[TB_Counter].href;
-								TB_NextHTML = "<span id='TB_next'>&nbsp;&nbsp;<a href='#'>Next &gt;</a></span>";
-							} else {
-								TB_PrevCaption = TB_TempArray[TB_Counter].title;
-								TB_PrevURL = TB_TempArray[TB_Counter].href;
-								TB_PrevHTML = "<span id='TB_prev'>&nbsp;&nbsp;<a href='#'>&lt; Prev</a></span>";
-							}
-						} else {
-							TB_FoundURL = true;
-							TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length);											
-						}
-				}
-			}
-
-			imgPreloader = new Image();
-			imgPreloader.onload = function(){		
-			imgPreloader.onload = null;
-				
-			// Resizing large images - orginal by Christian Montoya edited by me.
-			var pagesize = tb_getPageSize();
-			var x = pagesize[0] - 150;
-			var y = pagesize[1] - 150;
-			var imageWidth = imgPreloader.width;
-			var imageHeight = imgPreloader.height;
-			if (imageWidth > x) {
-				imageHeight = imageHeight * (x / imageWidth); 
-				imageWidth = x; 
-				if (imageHeight > y) { 
-					imageWidth = imageWidth * (y / imageHeight); 
-					imageHeight = y; 
-				}
-			} else if (imageHeight > y) { 
-				imageWidth = imageWidth * (y / imageHeight); 
-				imageHeight = y; 
-				if (imageWidth > x) { 
-					imageHeight = imageHeight * (x / imageWidth); 
-					imageWidth = x;
-				}
-			}
-			// End Resizing
-			
-			TB_WIDTH = imageWidth + 30;
-			TB_HEIGHT = imageHeight + 60;
-			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>"); 		
-			
-			$("#TB_closeWindowButton").click(tb_remove);
-			
-			if (!(TB_PrevHTML === "")) {
-				function goPrev(){
-					if($(document).unbind("click",goPrev)){$(document).unbind("click",goPrev);}
-					$("#TB_window").remove();
-					$("body").append("<div id='TB_window'></div>");
-					tb_show(TB_PrevCaption, TB_PrevURL, imageGroup);
-					return false;	
-				}
-				$("#TB_prev").click(goPrev);
-			}
-			
-			if (!(TB_NextHTML === "")) {		
-				function goNext(){
-					$("#TB_window").remove();
-					$("body").append("<div id='TB_window'></div>");
-					tb_show(TB_NextCaption, TB_NextURL, imageGroup);				
-					return false;	
-				}
-				$("#TB_next").click(goNext);
-				
-			}
-
-			document.onkeydown = function(e){ 	
-				if (e == null) { // ie
-					keycode = event.keyCode;
-				} else { // mozilla
-					keycode = e.which;
-				}
-				if(keycode == 27){ // close
-					tb_remove();
-				} else if(keycode == 190){ // display previous image
-					if(!(TB_NextHTML == "")){
-						document.onkeydown = "";
-						goNext();
-					}
-				} else if(keycode == 188){ // display next image
-					if(!(TB_PrevHTML == "")){
-						document.onkeydown = "";
-						goPrev();
-					}
-				}	
-			};
-			
-			tb_position();
-			$("#TB_load").remove();
-			$("#TB_ImageOff").click(tb_remove);
-			$("#TB_window").css({display:"block"}); //for safari using css instead of show
-			};
-			
-			imgPreloader.src = url;
-		}else{//code to show html
-			
-			var queryString = url.replace(/^[^\?]+\??/,'');
-			var params = tb_parseQuery( queryString );
-
-			TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL
-			TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL
-			ajaxContentW = TB_WIDTH - 30;
-			ajaxContentH = TB_HEIGHT - 45;
-			
-			if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window		
-					urlNoQuery = url.split('TB_');
-					$("#TB_iframeContent").remove();
-					if(params['modal'] != "true"){//iframe no modal
-						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' > </iframe>");
-					}else{//iframe modal
-					$("#TB_overlay").unbind();
-						$("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'> </iframe>");
-					}
-			}else{// not an iframe, ajax
-					if($("#TB_window").css("display") != "block"){
-						if(params['modal'] != "true"){//ajax no modal
-						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'>close</a> or Esc Key</div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
-						}else{//ajax modal
-						$("#TB_overlay").unbind();
-						$("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");	
-						}
-					}else{//this means the window is already up, we are just loading new content via ajax
-						$("#TB_ajaxContent")[0].style.width = ajaxContentW +"px";
-						$("#TB_ajaxContent")[0].style.height = ajaxContentH +"px";
-						$("#TB_ajaxContent")[0].scrollTop = 0;
-						$("#TB_ajaxWindowTitle").html(caption);
-					}
-			}
-					
-			$("#TB_closeWindowButton").click(tb_remove);
-			
-				if(url.indexOf('TB_inline') != -1){	
-					$("#TB_ajaxContent").append($('#' + params['inlineId']).children());
-					$("#TB_window").unload(function () {
-						$('#' + params['inlineId']).append( $("#TB_ajaxContent").children() ); // move elements back when you're finished
-					});
-					tb_position();
-					$("#TB_load").remove();
-					$("#TB_window").css({display:"block"}); 
-				}else if(url.indexOf('TB_iframe') != -1){
-					tb_position();
-					if($.browser.safari){//safari needs help because it will not fire iframe onload
-						$("#TB_load").remove();
-						$("#TB_window").css({display:"block"});
-					}
-				}else{
-					$("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method
-						tb_position();
-						$("#TB_load").remove();
-						tb_init("#TB_ajaxContent a.thickbox");
-						$("#TB_window").css({display:"block"});
-					});
-				}
-			
-		}
-
-		if(!params['modal']){
-			document.onkeyup = function(e){ 	
-				if (e == null) { // ie
-					keycode = event.keyCode;
-				} else { // mozilla
-					keycode = e.which;
-				}
-				if(keycode == 27){ // close
-					tb_remove();
-				}	
-			};
-		}
-		
-	} catch(e) {
-		//nothing here
-	}
-}
-
-//helper functions below
-function tb_showIframe(){
-	$("#TB_load").remove();
-	$("#TB_window").css({display:"block"});
-}
-
-function tb_remove() {
- 	$("#TB_imageOff").unbind("click");
-	$("#TB_closeWindowButton").unbind("click");
-	$("#TB_window").fadeOut("fast",function(){$('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();});
-	$("#TB_load").remove();
-	if (typeof document.body.style.maxHeight == "undefined") {//if IE 6
-		$("body","html").css({height: "auto", width: "auto"});
-		$("html").css("overflow","");
-	}
-	document.onkeydown = "";
-	document.onkeyup = "";
-	return false;
-}
-
-function tb_position() {
-$("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'});
-	if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { // take away IE6
-		$("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'});
-	}
-}
-
-function tb_parseQuery ( query ) {
-   var Params = {};
-   if ( ! query ) {return Params;}// return empty object
-   var Pairs = query.split(/[;&]/);
-   for ( var i = 0; i < Pairs.length; i++ ) {
-      var KeyVal = Pairs[i].split('=');
-      if ( ! KeyVal || KeyVal.length != 2 ) {continue;}
-      var key = unescape( KeyVal[0] );
-      var val = unescape( KeyVal[1] );
-      val = val.replace(/\+/g, ' ');
-      Params[key] = val;
-   }
-   return Params;
-}
-
-function tb_getPageSize(){
-	var de = document.documentElement;
-	var w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth;
-	var h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight;
-	arrayPageSize = [w,h];
-	return arrayPageSize;
-}
-
-function tb_detectMacXFF() {
-  var userAgent = navigator.userAgent.toLowerCase();
-  if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) {
-    return true;
-  }
-}
-
-
Index: js/jquery-latest-older.js
===================================================================
--- js/jquery-latest-older.js	(revision 6370)
+++ js/jquery-latest-older.js	(working copy)
@@ -1,3408 +0,0 @@
-(function(){
-/*
- * jQuery 1.2.3 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-02-06 00:21:25 -0500 (Wed, 06 Feb 2008) $
- * $Rev: 4663 $
- */
-
-// Map over jQuery in case of overwrite
-if ( window.jQuery )
-	var _jQuery = window.jQuery;
-
-var jQuery = window.jQuery = function( selector, context ) {
-	// The jQuery object is actually just the init constructor 'enhanced'
-	return new jQuery.prototype.init( selector, context );
-};
-
-// Map over the $ in case of overwrite
-if ( window.$ )
-	var _$ = window.$;
-	
-// Map the jQuery namespace to the '$' one
-window.$ = jQuery;
-
-// A simple way to check for HTML strings or ID strings
-// (both of which we optimize for)
-var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
-
-// Is it a simple selector
-var isSimple = /^.[^:#\[\.]*$/;
-
-jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
-		// Make sure that a selection was provided
-		selector = selector || document;
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// Handle HTML strings
-		} else if ( typeof selector == "string" ) {
-			// Are we dealing with HTML string or an ID?
-			var match = quickExpr.exec( selector );
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] )
-					selector = jQuery.clean( [ match[1] ], context );
-
-				// HANDLE: $("#id")
-				else {
-					var elem = document.getElementById( match[3] );
-
-					// Make sure an element was located
-					if ( elem )
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id != match[3] )
-							return jQuery().find( selector );
-
-						// Otherwise, we inject the element directly into the jQuery object
-						else {
-							this[0] = elem;
-							this.length = 1;
-							return this;
-						}
-
-					else
-						selector = [];
-				}
-
-			// HANDLE: $(expr, [context])
-			// (which is just equivalent to: $(content).find(expr)
-			} else
-				return new jQuery( context ).find( selector );
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) )
-			return new jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector );
-
-		return this.setArray(
-			// HANDLE: $(array)
-			selector.constructor == Array && selector ||
-
-			// HANDLE: $(arraylike)
-			// Watch for when an array-like object, contains DOM nodes, is passed in as the selector
-			(selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) ||
-
-			// HANDLE: $(*)
-			[ selector ] );
-	},
-	
-	// The current version of jQuery being used
-	jquery: "1.2.3",
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-	
-	// The number of elements contained in the matched element set
-	length: 0,
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == undefined ?
-
-			// Return a 'clean' array
-			jQuery.makeArray( this ) :
-
-			// Return just the object
-			this[ num ];
-	},
-	
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-		// Build a new jQuery matched element set
-		var ret = jQuery( elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-	
-	// Force the current matched set of elements to become
-	// the specified array of elements (destroying the stack in the process)
-	// You should use pushStack() in order to do this, but maintain the stack
-	setArray: function( elems ) {
-		// Resetting the length to 0, then using the native Array push
-		// is a super-fast way to populate an object with array-like properties
-		this.length = 0;
-		Array.prototype.push.apply( this, elems );
-		
-		return this;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	// Determine the position of an element within 
-	// the matched set of elements
-	index: function( elem ) {
-		var ret = -1;
-
-		// Locate the position of the desired element
-		this.each(function(i){
-			if ( this == elem )
-				ret = i;
-		});
-
-		return ret;
-	},
-
-	attr: function( name, value, type ) {
-		var options = name;
-		
-		// Look for the case where we're accessing a style value
-		if ( name.constructor == String )
-			if ( value == undefined )
-				return this.length && jQuery[ type || "attr" ]( this[0], name ) || undefined;
-
-			else {
-				options = {};
-				options[ name ] = value;
-			}
-		
-		// Check to see if we're setting style values
-		return this.each(function(i){
-			// Set all the styles
-			for ( name in options )
-				jQuery.attr(
-					type ?
-						this.style :
-						this,
-					name, jQuery.prop( this, options[ name ], type, i, name )
-				);
-		});
-	},
-
-	css: function( key, value ) {
-		// ignore negative width and height values
-		if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
-			value = undefined;
-		return this.attr( key, value, "curCSS" );
-	},
-
-	text: function( text ) {
-		if ( typeof text != "object" && text != null )
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-
-		var ret = "";
-
-		jQuery.each( text || this, function(){
-			jQuery.each( this.childNodes, function(){
-				if ( this.nodeType != 8 )
-					ret += this.nodeType != 1 ?
-						this.nodeValue :
-						jQuery.fn.text( [ this ] );
-			});
-		});
-
-		return ret;
-	},
-
-	wrapAll: function( html ) {
-		if ( this[0] )
-			// The elements to wrap the target around
-			jQuery( html, this[0].ownerDocument )
-				.clone()
-				.insertBefore( this[0] )
-				.map(function(){
-					var elem = this;
-
-					while ( elem.firstChild )
-						elem = elem.firstChild;
-
-					return elem;
-				})
-				.append(this);
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		return this.each(function(){
-			jQuery( this ).contents().wrapAll( html );
-		});
-	},
-
-	wrap: function( html ) {
-		return this.each(function(){
-			jQuery( this ).wrapAll( html );
-		});
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, false, function(elem){
-			if (this.nodeType == 1)
-				this.appendChild( elem );
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, true, function(elem){
-			if (this.nodeType == 1)
-				this.insertBefore( elem, this.firstChild );
-		});
-	},
-	
-	before: function() {
-		return this.domManip(arguments, false, false, function(elem){
-			this.parentNode.insertBefore( elem, this );
-		});
-	},
-
-	after: function() {
-		return this.domManip(arguments, false, true, function(elem){
-			this.parentNode.insertBefore( elem, this.nextSibling );
-		});
-	},
-
-	end: function() {
-		return this.prevObject || jQuery( [] );
-	},
-
-	find: function( selector ) {
-		var elems = jQuery.map(this, function(elem){
-			return jQuery.find( selector, elem );
-		});
-
-		return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ?
-			jQuery.unique( elems ) :
-			elems );
-	},
-
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function(){
-			if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to 
-				// attributes in IE that are actually only stored 
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var clone = this.cloneNode(true),
-					container = document.createElement("div");
-				container.appendChild(clone);
-				return jQuery.clean([container.innerHTML])[0];
-			} else
-				return this.cloneNode(true);
-		});
-
-		// Need to set the expando to null on the cloned set if it exists
-		// removeData doesn't work here, IE removes it from the original as well
-		// this is primarily for IE but the data expando shouldn't be copied over in any browser
-		var clone = ret.find("*").andSelf().each(function(){
-			if ( this[ expando ] != undefined )
-				this[ expando ] = null;
-		});
-		
-		// Copy the events from the original to the clone
-		if ( events === true )
-			this.find("*").andSelf().each(function(i){
-				if (this.nodeType == 3)
-					return;
-				var events = jQuery.data( this, "events" );
-
-				for ( var type in events )
-					for ( var handler in events[ type ] )
-						jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data );
-			});
-
-		// Return the cloned set
-		return ret;
-	},
-
-	filter: function( selector ) {
-		return this.pushStack(
-			jQuery.isFunction( selector ) &&
-			jQuery.grep(this, function(elem, i){
-				return selector.call( elem, i );
-			}) ||
-
-			jQuery.multiFilter( selector, this ) );
-	},
-
-	not: function( selector ) {
-		if ( selector.constructor == String )
-			// test special case where just one selector is passed in
-			if ( isSimple.test( selector ) )
-				return this.pushStack( jQuery.multiFilter( selector, this, true ) );
-			else
-				selector = jQuery.multiFilter( selector, this );
-
-		var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType;
-		return this.filter(function() {
-			return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector;
-		});
-	},
-
-	add: function( selector ) {
-		return !selector ? this : this.pushStack( jQuery.merge( 
-			this.get(),
-			selector.constructor == String ? 
-				jQuery( selector ).get() :
-				selector.length != undefined && (!selector.nodeName || jQuery.nodeName(selector, "form")) ?
-					selector : [selector] ) );
-	},
-
-	is: function( selector ) {
-		return selector ?
-			jQuery.multiFilter( selector, this ).length > 0 :
-			false;
-	},
-
-	hasClass: function( selector ) {
-		return this.is( "." + selector );
-	},
-	
-	val: function( value ) {
-		if ( value == undefined ) {
-
-			if ( this.length ) {
-				var elem = this[0];
-
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						options = elem.options,
-						one = elem.type == "select-one";
-					
-					// Nothing was selected
-					if ( index < 0 )
-						return null;
-
-					// Loop through all the selected options
-					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-						var option = options[ i ];
-
-						if ( option.selected ) {
-							// Get the specifc value for the option
-							value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
-							
-							// We don't need an array for one selects
-							if ( one )
-								return value;
-							
-							// Multi-Selects return an array
-							values.push( value );
-						}
-					}
-					
-					return values;
-					
-				// Everything else, we just grab the value
-				} else
-					return (this[0].value || "").replace(/\r/g, "");
-
-			}
-
-			return undefined;
-		}
-
-		return this.each(function(){
-			if ( this.nodeType != 1 )
-				return;
-
-			if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
-				this.checked = (jQuery.inArray(this.value, value) >= 0 ||
-					jQuery.inArray(this.name, value) >= 0);
-
-			else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = value.constructor == Array ?
-					value :
-					[ value ];
-
-				jQuery( "option", this ).each(function(){
-					this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
-						jQuery.inArray( this.text, values ) >= 0);
-				});
-
-				if ( !values.length )
-					this.selectedIndex = -1;
-
-			} else
-				this.value = value;
-		});
-	},
-	
-	html: function( value ) {
-		return value == undefined ?
-			(this.length ?
-				this[0].innerHTML :
-				null) :
-			this.empty().append( value );
-	},
-
-	replaceWith: function( value ) {
-		return this.after( value ).remove();
-	},
-
-	eq: function( i ) {
-		return this.slice( i, i + 1 );
-	},
-
-	slice: function() {
-		return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function(elem, i){
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	},
-
-	data: function( key, value ){
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
-
-		if ( value == null ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-			
-			if ( data == undefined && this.length )
-				data = jQuery.data( this[0], key );
-
-			return data == null && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-		} else
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
-				jQuery.data( this, key, value );
-			});
-	},
-
-	removeData: function( key ){
-		return this.each(function(){
-			jQuery.removeData( this, key );
-		});
-	},
-	
-	domManip: function( args, table, reverse, callback ) {
-		var clone = this.length > 1, elems; 
-
-		return this.each(function(){
-			if ( !elems ) {
-				elems = jQuery.clean( args, this.ownerDocument );
-
-				if ( reverse )
-					elems.reverse();
-			}
-
-			var obj = this;
-
-			if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) )
-				obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") );
-
-			var scripts = jQuery( [] );
-
-			jQuery.each(elems, function(){
-				var elem = clone ?
-					jQuery( this ).clone( true )[0] :
-					this;
-
-				// execute all scripts after the elements have been injected
-				if ( jQuery.nodeName( elem, "script" ) ) {
-					scripts = scripts.add( elem );
-				} else {
-					// Remove any inner scripts for later evaluation
-					if ( elem.nodeType == 1 )
-						scripts = scripts.add( jQuery( "script", elem ).remove() );
-
-					// Inject the elements into the document
-					callback.call( obj, elem );
-				}
-			});
-
-			scripts.each( evalScript );
-		});
-	}
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.prototype.init.prototype = jQuery.prototype;
-
-function evalScript( i, elem ) {
-	if ( elem.src )
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-
-	else
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-
-	if ( elem.parentNode )
-		elem.parentNode.removeChild( elem );
-}
-
-jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
-
-	// Handle a deep copy situation
-	if ( target.constructor == Boolean ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target != "object" && typeof target != "function" )
-		target = {};
-
-	// extend jQuery itself if only one argument is passed
-	if ( length == 1 ) {
-		target = this;
-		i = 0;
-	}
-
-	for ( ; i < length; i++ )
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null )
-			// Extend the base object
-			for ( var name in options ) {
-				// Prevent never-ending loop
-				if ( target === options[ name ] )
-					continue;
-
-				// Recurse if we're merging object values
-				if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
-					target[ name ] = jQuery.extend( target[ name ], options[ name ] );
-
-				// Don't bring in undefined values
-				else if ( options[ name ] != undefined )
-					target[ name ] = options[ name ];
-
-			}
-
-	// Return the modified object
-	return target;
-};
-
-var expando = "jQuery" + (new Date()).getTime(), uuid = 0, windowData = {};
-
-// exclude the following css properties to add px
-var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		window.$ = _$;
-
-		if ( deep )
-			window.jQuery = _jQuery;
-
-		return jQuery;
-	},
-
-	// See test/unit/core.js for details concerning this function.
-	isFunction: function( fn ) {
-		return !!fn && typeof fn != "string" && !fn.nodeName && 
-			fn.constructor != Array && /function/i.test( fn + "" );
-	},
-	
-	// check if an element is in a (or is an) XML document
-	isXMLDoc: function( elem ) {
-		return elem.documentElement && !elem.body ||
-			elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
-	},
-
-	// Evalulates a script in a global context
-	globalEval: function( data ) {
-		data = jQuery.trim( data );
-
-		if ( data ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-			if ( jQuery.browser.msie )
-				script.text = data;
-			else
-				script.appendChild( document.createTextNode( data ) );
-
-			head.appendChild( script );
-			head.removeChild( script );
-		}
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
-	},
-	
-	cache: {},
-	
-	data: function( elem, name, data ) {
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ];
-
-		// Compute a unique ID for the element
-		if ( !id ) 
-			id = elem[ expando ] = ++uuid;
-
-		// Only generate the data cache if we're
-		// trying to access or manipulate it
-		if ( name && !jQuery.cache[ id ] )
-			jQuery.cache[ id ] = {};
-		
-		// Prevent overriding the named cache with undefined values
-		if ( data != undefined )
-			jQuery.cache[ id ][ name ] = data;
-		
-		// Return the named cache data, or the ID for the element	
-		return name ?
-			jQuery.cache[ id ][ name ] :
-			id;
-	},
-	
-	removeData: function( elem, name ) {
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ];
-
-		// If we want to remove a specific section of the element's data
-		if ( name ) {
-			if ( jQuery.cache[ id ] ) {
-				// Remove the section of cache data
-				delete jQuery.cache[ id ][ name ];
-
-				// If we've removed all the data, remove the element's cache
-				name = "";
-
-				for ( name in jQuery.cache[ id ] )
-					break;
-
-				if ( !name )
-					jQuery.removeData( elem );
-			}
-
-		// Otherwise, we want to remove all of the element's data
-		} else {
-			// Clean up the element expando
-			try {
-				delete elem[ expando ];
-			} catch(e){
-				// IE has trouble directly removing the expando
-				// but it's ok with using removeAttribute
-				if ( elem.removeAttribute )
-					elem.removeAttribute( expando );
-			}
-
-			// Completely remove the data cache
-			delete jQuery.cache[ id ];
-		}
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		if ( args ) {
-			if ( object.length == undefined ) {
-				for ( var name in object )
-					if ( callback.apply( object[ name ], args ) === false )
-						break;
-			} else
-				for ( var i = 0, length = object.length; i < length; i++ )
-					if ( callback.apply( object[ i ], args ) === false )
-						break;
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( object.length == undefined ) {
-				for ( var name in object )
-					if ( callback.call( object[ name ], name, object[ name ] ) === false )
-						break;
-			} else
-				for ( var i = 0, length = object.length, value = object[0]; 
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
-		}
-
-		return object;
-	},
-	
-	prop: function( elem, value, type, i, name ) {
-			// Handle executable functions
-			if ( jQuery.isFunction( value ) )
-				value = value.call( elem, i );
-				
-			// Handle passing in a number to a CSS property
-			return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
-				value + "px" :
-				value;
-	},
-
-	className: {
-		// internal only, use addClass("class")
-		add: function( elem, classNames ) {
-			jQuery.each((classNames || "").split(/\s+/), function(i, className){
-				if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
-					elem.className += (elem.className ? " " : "") + className;
-			});
-		},
-
-		// internal only, use removeClass("class")
-		remove: function( elem, classNames ) {
-			if (elem.nodeType == 1)
-				elem.className = classNames != undefined ?
-					jQuery.grep(elem.className.split(/\s+/), function(className){
-						return !jQuery.className.has( classNames, className );	
-					}).join(" ") :
-					"";
-		},
-
-		// internal only, use is(".class")
-		has: function( elem, className ) {
-			return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
-		}
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		callback.call( elem );
-
-		// Revert the old values
-		for ( var name in options )
-			elem.style[ name ] = old[ name ];
-	},
-
-	css: function( elem, name, force ) {
-		if ( name == "width" || name == "height" ) {
-			var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
-		
-			function getWH() {
-				val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
-				var padding = 0, border = 0;
-				jQuery.each( which, function() {
-					padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-				});
-				val -= Math.round(padding + border);
-			}
-		
-			if ( jQuery(elem).is(":visible") )
-				getWH();
-			else
-				jQuery.swap( elem, props, getWH );
-			
-			return Math.max(0, val);
-		}
-		
-		return jQuery.curCSS( elem, name, force );
-	},
-
-	curCSS: function( elem, name, force ) {
-		var ret;
-
-		// A helper method for determining if an element's values are broken
-		function color( elem ) {
-			if ( !jQuery.browser.safari )
-				return false;
-
-			var ret = document.defaultView.getComputedStyle( elem, null );
-			return !ret || ret.getPropertyValue("color") == "";
-		}
-
-		// We need to handle opacity special in IE
-		if ( name == "opacity" && jQuery.browser.msie ) {
-			ret = jQuery.attr( elem.style, "opacity" );
-
-			return ret == "" ?
-				"1" :
-				ret;
-		}
-		// Opera sometimes will give the wrong display answer, this fixes it, see #2037
-		if ( jQuery.browser.opera && name == "display" ) {
-			var save = elem.style.outline;
-			elem.style.outline = "0 solid black";
-			elem.style.outline = save;
-		}
-		
-		// Make sure we're using the right name for getting the float value
-		if ( name.match( /float/i ) )
-			name = styleFloat;
-
-		if ( !force && elem.style && elem.style[ name ] )
-			ret = elem.style[ name ];
-
-		else if ( document.defaultView && document.defaultView.getComputedStyle ) {
-
-			// Only "float" is needed here
-			if ( name.match( /float/i ) )
-				name = "float";
-
-			name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
-
-			var getComputedStyle = document.defaultView.getComputedStyle( elem, null );
-
-			if ( getComputedStyle && !color( elem ) )
-				ret = getComputedStyle.getPropertyValue( name );
-
-			// If the element isn't reporting its values properly in Safari
-			// then some display: none elements are involved
-			else {
-				var swap = [], stack = [];
-
-				// Locate all of the parent display: none elements
-				for ( var a = elem; a && color(a); a = a.parentNode )
-					stack.unshift(a);
-
-				// Go through and make them visible, but in reverse
-				// (It would be better if we knew the exact display type that they had)
-				for ( var i = 0; i < stack.length; i++ )
-					if ( color( stack[ i ] ) ) {
-						swap[ i ] = stack[ i ].style.display;
-						stack[ i ].style.display = "block";
-					}
-
-				// Since we flip the display style, we have to handle that
-				// one special, otherwise get the value
-				ret = name == "display" && swap[ stack.length - 1 ] != null ?
-					"none" :
-					( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || "";
-
-				// Finally, revert the display styles back
-				for ( var i = 0; i < swap.length; i++ )
-					if ( swap[ i ] != null )
-						stack[ i ].style.display = swap[ i ];
-			}
-
-			// We should always get a number back from opacity
-			if ( name == "opacity" && ret == "" )
-				ret = "1";
-
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(/\-(\w)/g, function(all, letter){
-				return letter.toUpperCase();
-			});
-
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
-
-			// From the awesome hack by Dean Edwards
-			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-			// If we're not dealing with a regular pixel number
-			// but a number that has a weird ending, we need to convert it to pixels
-			if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
-				// Remember the original values
-				var style = elem.style.left, runtimeStyle = elem.runtimeStyle.left;
-
-				// Put in the new values to get a computed value out
-				elem.runtimeStyle.left = elem.currentStyle.left;
-				elem.style.left = ret || 0;
-				ret = elem.style.pixelLeft + "px";
-
-				// Revert the changed values
-				elem.style.left = style;
-				elem.runtimeStyle.left = runtimeStyle;
-			}
-		}
-
-		return ret;
-	},
-	
-	clean: function( elems, context ) {
-		var ret = [];
-		context = context || document;
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if (typeof context.createElement == 'undefined') 
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-
-		jQuery.each(elems, function(i, elem){
-			if ( !elem )
-				return;
-
-			if ( elem.constructor == Number )
-				elem = elem.toString();
-			
-			// Convert html string into DOM nodes
-			if ( typeof elem == "string" ) {
-				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
-					return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
-						all :
-						front + "></" + tag + ">";
-				});
-
-				// Trim whitespace, otherwise indexOf won't work as expected
-				var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div");
-
-				var wrap =
-					// option or optgroup
-					!tags.indexOf("<opt") &&
-					[ 1, "<select multiple='multiple'>", "</select>" ] ||
-					
-					!tags.indexOf("<leg") &&
-					[ 1, "<fieldset>", "</fieldset>" ] ||
-					
-					tags.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
-					[ 1, "<table>", "</table>" ] ||
-					
-					!tags.indexOf("<tr") &&
-					[ 2, "<table><tbody>", "</tbody></table>" ] ||
-					
-				 	// <thead> matched above
-					(!tags.indexOf("<td") || !tags.indexOf("<th")) &&
-					[ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] ||
-					
-					!tags.indexOf("<col") &&
-					[ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] ||
-
-					// IE can't serialize <link> and <script> tags normally
-					jQuery.browser.msie &&
-					[ 1, "div<div>", "</div>" ] ||
-					
-					[ 0, "", "" ];
-
-				// Go to html and back, then peel off extra wrappers
-				div.innerHTML = wrap[1] + elem + wrap[2];
-				
-				// Move to the right depth
-				while ( wrap[0]-- )
-					div = div.lastChild;
-				
-				// Remove IE's autoinserted <tbody> from table fragments
-				if ( jQuery.browser.msie ) {
-					
-					// String was a <table>, *may* have spurious <tbody>
-					var tbody = !tags.indexOf("<table") && tags.indexOf("<tbody") < 0 ?
-						div.firstChild && div.firstChild.childNodes :
-						
-						// String was a bare <thead> or <tfoot>
-						wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ?
-							div.childNodes :
-							[];
-				
-					for ( var j = tbody.length - 1; j >= 0 ; --j )
-						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
-							tbody[ j ].parentNode.removeChild( tbody[ j ] );
-					
-					// IE completely kills leading whitespace when innerHTML is used	
-					if ( /^\s/.test( elem ) )	
-						div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
-				
-				}
-				
-				elem = jQuery.makeArray( div.childNodes );
-			}
-
-			if ( elem.length === 0 && (!jQuery.nodeName( elem, "form" ) && !jQuery.nodeName( elem, "select" )) )
-				return;
-
-			if ( elem[0] == undefined || jQuery.nodeName( elem, "form" ) || elem.options )
-				ret.push( elem );
-
-			else
-				ret = jQuery.merge( ret, elem );
-
-		});
-
-		return ret;
-	},
-	
-	attr: function( elem, name, value ) {
-		// don't set attributes on text and comment nodes
-		if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
-			return undefined;
-
-		var fix = jQuery.isXMLDoc( elem ) ?
-			{} :
-			jQuery.props;
-
-		// Safari mis-reports the default selected property of a hidden option
-		// Accessing the parent's selectedIndex property fixes it
-		if ( name == "selected" && jQuery.browser.safari )
-			elem.parentNode.selectedIndex;
-		
-		// Certain attributes only work when accessed via the old DOM 0 way
-		if ( fix[ name ] ) {
-			if ( value != undefined )
-				elem[ fix[ name ] ] = value;
-
-			return elem[ fix[ name ] ];
-
-		} else if ( jQuery.browser.msie && name == "style" )
-			return jQuery.attr( elem.style, "cssText", value );
-
-		else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName( elem, "form" ) && (name == "action" || name == "method") )
-			return elem.getAttributeNode( name ).nodeValue;
-
-		// IE elem.getAttribute passes even for style
-		else if ( elem.tagName ) {
-
-			if ( value != undefined ) {
-				// We can't allow the type property to be changed (since it causes problems in IE)
-				if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
-					throw "type property can't be changed";
-
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
-			}
-
-			if ( jQuery.browser.msie && /href|src/.test( name ) && !jQuery.isXMLDoc( elem ) ) 
-				return elem.getAttribute( name, 2 );
-
-			return elem.getAttribute( name );
-
-		// elem is actually elem.style ... set the style
-		} else {
-			// IE actually uses filters for opacity
-			if ( name == "opacity" && jQuery.browser.msie ) {
-				if ( value != undefined ) {
-					// IE has trouble with opacity if it does not have layout
-					// Force it by setting the zoom level
-					elem.zoom = 1; 
-	
-					// Set the alpha filter to set the opacity
-					elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) +
-						(parseFloat( value ).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
-				}
-	
-				return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
-					(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() :
-					"";
-			}
-
-			name = name.replace(/-([a-z])/ig, function(all, letter){
-				return letter.toUpperCase();
-			});
-
-			if ( value != undefined )
-				elem[ name ] = value;
-
-			return elem[ name ];
-		}
-	},
-	
-	trim: function( text ) {
-		return (text || "").replace( /^\s+|\s+$/g, "" );
-	},
-
-	makeArray: function( array ) {
-		var ret = [];
-
-		// Need to use typeof to fight Safari childNodes crashes
-		if ( typeof array != "array" )
-			for ( var i = 0, length = array.length; i < length; i++ )
-				ret.push( array[ i ] );
-		else
-			ret = array.slice( 0 );
-
-		return ret;
-	},
-
-	inArray: function( elem, array ) {
-		for ( var i = 0, length = array.length; i < length; i++ )
-			if ( array[ i ] == elem )
-				return i;
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		// We have to loop this way because IE & Opera overwrite the length
-		// expando of getElementsByTagName
-
-		// Also, we need to make sure that the correct elements are being returned
-		// (IE returns comment nodes in a '*' query)
-		if ( jQuery.browser.msie ) {
-			for ( var i = 0; second[ i ]; i++ )
-				if ( second[ i ].nodeType != 8 )
-					first.push( second[ i ] );
-
-		} else
-			for ( var i = 0; second[ i ]; i++ )
-				first.push( second[ i ] );
-
-		return first;
-	},
-
-	unique: function( array ) {
-		var ret = [], done = {};
-
-		try {
-
-			for ( var i = 0, length = array.length; i < length; i++ ) {
-				var id = jQuery.data( array[ i ] );
-
-				if ( !done[ id ] ) {
-					done[ id ] = true;
-					ret.push( array[ i ] );
-				}
-			}
-
-		} catch( e ) {
-			ret = array;
-		}
-
-		return ret;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [];
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ )
-			if ( !inv && callback( elems[ i ], i ) || inv && !callback( elems[ i ], i ) )
-				ret.push( elems[ i ] );
-
-		return ret;
-	},
-
-	map: function( elems, callback ) {
-		var ret = [];
-
-		// Go through the array, translating each of the items to their
-		// new value (or values).
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			var value = callback( elems[ i ], i );
-
-			if ( value !== null && value != undefined ) {
-				if ( value.constructor != Array )
-					value = [ value ];
-
-				ret = ret.concat( value );
-			}
-		}
-
-		return ret;
-	}
-});
-
-var userAgent = navigator.userAgent.toLowerCase();
-
-// Figure out what browser is being used
-jQuery.browser = {
-	version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1],
-	safari: /webkit/.test( userAgent ),
-	opera: /opera/.test( userAgent ),
-	msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
-	mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
-};
-
-var styleFloat = jQuery.browser.msie ?
-	"styleFloat" :
-	"cssFloat";
-	
-jQuery.extend({
-	// Check to see if the W3C box model is being used
-	boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
-	
-	props: {
-		"for": "htmlFor",
-		"class": "className",
-		"float": styleFloat,
-		cssFloat: styleFloat,
-		styleFloat: styleFloat,
-		innerHTML: "innerHTML",
-		className: "className",
-		value: "value",
-		disabled: "disabled",
-		checked: "checked",
-		readonly: "readOnly",
-		selected: "selected",
-		maxlength: "maxLength",
-		selectedIndex: "selectedIndex",
-		defaultValue: "defaultValue",
-		tagName: "tagName",
-		nodeName: "nodeName"
-	}
-});
-
-jQuery.each({
-	parent: function(elem){return elem.parentNode;},
-	parents: function(elem){return jQuery.dir(elem,"parentNode");},
-	next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
-	prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
-	nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
-	prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
-	siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
-	children: function(elem){return jQuery.sibling(elem.firstChild);},
-	contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
-}, function(name, fn){
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = jQuery.map( this, fn );
-
-		if ( selector && typeof selector == "string" )
-			ret = jQuery.multiFilter( selector, ret );
-
-		return this.pushStack( jQuery.unique( ret ) );
-	};
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function(name, original){
-	jQuery.fn[ name ] = function() {
-		var args = arguments;
-
-		return this.each(function(){
-			for ( var i = 0, length = args.length; i < length; i++ )
-				jQuery( args[ i ] )[ original ]( this );
-		});
-	};
-});
-
-jQuery.each({
-	removeAttr: function( name ) {
-		jQuery.attr( this, name, "" );
-		if (this.nodeType == 1) 
-			this.removeAttribute( name );
-	},
-
-	addClass: function( classNames ) {
-		jQuery.className.add( this, classNames );
-	},
-
-	removeClass: function( classNames ) {
-		jQuery.className.remove( this, classNames );
-	},
-
-	toggleClass: function( classNames ) {
-		jQuery.className[ jQuery.className.has( this, classNames ) ? "remove" : "add" ]( this, classNames );
-	},
-
-	remove: function( selector ) {
-		if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) {
-			// Prevent memory leaks
-			jQuery( "*", this ).add(this).each(function(){
-				jQuery.event.remove(this);
-				jQuery.removeData(this);
-			});
-			if (this.parentNode)
-				this.parentNode.removeChild( this );
-		}
-	},
-
-	empty: function() {
-		// Remove element nodes and prevent memory leaks
-		jQuery( ">*", this ).remove();
-		
-		// Remove any remaining nodes
-		while ( this.firstChild )
-			this.removeChild( this.firstChild );
-	}
-}, function(name, fn){
-	jQuery.fn[ name ] = function(){
-		return this.each( fn, arguments );
-	};
-});
-
-jQuery.each([ "Height", "Width" ], function(i, name){
-	var type = name.toLowerCase();
-	
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		return this[0] == window ?
-			// Opera reports document.body.client[Width/Height] properly in both quirks and standards
-			jQuery.browser.opera && document.body[ "client" + name ] || 
-			
-			// Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
-			jQuery.browser.safari && window[ "inner" + name ] ||
-			
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :
-		
-			// Get document width or height
-			this[0] == document ?
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max( 
-					Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]), 
-					Math.max(document.body["offset" + name], document.documentElement["offset" + name]) 
-				) :
-
-				// Get or set width or height on the element
-				size == undefined ?
-					// Get width or height on the element
-					(this.length ? jQuery.css( this[0], type ) : null) :
-
-					// Set the width or height on the element (default to pixels if value is unitless)
-					this.css( type, size.constructor == String ? size : size + "px" );
-	};
-});
-
-var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
-		"(?:[\\w*_-]|\\\\.)" :
-		"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
-	quickChild = new RegExp("^>\\s*(" + chars + "+)"),
-	quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"),
-	quickClass = new RegExp("^([#.]?)(" + chars + "*)");
-
-jQuery.extend({
-	expr: {
-		"": function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},
-		"#": function(a,i,m){return a.getAttribute("id")==m[2];},
-		":": {
-			// Position Checks
-			lt: function(a,i,m){return i<m[3]-0;},
-			gt: function(a,i,m){return i>m[3]-0;},
-			nth: function(a,i,m){return m[3]-0==i;},
-			eq: function(a,i,m){return m[3]-0==i;},
-			first: function(a,i){return i==0;},
-			last: function(a,i,m,r){return i==r.length-1;},
-			even: function(a,i){return i%2==0;},
-			odd: function(a,i){return i%2;},
-
-			// Child Checks
-			"first-child": function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},
-			"last-child": function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},
-			"only-child": function(a){return !jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},
-
-			// Parent Checks
-			parent: function(a){return a.firstChild;},
-			empty: function(a){return !a.firstChild;},
-
-			// Text Check
-			contains: function(a,i,m){return (a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},
-
-			// Visibility
-			visible: function(a){return "hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},
-			hidden: function(a){return "hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},
-
-			// Form attributes
-			enabled: function(a){return !a.disabled;},
-			disabled: function(a){return a.disabled;},
-			checked: function(a){return a.checked;},
-			selected: function(a){return a.selected||jQuery.attr(a,"selected");},
-
-			// Form elements
-			text: function(a){return "text"==a.type;},
-			radio: function(a){return "radio"==a.type;},
-			checkbox: function(a){return "checkbox"==a.type;},
-			file: function(a){return "file"==a.type;},
-			password: function(a){return "password"==a.type;},
-			submit: function(a){return "submit"==a.type;},
-			image: function(a){return "image"==a.type;},
-			reset: function(a){return "reset"==a.type;},
-			button: function(a){return "button"==a.type||jQuery.nodeName(a,"button");},
-			input: function(a){return /input|select|textarea|button/i.test(a.nodeName);},
-
-			// :has()
-			has: function(a,i,m){return jQuery.find(m[3],a).length;},
-
-			// :header
-			header: function(a){return /h\d/i.test(a.nodeName);},
-
-			// :animated
-			animated: function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}
-		}
-	},
-	
-	// The regular expressions that power the parsing engine
-	parse: [
-		// Match: [@value='test'], [@foo]
-		/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,
-
-		// Match: :contains('foo')
-		/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
-
-		// Match: :even, :last-chlid, #id, .class
-		new RegExp("^([:.#]*)(" + chars + "+)")
-	],
-
-	multiFilter: function( expr, elems, not ) {
-		var old, cur = [];
-
-		while ( expr && expr != old ) {
-			old = expr;
-			var f = jQuery.filter( expr, elems, not );
-			expr = f.t.replace(/^\s*,\s*/, "" );
-			cur = not ? elems = f.r : jQuery.merge( cur, f.r );
-		}
-
-		return cur;
-	},
-
-	find: function( t, context ) {
-		// Quickly handle non-string expressions
-		if ( typeof t != "string" )
-			return [ t ];
-
-		// check to make sure context is a DOM element or a document
-		if ( context && context.nodeType != 1 && context.nodeType != 9)
-			return [ ];
-
-		// Set the correct context (if none is provided)
-		context = context || document;
-
-		// Initialize the search
-		var ret = [context], done = [], last, nodeName;
-
-		// Continue while a selector expression exists, and while
-		// we're no longer looping upon ourselves
-		while ( t && last != t ) {
-			var r = [];
-			last = t;
-
-			t = jQuery.trim(t);
-
-			var foundToken = false;
-
-			// An attempt at speeding up child selectors that
-			// point to a specific element tag
-			var re = quickChild;
-			var m = re.exec(t);
-
-			if ( m ) {
-				nodeName = m[1].toUpperCase();
-
-				// Perform our own iteration and filter
-				for ( var i = 0; ret[i]; i++ )
-					for ( var c = ret[i].firstChild; c; c = c.nextSibling )
-						if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName) )
-							r.push( c );
-
-				ret = r;
-				t = t.replace( re, "" );
-				if ( t.indexOf(" ") == 0 ) continue;
-				foundToken = true;
-			} else {
-				re = /^([>+~])\s*(\w*)/i;
-
-				if ( (m = re.exec(t)) != null ) {
-					r = [];
-
-					var merge = {};
-					nodeName = m[2].toUpperCase();
-					m = m[1];
-
-					for ( var j = 0, rl = ret.length; j < rl; j++ ) {
-						var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild;
-						for ( ; n; n = n.nextSibling )
-							if ( n.nodeType == 1 ) {
-								var id = jQuery.data(n);
-
-								if ( m == "~" && merge[id] ) break;
-								
-								if (!nodeName || n.nodeName.toUpperCase() == nodeName ) {
-									if ( m == "~" ) merge[id] = true;
-									r.push( n );
-								}
-								
-								if ( m == "+" ) break;
-							}
-					}
-
-					ret = r;
-
-					// And remove the token
-					t = jQuery.trim( t.replace( re, "" ) );
-					foundToken = true;
-				}
-			}
-
-			// See if there's still an expression, and that we haven't already
-			// matched a token
-			if ( t && !foundToken ) {
-				// Handle multiple expressions
-				if ( !t.indexOf(",") ) {
-					// Clean the result set
-					if ( context == ret[0] ) ret.shift();
-
-					// Merge the result sets
-					done = jQuery.merge( done, ret );
-
-					// Reset the context
-					r = ret = [context];
-
-					// Touch up the selector string
-					t = " " + t.substr(1,t.length);
-
-				} else {
-					// Optimize for the case nodeName#idName
-					var re2 = quickID;
-					var m = re2.exec(t);
-					
-					// Re-organize the results, so that they're consistent
-					if ( m ) {
-						m = [ 0, m[2], m[3], m[1] ];
-
-					} else {
-						// Otherwise, do a traditional filter check for
-						// ID, class, and element selectors
-						re2 = quickClass;
-						m = re2.exec(t);
-					}
-
-					m[2] = m[2].replace(/\\/g, "");
-
-					var elem = ret[ret.length-1];
-
-					// Try to do a global search by ID, where we can
-					if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) {
-						// Optimization for HTML document case
-						var oid = elem.getElementById(m[2]);
-						
-						// Do a quick check for the existence of the actual ID attribute
-						// to avoid selecting by the name attribute in IE
-						// also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
-						if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] )
-							oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
-
-						// Do a quick check for node name (where applicable) so
-						// that div#foo searches will be really fast
-						ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
-					} else {
-						// We need to find all descendant elements
-						for ( var i = 0; ret[i]; i++ ) {
-							// Grab the tag name being searched for
-							var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2];
-
-							// Handle IE7 being really dumb about <object>s
-							if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )
-								tag = "param";
-
-							r = jQuery.merge( r, ret[i].getElementsByTagName( tag ));
-						}
-
-						// It's faster to filter by class and be done with it
-						if ( m[1] == "." )
-							r = jQuery.classFilter( r, m[2] );
-
-						// Same with ID filtering
-						if ( m[1] == "#" ) {
-							var tmp = [];
-
-							// Try to find the element with the ID
-							for ( var i = 0; r[i]; i++ )
-								if ( r[i].getAttribute("id") == m[2] ) {
-									tmp = [ r[i] ];
-									break;
-								}
-
-							r = tmp;
-						}
-
-						ret = r;
-					}
-
-					t = t.replace( re2, "" );
-				}
-
-			}
-
-			// If a selector string still exists
-			if ( t ) {
-				// Attempt to filter it
-				var val = jQuery.filter(t,r);
-				ret = r = val.r;
-				t = jQuery.trim(val.t);
-			}
-		}
-
-		// An error occurred with the selector;
-		// just return an empty set instead
-		if ( t )
-			ret = [];
-
-		// Remove the root context
-		if ( ret && context == ret[0] )
-			ret.shift();
-
-		// And combine the results
-		done = jQuery.merge( done, ret );
-
-		return done;
-	},
-
-	classFilter: function(r,m,not){
-		m = " " + m + " ";
-		var tmp = [];
-		for ( var i = 0; r[i]; i++ ) {
-			var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
-			if ( !not && pass || not && !pass )
-				tmp.push( r[i] );
-		}
-		return tmp;
-	},
-
-	filter: function(t,r,not) {
-		var last;
-
-		// Look for common filter expressions
-		while ( t && t != last ) {
-			last = t;
-
-			var p = jQuery.parse, m;
-
-			for ( var i = 0; p[i]; i++ ) {
-				m = p[i].exec( t );
-
-				if ( m ) {
-					// Remove what we just matched
-					t = t.substring( m[0].length );
-
-					m[2] = m[2].replace(/\\/g, "");
-					break;
-				}
-			}
-
-			if ( !m )
-				break;
-
-			// :not() is a special case that can be optimized by
-			// keeping it out of the expression list
-			if ( m[1] == ":" && m[2] == "not" )
-				// optimize if only one selector found (most common case)
-				r = isSimple.test( m[3] ) ?
-					jQuery.filter(m[3], r, true).r :
-					jQuery( r ).not( m[3] );
-
-			// We can get a big speed boost by filtering by class here
-			else if ( m[1] == "." )
-				r = jQuery.classFilter(r, m[2], not);
-
-			else if ( m[1] == "[" ) {
-				var tmp = [], type = m[3];
-				
-				for ( var i = 0, rl = r.length; i < rl; i++ ) {
-					var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
-					
-					if ( z == null || /href|src|selected/.test(m[2]) )
-						z = jQuery.attr(a,m[2]) || '';
-
-					if ( (type == "" && !!z ||
-						 type == "=" && z == m[5] ||
-						 type == "!=" && z != m[5] ||
-						 type == "^=" && z && !z.indexOf(m[5]) ||
-						 type == "$=" && z.substr(z.length - m[5].length) == m[5] ||
-						 (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not )
-							tmp.push( a );
-				}
-				
-				r = tmp;
-
-			// We can get a speed boost by handling nth-child here
-			} else if ( m[1] == ":" && m[2] == "nth-child" ) {
-				var merge = {}, tmp = [],
-					// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-					test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
-						m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
-						!/\D/.test(m[3]) && "0n+" + m[3] || m[3]),
-					// calculate the numbers (first)n+(last) including if they are negative
-					first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0;
- 
-				// loop through all the elements left in the jQuery object
-				for ( var i = 0, rl = r.length; i < rl; i++ ) {
-					var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode);
-
-					if ( !merge[id] ) {
-						var c = 1;
-
-						for ( var n = parentNode.firstChild; n; n = n.nextSibling )
-							if ( n.nodeType == 1 )
-								n.nodeIndex = c++;
-
-						merge[id] = true;
-					}
-
-					var add = false;
-
-					if ( first == 0 ) {
-						if ( node.nodeIndex == last )
-							add = true;
-					} else if ( (node.nodeIndex - last) % first == 0 && (node.nodeIndex - last) / first >= 0 )
-						add = true;
-
-					if ( add ^ not )
-						tmp.push( node );
-				}
-
-				r = tmp;
-
-			// Otherwise, find the expression to execute
-			} else {
-				var fn = jQuery.expr[ m[1] ];
-				if ( typeof fn == "object" )
-					fn = fn[ m[2] ];
-
-				if ( typeof fn == "string" )
-					fn = eval("false||function(a,i){return " + fn + ";}");
-
-				// Execute it against the current filter
-				r = jQuery.grep( r, function(elem, i){
-					return fn(elem, i, m, r);
-				}, not );
-			}
-		}
-
-		// Return an array of filtered elements (r)
-		// and the modified expression string (t)
-		return { r: r, t: t };
-	},
-
-	dir: function( elem, dir ){
-		var matched = [];
-		var cur = elem[dir];
-		while ( cur && cur != document ) {
-			if ( cur.nodeType == 1 )
-				matched.push( cur );
-			cur = cur[dir];
-		}
-		return matched;
-	},
-	
-	nth: function(cur,result,dir,elem){
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] )
-			if ( cur.nodeType == 1 && ++num == result )
-				break;
-
-		return cur;
-	},
-	
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType == 1 && (!elem || n != elem) )
-				r.push( n );
-		}
-
-		return r;
-	}
-});
-
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code orignated from 
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function(elem, types, handler, data) {
-		if ( elem.nodeType == 3 || elem.nodeType == 8 )
-			return;
-
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( jQuery.browser.msie && elem.setInterval != undefined )
-			elem = window;
-
-		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid )
-			handler.guid = this.guid++;
-			
-		// if data is passed, bind to handler 
-		if( data != undefined ) { 
-			// Create temporary function pointer to original handler 
-			var fn = handler; 
-
-			// Create unique handler function, wrapped around original handler 
-			handler = function() { 
-				// Pass arguments and context to original handler 
-				return fn.apply(this, arguments); 
-			};
-
-			// Store data in unique handler 
-			handler.data = data;
-
-			// Set the guid of unique handler to the same of original handler, so it can be removed 
-			handler.guid = fn.guid;
-		}
-
-		// Init the element's event structure
-		var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
-			handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
-				// returned undefined or false
-				var val;
-
-				// Handle the second event of a trigger and when
-				// an event is called after a page has unloaded
-				if ( typeof jQuery == "undefined" || jQuery.event.triggered )
-					return val;
-		
-				val = jQuery.event.handle.apply(arguments.callee.elem, arguments);
-		
-				return val;
-			});
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native
-		// event in IE.
-		handle.elem = elem;
-			
-			// Handle multiple events seperated by a space
-			// jQuery(...).bind("mouseover mouseout", fn);
-			jQuery.each(types.split(/\s+/), function(index, type) {
-				// Namespaced event handlers
-				var parts = type.split(".");
-				type = parts[0];
-				handler.type = parts[1];
-
-				// Get the current list of functions bound to this event
-				var handlers = events[type];
-
-				// Init the event handler queue
-				if (!handlers) {
-					handlers = events[type] = {};
-		
-					// Check for a special event handler
-					// Only use addEventListener/attachEvent if the special
-					// events handler returns false
-					if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) {
-						// Bind the global event handler to the element
-						if (elem.addEventListener)
-							elem.addEventListener(type, handle, false);
-						else if (elem.attachEvent)
-							elem.attachEvent("on" + type, handle);
-					}
-				}
-
-				// Add the function to the element's handler list
-				handlers[handler.guid] = handler;
-
-				// Keep track of which events have been used, for global triggering
-				jQuery.event.global[type] = true;
-			});
-		
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	guid: 1,
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function(elem, types, handler) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType == 3 || elem.nodeType == 8 )
-			return;
-
-		var events = jQuery.data(elem, "events"), ret, index;
-
-		if ( events ) {
-			// Unbind all events for the element
-			if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") )
-				for ( var type in events )
-					this.remove( elem, type + (types || "") );
-			else {
-				// types is actually an event object here
-				if ( types.type ) {
-					handler = types.handler;
-					types = types.type;
-				}
-				
-				// Handle multiple events seperated by a space
-				// jQuery(...).unbind("mouseover mouseout", fn);
-				jQuery.each(types.split(/\s+/), function(index, type){
-					// Namespaced event handlers
-					var parts = type.split(".");
-					type = parts[0];
-					
-					if ( events[type] ) {
-						// remove the given handler for the given type
-						if ( handler )
-							delete events[type][handler.guid];
-			
-						// remove all handlers for the given type
-						else
-							for ( handler in events[type] )
-								// Handle the removal of namespaced events
-								if ( !parts[1] || events[type][handler].type == parts[1] )
-									delete events[type][handler];
-
-						// remove generic event handler if no more handlers exist
-						for ( ret in events[type] ) break;
-						if ( !ret ) {
-							if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) {
-								if (elem.removeEventListener)
-									elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
-								else if (elem.detachEvent)
-									elem.detachEvent("on" + type, jQuery.data(elem, "handle"));
-							}
-							ret = null;
-							delete events[type];
-						}
-					}
-				});
-			}
-
-			// Remove the expando if it's no longer used
-			for ( ret in events ) break;
-			if ( !ret ) {
-				var handle = jQuery.data( elem, "handle" );
-				if ( handle ) handle.elem = null;
-				jQuery.removeData( elem, "events" );
-				jQuery.removeData( elem, "handle" );
-			}
-		}
-	},
-
-	trigger: function(type, data, elem, donative, extra) {
-		// Clone the incoming data, if any
-		data = jQuery.makeArray(data || []);
-
-		if ( type.indexOf("!") >= 0 ) {
-			type = type.slice(0, -1);
-			var exclusive = true;
-		}
-
-		// Handle a global trigger
-		if ( !elem ) {
-			// Only trigger if we've ever bound an event for it
-			if ( this.global[type] )
-				jQuery("*").add([window, document]).trigger(type, data);
-
-		// Handle triggering a single element
-		} else {
-			// don't do events on text and comment nodes
-			if ( elem.nodeType == 3 || elem.nodeType == 8 )
-				return undefined;
-
-			var val, ret, fn = jQuery.isFunction( elem[ type ] || null ),
-				// Check to see if we need to provide a fake event, or not
-				event = !data[0] || !data[0].preventDefault;
-			
-			// Pass along a fake event
-			if ( event )
-				data.unshift( this.fix({ type: type, target: elem }) );
-
-			// Enforce the right trigger type
-			data[0].type = type;
-			if ( exclusive )
-				data[0].exclusive = true;
-
-			// Trigger the event
-			if ( jQuery.isFunction( jQuery.data(elem, "handle") ) )
-				val = jQuery.data(elem, "handle").apply( elem, data );
-
-			// Handle triggering native .onfoo handlers
-			if ( !fn && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
-				val = false;
-
-			// Extra functions don't get the custom event object
-			if ( event )
-				data.shift();
-
-			// Handle triggering of extra function
-			if ( extra && jQuery.isFunction( extra ) ) {
-				// call the extra function and tack the current return value on the end for possible inspection
-				ret = extra.apply( elem, val == null ? data : data.concat( val ) );
-				// if anything is returned, give it precedence and have it overwrite the previous value
-				if (ret !== undefined)
-					val = ret;
-			}
-
-			// Trigger the native events (except for clicks on links)
-			if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
-				this.triggered = true;
-				try {
-					elem[ type ]();
-				// prevent IE from throwing an error for some hidden elements
-				} catch (e) {}
-			}
-
-			this.triggered = false;
-		}
-
-		return val;
-	},
-
-	handle: function(event) {
-		// returned undefined or false
-		var val;
-
-		// Empty object is for triggered events with no data
-		event = jQuery.event.fix( event || window.event || {} ); 
-
-		// Namespaced event handlers
-		var parts = event.type.split(".");
-		event.type = parts[0];
-
-		var handlers = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 );
-		args.unshift( event );
-
-		for ( var j in handlers ) {
-			var handler = handlers[j];
-			// Pass in a reference to the handler function itself
-			// So that we can later remove it
-			args[0].handler = handler;
-			args[0].data = handler.data;
-
-			// Filter the functions by class
-			if ( !parts[1] && !event.exclusive || handler.type == parts[1] ) {
-				var ret = handler.apply( this, args );
-
-				if ( val !== false )
-					val = ret;
-
-				if ( ret === false ) {
-					event.preventDefault();
-					event.stopPropagation();
-				}
-			}
-		}
-
-		// Clean up added properties in IE to prevent memory leak
-		if (jQuery.browser.msie)
-			event.target = event.preventDefault = event.stopPropagation =
-				event.handler = event.data = null;
-
-		return val;
-	},
-
-	fix: function(event) {
-		// store a copy of the original event object 
-		// and clone to set read-only properties
-		var originalEvent = event;
-		event = jQuery.extend({}, originalEvent);
-		
-		// add preventDefault and stopPropagation since 
-		// they will not work on the clone
-		event.preventDefault = function() {
-			// if preventDefault exists run it on the original event
-			if (originalEvent.preventDefault)
-				originalEvent.preventDefault();
-			// otherwise set the returnValue property of the original event to false (IE)
-			originalEvent.returnValue = false;
-		};
-		event.stopPropagation = function() {
-			// if stopPropagation exists run it on the original event
-			if (originalEvent.stopPropagation)
-				originalEvent.stopPropagation();
-			// otherwise set the cancelBubble property of the original event to true (IE)
-			originalEvent.cancelBubble = true;
-		};
-		
-		// Fix target property, if necessary
-		if ( !event.target )
-			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
-				
-		// check if target is a textnode (safari)
-		if ( event.target.nodeType == 3 )
-			event.target = originalEvent.target.parentNode;
-
-		// Add relatedTarget, if necessary
-		if ( !event.relatedTarget && event.fromElement )
-			event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement;
-
-		// Calculate pageX/Y if missing and clientX/Y available
-		if ( event.pageX == null && event.clientX != null ) {
-			var doc = document.documentElement, body = document.body;
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0);
-		}
-			
-		// Add which for key events
-		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) )
-			event.which = event.charCode || event.keyCode;
-		
-		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-		if ( !event.metaKey && event.ctrlKey )
-			event.metaKey = event.ctrlKey;
-
-		// Add which for click: 1 == left; 2 == middle; 3 == right
-		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button )
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-			
-		return event;
-	},
-	
-	special: {
-		ready: {
-			setup: function() {
-				// Make sure the ready event is setup
-				bindReady();
-				return;
-			},
-			
-			teardown: function() { return; }
-		},
-		
-		mouseenter: {
-			setup: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler);
-				return true;
-			},
-		
-			teardown: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler);
-				return true;
-			},
-			
-			handler: function(event) {
-				// If we actually just moused on to a sub-element, ignore it
-				if ( withinElement(event, this) ) return true;
-				// Execute the right handlers by setting the event type to mouseenter
-				arguments[0].type = "mouseenter";
-				return jQuery.event.handle.apply(this, arguments);
-			}
-		},
-	
-		mouseleave: {
-			setup: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler);
-				return true;
-			},
-		
-			teardown: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler);
-				return true;
-			},
-			
-			handler: function(event) {
-				// If we actually just moused on to a sub-element, ignore it
-				if ( withinElement(event, this) ) return true;
-				// Execute the right handlers by setting the event type to mouseleave
-				arguments[0].type = "mouseleave";
-				return jQuery.event.handle.apply(this, arguments);
-			}
-		}
-	}
-};
-
-jQuery.fn.extend({
-	bind: function( type, data, fn ) {
-		return type == "unload" ? this.one(type, data, fn) : this.each(function(){
-			jQuery.event.add( this, type, fn || data, fn && data );
-		});
-	},
-	
-	one: function( type, data, fn ) {
-		return this.each(function(){
-			jQuery.event.add( this, type, function(event) {
-				jQuery(this).unbind(event);
-				return (fn || data).apply( this, arguments);
-			}, fn && data);
-		});
-	},
-
-	unbind: function( type, fn ) {
-		return this.each(function(){
-			jQuery.event.remove( this, type, fn );
-		});
-	},
-
-	trigger: function( type, data, fn ) {
-		return this.each(function(){
-			jQuery.event.trigger( type, data, this, true, fn );
-		});
-	},
-
-	triggerHandler: function( type, data, fn ) {
-		if ( this[0] )
-			return jQuery.event.trigger( type, data, this[0], false, fn );
-		return undefined;
-	},
-
-	toggle: function() {
-		// Save reference to arguments for access in closure
-		var args = arguments;
-
-		return this.click(function(event) {
-			// Figure out which function to execute
-			this.lastToggle = 0 == this.lastToggle ? 1 : 0;
-			
-			// Make sure that clicks stop
-			event.preventDefault();
-			
-			// and execute the function
-			return args[this.lastToggle].apply( this, arguments ) || false;
-		});
-	},
-
-	hover: function(fnOver, fnOut) {
-		return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut);
-	},
-	
-	ready: function(fn) {
-		// Attach the listeners
-		bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady )
-			// Execute the function immediately
-			fn.call( document, jQuery );
-			
-		// Otherwise, remember the function for later
-		else
-			// Add the function to the wait list
-			jQuery.readyList.push( function() { return fn.call(this, jQuery); } );
-	
-		return this;
-	}
-});
-
-jQuery.extend({
-	isReady: false,
-	readyList: [],
-	// Handle when the DOM is ready
-	ready: function() {
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.isReady ) {
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-			
-			// If there are functions bound, to execute
-			if ( jQuery.readyList ) {
-				// Execute all of them
-				jQuery.each( jQuery.readyList, function(){
-					this.apply( document );
-				});
-				
-				// Reset the list of functions
-				jQuery.readyList = null;
-			}
-		
-			// Trigger any bound ready events
-			jQuery(document).triggerHandler("ready");
-		}
-	}
-});
-
-var readyBound = false;
-
-function bindReady(){
-	if ( readyBound ) return;
-	readyBound = true;
-
-	// Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
-	if ( document.addEventListener && !jQuery.browser.opera)
-		// Use the handy event callback
-		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
-	
-	// If IE is used and is not in a frame
-	// Continually check to see if the document is ready
-	if ( jQuery.browser.msie && window == top ) (function(){
-		if (jQuery.isReady) return;
-		try {
-			// If IE is used, use the trick by Diego Perini
-			// http://javascript.nwbox.com/IEContentLoaded/
-			document.documentElement.doScroll("left");
-		} catch( error ) {
-			setTimeout( arguments.callee, 0 );
-			return;
-		}
-		// and execute any waiting functions
-		jQuery.ready();
-	})();
-
-	if ( jQuery.browser.opera )
-		document.addEventListener( "DOMContentLoaded", function () {
-			if (jQuery.isReady) return;
-			for (var i = 0; i < document.styleSheets.length; i++)
-				if (document.styleSheets[i].disabled) {
-					setTimeout( arguments.callee, 0 );
-					return;
-				}
-			// and execute any waiting functions
-			jQuery.ready();
-		}, false);
-
-	if ( jQuery.browser.safari ) {
-		var numStyles;
-		(function(){
-			if (jQuery.isReady) return;
-			if ( document.readyState != "loaded" && document.readyState != "complete" ) {
-				setTimeout( arguments.callee, 0 );
-				return;
-			}
-			if ( numStyles === undefined )
-				numStyles = jQuery("style, link[rel=stylesheet]").length;
-			if ( document.styleSheets.length != numStyles ) {
-				setTimeout( arguments.callee, 0 );
-				return;
-			}
-			// and execute any waiting functions
-			jQuery.ready();
-		})();
-	}
-
-	// A fallback to window.onload, that will always work
-	jQuery.event.add( window, "load", jQuery.ready );
-}
-
-jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
-	"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + 
-	"submit,keydown,keypress,keyup,error").split(","), function(i, name){
-	
-	// Handle event binding
-	jQuery.fn[name] = function(fn){
-		return fn ? this.bind(name, fn) : this.trigger(name);
-	};
-});
-
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function(event, elem) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-	// Traverse up the tree
-	while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; }
-	// Return true if we actually just moused on to a sub-element
-	return parent == elem;
-};
-
-// Prevent memory leaks in IE
-// And prevent errors on refresh with events like mouseover in other browsers
-// Window isn't included so as not to unbind existing unload events
-jQuery(window).bind("unload", function() {
-	jQuery("*").add(document).unbind();
-});
-jQuery.fn.extend({
-	load: function( url, params, callback ) {
-		if ( jQuery.isFunction( url ) )
-			return this.bind("load", url);
-
-		var off = url.indexOf(" ");
-		if ( off >= 0 ) {
-			var selector = url.slice(off, url.length);
-			url = url.slice(0, off);
-		}
-
-		callback = callback || function(){};
-
-		// Default to a GET request
-		var type = "GET";
-
-		// If the second parameter was provided
-		if ( params )
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = null;
-
-			// Otherwise, build a param string
-			} else {
-				params = jQuery.param( params );
-				type = "POST";
-			}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			complete: function(res, status){
-				// If successful, inject the HTML into all the matched elements
-				if ( status == "success" || status == "notmodified" )
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div/>")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						res.responseText );
-
-				self.each( callback, [res.responseText, status, res] );
-			}
-		});
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param(this.serializeArray());
-	},
-	serializeArray: function() {
-		return this.map(function(){
-			return jQuery.nodeName(this, "form") ?
-				jQuery.makeArray(this.elements) : this;
-		})
-		.filter(function(){
-			return this.name && !this.disabled && 
-				(this.checked || /select|textarea/i.test(this.nodeName) || 
-					/text|hidden|password/i.test(this.type));
-		})
-		.map(function(i, elem){
-			var val = jQuery(this).val();
-			return val == null ? null :
-				val.constructor == Array ?
-					jQuery.map( val, function(val, i){
-						return {name: elem.name, value: val};
-					}) :
-					{name: elem.name, value: val};
-		}).get();
-	}
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
-	jQuery.fn[o] = function(f){
-		return this.bind(o, f);
-	};
-});
-
-var jsc = (new Date).getTime();
-
-jQuery.extend({
-	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was ommited
-		if ( jQuery.isFunction( data ) ) {
-			callback = data;
-			data = null;
-		}
-		
-		return jQuery.ajax({
-			type: "GET",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get(url, null, callback, "script");
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get(url, data, callback, "json");
-	},
-
-	post: function( url, data, callback, type ) {
-		if ( jQuery.isFunction( data ) ) {
-			callback = data;
-			data = {};
-		}
-
-		return jQuery.ajax({
-			type: "POST",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	ajaxSetup: function( settings ) {
-		jQuery.extend( jQuery.ajaxSettings, settings );
-	},
-
-	ajaxSettings: {
-		global: true,
-		type: "GET",
-		timeout: 0,
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		data: null,
-		username: null,
-		password: null,
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			script: "text/javascript, application/javascript",
-			json: "application/json, text/javascript",
-			text: "text/plain",
-			_default: "*/*"
-		}
-	},
-	
-	// Last-Modified header cache for next request
-	lastModified: {},
-
-	ajax: function( s ) {
-		var jsonp, jsre = /=\?(&|$)/g, status, data;
-
-		// Extend the settings, but re-extend 's' so that it can be
-		// checked again later (in the test suite, specifically)
-		s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
-
-		// convert data if not already a string
-		if ( s.data && s.processData && typeof s.data != "string" )
-			s.data = jQuery.param(s.data);
-
-		// Handle JSONP Parameter Callbacks
-		if ( s.dataType == "jsonp" ) {
-			if ( s.type.toLowerCase() == "get" ) {
-				if ( !s.url.match(jsre) )
-					s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
-			} else if ( !s.data || !s.data.match(jsre) )
-				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
-			s.dataType = "json";
-		}
-
-		// Build temporary JSONP function
-		if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
-			jsonp = "jsonp" + jsc++;
-
-			// Replace the =? sequence both in the query string and the data
-			if ( s.data )
-				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
-			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
-
-			// We need to make sure
-			// that a JSONP style response is executed properly
-			s.dataType = "script";
-
-			// Handle JSONP-style loading
-			window[ jsonp ] = function(tmp){
-				data = tmp;
-				success();
-				complete();
-				// Garbage collect
-				window[ jsonp ] = undefined;
-				try{ delete window[ jsonp ]; } catch(e){}
-				if ( head )
-					head.removeChild( script );
-			};
-		}
-
-		if ( s.dataType == "script" && s.cache == null )
-			s.cache = false;
-
-		if ( s.cache === false && s.type.toLowerCase() == "get" ) {
-			var ts = (new Date()).getTime();
-			// try replacing _= if it is there
-			var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
-			// if nothing was replaced, add timestamp to the end
-			s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
-		}
-
-		// If data is available, append data to url for get requests
-		if ( s.data && s.type.toLowerCase() == "get" ) {
-			s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
-
-			// IE likes to send both get and post data, prevent this
-			s.data = null;
-		}
-
-		// Watch for a new set of requests
-		if ( s.global && ! jQuery.active++ )
-			jQuery.event.trigger( "ajaxStart" );
-
-		// If we're requesting a remote document
-		// and trying to load JSON or Script with a GET
-		if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) {
-			var head = document.getElementsByTagName("head")[0];
-			var script = document.createElement("script");
-			script.src = s.url;
-			if (s.scriptCharset)
-				script.charset = s.scriptCharset;
-
-			// Handle Script loading
-			if ( !jsonp ) {
-				var done = false;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function(){
-					if ( !done && (!this.readyState || 
-							this.readyState == "loaded" || this.readyState == "complete") ) {
-						done = true;
-						success();
-						complete();
-						head.removeChild( script );
-					}
-				};
-			}
-
-			head.appendChild(script);
-
-			// We handle everything using the script element injection
-			return undefined;
-		}
-
-		var requestDone = false;
-
-		// Create the request object; Microsoft failed to properly
-		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
-		var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
-
-		// Open the socket
-		xml.open(s.type, s.url, s.async, s.username, s.password);
-
-		// Need an extra try/catch for cross domain requests in Firefox 3
-		try {
-			// Set the correct header, if data is being sent
-			if ( s.data )
-				xml.setRequestHeader("Content-Type", s.contentType);
-
-			// Set the If-Modified-Since header, if ifModified mode.
-			if ( s.ifModified )
-				xml.setRequestHeader("If-Modified-Since",
-					jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
-
-			// Set header so the called script knows that it's an XMLHttpRequest
-			xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-
-			// Set the Accepts header for the server, depending on the dataType
-			xml.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
-				s.accepts[ s.dataType ] + ", */*" :
-				s.accepts._default );
-		} catch(e){}
-
-		// Allow custom headers/mimetypes
-		if ( s.beforeSend )
-			s.beforeSend(xml);
-			
-		if ( s.global )
-			jQuery.event.trigger("ajaxSend", [xml, s]);
-
-		// Wait for a response to come back
-		var onreadystatechange = function(isTimeout){
-			// The transfer is complete and the data is available, or the request timed out
-			if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) {
-				requestDone = true;
-				
-				// clear poll interval
-				if (ival) {
-					clearInterval(ival);
-					ival = null;
-				}
-				
-				status = isTimeout == "timeout" && "timeout" ||
-					!jQuery.httpSuccess( xml ) && "error" ||
-					s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
-					"success";
-
-				if ( status == "success" ) {
-					// Watch for, and catch, XML document parse errors
-					try {
-						// process the data (runs the xml through httpData regardless of callback)
-						data = jQuery.httpData( xml, s.dataType );
-					} catch(e) {
-						status = "parsererror";
-					}
-				}
-
-				// Make sure that the request was successful or notmodified
-				if ( status == "success" ) {
-					// Cache Last-Modified header, if ifModified mode.
-					var modRes;
-					try {
-						modRes = xml.getResponseHeader("Last-Modified");
-					} catch(e) {} // swallow exception thrown by FF if header is not available
-	
-					if ( s.ifModified && modRes )
-						jQuery.lastModified[s.url] = modRes;
-
-					// JSONP handles its own success callback
-					if ( !jsonp )
-						success();	
-				} else
-					jQuery.handleError(s, xml, status);
-
-				// Fire the complete handlers
-				complete();
-
-				// Stop memory leaks
-				if ( s.async )
-					xml = null;
-			}
-		};
-		
-		if ( s.async ) {
-			// don't attach the handler to the request, just poll it instead
-			var ival = setInterval(onreadystatechange, 13); 
-
-			// Timeout checker
-			if ( s.timeout > 0 )
-				setTimeout(function(){
-					// Check to see if the request is still happening
-					if ( xml ) {
-						// Cancel the request
-						xml.abort();
-	
-						if( !requestDone )
-							onreadystatechange( "timeout" );
-					}
-				}, s.timeout);
-		}
-			
-		// Send the data
-		try {
-			xml.send(s.data);
-		} catch(e) {
-			jQuery.handleError(s, xml, null, e);
-		}
-		
-		// firefox 1.5 doesn't fire statechange for sync requests
-		if ( !s.async )
-			onreadystatechange();
-
-		function success(){
-			// If a local callback was specified, fire it and pass it the data
-			if ( s.success )
-				s.success( data, status );
-
-			// Fire the global callback
-			if ( s.global )
-				jQuery.event.trigger( "ajaxSuccess", [xml, s] );
-		}
-
-		function complete(){
-			// Process result
-			if ( s.complete )
-				s.complete(xml, status);
-
-			// The request was completed
-			if ( s.global )
-				jQuery.event.trigger( "ajaxComplete", [xml, s] );
-
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active )
-				jQuery.event.trigger( "ajaxStop" );
-		}
-		
-		// return XMLHttpRequest to allow aborting the request etc.
-		return xml;
-	},
-
-	handleError: function( s, xml, status, e ) {
-		// If a local callback was specified, fire it
-		if ( s.error ) s.error( xml, status, e );
-
-		// Fire the global callback
-		if ( s.global )
-			jQuery.event.trigger( "ajaxError", [xml, s, e] );
-	},
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function( r ) {
-		try {
-			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-			return !r.status && location.protocol == "file:" ||
-				( r.status >= 200 && r.status < 300 ) || r.status == 304 || r.status == 1223 ||
-				jQuery.browser.safari && r.status == undefined;
-		} catch(e){}
-		return false;
-	},
-
-	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function( xml, url ) {
-		try {
-			var xmlRes = xml.getResponseHeader("Last-Modified");
-
-			// Firefox always returns 200. check Last-Modified date
-			return xml.status == 304 || xmlRes == jQuery.lastModified[url] ||
-				jQuery.browser.safari && xml.status == undefined;
-		} catch(e){}
-		return false;
-	},
-
-	httpData: function( r, type ) {
-		var ct = r.getResponseHeader("content-type");
-		var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0;
-		var data = xml ? r.responseXML : r.responseText;
-
-		if ( xml && data.documentElement.tagName == "parsererror" )
-			throw "parsererror";
-
-		// If the type is "script", eval it in global context
-		if ( type == "script" )
-			jQuery.globalEval( data );
-
-		// Get the JavaScript object, if JSON is used.
-		if ( type == "json" )
-			data = eval("(" + data + ")");
-
-		return data;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a ) {
-		var s = [];
-
-		// If an array was passed in, assume that it is an array
-		// of form elements
-		if ( a.constructor == Array || a.jquery )
-			// Serialize the form elements
-			jQuery.each( a, function(){
-				s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) );
-			});
-
-		// Otherwise, assume that it's an object of key/value pairs
-		else
-			// Serialize the key/values
-			for ( var j in a )
-				// If the value is an array then the key names need to be repeated
-				if ( a[j] && a[j].constructor == Array )
-					jQuery.each( a[j], function(){
-						s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
-					});
-				else
-					s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) );
-
-		// Return the resulting serialization
-		return s.join("&").replace(/%20/g, "+");
-	}
-
-});
-jQuery.fn.extend({
-	show: function(speed,callback){
-		return speed ?
-			this.animate({
-				height: "show", width: "show", opacity: "show"
-			}, speed, callback) :
-			
-			this.filter(":hidden").each(function(){
-				this.style.display = this.oldblock || "";
-				if ( jQuery.css(this,"display") == "none" ) {
-					var elem = jQuery("<" + this.tagName + " />").appendTo("body");
-					this.style.display = elem.css("display");
-					// handle an edge condition where css is - div { display:none; } or similar
-					if (this.style.display == "none")
-						this.style.display = "block";
-					elem.remove();
-				}
-			}).end();
-	},
-	
-	hide: function(speed,callback){
-		return speed ?
-			this.animate({
-				height: "hide", width: "hide", opacity: "hide"
-			}, speed, callback) :
-			
-			this.filter(":visible").each(function(){
-				this.oldblock = this.oldblock || jQuery.css(this,"display");
-				this.style.display = "none";
-			}).end();
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-	
-	toggle: function( fn, fn2 ){
-		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
-			this._toggle( fn, fn2 ) :
-			fn ?
-				this.animate({
-					height: "toggle", width: "toggle", opacity: "toggle"
-				}, fn, fn2) :
-				this.each(function(){
-					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
-				});
-	},
-	
-	slideDown: function(speed,callback){
-		return this.animate({height: "show"}, speed, callback);
-	},
-	
-	slideUp: function(speed,callback){
-		return this.animate({height: "hide"}, speed, callback);
-	},
-
-	slideToggle: function(speed, callback){
-		return this.animate({height: "toggle"}, speed, callback);
-	},
-	
-	fadeIn: function(speed, callback){
-		return this.animate({opacity: "show"}, speed, callback);
-	},
-	
-	fadeOut: function(speed, callback){
-		return this.animate({opacity: "hide"}, speed, callback);
-	},
-	
-	fadeTo: function(speed,to,callback){
-		return this.animate({opacity: to}, speed, callback);
-	},
-	
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed(speed, easing, callback);
-
-		return this[ optall.queue === false ? "each" : "queue" ](function(){
-			if ( this.nodeType != 1)
-				return false;
-
-			var opt = jQuery.extend({}, optall);
-			var hidden = jQuery(this).is(":hidden"), self = this;
-			
-			for ( var p in prop ) {
-				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
-					return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
-
-				if ( p == "height" || p == "width" ) {
-					// Store display property
-					opt.display = jQuery.css(this, "display");
-
-					// Make sure that nothing sneaks out
-					opt.overflow = this.style.overflow;
-				}
-			}
-
-			if ( opt.overflow != null )
-				this.style.overflow = "hidden";
-
-			opt.curAnim = jQuery.extend({}, prop);
-			
-			jQuery.each( prop, function(name, val){
-				var e = new jQuery.fx( self, opt, name );
-
-				if ( /toggle|show|hide/.test(val) )
-					e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
-				else {
-					var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
-						start = e.cur(true) || 0;
-
-					if ( parts ) {
-						var end = parseFloat(parts[2]),
-							unit = parts[3] || "px";
-
-						// We need to compute starting value
-						if ( unit != "px" ) {
-							self.style[ name ] = (end || 1) + unit;
-							start = ((end || 1) / e.cur(true)) * start;
-							self.style[ name ] = start + unit;
-						}
-
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] )
-							end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
-
-						e.custom( start, end, unit );
-					} else
-						e.custom( start, val, "" );
-				}
-			});
-
-			// For JS strict compliance
-			return true;
-		});
-	},
-	
-	queue: function(type, fn){
-		if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
-			fn = type;
-			type = "fx";
-		}
-
-		if ( !type || (typeof type == "string" && !fn) )
-			return queue( this[0], type );
-
-		return this.each(function(){
-			if ( fn.constructor == Array )
-				queue(this, type, fn);
-			else {
-				queue(this, type).push( fn );
-			
-				if ( queue(this, type).length == 1 )
-					fn.apply(this);
-			}
-		});
-	},
-
-	stop: function(clearQueue, gotoEnd){
-		var timers = jQuery.timers;
-
-		if (clearQueue)
-			this.queue([]);
-
-		this.each(function(){
-			// go in reverse order so anything added to the queue during the loop is ignored
-			for ( var i = timers.length - 1; i >= 0; i-- )
-				if ( timers[i].elem == this ) {
-					if (gotoEnd)
-						// force the next step to be the last
-						timers[i](true);
-					timers.splice(i, 1);
-				}
-		});
-
-		// start the next in the queue if the last step wasn't forced
-		if (!gotoEnd)
-			this.dequeue();
-
-		return this;
-	}
-
-});
-
-var queue = function( elem, type, array ) {
-	if ( !elem )
-		return undefined;
-
-	type = type || "fx";
-
-	var q = jQuery.data( elem, type + "queue" );
-
-	if ( !q || array )
-		q = jQuery.data( elem, type + "queue", 
-			array ? jQuery.makeArray(array) : [] );
-
-	return q;
-};
-
-jQuery.fn.dequeue = function(type){
-	type = type || "fx";
-
-	return this.each(function(){
-		var q = queue(this, type);
-
-		q.shift();
-
-		if ( q.length )
-			q[0].apply( this );
-	});
-};
-
-jQuery.extend({
-	
-	speed: function(speed, easing, fn) {
-		var opt = speed && speed.constructor == Object ? speed : {
-			complete: fn || !fn && easing || 
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && easing.constructor != Function && easing
-		};
-
-		opt.duration = (opt.duration && opt.duration.constructor == Number ? 
-			opt.duration : 
-			{ slow: 600, fast: 200 }[opt.duration]) || 400;
-	
-		// Queueing
-		opt.old = opt.complete;
-		opt.complete = function(){
-			if ( opt.queue !== false )
-				jQuery(this).dequeue();
-			if ( jQuery.isFunction( opt.old ) )
-				opt.old.apply( this );
-		};
-	
-		return opt;
-	},
-	
-	easing: {
-		linear: function( p, n, firstNum, diff ) {
-			return firstNum + diff * p;
-		},
-		swing: function( p, n, firstNum, diff ) {
-			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
-		}
-	},
-	
-	timers: [],
-	timerId: null,
-
-	fx: function( elem, options, prop ){
-		this.options = options;
-		this.elem = elem;
-		this.prop = prop;
-
-		if ( !options.orig )
-			options.orig = {};
-	}
-
-});
-
-jQuery.fx.prototype = {
-
-	// Simple function for setting a style value
-	update: function(){
-		if ( this.options.step )
-			this.options.step.apply( this.elem, [ this.now, this ] );
-
-		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-
-		// Set display property to block for height/width animations
-		if ( this.prop == "height" || this.prop == "width" )
-			this.elem.style.display = "block";
-	},
-
-	// Get the current size
-	cur: function(force){
-		if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
-			return this.elem[ this.prop ];
-
-		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
-		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
-	},
-
-	// Start an animation from one number to another
-	custom: function(from, to, unit){
-		this.startTime = (new Date()).getTime();
-		this.start = from;
-		this.end = to;
-		this.unit = unit || this.unit || "px";
-		this.now = this.start;
-		this.pos = this.state = 0;
-		this.update();
-
-		var self = this;
-		function t(gotoEnd){
-			return self.step(gotoEnd);
-		}
-
-		t.elem = this.elem;
-
-		jQuery.timers.push(t);
-
-		if ( jQuery.timerId == null ) {
-			jQuery.timerId = setInterval(function(){
-				var timers = jQuery.timers;
-				
-				for ( var i = 0; i < timers.length; i++ )
-					if ( !timers[i]() )
-						timers.splice(i--, 1);
-
-				if ( !timers.length ) {
-					clearInterval( jQuery.timerId );
-					jQuery.timerId = null;
-				}
-			}, 13);
-		}
-	},
-
-	// Simple 'show' function
-	show: function(){
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		this.custom(0, this.cur());
-
-		// Make sure that we start at a small width/height to avoid any
-		// flash of content
-		if ( this.prop == "width" || this.prop == "height" )
-			this.elem.style[this.prop] = "1px";
-		
-		// Start by showing the element
-		jQuery(this.elem).show();
-	},
-
-	// Simple 'hide' function
-	hide: function(){
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom(this.cur(), 0);
-	},
-
-	// Each step of an animation
-	step: function(gotoEnd){
-		var t = (new Date()).getTime();
-
-		if ( gotoEnd || t > this.options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			this.options.curAnim[ this.prop ] = true;
-
-			var done = true;
-			for ( var i in this.options.curAnim )
-				if ( this.options.curAnim[i] !== true )
-					done = false;
-
-			if ( done ) {
-				if ( this.options.display != null ) {
-					// Reset the overflow
-					this.elem.style.overflow = this.options.overflow;
-				
-					// Reset the display
-					this.elem.style.display = this.options.display;
-					if ( jQuery.css(this.elem, "display") == "none" )
-						this.elem.style.display = "block";
-				}
-
-				// Hide the element if the "hide" operation was done
-				if ( this.options.hide )
-					this.elem.style.display = "none";
-
-				// Reset the properties, if the item has been hidden or shown
-				if ( this.options.hide || this.options.show )
-					for ( var p in this.options.curAnim )
-						jQuery.attr(this.elem.style, p, this.options.orig[p]);
-			}
-
-			// If a callback was provided, execute it
-			if ( done && jQuery.isFunction( this.options.complete ) )
-				// Execute the complete function
-				this.options.complete.apply( this.elem );
-
-			return false;
-		} else {
-			var n = t - this.startTime;
-			this.state = n / this.options.duration;
-
-			// Perform the easing function, defaults to swing
-			this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
-			this.now = this.start + ((this.end - this.start) * this.pos);
-
-			// Perform the next step of the animation
-			this.update();
-		}
-
-		return true;
-	}
-
-};
-
-jQuery.fx.step = {
-	scrollLeft: function(fx){
-		fx.elem.scrollLeft = fx.now;
-	},
-
-	scrollTop: function(fx){
-		fx.elem.scrollTop = fx.now;
-	},
-
-	opacity: function(fx){
-		jQuery.attr(fx.elem.style, "opacity", fx.now);
-	},
-
-	_default: function(fx){
-		fx.elem.style[ fx.prop ] = fx.now + fx.unit;
-	}
-};
-// The Offset Method
-// Originally By Brandon Aaron, part of the Dimension Plugin
-// http://jquery.com/plugins/project/dimensions
-jQuery.fn.offset = function() {
-	var left = 0, top = 0, elem = this[0], results;
-	
-	if ( elem ) with ( jQuery.browser ) {
-		var parent       = elem.parentNode, 
-		    offsetChild  = elem,
-		    offsetParent = elem.offsetParent, 
-		    doc          = elem.ownerDocument,
-		    safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
-		    fixed        = jQuery.css(elem, "position") == "fixed";
-	
-		// Use getBoundingClientRect if available
-		if ( elem.getBoundingClientRect ) {
-			var box = elem.getBoundingClientRect();
-		
-			// Add the document scroll offsets
-			add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-				box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
-		
-			// IE adds the HTML element's border, by default it is medium which is 2px
-			// IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; }
-			// IE 7 standards mode, the border is always 2px
-			// This border/offset is typically represented by the clientLeft and clientTop properties
-			// However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS
-			// Therefore this method will be off by 2px in IE while in quirksmode
-			add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop );
-	
-		// Otherwise loop through the offsetParents and parentNodes
-		} else {
-		
-			// Initial element offsets
-			add( elem.offsetLeft, elem.offsetTop );
-			
-			// Get parent offsets
-			while ( offsetParent ) {
-				// Add offsetParent offsets
-				add( offsetParent.offsetLeft, offsetParent.offsetTop );
-			
-				// Mozilla and Safari > 2 does not include the border on offset parents
-				// However Mozilla adds the border for table or table cells
-				if ( mozilla && !/^t(able|d|h)$/i.test(offsetParent.tagName) || safari && !safari2 )
-					border( offsetParent );
-					
-				// Add the document scroll offsets if position is fixed on any offsetParent
-				if ( !fixed && jQuery.css(offsetParent, "position") == "fixed" )
-					fixed = true;
-			
-				// Set offsetChild to previous offsetParent unless it is the body element
-				offsetChild  = /^body$/i.test(offsetParent.tagName) ? offsetChild : offsetParent;
-				// Get next offsetParent
-				offsetParent = offsetParent.offsetParent;
-			}
-		
-			// Get parent scroll offsets
-			while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
-				// Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
-				if ( !/^inline|table.*$/i.test(jQuery.css(parent, "display")) )
-					// Subtract parent scroll offsets
-					add( -parent.scrollLeft, -parent.scrollTop );
-			
-				// Mozilla does not add the border for a parent that has overflow != visible
-				if ( mozilla && jQuery.css(parent, "overflow") != "visible" )
-					border( parent );
-			
-				// Get next parent
-				parent = parent.parentNode;
-			}
-		
-			// Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild
-			// Mozilla doubles body offsets with a non-absolutely positioned offsetChild
-			if ( (safari2 && (fixed || jQuery.css(offsetChild, "position") == "absolute")) || 
-				(mozilla && jQuery.css(offsetChild, "position") != "absolute") )
-					add( -doc.body.offsetLeft, -doc.body.offsetTop );
-			
-			// Add the document scroll offsets if position is fixed
-			if ( fixed )
-				add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-					Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
-		}
-
-		// Return an object with top and left properties
-		results = { top: top, left: left };
-	}
-
-	function border(elem) {
-		add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
-	}
-
-	function add(l, t) {
-		left += parseInt(l) || 0;
-		top += parseInt(t) || 0;
-	}
-
-	return results;
-};
-})();
Index: js/jquery.ajaxContent.js
===================================================================
--- js/jquery.ajaxContent.js	(revision 6370)
+++ js/jquery.ajaxContent.js	(working copy)
@@ -1,163 +0,0 @@
-/**
- *ajaxContent - jQuery plugin for accessible, unobtrusive and easy ajax behaviour.
- * @Version 2.1 Beta
- * 
- * @requires jQuery v 1.2+
- * 
- * http://www.andreacfm.com/index.cfm/jquery-plugins
- *
- * Copyright (c) 2007 Andrea Campolonghi (andreacfm.com)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- */
-  //make $ surely available inside the PI as jQuery shortcut
-(function($) {
-	//call teh method with options arguments
-	$.fn.ajaxContent = function(options) {
-		//extend to defaults
-		var defaults = $.extend({}, $.fn.ajaxContent.defaults, options);
-			// debug if required		
-			if(defaults.debug == 'true'){
-				debug(this);
-			};
-			//Initilaize any instance looping on the match element
-			return this.each(function(){
-				//set local variables and extend to the metadata plugin if loaded
-				var $obj = $(this);
-				var href = $obj.attr('href');
-				var o = $.metadata ? $.extend({}, defaults, $obj.metadata()) : defaults;
-				// add binding change events on url if required
-				if(o.bind != ''){
-					var binds = o.bind.split(',');
-					for(var i=0; i < binds.length ; i++){
-						var queryString = setQueryString(binds);
-						var url = href + queryString;
-						$obj.attr({href:url});
-						if ($(binds[i]).attr('type') == "radio" || $(binds[i]).attr('type') == "checkbox"){
-							$('input[name=' + $(binds[i]).attr("name") + ']').change(function(){
-								var queryString = setQueryString(binds);
-								var url = href + queryString;
-								$obj.attr({href:url});						
-							});
-							}else{
-							$(binds[i]).change(function(){
-								var queryString = setQueryString(binds);
-								var url = href + queryString;
-								$obj.attr({href:url});						
-							});
-						}							
-					}
-				}
-				var $target = $(o.target);
-
-			//bind the event
-			$obj.bind(o.event, function(){
-				// add loader if required
-				if(o.loader == 'true'){
-					if(o.loaderType == 'img'){
- 							$target.html('<img src="' + o.loadingMsg + '"/>');
- 						}else{
-							 $target.html(o.loadingMsg);
- 							}
- 					} 
-					//remove add current class
-					$('a.' + o.currentClass).removeClass(o.currentClass);								
-					$obj.addClass(o.currentClass);
-					// make the call
-					$.ajax({ 
-  						type: o.type, 
-  						url: $obj.attr('href'),
-  						cache:'false',
-  						beforeSend:function(){
-  							if(typeof o.beforeSend == 'function'){
-  								o.beforeSend($obj,$target);
-  								}
-  						},
-  						success: function(msg){ 
-    						$target.html(msg);
-    						if(o.extend == 'true'){
-    							$(o.filter,$target).ajaxContent({
-    								target:o.ex_target,
-									type:o.ex_type,
-									event:o.ex_event,
-									loader:o.ex_loader,
-									loaderType:o.ex_loaderType,
-									loadingMsg:o.ex_loadingMsg,
-									errorMsg:o.ex_errorMsg,
-									currentClass:o.ex_currentClass,
-									success:o.ex_success,
-									beforeSend:o.ex_beforeSend,
-									error:o.ex_error,
-									bind:o.ex_bind
-    							});
-    						}
-    						//if a callback exist pass arguments ( object,target and receive message)
-    						if(typeof o.success == 'function'){
-    							o.success($obj,$target,msg);
-    							}  						
-    						},
-						error: function(){
-							$target.html("<p>" + o.errorMsg + "</p>");
-							if(typeof o.error == 'function'){
-    							o.error($target);
-    							}  						
-    					 
-						}
-					});
-				return false;
-			});
-		});
-	};	
-  	function debug($obj) {
-    if (window.console && window.console.log)
-     window.console.log('selection count: ' + $obj.size() + '  with class:' + $obj.attr('class'));
-  	};
-  	function setQueryString(binds){
-  		var queryString = '?';
-  		for(var i=0; i < binds.length; i++){
-  			if ($(binds[i]).attr('type') == "radio"){
-				queryString += $('input[name=' + $(binds[i]).attr("name") + ']').fieldSerialize();
-  			}else if($(binds[i]).attr('type') == "checkbox"){
-  				queryString += $(binds[i]).attr("name") + '=' + $('input[name=' + $(binds[i]).attr("name") + ']').fieldValue();
-  			}
-  			else{
-  				queryString += $(binds[i]).fieldSerialize();	
-  			}	
-  			if(i != binds.length - 1){
-  				queryString += '&';
-  			}
-  		}
-	return queryString;
-  	};
-})(jQuery);
-
-$.fn.ajaxContent.defaults = {
-		target: '#ajaxContent',
-		type:'get',
-		event:'click',
-		loader:'true',
-		loaderType:'text',
-		loadingMsg:'Loading...',
-		errorMsg:'An error occured durign the page requesting process!',
-		currentClass:'selected',
-		success:'',
-		beforeSend:'',
-		error:'',
-		bind:'',
-		debug:'false',
-		extend:'false',
-		filter:'',
-		ex_target:'',
-		ex_type:'get',
-		ex_event:'click',
-		ex_loader:'true',
-		ex_loaderType:'text',
-		ex_loadingMsg:'Loading...',
-		ex_errorMsg:'An error occured durign the page requesting process!',
-		ex_currentClass:'selected',
-		ex_success:'',
-		ex_beforeSend:'',
-		ex_error:'',
-		ex_bind:''
-};
\ No newline at end of file
Index: js/jquery-1.2.6.pack.js
===================================================================
--- js/jquery-1.2.6.pack.js	(revision 6370)
+++ js/jquery-1.2.6.pack.js	(working copy)
@@ -1,11 +0,0 @@
-/*
- * jQuery 1.2.6 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
- */
-eval(function(p,a,c,k,e,r){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--)r[e(c)]=k[c]||e(c);k=[function(e){return r[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}('(H(){J w=1b.4M,3m$=1b.$;J D=1b.4M=1b.$=H(a,b){I 2B D.17.5j(a,b)};J u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/,62=/^.[^:#\\[\\.]*$/,12;D.17=D.44={5j:H(d,b){d=d||S;G(d.16){7[0]=d;7.K=1;I 7}G(1j d=="23"){J c=u.2D(d);G(c&&(c[1]||!b)){G(c[1])d=D.4h([c[1]],b);N{J a=S.61(c[3]);G(a){G(a.2v!=c[3])I D().2q(d);I D(a)}d=[]}}N I D(b).2q(d)}N G(D.1D(d))I D(S)[D.17.27?"27":"43"](d);I 7.6Y(D.2d(d))},5w:"1.2.6",8G:H(){I 7.K},K:0,3p:H(a){I a==12?D.2d(7):7[a]},2I:H(b){J a=D(b);a.5n=7;I a},6Y:H(a){7.K=0;2p.44.1p.1w(7,a);I 7},P:H(a,b){I D.P(7,a,b)},5i:H(b){J a=-1;I D.2L(b&&b.5w?b[0]:b,7)},1K:H(c,a,b){J d=c;G(c.1q==56)G(a===12)I 7[0]&&D[b||"1K"](7[0],c);N{d={};d[c]=a}I 7.P(H(i){R(c 1n d)D.1K(b?7.V:7,c,D.1i(7,d[c],b,i,c))})},1g:H(b,a){G((b==\'2h\'||b==\'1Z\')&&3d(a)<0)a=12;I 7.1K(b,a,"2a")},1r:H(b){G(1j b!="49"&&b!=U)I 7.4E().3v((7[0]&&7[0].2z||S).5F(b));J a="";D.P(b||7,H(){D.P(7.3t,H(){G(7.16!=8)a+=7.16!=1?7.76:D.17.1r([7])})});I a},5z:H(b){G(7[0])D(b,7[0].2z).5y().39(7[0]).2l(H(){J a=7;1B(a.1x)a=a.1x;I a}).3v(7);I 7},8Y:H(a){I 7.P(H(){D(7).6Q().5z(a)})},8R:H(a){I 7.P(H(){D(7).5z(a)})},3v:H(){I 7.3W(19,M,Q,H(a){G(7.16==1)7.3U(a)})},6F:H(){I 7.3W(19,M,M,H(a){G(7.16==1)7.39(a,7.1x)})},6E:H(){I 7.3W(19,Q,Q,H(a){7.1d.39(a,7)})},5q:H(){I 7.3W(19,Q,M,H(a){7.1d.39(a,7.2H)})},3l:H(){I 7.5n||D([])},2q:H(b){J c=D.2l(7,H(a){I D.2q(b,a)});I 7.2I(/[^+>] [^+>]/.11(b)||b.1h("..")>-1?D.4r(c):c)},5y:H(e){J f=7.2l(H(){G(D.14.1f&&!D.4n(7)){J a=7.6o(M),5h=S.3h("1v");5h.3U(a);I D.4h([5h.4H])[0]}N I 7.6o(M)});J d=f.2q("*").5c().P(H(){G(7[E]!=12)7[E]=U});G(e===M)7.2q("*").5c().P(H(i){G(7.16==3)I;J c=D.L(7,"3w");R(J a 1n c)R(J b 1n c[a])D.W.1e(d[i],a,c[a][b],c[a][b].L)});I f},1E:H(b){I 7.2I(D.1D(b)&&D.3C(7,H(a,i){I b.1k(a,i)})||D.3g(b,7))},4Y:H(b){G(b.1q==56)G(62.11(b))I 7.2I(D.3g(b,7,M));N b=D.3g(b,7);J a=b.K&&b[b.K-1]!==12&&!b.16;I 7.1E(H(){I a?D.2L(7,b)<0:7!=b})},1e:H(a){I 7.2I(D.4r(D.2R(7.3p(),1j a==\'23\'?D(a):D.2d(a))))},3F:H(a){I!!a&&D.3g(a,7).K>0},7T:H(a){I 7.3F("."+a)},6e:H(b){G(b==12){G(7.K){J c=7[0];G(D.Y(c,"2A")){J e=c.64,63=[],15=c.15,2V=c.O=="2A-2V";G(e<0)I U;R(J i=2V?e:0,2f=2V?e+1:15.K;i<2f;i++){J d=15[i];G(d.2W){b=D.14.1f&&!d.at.2x.an?d.1r:d.2x;G(2V)I b;63.1p(b)}}I 63}N I(7[0].2x||"").1o(/\\r/g,"")}I 12}G(b.1q==4L)b+=\'\';I 7.P(H(){G(7.16!=1)I;G(b.1q==2p&&/5O|5L/.11(7.O))7.4J=(D.2L(7.2x,b)>=0||D.2L(7.34,b)>=0);N G(D.Y(7,"2A")){J a=D.2d(b);D("9R",7).P(H(){7.2W=(D.2L(7.2x,a)>=0||D.2L(7.1r,a)>=0)});G(!a.K)7.64=-1}N 7.2x=b})},2K:H(a){I a==12?(7[0]?7[0].4H:U):7.4E().3v(a)},7b:H(a){I 7.5q(a).21()},79:H(i){I 7.3s(i,i+1)},3s:H(){I 7.2I(2p.44.3s.1w(7,19))},2l:H(b){I 7.2I(D.2l(7,H(a,i){I b.1k(a,i,a)}))},5c:H(){I 7.1e(7.5n)},L:H(d,b){J a=d.1R(".");a[1]=a[1]?"."+a[1]:"";G(b===12){J c=7.5C("9z"+a[1]+"!",[a[0]]);G(c===12&&7.K)c=D.L(7[0],d);I c===12&&a[1]?7.L(a[0]):c}N I 7.1P("9u"+a[1]+"!",[a[0],b]).P(H(){D.L(7,d,b)})},3b:H(a){I 7.P(H(){D.3b(7,a)})},3W:H(g,f,h,d){J e=7.K>1,3x;I 7.P(H(){G(!3x){3x=D.4h(g,7.2z);G(h)3x.9o()}J b=7;G(f&&D.Y(7,"1T")&&D.Y(3x[0],"4F"))b=7.3H("22")[0]||7.3U(7.2z.3h("22"));J c=D([]);D.P(3x,H(){J a=e?D(7).5y(M)[0]:7;G(D.Y(a,"1m"))c=c.1e(a);N{G(a.16==1)c=c.1e(D("1m",a).21());d.1k(b,a)}});c.P(6T)})}};D.17.5j.44=D.17;H 6T(i,a){G(a.4d)D.3Y({1a:a.4d,31:Q,1O:"1m"});N D.5u(a.1r||a.6O||a.4H||"");G(a.1d)a.1d.37(a)}H 1z(){I+2B 8J}D.1l=D.17.1l=H(){J b=19[0]||{},i=1,K=19.K,4x=Q,15;G(b.1q==8I){4x=b;b=19[1]||{};i=2}G(1j b!="49"&&1j b!="H")b={};G(K==i){b=7;--i}R(;i<K;i++)G((15=19[i])!=U)R(J c 1n 15){J a=b[c],2w=15[c];G(b===2w)6M;G(4x&&2w&&1j 2w=="49"&&!2w.16)b[c]=D.1l(4x,a||(2w.K!=U?[]:{}),2w);N G(2w!==12)b[c]=2w}I b};J E="4M"+1z(),6K=0,5r={},6G=/z-?5i|8B-?8A|1y|6B|8v-?1Z/i,3P=S.3P||{};D.1l({8u:H(a){1b.$=3m$;G(a)1b.4M=w;I D},1D:H(a){I!!a&&1j a!="23"&&!a.Y&&a.1q!=2p&&/^[\\s[]?H/.11(a+"")},4n:H(a){I a.1C&&!a.1c||a.2j&&a.2z&&!a.2z.1c},5u:H(a){a=D.3k(a);G(a){J b=S.3H("6w")[0]||S.1C,1m=S.3h("1m");1m.O="1r/4t";G(D.14.1f)1m.1r=a;N 1m.3U(S.5F(a));b.39(1m,b.1x);b.37(1m)}},Y:H(b,a){I b.Y&&b.Y.2r()==a.2r()},1Y:{},L:H(c,d,b){c=c==1b?5r:c;J a=c[E];G(!a)a=c[E]=++6K;G(d&&!D.1Y[a])D.1Y[a]={};G(b!==12)D.1Y[a][d]=b;I d?D.1Y[a][d]:a},3b:H(c,b){c=c==1b?5r:c;J a=c[E];G(b){G(D.1Y[a]){2U D.1Y[a][b];b="";R(b 1n D.1Y[a])1X;G(!b)D.3b(c)}}N{1U{2U c[E]}1V(e){G(c.5l)c.5l(E)}2U D.1Y[a]}},P:H(d,a,c){J e,i=0,K=d.K;G(c){G(K==12){R(e 1n d)G(a.1w(d[e],c)===Q)1X}N R(;i<K;)G(a.1w(d[i++],c)===Q)1X}N{G(K==12){R(e 1n d)G(a.1k(d[e],e,d[e])===Q)1X}N R(J b=d[0];i<K&&a.1k(b,i,b)!==Q;b=d[++i]){}}I d},1i:H(b,a,c,i,d){G(D.1D(a))a=a.1k(b,i);I a&&a.1q==4L&&c=="2a"&&!6G.11(d)?a+"2X":a},1F:{1e:H(c,b){D.P((b||"").1R(/\\s+/),H(i,a){G(c.16==1&&!D.1F.3T(c.1F,a))c.1F+=(c.1F?" ":"")+a})},21:H(c,b){G(c.16==1)c.1F=b!=12?D.3C(c.1F.1R(/\\s+/),H(a){I!D.1F.3T(b,a)}).6s(" "):""},3T:H(b,a){I D.2L(a,(b.1F||b).6r().1R(/\\s+/))>-1}},6q:H(b,c,a){J e={};R(J d 1n c){e[d]=b.V[d];b.V[d]=c[d]}a.1k(b);R(J d 1n c)b.V[d]=e[d]},1g:H(d,e,c){G(e=="2h"||e=="1Z"){J b,3X={30:"5x",5g:"1G",18:"3I"},35=e=="2h"?["5e","6k"]:["5G","6i"];H 5b(){b=e=="2h"?d.8f:d.8c;J a=0,2C=0;D.P(35,H(){a+=3d(D.2a(d,"57"+7,M))||0;2C+=3d(D.2a(d,"2C"+7+"4b",M))||0});b-=29.83(a+2C)}G(D(d).3F(":4j"))5b();N D.6q(d,3X,5b);I 29.2f(0,b)}I D.2a(d,e,c)},2a:H(f,l,k){J e,V=f.V;H 3E(b){G(!D.14.2k)I Q;J a=3P.54(b,U);I!a||a.52("3E")==""}G(l=="1y"&&D.14.1f){e=D.1K(V,"1y");I e==""?"1":e}G(D.14.2G&&l=="18"){J d=V.50;V.50="0 7Y 7W";V.50=d}G(l.1I(/4i/i))l=y;G(!k&&V&&V[l])e=V[l];N G(3P.54){G(l.1I(/4i/i))l="4i";l=l.1o(/([A-Z])/g,"-$1").3y();J c=3P.54(f,U);G(c&&!3E(f))e=c.52(l);N{J g=[],2E=[],a=f,i=0;R(;a&&3E(a);a=a.1d)2E.6h(a);R(;i<2E.K;i++)G(3E(2E[i])){g[i]=2E[i].V.18;2E[i].V.18="3I"}e=l=="18"&&g[2E.K-1]!=U?"2F":(c&&c.52(l))||"";R(i=0;i<g.K;i++)G(g[i]!=U)2E[i].V.18=g[i]}G(l=="1y"&&e=="")e="1"}N G(f.4g){J h=l.1o(/\\-(\\w)/g,H(a,b){I b.2r()});e=f.4g[l]||f.4g[h];G(!/^\\d+(2X)?$/i.11(e)&&/^\\d/.11(e)){J j=V.1A,66=f.65.1A;f.65.1A=f.4g.1A;V.1A=e||0;e=V.aM+"2X";V.1A=j;f.65.1A=66}}I e},4h:H(l,h){J k=[];h=h||S;G(1j h.3h==\'12\')h=h.2z||h[0]&&h[0].2z||S;D.P(l,H(i,d){G(!d)I;G(d.1q==4L)d+=\'\';G(1j d=="23"){d=d.1o(/(<(\\w+)[^>]*?)\\/>/g,H(b,a,c){I c.1I(/^(aK|4f|7E|aG|4T|7A|aB|3n|az|ay|av)$/i)?b:a+"></"+c+">"});J f=D.3k(d).3y(),1v=h.3h("1v");J e=!f.1h("<au")&&[1,"<2A 7w=\'7w\'>","</2A>"]||!f.1h("<ar")&&[1,"<7v>","</7v>"]||f.1I(/^<(aq|22|am|ak|ai)/)&&[1,"<1T>","</1T>"]||!f.1h("<4F")&&[2,"<1T><22>","</22></1T>"]||(!f.1h("<af")||!f.1h("<ad"))&&[3,"<1T><22><4F>","</4F></22></1T>"]||!f.1h("<7E")&&[2,"<1T><22></22><7q>","</7q></1T>"]||D.14.1f&&[1,"1v<1v>","</1v>"]||[0,"",""];1v.4H=e[1]+d+e[2];1B(e[0]--)1v=1v.5T;G(D.14.1f){J g=!f.1h("<1T")&&f.1h("<22")<0?1v.1x&&1v.1x.3t:e[1]=="<1T>"&&f.1h("<22")<0?1v.3t:[];R(J j=g.K-1;j>=0;--j)G(D.Y(g[j],"22")&&!g[j].3t.K)g[j].1d.37(g[j]);G(/^\\s/.11(d))1v.39(h.5F(d.1I(/^\\s*/)[0]),1v.1x)}d=D.2d(1v.3t)}G(d.K===0&&(!D.Y(d,"3V")&&!D.Y(d,"2A")))I;G(d[0]==12||D.Y(d,"3V")||d.15)k.1p(d);N k=D.2R(k,d)});I k},1K:H(d,f,c){G(!d||d.16==3||d.16==8)I 12;J e=!D.4n(d),40=c!==12,1f=D.14.1f;f=e&&D.3X[f]||f;G(d.2j){J g=/5Q|4d|V/.11(f);G(f=="2W"&&D.14.2k)d.1d.64;G(f 1n d&&e&&!g){G(40){G(f=="O"&&D.Y(d,"4T")&&d.1d)7p"O a3 a1\'t 9V 9U";d[f]=c}G(D.Y(d,"3V")&&d.7i(f))I d.7i(f).76;I d[f]}G(1f&&e&&f=="V")I D.1K(d.V,"9T",c);G(40)d.9Q(f,""+c);J h=1f&&e&&g?d.4G(f,2):d.4G(f);I h===U?12:h}G(1f&&f=="1y"){G(40){d.6B=1;d.1E=(d.1E||"").1o(/7f\\([^)]*\\)/,"")+(3r(c)+\'\'=="9L"?"":"7f(1y="+c*7a+")")}I d.1E&&d.1E.1h("1y=")>=0?(3d(d.1E.1I(/1y=([^)]*)/)[1])/7a)+\'\':""}f=f.1o(/-([a-z])/9H,H(a,b){I b.2r()});G(40)d[f]=c;I d[f]},3k:H(a){I(a||"").1o(/^\\s+|\\s+$/g,"")},2d:H(b){J a=[];G(b!=U){J i=b.K;G(i==U||b.1R||b.4I||b.1k)a[0]=b;N 1B(i)a[--i]=b[i]}I a},2L:H(b,a){R(J i=0,K=a.K;i<K;i++)G(a[i]===b)I i;I-1},2R:H(a,b){J i=0,T,2S=a.K;G(D.14.1f){1B(T=b[i++])G(T.16!=8)a[2S++]=T}N 1B(T=b[i++])a[2S++]=T;I a},4r:H(a){J c=[],2o={};1U{R(J i=0,K=a.K;i<K;i++){J b=D.L(a[i]);G(!2o[b]){2o[b]=M;c.1p(a[i])}}}1V(e){c=a}I c},3C:H(c,a,d){J b=[];R(J i=0,K=c.K;i<K;i++)G(!d!=!a(c[i],i))b.1p(c[i]);I b},2l:H(d,a){J c=[];R(J i=0,K=d.K;i<K;i++){J b=a(d[i],i);G(b!=U)c[c.K]=b}I c.7d.1w([],c)}});J v=9B.9A.3y();D.14={5B:(v.1I(/.+(?:9y|9x|9w|9v)[\\/: ]([\\d.]+)/)||[])[1],2k:/75/.11(v),2G:/2G/.11(v),1f:/1f/.11(v)&&!/2G/.11(v),42:/42/.11(v)&&!/(9s|75)/.11(v)};J y=D.14.1f?"7o":"72";D.1l({71:!D.14.1f||S.70=="6Z",3X:{"R":"9n","9k":"1F","4i":y,72:y,7o:y,9h:"9f",9e:"9d",9b:"99"}});D.P({6W:H(a){I a.1d},97:H(a){I D.4S(a,"1d")},95:H(a){I D.3a(a,2,"2H")},91:H(a){I D.3a(a,2,"4l")},8Z:H(a){I D.4S(a,"2H")},8X:H(a){I D.4S(a,"4l")},8W:H(a){I D.5v(a.1d.1x,a)},8V:H(a){I D.5v(a.1x)},6Q:H(a){I D.Y(a,"8U")?a.8T||a.8S.S:D.2d(a.3t)}},H(c,d){D.17[c]=H(b){J a=D.2l(7,d);G(b&&1j b=="23")a=D.3g(b,a);I 7.2I(D.4r(a))}});D.P({6P:"3v",8Q:"6F",39:"6E",8P:"5q",8O:"7b"},H(c,b){D.17[c]=H(){J a=19;I 7.P(H(){R(J i=0,K=a.K;i<K;i++)D(a[i])[b](7)})}});D.P({8N:H(a){D.1K(7,a,"");G(7.16==1)7.5l(a)},8M:H(a){D.1F.1e(7,a)},8L:H(a){D.1F.21(7,a)},8K:H(a){D.1F[D.1F.3T(7,a)?"21":"1e"](7,a)},21:H(a){G(!a||D.1E(a,[7]).r.K){D("*",7).1e(7).P(H(){D.W.21(7);D.3b(7)});G(7.1d)7.1d.37(7)}},4E:H(){D(">*",7).21();1B(7.1x)7.37(7.1x)}},H(a,b){D.17[a]=H(){I 7.P(b,19)}});D.P(["6N","4b"],H(i,c){J b=c.3y();D.17[b]=H(a){I 7[0]==1b?D.14.2G&&S.1c["5t"+c]||D.14.2k&&1b["5s"+c]||S.70=="6Z"&&S.1C["5t"+c]||S.1c["5t"+c]:7[0]==S?29.2f(29.2f(S.1c["4y"+c],S.1C["4y"+c]),29.2f(S.1c["2i"+c],S.1C["2i"+c])):a==12?(7.K?D.1g(7[0],b):U):7.1g(b,a.1q==56?a:a+"2X")}});H 25(a,b){I a[0]&&3r(D.2a(a[0],b,M),10)||0}J C=D.14.2k&&3r(D.14.5B)<8H?"(?:[\\\\w*3m-]|\\\\\\\\.)":"(?:[\\\\w\\8F-\\8E*3m-]|\\\\\\\\.)",6L=2B 4v("^>\\\\s*("+C+"+)"),6J=2B 4v("^("+C+"+)(#)("+C+"+)"),6I=2B 4v("^([#.]?)("+C+"*)");D.1l({6H:{"":H(a,i,m){I m[2]=="*"||D.Y(a,m[2])},"#":H(a,i,m){I a.4G("2v")==m[2]},":":{8D:H(a,i,m){I i<m[3]-0},8C:H(a,i,m){I i>m[3]-0},3a:H(a,i,m){I m[3]-0==i},79:H(a,i,m){I m[3]-0==i},3o:H(a,i){I i==0},3S:H(a,i,m,r){I i==r.K-1},6D:H(a,i){I i%2==0},6C:H(a,i){I i%2},"3o-4u":H(a){I a.1d.3H("*")[0]==a},"3S-4u":H(a){I D.3a(a.1d.5T,1,"4l")==a},"8z-4u":H(a){I!D.3a(a.1d.5T,2,"4l")},6W:H(a){I a.1x},4E:H(a){I!a.1x},8y:H(a,i,m){I(a.6O||a.8x||D(a).1r()||"").1h(m[3])>=0},4j:H(a){I"1G"!=a.O&&D.1g(a,"18")!="2F"&&D.1g(a,"5g")!="1G"},1G:H(a){I"1G"==a.O||D.1g(a,"18")=="2F"||D.1g(a,"5g")=="1G"},8w:H(a){I!a.3R},3R:H(a){I a.3R},4J:H(a){I a.4J},2W:H(a){I a.2W||D.1K(a,"2W")},1r:H(a){I"1r"==a.O},5O:H(a){I"5O"==a.O},5L:H(a){I"5L"==a.O},5p:H(a){I"5p"==a.O},3Q:H(a){I"3Q"==a.O},5o:H(a){I"5o"==a.O},6A:H(a){I"6A"==a.O},6z:H(a){I"6z"==a.O},2s:H(a){I"2s"==a.O||D.Y(a,"2s")},4T:H(a){I/4T|2A|6y|2s/i.11(a.Y)},3T:H(a,i,m){I D.2q(m[3],a).K},8t:H(a){I/h\\d/i.11(a.Y)},8s:H(a){I D.3C(D.3O,H(b){I a==b.T}).K}}},6x:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,2B 4v("^([:.#]*)("+C+"+)")],3g:H(a,c,b){J d,1t=[];1B(a&&a!=d){d=a;J f=D.1E(a,c,b);a=f.t.1o(/^\\s*,\\s*/,"");1t=b?c=f.r:D.2R(1t,f.r)}I 1t},2q:H(t,o){G(1j t!="23")I[t];G(o&&o.16!=1&&o.16!=9)I[];o=o||S;J d=[o],2o=[],3S,Y;1B(t&&3S!=t){J r=[];3S=t;t=D.3k(t);J l=Q,3j=6L,m=3j.2D(t);G(m){Y=m[1].2r();R(J i=0;d[i];i++)R(J c=d[i].1x;c;c=c.2H)G(c.16==1&&(Y=="*"||c.Y.2r()==Y))r.1p(c);d=r;t=t.1o(3j,"");G(t.1h(" ")==0)6M;l=M}N{3j=/^([>+~])\\s*(\\w*)/i;G((m=3j.2D(t))!=U){r=[];J k={};Y=m[2].2r();m=m[1];R(J j=0,3i=d.K;j<3i;j++){J n=m=="~"||m=="+"?d[j].2H:d[j].1x;R(;n;n=n.2H)G(n.16==1){J g=D.L(n);G(m=="~"&&k[g])1X;G(!Y||n.Y.2r()==Y){G(m=="~")k[g]=M;r.1p(n)}G(m=="+")1X}}d=r;t=D.3k(t.1o(3j,""));l=M}}G(t&&!l){G(!t.1h(",")){G(o==d[0])d.4s();2o=D.2R(2o,d);r=d=[o];t=" "+t.6v(1,t.K)}N{J h=6J;J m=h.2D(t);G(m){m=[0,m[2],m[3],m[1]]}N{h=6I;m=h.2D(t)}m[2]=m[2].1o(/\\\\/g,"");J f=d[d.K-1];G(m[1]=="#"&&f&&f.61&&!D.4n(f)){J p=f.61(m[2]);G((D.14.1f||D.14.2G)&&p&&1j p.2v=="23"&&p.2v!=m[2])p=D(\'[@2v="\'+m[2]+\'"]\',f)[0];d=r=p&&(!m[3]||D.Y(p,m[3]))?[p]:[]}N{R(J i=0;d[i];i++){J a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];G(a=="*"&&d[i].Y.3y()=="49")a="3n";r=D.2R(r,d[i].3H(a))}G(m[1]==".")r=D.5m(r,m[2]);G(m[1]=="#"){J e=[];R(J i=0;r[i];i++)G(r[i].4G("2v")==m[2]){e=[r[i]];1X}r=e}d=r}t=t.1o(h,"")}}G(t){J b=D.1E(t,r);d=r=b.r;t=D.3k(b.t)}}G(t)d=[];G(d&&o==d[0])d.4s();2o=D.2R(2o,d);I 2o},5m:H(r,m,a){m=" "+m+" ";J c=[];R(J i=0;r[i];i++){J b=(" "+r[i].1F+" ").1h(m)>=0;G(!a&&b||a&&!b)c.1p(r[i])}I c},1E:H(t,r,h){J d;1B(t&&t!=d){d=t;J p=D.6x,m;R(J i=0;p[i];i++){m=p[i].2D(t);G(m){t=t.8r(m[0].K);m[2]=m[2].1o(/\\\\/g,"");1X}}G(!m)1X;G(m[1]==":"&&m[2]=="4Y")r=62.11(m[3])?D.1E(m[3],r,M).r:D(r).4Y(m[3]);N G(m[1]==".")r=D.5m(r,m[2],h);N G(m[1]=="["){J g=[],O=m[3];R(J i=0,3i=r.K;i<3i;i++){J a=r[i],z=a[D.3X[m[2]]||m[2]];G(z==U||/5Q|4d|2W/.11(m[2]))z=D.1K(a,m[2])||\'\';G((O==""&&!!z||O=="="&&z==m[5]||O=="!="&&z!=m[5]||O=="^="&&z&&!z.1h(m[5])||O=="$="&&z.6v(z.K-m[5].K)==m[5]||(O=="*="||O=="~=")&&z.1h(m[5])>=0)^h)g.1p(a)}r=g}N G(m[1]==":"&&m[2]=="3a-4u"){J e={},g=[],11=/(-?)(\\d*)n((?:\\+|-)?\\d*)/.2D(m[3]=="6D"&&"2n"||m[3]=="6C"&&"2n+1"||!/\\D/.11(m[3])&&"8q+"+m[3]||m[3]),3o=(11[1]+(11[2]||1))-0,d=11[3]-0;R(J i=0,3i=r.K;i<3i;i++){J j=r[i],1d=j.1d,2v=D.L(1d);G(!e[2v]){J c=1;R(J n=1d.1x;n;n=n.2H)G(n.16==1)n.4q=c++;e[2v]=M}J b=Q;G(3o==0){G(j.4q==d)b=M}N G((j.4q-d)%3o==0&&(j.4q-d)/3o>=0)b=M;G(b^h)g.1p(j)}r=g}N{J f=D.6H[m[1]];G(1j f=="49")f=f[m[2]];G(1j f=="23")f=6u("Q||H(a,i){I "+f+";}");r=D.3C(r,H(a,i){I f(a,i,m,r)},h)}}I{r:r,t:t}},4S:H(b,c){J a=[],1t=b[c];1B(1t&&1t!=S){G(1t.16==1)a.1p(1t);1t=1t[c]}I a},3a:H(a,e,c,b){e=e||1;J d=0;R(;a;a=a[c])G(a.16==1&&++d==e)1X;I a},5v:H(n,a){J r=[];R(;n;n=n.2H){G(n.16==1&&n!=a)r.1p(n)}I r}});D.W={1e:H(f,i,g,e){G(f.16==3||f.16==8)I;G(D.14.1f&&f.4I)f=1b;G(!g.24)g.24=7.24++;G(e!=12){J h=g;g=7.3M(h,H(){I h.1w(7,19)});g.L=e}J j=D.L(f,"3w")||D.L(f,"3w",{}),1H=D.L(f,"1H")||D.L(f,"1H",H(){G(1j D!="12"&&!D.W.5k)I D.W.1H.1w(19.3L.T,19)});1H.T=f;D.P(i.1R(/\\s+/),H(c,b){J a=b.1R(".");b=a[0];g.O=a[1];J d=j[b];G(!d){d=j[b]={};G(!D.W.2t[b]||D.W.2t[b].4p.1k(f)===Q){G(f.3K)f.3K(b,1H,Q);N G(f.6t)f.6t("4o"+b,1H)}}d[g.24]=g;D.W.26[b]=M});f=U},24:1,26:{},21:H(e,h,f){G(e.16==3||e.16==8)I;J i=D.L(e,"3w"),1L,5i;G(i){G(h==12||(1j h=="23"&&h.8p(0)=="."))R(J g 1n i)7.21(e,g+(h||""));N{G(h.O){f=h.2y;h=h.O}D.P(h.1R(/\\s+/),H(b,a){J c=a.1R(".");a=c[0];G(i[a]){G(f)2U i[a][f.24];N R(f 1n i[a])G(!c[1]||i[a][f].O==c[1])2U i[a][f];R(1L 1n i[a])1X;G(!1L){G(!D.W.2t[a]||D.W.2t[a].4A.1k(e)===Q){G(e.6p)e.6p(a,D.L(e,"1H"),Q);N G(e.6n)e.6n("4o"+a,D.L(e,"1H"))}1L=U;2U i[a]}}})}R(1L 1n i)1X;G(!1L){J d=D.L(e,"1H");G(d)d.T=U;D.3b(e,"3w");D.3b(e,"1H")}}},1P:H(h,c,f,g,i){c=D.2d(c);G(h.1h("!")>=0){h=h.3s(0,-1);J a=M}G(!f){G(7.26[h])D("*").1e([1b,S]).1P(h,c)}N{G(f.16==3||f.16==8)I 12;J b,1L,17=D.1D(f[h]||U),W=!c[0]||!c[0].32;G(W){c.6h({O:h,2J:f,32:H(){},3J:H(){},4C:1z()});c[0][E]=M}c[0].O=h;G(a)c[0].6m=M;J d=D.L(f,"1H");G(d)b=d.1w(f,c);G((!17||(D.Y(f,\'a\')&&h=="4V"))&&f["4o"+h]&&f["4o"+h].1w(f,c)===Q)b=Q;G(W)c.4s();G(i&&D.1D(i)){1L=i.1w(f,b==U?c:c.7d(b));G(1L!==12)b=1L}G(17&&g!==Q&&b!==Q&&!(D.Y(f,\'a\')&&h=="4V")){7.5k=M;1U{f[h]()}1V(e){}}7.5k=Q}I b},1H:H(b){J a,1L,38,5f,4m;b=19[0]=D.W.6l(b||1b.W);38=b.O.1R(".");b.O=38[0];38=38[1];5f=!38&&!b.6m;4m=(D.L(7,"3w")||{})[b.O];R(J j 1n 4m){J c=4m[j];G(5f||c.O==38){b.2y=c;b.L=c.L;1L=c.1w(7,19);G(a!==Q)a=1L;G(1L===Q){b.32();b.3J()}}}I a},6l:H(b){G(b[E]==M)I b;J d=b;b={8o:d};J c="8n 8m 8l 8k 2s 8j 47 5d 6j 5E 8i L 8h 8g 4K 2y 5a 59 8e 8b 58 6f 8a 88 4k 87 86 84 6d 2J 4C 6c O 82 81 35".1R(" ");R(J i=c.K;i;i--)b[c[i]]=d[c[i]];b[E]=M;b.32=H(){G(d.32)d.32();d.80=Q};b.3J=H(){G(d.3J)d.3J();d.7Z=M};b.4C=b.4C||1z();G(!b.2J)b.2J=b.6d||S;G(b.2J.16==3)b.2J=b.2J.1d;G(!b.4k&&b.4K)b.4k=b.4K==b.2J?b.6c:b.4K;G(b.58==U&&b.5d!=U){J a=S.1C,1c=S.1c;b.58=b.5d+(a&&a.2e||1c&&1c.2e||0)-(a.6b||0);b.6f=b.6j+(a&&a.2c||1c&&1c.2c||0)-(a.6a||0)}G(!b.35&&((b.47||b.47===0)?b.47:b.5a))b.35=b.47||b.5a;G(!b.59&&b.5E)b.59=b.5E;G(!b.35&&b.2s)b.35=(b.2s&1?1:(b.2s&2?3:(b.2s&4?2:0)));I b},3M:H(a,b){b.24=a.24=a.24||b.24||7.24++;I b},2t:{27:{4p:H(){55();I},4A:H(){I}},3D:{4p:H(){G(D.14.1f)I Q;D(7).2O("53",D.W.2t.3D.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("53",D.W.2t.3D.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3D";I D.W.1H.1w(7,19)}},3N:{4p:H(){G(D.14.1f)I Q;D(7).2O("51",D.W.2t.3N.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("51",D.W.2t.3N.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3N";I D.W.1H.1w(7,19)}}}};D.17.1l({2O:H(c,a,b){I c=="4X"?7.2V(c,a,b):7.P(H(){D.W.1e(7,c,b||a,b&&a)})},2V:H(d,b,c){J e=D.W.3M(c||b,H(a){D(7).4e(a,e);I(c||b).1w(7,19)});I 7.P(H(){D.W.1e(7,d,e,c&&b)})},4e:H(a,b){I 7.P(H(){D.W.21(7,a,b)})},1P:H(c,a,b){I 7.P(H(){D.W.1P(c,a,7,M,b)})},5C:H(c,a,b){I 7[0]&&D.W.1P(c,a,7[0],Q,b)},2m:H(b){J c=19,i=1;1B(i<c.K)D.W.3M(b,c[i++]);I 7.4V(D.W.3M(b,H(a){7.4Z=(7.4Z||0)%i;a.32();I c[7.4Z++].1w(7,19)||Q}))},7X:H(a,b){I 7.2O(\'3D\',a).2O(\'3N\',b)},27:H(a){55();G(D.2Q)a.1k(S,D);N D.3A.1p(H(){I a.1k(7,D)});I 7}});D.1l({2Q:Q,3A:[],27:H(){G(!D.2Q){D.2Q=M;G(D.3A){D.P(D.3A,H(){7.1k(S)});D.3A=U}D(S).5C("27")}}});J x=Q;H 55(){G(x)I;x=M;G(S.3K&&!D.14.2G)S.3K("69",D.27,Q);G(D.14.1f&&1b==1S)(H(){G(D.2Q)I;1U{S.1C.7V("1A")}1V(3e){3B(19.3L,0);I}D.27()})();G(D.14.2G)S.3K("69",H(){G(D.2Q)I;R(J i=0;i<S.4W.K;i++)G(S.4W[i].3R){3B(19.3L,0);I}D.27()},Q);G(D.14.2k){J a;(H(){G(D.2Q)I;G(S.3f!="68"&&S.3f!="1J"){3B(19.3L,0);I}G(a===12)a=D("V, 7A[7U=7S]").K;G(S.4W.K!=a){3B(19.3L,0);I}D.27()})()}D.W.1e(1b,"43",D.27)}D.P(("7R,7Q,43,85,4y,4X,4V,7P,"+"7O,7N,89,53,51,7M,2A,"+"5o,7L,7K,8d,3e").1R(","),H(i,b){D.17[b]=H(a){I a?7.2O(b,a):7.1P(b)}});J F=H(a,c){J b=a.4k;1B(b&&b!=c)1U{b=b.1d}1V(3e){b=c}I b==c};D(1b).2O("4X",H(){D("*").1e(S).4e()});D.17.1l({67:D.17.43,43:H(g,d,c){G(1j g!=\'23\')I 7.67(g);J e=g.1h(" ");G(e>=0){J i=g.3s(e,g.K);g=g.3s(0,e)}c=c||H(){};J f="2P";G(d)G(D.1D(d)){c=d;d=U}N{d=D.3n(d);f="6g"}J h=7;D.3Y({1a:g,O:f,1O:"2K",L:d,1J:H(a,b){G(b=="1W"||b=="7J")h.2K(i?D("<1v/>").3v(a.4U.1o(/<1m(.|\\s)*?\\/1m>/g,"")).2q(i):a.4U);h.P(c,[a.4U,b,a])}});I 7},aL:H(){I D.3n(7.7I())},7I:H(){I 7.2l(H(){I D.Y(7,"3V")?D.2d(7.aH):7}).1E(H(){I 7.34&&!7.3R&&(7.4J||/2A|6y/i.11(7.Y)||/1r|1G|3Q/i.11(7.O))}).2l(H(i,c){J b=D(7).6e();I b==U?U:b.1q==2p?D.2l(b,H(a,i){I{34:c.34,2x:a}}):{34:c.34,2x:b}}).3p()}});D.P("7H,7G,7F,7D,7C,7B".1R(","),H(i,o){D.17[o]=H(f){I 7.2O(o,f)}});J B=1z();D.1l({3p:H(d,b,a,c){G(D.1D(b)){a=b;b=U}I D.3Y({O:"2P",1a:d,L:b,1W:a,1O:c})},aE:H(b,a){I D.3p(b,U,a,"1m")},aD:H(c,b,a){I D.3p(c,b,a,"3z")},aC:H(d,b,a,c){G(D.1D(b)){a=b;b={}}I D.3Y({O:"6g",1a:d,L:b,1W:a,1O:c})},aA:H(a){D.1l(D.60,a)},60:{1a:5Z.5Q,26:M,O:"2P",2T:0,7z:"4R/x-ax-3V-aw",7x:M,31:M,L:U,5Y:U,3Q:U,4Q:{2N:"4R/2N, 1r/2N",2K:"1r/2K",1m:"1r/4t, 4R/4t",3z:"4R/3z, 1r/4t",1r:"1r/as",4w:"*/*"}},4z:{},3Y:H(s){s=D.1l(M,s,D.1l(M,{},D.60,s));J g,2Z=/=\\?(&|$)/g,1u,L,O=s.O.2r();G(s.L&&s.7x&&1j s.L!="23")s.L=D.3n(s.L);G(s.1O=="4P"){G(O=="2P"){G(!s.1a.1I(2Z))s.1a+=(s.1a.1I(/\\?/)?"&":"?")+(s.4P||"7u")+"=?"}N G(!s.L||!s.L.1I(2Z))s.L=(s.L?s.L+"&":"")+(s.4P||"7u")+"=?";s.1O="3z"}G(s.1O=="3z"&&(s.L&&s.L.1I(2Z)||s.1a.1I(2Z))){g="4P"+B++;G(s.L)s.L=(s.L+"").1o(2Z,"="+g+"$1");s.1a=s.1a.1o(2Z,"="+g+"$1");s.1O="1m";1b[g]=H(a){L=a;1W();1J();1b[g]=12;1U{2U 1b[g]}1V(e){}G(i)i.37(h)}}G(s.1O=="1m"&&s.1Y==U)s.1Y=Q;G(s.1Y===Q&&O=="2P"){J j=1z();J k=s.1a.1o(/(\\?|&)3m=.*?(&|$)/,"$ap="+j+"$2");s.1a=k+((k==s.1a)?(s.1a.1I(/\\?/)?"&":"?")+"3m="+j:"")}G(s.L&&O=="2P"){s.1a+=(s.1a.1I(/\\?/)?"&":"?")+s.L;s.L=U}G(s.26&&!D.4O++)D.W.1P("7H");J n=/^(?:\\w+:)?\\/\\/([^\\/?#]+)/;G(s.1O=="1m"&&O=="2P"&&n.11(s.1a)&&n.2D(s.1a)[1]!=5Z.al){J i=S.3H("6w")[0];J h=S.3h("1m");h.4d=s.1a;G(s.7t)h.aj=s.7t;G(!g){J l=Q;h.ah=h.ag=H(){G(!l&&(!7.3f||7.3f=="68"||7.3f=="1J")){l=M;1W();1J();i.37(h)}}}i.3U(h);I 12}J m=Q;J c=1b.7s?2B 7s("ae.ac"):2B 7r();G(s.5Y)c.6R(O,s.1a,s.31,s.5Y,s.3Q);N c.6R(O,s.1a,s.31);1U{G(s.L)c.4B("ab-aa",s.7z);G(s.5S)c.4B("a9-5R-a8",D.4z[s.1a]||"a7, a6 a5 a4 5N:5N:5N a2");c.4B("X-9Z-9Y","7r");c.4B("9W",s.1O&&s.4Q[s.1O]?s.4Q[s.1O]+", */*":s.4Q.4w)}1V(e){}G(s.7m&&s.7m(c,s)===Q){s.26&&D.4O--;c.7l();I Q}G(s.26)D.W.1P("7B",[c,s]);J d=H(a){G(!m&&c&&(c.3f==4||a=="2T")){m=M;G(f){7k(f);f=U}1u=a=="2T"&&"2T"||!D.7j(c)&&"3e"||s.5S&&D.7h(c,s.1a)&&"7J"||"1W";G(1u=="1W"){1U{L=D.6X(c,s.1O,s.9S)}1V(e){1u="5J"}}G(1u=="1W"){J b;1U{b=c.5I("7g-5R")}1V(e){}G(s.5S&&b)D.4z[s.1a]=b;G(!g)1W()}N D.5H(s,c,1u);1J();G(s.31)c=U}};G(s.31){J f=4I(d,13);G(s.2T>0)3B(H(){G(c){c.7l();G(!m)d("2T")}},s.2T)}1U{c.9P(s.L)}1V(e){D.5H(s,c,U,e)}G(!s.31)d();H 1W(){G(s.1W)s.1W(L,1u);G(s.26)D.W.1P("7C",[c,s])}H 1J(){G(s.1J)s.1J(c,1u);G(s.26)D.W.1P("7F",[c,s]);G(s.26&&!--D.4O)D.W.1P("7G")}I c},5H:H(s,a,b,e){G(s.3e)s.3e(a,b,e);G(s.26)D.W.1P("7D",[a,s,e])},4O:0,7j:H(a){1U{I!a.1u&&5Z.9O=="5p:"||(a.1u>=7e&&a.1u<9N)||a.1u==7c||a.1u==9K||D.14.2k&&a.1u==12}1V(e){}I Q},7h:H(a,c){1U{J b=a.5I("7g-5R");I a.1u==7c||b==D.4z[c]||D.14.2k&&a.1u==12}1V(e){}I Q},6X:H(a,c,b){J d=a.5I("9J-O"),2N=c=="2N"||!c&&d&&d.1h("2N")>=0,L=2N?a.9I:a.4U;G(2N&&L.1C.2j=="5J")7p"5J";G(b)L=b(L,c);G(c=="1m")D.5u(L);G(c=="3z")L=6u("("+L+")");I L},3n:H(a){J s=[];G(a.1q==2p||a.5w)D.P(a,H(){s.1p(3u(7.34)+"="+3u(7.2x))});N R(J j 1n a)G(a[j]&&a[j].1q==2p)D.P(a[j],H(){s.1p(3u(j)+"="+3u(7))});N s.1p(3u(j)+"="+3u(D.1D(a[j])?a[j]():a[j]));I s.6s("&").1o(/%20/g,"+")}});D.17.1l({1N:H(c,b){I c?7.2g({1Z:"1N",2h:"1N",1y:"1N"},c,b):7.1E(":1G").P(H(){7.V.18=7.5D||"";G(D.1g(7,"18")=="2F"){J a=D("<"+7.2j+" />").6P("1c");7.V.18=a.1g("18");G(7.V.18=="2F")7.V.18="3I";a.21()}}).3l()},1M:H(b,a){I b?7.2g({1Z:"1M",2h:"1M",1y:"1M"},b,a):7.1E(":4j").P(H(){7.5D=7.5D||D.1g(7,"18");7.V.18="2F"}).3l()},78:D.17.2m,2m:H(a,b){I D.1D(a)&&D.1D(b)?7.78.1w(7,19):a?7.2g({1Z:"2m",2h:"2m",1y:"2m"},a,b):7.P(H(){D(7)[D(7).3F(":1G")?"1N":"1M"]()})},9G:H(b,a){I 7.2g({1Z:"1N"},b,a)},9F:H(b,a){I 7.2g({1Z:"1M"},b,a)},9E:H(b,a){I 7.2g({1Z:"2m"},b,a)},9D:H(b,a){I 7.2g({1y:"1N"},b,a)},9M:H(b,a){I 7.2g({1y:"1M"},b,a)},9C:H(c,a,b){I 7.2g({1y:a},c,b)},2g:H(k,j,i,g){J h=D.77(j,i,g);I 7[h.36===Q?"P":"36"](H(){G(7.16!=1)I Q;J f=D.1l({},h),p,1G=D(7).3F(":1G"),46=7;R(p 1n k){G(k[p]=="1M"&&1G||k[p]=="1N"&&!1G)I f.1J.1k(7);G(p=="1Z"||p=="2h"){f.18=D.1g(7,"18");f.33=7.V.33}}G(f.33!=U)7.V.33="1G";f.45=D.1l({},k);D.P(k,H(c,a){J e=2B D.28(46,f,c);G(/2m|1N|1M/.11(a))e[a=="2m"?1G?"1N":"1M":a](k);N{J b=a.6r().1I(/^([+-]=)?([\\d+-.]+)(.*)$/),2b=e.1t(M)||0;G(b){J d=3d(b[2]),2M=b[3]||"2X";G(2M!="2X"){46.V[c]=(d||1)+2M;2b=((d||1)/e.1t(M))*2b;46.V[c]=2b+2M}G(b[1])d=((b[1]=="-="?-1:1)*d)+2b;e.3G(2b,d,2M)}N e.3G(2b,a,"")}});I M})},36:H(a,b){G(D.1D(a)||(a&&a.1q==2p)){b=a;a="28"}G(!a||(1j a=="23"&&!b))I A(7[0],a);I 7.P(H(){G(b.1q==2p)A(7,a,b);N{A(7,a).1p(b);G(A(7,a).K==1)b.1k(7)}})},9X:H(b,c){J a=D.3O;G(b)7.36([]);7.P(H(){R(J i=a.K-1;i>=0;i--)G(a[i].T==7){G(c)a[i](M);a.7n(i,1)}});G(!c)7.5A();I 7}});J A=H(b,c,a){G(b){c=c||"28";J q=D.L(b,c+"36");G(!q||a)q=D.L(b,c+"36",D.2d(a))}I q};D.17.5A=H(a){a=a||"28";I 7.P(H(){J q=A(7,a);q.4s();G(q.K)q[0].1k(7)})};D.1l({77:H(b,a,c){J d=b&&b.1q==a0?b:{1J:c||!c&&a||D.1D(b)&&b,2u:b,41:c&&a||a&&a.1q!=9t&&a};d.2u=(d.2u&&d.2u.1q==4L?d.2u:D.28.5K[d.2u])||D.28.5K.74;d.5M=d.1J;d.1J=H(){G(d.36!==Q)D(7).5A();G(D.1D(d.5M))d.5M.1k(7)};I d},41:{73:H(p,n,b,a){I b+a*p},5P:H(p,n,b,a){I((-29.9r(p*29.9q)/2)+0.5)*a+b}},3O:[],48:U,28:H(b,c,a){7.15=c;7.T=b;7.1i=a;G(!c.3Z)c.3Z={}}});D.28.44={4D:H(){G(7.15.2Y)7.15.2Y.1k(7.T,7.1z,7);(D.28.2Y[7.1i]||D.28.2Y.4w)(7);G(7.1i=="1Z"||7.1i=="2h")7.T.V.18="3I"},1t:H(a){G(7.T[7.1i]!=U&&7.T.V[7.1i]==U)I 7.T[7.1i];J r=3d(D.1g(7.T,7.1i,a));I r&&r>-9p?r:3d(D.2a(7.T,7.1i))||0},3G:H(c,b,d){7.5V=1z();7.2b=c;7.3l=b;7.2M=d||7.2M||"2X";7.1z=7.2b;7.2S=7.4N=0;7.4D();J e=7;H t(a){I e.2Y(a)}t.T=7.T;D.3O.1p(t);G(D.48==U){D.48=4I(H(){J a=D.3O;R(J i=0;i<a.K;i++)G(!a[i]())a.7n(i--,1);G(!a.K){7k(D.48);D.48=U}},13)}},1N:H(){7.15.3Z[7.1i]=D.1K(7.T.V,7.1i);7.15.1N=M;7.3G(0,7.1t());G(7.1i=="2h"||7.1i=="1Z")7.T.V[7.1i]="9m";D(7.T).1N()},1M:H(){7.15.3Z[7.1i]=D.1K(7.T.V,7.1i);7.15.1M=M;7.3G(7.1t(),0)},2Y:H(a){J t=1z();G(a||t>7.15.2u+7.5V){7.1z=7.3l;7.2S=7.4N=1;7.4D();7.15.45[7.1i]=M;J b=M;R(J i 1n 7.15.45)G(7.15.45[i]!==M)b=Q;G(b){G(7.15.18!=U){7.T.V.33=7.15.33;7.T.V.18=7.15.18;G(D.1g(7.T,"18")=="2F")7.T.V.18="3I"}G(7.15.1M)7.T.V.18="2F";G(7.15.1M||7.15.1N)R(J p 1n 7.15.45)D.1K(7.T.V,p,7.15.3Z[p])}G(b)7.15.1J.1k(7.T);I Q}N{J n=t-7.5V;7.4N=n/7.15.2u;7.2S=D.41[7.15.41||(D.41.5P?"5P":"73")](7.4N,n,0,1,7.15.2u);7.1z=7.2b+((7.3l-7.2b)*7.2S);7.4D()}I M}};D.1l(D.28,{5K:{9l:9j,9i:7e,74:9g},2Y:{2e:H(a){a.T.2e=a.1z},2c:H(a){a.T.2c=a.1z},1y:H(a){D.1K(a.T.V,"1y",a.1z)},4w:H(a){a.T.V[a.1i]=a.1z+a.2M}}});D.17.2i=H(){J b=0,1S=0,T=7[0],3q;G(T)ao(D.14){J d=T.1d,4a=T,1s=T.1s,1Q=T.2z,5U=2k&&3r(5B)<9c&&!/9a/i.11(v),1g=D.2a,3c=1g(T,"30")=="3c";G(T.7y){J c=T.7y();1e(c.1A+29.2f(1Q.1C.2e,1Q.1c.2e),c.1S+29.2f(1Q.1C.2c,1Q.1c.2c));1e(-1Q.1C.6b,-1Q.1C.6a)}N{1e(T.5X,T.5W);1B(1s){1e(1s.5X,1s.5W);G(42&&!/^t(98|d|h)$/i.11(1s.2j)||2k&&!5U)2C(1s);G(!3c&&1g(1s,"30")=="3c")3c=M;4a=/^1c$/i.11(1s.2j)?4a:1s;1s=1s.1s}1B(d&&d.2j&&!/^1c|2K$/i.11(d.2j)){G(!/^96|1T.*$/i.11(1g(d,"18")))1e(-d.2e,-d.2c);G(42&&1g(d,"33")!="4j")2C(d);d=d.1d}G((5U&&(3c||1g(4a,"30")=="5x"))||(42&&1g(4a,"30")!="5x"))1e(-1Q.1c.5X,-1Q.1c.5W);G(3c)1e(29.2f(1Q.1C.2e,1Q.1c.2e),29.2f(1Q.1C.2c,1Q.1c.2c))}3q={1S:1S,1A:b}}H 2C(a){1e(D.2a(a,"6V",M),D.2a(a,"6U",M))}H 1e(l,t){b+=3r(l,10)||0;1S+=3r(t,10)||0}I 3q};D.17.1l({30:H(){J a=0,1S=0,3q;G(7[0]){J b=7.1s(),2i=7.2i(),4c=/^1c|2K$/i.11(b[0].2j)?{1S:0,1A:0}:b.2i();2i.1S-=25(7,\'94\');2i.1A-=25(7,\'aF\');4c.1S+=25(b,\'6U\');4c.1A+=25(b,\'6V\');3q={1S:2i.1S-4c.1S,1A:2i.1A-4c.1A}}I 3q},1s:H(){J a=7[0].1s;1B(a&&(!/^1c|2K$/i.11(a.2j)&&D.1g(a,\'30\')==\'93\'))a=a.1s;I D(a)}});D.P([\'5e\',\'5G\'],H(i,b){J c=\'4y\'+b;D.17[c]=H(a){G(!7[0])I;I a!=12?7.P(H(){7==1b||7==S?1b.92(!i?a:D(1b).2e(),i?a:D(1b).2c()):7[c]=a}):7[0]==1b||7[0]==S?46[i?\'aI\':\'aJ\']||D.71&&S.1C[c]||S.1c[c]:7[0][c]}});D.P(["6N","4b"],H(i,b){J c=i?"5e":"5G",4f=i?"6k":"6i";D.17["5s"+b]=H(){I 7[b.3y()]()+25(7,"57"+c)+25(7,"57"+4f)};D.17["90"+b]=H(a){I 7["5s"+b]()+25(7,"2C"+c+"4b")+25(7,"2C"+4f+"4b")+(a?25(7,"6S"+c)+25(7,"6S"+4f):0)}})})();',62,669,'|||||||this|||||||||||||||||||||||||||||||||||if|function|return|var|length|data|true|else|type|each|false|for|document|elem|null|style|event||nodeName|||test|undefined||browser|options|nodeType|fn|display|arguments|url|window|body|parentNode|add|msie|css|indexOf|prop|typeof|call|extend|script|in|replace|push|constructor|text|offsetParent|cur|status|div|apply|firstChild|opacity|now|left|while|documentElement|isFunction|filter|className|hidden|handle|match|complete|attr|ret|hide|show|dataType|trigger|doc|split|top|table|try|catch|success|break|cache|height||remove|tbody|string|guid|num|global|ready|fx|Math|curCSS|start|scrollTop|makeArray|scrollLeft|max|animate|width|offset|tagName|safari|map|toggle||done|Array|find|toUpperCase|button|special|duration|id|copy|value|handler|ownerDocument|select|new|border|exec|stack|none|opera|nextSibling|pushStack|target|html|inArray|unit|xml|bind|GET|isReady|merge|pos|timeout|delete|one|selected|px|step|jsre|position|async|preventDefault|overflow|name|which|queue|removeChild|namespace|insertBefore|nth|removeData|fixed|parseFloat|error|readyState|multiFilter|createElement|rl|re|trim|end|_|param|first|get|results|parseInt|slice|childNodes|encodeURIComponent|append|events|elems|toLowerCase|json|readyList|setTimeout|grep|mouseenter|color|is|custom|getElementsByTagName|block|stopPropagation|addEventListener|callee|proxy|mouseleave|timers|defaultView|password|disabled|last|has|appendChild|form|domManip|props|ajax|orig|set|easing|mozilla|load|prototype|curAnim|self|charCode|timerId|object|offsetChild|Width|parentOffset|src|unbind|br|currentStyle|clean|float|visible|relatedTarget|previousSibling|handlers|isXMLDoc|on|setup|nodeIndex|unique|shift|javascript|child|RegExp|_default|deep|scroll|lastModified|teardown|setRequestHeader|timeStamp|update|empty|tr|getAttribute|innerHTML|setInterval|checked|fromElement|Number|jQuery|state|active|jsonp|accepts|application|dir|input|responseText|click|styleSheets|unload|not|lastToggle|outline|mouseout|getPropertyValue|mouseover|getComputedStyle|bindReady|String|padding|pageX|metaKey|keyCode|getWH|andSelf|clientX|Left|all|visibility|container|index|init|triggered|removeAttribute|classFilter|prevObject|submit|file|after|windowData|inner|client|globalEval|sibling|jquery|absolute|clone|wrapAll|dequeue|version|triggerHandler|oldblock|ctrlKey|createTextNode|Top|handleError|getResponseHeader|parsererror|speeds|checkbox|old|00|radio|swing|href|Modified|ifModified|lastChild|safari2|startTime|offsetTop|offsetLeft|username|location|ajaxSettings|getElementById|isSimple|values|selectedIndex|runtimeStyle|rsLeft|_load|loaded|DOMContentLoaded|clientTop|clientLeft|toElement|srcElement|val|pageY|POST|unshift|Bottom|clientY|Right|fix|exclusive|detachEvent|cloneNode|removeEventListener|swap|toString|join|attachEvent|eval|substr|head|parse|textarea|reset|image|zoom|odd|even|before|prepend|exclude|expr|quickClass|quickID|uuid|quickChild|continue|Height|textContent|appendTo|contents|open|margin|evalScript|borderTopWidth|borderLeftWidth|parent|httpData|setArray|CSS1Compat|compatMode|boxModel|cssFloat|linear|def|webkit|nodeValue|speed|_toggle|eq|100|replaceWith|304|concat|200|alpha|Last|httpNotModified|getAttributeNode|httpSuccess|clearInterval|abort|beforeSend|splice|styleFloat|throw|colgroup|XMLHttpRequest|ActiveXObject|scriptCharset|callback|fieldset|multiple|processData|getBoundingClientRect|contentType|link|ajaxSend|ajaxSuccess|ajaxError|col|ajaxComplete|ajaxStop|ajaxStart|serializeArray|notmodified|keypress|keydown|change|mouseup|mousedown|dblclick|focus|blur|stylesheet|hasClass|rel|doScroll|black|hover|solid|cancelBubble|returnValue|wheelDelta|view|round|shiftKey|resize|screenY|screenX|relatedNode|mousemove|prevValue|originalTarget|offsetHeight|keyup|newValue|offsetWidth|eventPhase|detail|currentTarget|cancelable|bubbles|attrName|attrChange|altKey|originalEvent|charAt|0n|substring|animated|header|noConflict|line|enabled|innerText|contains|only|weight|font|gt|lt|uFFFF|u0128|size|417|Boolean|Date|toggleClass|removeClass|addClass|removeAttr|replaceAll|insertAfter|prependTo|wrap|contentWindow|contentDocument|iframe|children|siblings|prevAll|wrapInner|nextAll|outer|prev|scrollTo|static|marginTop|next|inline|parents|able|cellSpacing|adobeair|cellspacing|522|maxLength|maxlength|readOnly|400|readonly|fast|600|class|slow|1px|htmlFor|reverse|10000|PI|cos|compatible|Function|setData|ie|ra|it|rv|getData|userAgent|navigator|fadeTo|fadeIn|slideToggle|slideUp|slideDown|ig|responseXML|content|1223|NaN|fadeOut|300|protocol|send|setAttribute|option|dataFilter|cssText|changed|be|Accept|stop|With|Requested|Object|can|GMT|property|1970|Jan|01|Thu|Since|If|Type|Content|XMLHTTP|th|Microsoft|td|onreadystatechange|onload|cap|charset|colg|host|tfoot|specified|with|1_|thead|leg|plain|attributes|opt|embed|urlencoded|www|area|hr|ajaxSetup|meta|post|getJSON|getScript|marginLeft|img|elements|pageYOffset|pageXOffset|abbr|serialize|pixelLeft'.split('|'),0,{}))
\ No newline at end of file
Index: js/vulab.admin.js
===================================================================
--- js/vulab.admin.js	(revision 6370)
+++ js/vulab.admin.js	(working copy)
@@ -1,176 +0,0 @@
-/*
-File: 		vulab.admin.js \\v 1.0
-Info:		- handle all /admin js functionality
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-
-
-$(document).ready(function(){
-
-	addLog('jquery loaded');	
-
-	//Handle Postdata.
-	postdata = $('#postdata').text();
-	//$('#postdata').empty(); //Empty it, its sensitive to stupid people.
-	if (postdata) { addLog('harvested postdata!'); addLog(postdata); }
-/*
-	$('.onofftoggle').click(function(){ 
-		var id = $(this).attr('id');
-		$('.'+id).fadeOut('fast');
-		var status = $('#'+id).attr('checked');
-		if (status == false) { $('.'+id).attr('disabled',''); }
-		if (status == true) { $('.'+id).attr('disabled','disabled'); }
-		$('.'+id).fadeIn('fast');
-	});
-	*/	
-	$('.isolatetoggle').click(function(){
-		$('.isolatetoggle').each (function(i) {
-			var id = $(this).attr('id');
-			$('.'+id).fadeOut('fast');
-		});	
-		var id = $(this).attr('id');
-		$('.'+id).fadeIn('def');
-		
-	});
-
-	$("#pre_none").click(function() {
-		$('#surveytool').fadeOut('fast');
-		$('#surveytitle').fadeOut('fast');
-		$('#copysurvey').fadeOut('fast');
-	});
-	$("#post_none").click(function() {
-		$('#surveytool').fadeOut('fast');
-		$('#surveytitle').fadeOut('fast');
-		$('#copysurvey').fadeOut('fast');
-	});
-	$("#pre_new").click(function() {
-		$('#copysurvey').fadeOut('fast');
-		$('#surveytool').fadeOut('fast');
-		$('#surveytitle').fadeOut('fast');
-		$('iframe#surveytool').attr('src','manage.php?where=survey_tool&lay=form&new=true');
-		$('#surveytool').fadeIn('fast');
-		
-		//alert('new');
-	/*	$('#surveytool').empty();
-		$.ajax({
-  			type: "GET",
-   			url: "manage.php?where=survey_tool&new=true&lay=ajax&where_context=pre_new",
-   			success: function(html){
-   			 	$('#surveytool').empty();
-				$('#surveytool').attr('innerHTML',html);
-				$('#surveytool').fadeIn('fast');	
-			}
-   		});
-   		$('#surveytool').fadeIn('fast');
-   		*/
-	});
-
-	$("#post_new").click(function() {
-		$('#copysurvey').fadeOut('fast');
-		$('#surveytool').fadeOut('fast');
-		$('#surveytitle').fadeOut('fast');
-		$('iframe#surveytool').attr('src','manage.php?where=survey_tool&lay=form&new=true');
-		$('#surveytool').fadeIn('fast');
-	});
-	$("#pre_copy").click(function() {
-		$('#surveytool').fadeOut('fast');
-		$('#copysurvey').fadeIn('fast');
-	//	alert('copy');
-	});
-	$("#post_copy").click(function() {
-		$('#surveytool').fadeOut('fast');
-		$('#surveytitle').fadeOut('fast');
-		$('#surveynote').fadeOut('fast');
-		$('#copysurvey').fadeIn('fast');
-	//	alert('copy');
-	});
-	$('#copysurvey option').click(function(){	
-		
-		var thisval = $(this).attr('value');
-		$('#surveytool').fadeOut('fast');
-		$('iframe#surveytool').attr('src','manage.php?where=survey_tool&lay=form&fromID='+thisval+'&new=true&makenew=true');
-		$('#surveytool').fadeIn('fast');
-/*		$('#surveytool').fadeOut('fast');
-		$.ajax({
-  			type: "GET",
-   			url: "manage.php?where=survey_tool&where_context=pre_copy&lay=ajax&newid="+thisval,
-   			success: function(html){
-   			 	$('#surveytool').empty();
-				$('#surveytool').attr('innerHTML',html);
-				$('#surveytool').fadeIn('fast');	
-			}
-   		});
-   		$('#survey_tool').fadeIn('fast');
-//		$('#editsurvey').attr('href','?where=survey_tool&where_context=pre_copy&lay=ajax&newid='+$(this).attr('value'));
-*/
-	});
-
-	
-	$("#debug_toggle").click(function(){
-		if ($(this).html() == 'minimize debug') {
-			$(this).html('expand debug');
-			$('.debug').slideUp();
-			return;
-		}
-		if ($(this).html() == 'expand debug') {
-			$(this).html('minimize debug');
-			$('.debug').slideDown();
-			return;
-		}
-	});
-	
-	$("#log_toggle").click(function(){
-		if ($(this).html() == 'minimize log') {
-			$(this).html('expand log');
-			$('.log').slideUp();
-			return;
-		}
-		if ($(this).html() == 'expand log') {
-			$(this).html('minimize log');
-			$('.log').slideDown();
-			return;
-		}
-	});
-	addLog('all jquery executed');
-	
-	$('.noneWarning').click(function() {
-	
-	});
-	
-	//Utility for Checkboxes in Filters
-	$('a[href="#checkall"]').click(function() {
-		var keyClass = $(this).attr('class');
-		$('input[type=checkbox]').each( function() {
-			if ($(this).hasClass(keyClass)) {
-//			console.log('check');
-				$(this).attr('checked','checked');
-			}
-		});
-	});
-	$('a[href="#checknone"]').click(function() {
-		$('input[type=checkbox]').each( function() {
-		var keyClass = $(this).attr('class');
-			if ($(this).hasClass(keyClass)) {
-//			console.log('uncheck');
-				$(this).attr('checked','');
-			}
-		});
-	});
-	
-// Project JS
-	$('a[href="#save"]').click(function() {
-		$('input[name="go"]').attr('value',$('input[name="from"]').attr('value'));
-		document.containerform.submit();
-	});
-	
-	$('.hrefmodal').click(function() {	
-		$.showAkModal('http://google.com',$(this).attr('alt'),230,170);
-	});
-});
-
-function addLog(line) {
-	if ($('.log')) { $('.log').append(line+"<br/>"); }
-}
\ No newline at end of file
Index: js/jquery.form.js
===================================================================
--- js/jquery.form.js	(revision 6370)
+++ js/jquery.form.js	(working copy)
@@ -1,869 +0,0 @@
-/*
- * jQuery Form Plugin
- * version: 2.07 (03/04/2008)
- * @requires jQuery v1.2.2 or later
- *
- * Examples at: http://malsup.com/jquery/form/
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * Revision: $Id$
- */
- (function($) {
-/**
- * ajaxSubmit() provides a mechanism for submitting an HTML form using AJAX.
- *
- * ajaxSubmit accepts a single argument which can be either a success callback function
- * or an options Object.  If a function is provided it will be invoked upon successful
- * completion of the submit and will be passed the response from the server.
- * If an options Object is provided, the following attributes are supported:
- *
- *  target:   Identifies the element(s) in the page to be updated with the server response.
- *            This value may be specified as a jQuery selection string, a jQuery object,
- *            or a DOM element.
- *            default value: null
- *
- *  url:      URL to which the form data will be submitted.
- *            default value: value of form's 'action' attribute
- *
- *  type:     The method in which the form data should be submitted, 'GET' or 'POST'.
- *            default value: value of form's 'method' attribute (or 'GET' if none found)
- *
- *  data:     Additional data to add to the request, specified as key/value pairs (see $.ajax).
- *
- *  beforeSubmit:  Callback method to be invoked before the form is submitted.
- *            default value: null
- *
- *  success:  Callback method to be invoked after the form has been successfully submitted
- *            and the response has been returned from the server
- *            default value: null
- *
- *  dataType: Expected dataType of the response.  One of: null, 'xml', 'script', or 'json'
- *            default value: null
- *
- *  semantic: Boolean flag indicating whether data must be submitted in semantic order (slower).
- *            default value: false
- *
- *  resetForm: Boolean flag indicating whether the form should be reset if the submit is successful
- *
- *  clearForm: Boolean flag indicating whether the form should be cleared if the submit is successful
- *
- *
- * The 'beforeSubmit' callback can be provided as a hook for running pre-submit logic or for
- * validating the form data.  If the 'beforeSubmit' callback returns false then the form will
- * not be submitted. The 'beforeSubmit' callback is invoked with three arguments: the form data
- * in array format, the jQuery object, and the options object passed into ajaxSubmit.
- * The form data array takes the following form:
- *
- *     [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
- *
- * If a 'success' callback method is provided it is invoked after the response has been returned
- * from the server.  It is passed the responseText or responseXML value (depending on dataType).
- * See jQuery.ajax for further details.
- *
- *
- * The dataType option provides a means for specifying how the server response should be handled.
- * This maps directly to the jQuery.httpData method.  The following values are supported:
- *
- *      'xml':    if dataType == 'xml' the server response is treated as XML and the 'success'
- *                   callback method, if specified, will be passed the responseXML value
- *      'json':   if dataType == 'json' the server response will be evaluted and passed to
- *                   the 'success' callback, if specified
- *      'script': if dataType == 'script' the server response is evaluated in the global context
- *
- *
- * Note that it does not make sense to use both the 'target' and 'dataType' options.  If both
- * are provided the target will be ignored.
- *
- * The semantic argument can be used to force form serialization in semantic order.
- * This is normally true anyway, unless the form contains input elements of type='image'.
- * If your form must be submitted with name/value pairs in semantic order and your form
- * contains an input of type='image" then pass true for this arg, otherwise pass false
- * (or nothing) to avoid the overhead for this logic.
- *
- *
- * When used on its own, ajaxSubmit() is typically bound to a form's submit event like this:
- *
- * $("#form-id").submit(function() {
- *     $(this).ajaxSubmit(options);
- *     return false; // cancel conventional submit
- * });
- *
- * When using ajaxForm(), however, this is done for you.
- *
- * @example
- * $('#myForm').ajaxSubmit(function(data) {
- *     alert('Form submit succeeded! Server returned: ' + data);
- * });
- * @desc Submit form and alert server response
- *
- *
- * @example
- * var options = {
- *     target: '#myTargetDiv'
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Submit form and update page element with server response
- *
- *
- * @example
- * var options = {
- *     success: function(responseText) {
- *         alert(responseText);
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Submit form and alert the server response
- *
- *
- * @example
- * var options = {
- *     beforeSubmit: function(formArray, jqForm) {
- *         if (formArray.length == 0) {
- *             alert('Please enter data.');
- *             return false;
- *         }
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Pre-submit validation which aborts the submit operation if form data is empty
- *
- *
- * @example
- * var options = {
- *     url: myJsonUrl.php,
- *     dataType: 'json',
- *     success: function(data) {
- *        // 'data' is an object representing the the evaluated json data
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc json data returned and evaluated
- *
- *
- * @example
- * var options = {
- *     url: myXmlUrl.php,
- *     dataType: 'xml',
- *     success: function(responseXML) {
- *        // responseXML is XML document object
- *        var data = $('myElement', responseXML).text();
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc XML data returned from server
- *
- *
- * @example
- * var options = {
- *     resetForm: true
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc submit form and reset it if successful
- *
- * @example
- * $('#myForm).submit(function() {
- *    $(this).ajaxSubmit();
- *    return false;
- * });
- * @desc Bind form's submit event to use ajaxSubmit
- *
- *
- * @name ajaxSubmit
- * @type jQuery
- * @param options  object literal containing options which control the form submission process
- * @cat Plugins/Form
- * @return jQuery
- */
-$.fn.ajaxSubmit = function(options) {
-    if (typeof options == 'function')
-        options = { success: options };
-
-    options = $.extend({
-        url:  this.attr('action') || window.location.toString(),
-        type: this.attr('method') || 'GET'
-    }, options || {});
-
-    // hook for manipulating the form data before it is extracted;
-    // convenient for use with rich editors like tinyMCE or FCKEditor
-    var veto = {};
-    this.trigger('form-pre-serialize', [this, options, veto]);
-    if (veto.veto) return this;
-
-    var a = this.formToArray(options.semantic);
-    if (options.data) {
-        options.extraData = options.data;
-        for (var n in options.data)
-            a.push( { name: n, value: options.data[n] } );
-    }
-
-    // give pre-submit callback an opportunity to abort the submit
-    if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) return this;
-
-    // fire vetoable 'validate' event
-    this.trigger('form-submit-validate', [a, this, options, veto]);
-    if (veto.veto) return this;
-
-    var q = $.param(a);
-
-    if (options.type.toUpperCase() == 'GET') {
-        options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
-        options.data = null;  // data is null for 'get'
-    }
-    else
-        options.data = q; // data is the query string for 'post'
-
-    var $form = this, callbacks = [];
-    if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
-    if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
-
-    // perform a load on the target only if dataType is not provided
-    if (!options.dataType && options.target) {
-        var oldSuccess = options.success || function(){};
-        callbacks.push(function(data) {
-            $(options.target).html(data).each(oldSuccess, arguments);
-        });
-    }
-    else if (options.success)
-        callbacks.push(options.success);
-
-    options.success = function(data, status) {
-        for (var i=0, max=callbacks.length; i < max; i++)
-            callbacks[i](data, status, $form);
-    };
-
-    // are there files to upload?
-    var files = $('input:file', this).fieldValue();
-    var found = false;
-    for (var j=0; j < files.length; j++)
-        if (files[j])
-            found = true;
-
-    // options.iframe allows user to force iframe mode
-   if (options.iframe || found) { 
-       // hack to fix Safari hang (thanks to Tim Molendijk for this)
-       // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
-       if ($.browser.safari && options.closeKeepAlive)
-           $.get(options.closeKeepAlive, fileUpload);
-       else
-           fileUpload();
-       }
-   else
-       $.ajax(options);
-
-    // fire 'notify' event
-    this.trigger('form-submit-notify', [this, options]);
-    return this;
-
-
-    // private function for handling file uploads (hat tip to YAHOO!)
-    function fileUpload() {
-        var form = $form[0];
-        var opts = $.extend({}, $.ajaxSettings, options);
-
-        var id = 'jqFormIO' + (new Date().getTime());
-        var $io = $('<iframe id="' + id + '" name="' + id + '" />');
-        var io = $io[0];
-        var op8 = $.browser.opera && window.opera.version() < 9;
-        if ($.browser.msie || op8) io.src = 'javascript:false;document.write("");';
-        $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
-
-        var xhr = { // mock object
-            responseText: null,
-            responseXML: null,
-            status: 0,
-            statusText: 'n/a',
-            getAllResponseHeaders: function() {},
-            getResponseHeader: function() {},
-            setRequestHeader: function() {}
-        };
-
-        var g = opts.global;
-        // trigger ajax global events so that activity/block indicators work like normal
-        if (g && ! $.active++) $.event.trigger("ajaxStart");
-        if (g) $.event.trigger("ajaxSend", [xhr, opts]);
-
-        var cbInvoked = 0;
-        var timedOut = 0;
-
-        // take a breath so that pending repaints get some cpu time before the upload starts
-        setTimeout(function() {
-            // make sure form attrs are set
-            var t = $form.attr('target'), a = $form.attr('action');
-            $form.attr({
-                target:   id,
-                encoding: 'multipart/form-data',
-                enctype:  'multipart/form-data',
-                method:   'POST',
-                action:   opts.url
-            });
-
-            // support timout
-            if (opts.timeout)
-                setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
-
-            // add "extra" data to form if provided in options
-            var extraInputs = [];
-            try {
-                if (options.extraData)
-                    for (var n in options.extraData)
-                        extraInputs.push(
-                            $('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
-                                .appendTo(form)[0]);
-            
-                // add iframe to doc and submit the form
-                $io.appendTo('body');
-                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
-                form.submit();
-            }
-            finally {
-                // reset attrs and remove "extra" input elements
-                $form.attr('action', a);
-                t ? $form.attr('target', t) : $form.removeAttr('target');
-                $(extraInputs).remove();
-            }
-        }, 10);
-
-        function cb() {
-            if (cbInvoked++) return;
-
-            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
-
-            var ok = true;
-            try {
-                if (timedOut) throw 'timeout';
-                // extract the server response from the iframe
-                var data, doc;
-                doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-                xhr.responseText = doc.body ? doc.body.innerHTML : null;
-                xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
-                xhr.getResponseHeader = function(header){
-                    var headers = {'content-type': opts.dataType};
-                    return headers[header];
-                };
-
-                if (opts.dataType == 'json' || opts.dataType == 'script') {
-                    var ta = doc.getElementsByTagName('textarea')[0];
-                    xhr.responseText = ta ? ta.value : xhr.responseText;
-                }
-                else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
-                    xhr.responseXML = toXml(xhr.responseText);
-                }
-                data = $.httpData(xhr, opts.dataType);
-            }
-            catch(e){
-                ok = false;
-                $.handleError(opts, xhr, 'error', e);
-            }
-
-            // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
-            if (ok) {
-                opts.success(data, 'success');
-                if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
-            }
-            if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
-            if (g && ! --$.active) $.event.trigger("ajaxStop");
-            if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
-
-            // clean up
-            setTimeout(function() {
-                $io.remove();
-                xhr.responseXML = null;
-            }, 100);
-        };
-
-        function toXml(s, doc) {
-            if (window.ActiveXObject) {
-                doc = new ActiveXObject('Microsoft.XMLDOM');
-                doc.async = 'false';
-                doc.loadXML(s);
-            }
-            else
-                doc = (new DOMParser()).parseFromString(s, 'text/xml');
-            return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
-        };
-    };
-};
-
-/**
- * ajaxForm() provides a mechanism for fully automating form submission.
- *
- * The advantages of using this method instead of ajaxSubmit() are:
- *
- * 1: This method will include coordinates for <input type="image" /> elements (if the element
- *    is used to submit the form).
- * 2. This method will include the submit element's name/value data (for the element that was
- *    used to submit the form).
- * 3. This method binds the submit() method to the form for you.
- *
- * Note that for accurate x/y coordinates of image submit elements in all browsers
- * you need to also use the "dimensions" plugin (this method will auto-detect its presence).
- *
- * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
- * passes the options argument along after properly binding events for submit elements and
- * the form itself.  See ajaxSubmit for a full description of the options argument.
- *
- *
- * @example
- * var options = {
- *     target: '#myTargetDiv'
- * };
- * $('#myForm').ajaxSForm(options);
- * @desc Bind form's submit event so that 'myTargetDiv' is updated with the server response
- *       when the form is submitted.
- *
- *
- * @example
- * var options = {
- *     success: function(responseText) {
- *         alert(responseText);
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Bind form's submit event so that server response is alerted after the form is submitted.
- *
- *
- * @example
- * var options = {
- *     beforeSubmit: function(formArray, jqForm) {
- *         if (formArray.length == 0) {
- *             alert('Please enter data.');
- *             return false;
- *         }
- *     }
- * };
- * $('#myForm').ajaxSubmit(options);
- * @desc Bind form's submit event so that pre-submit callback is invoked before the form
- *       is submitted.
- *
- *
- * @name   ajaxForm
- * @param  options  object literal containing options which control the form submission process
- * @return jQuery
- * @cat    Plugins/Form
- * @type   jQuery
- */
-$.fn.ajaxForm = function(options) {
-    return this.ajaxFormUnbind().bind('submit.form-plugin',function() {
-        $(this).ajaxSubmit(options);
-        return false;
-    }).each(function() {
-        // store options in hash
-        $(":submit,input:image", this).bind('click.form-plugin',function(e) {
-            var $form = this.form;
-            $form.clk = this;
-            if (this.type == 'image') {
-                if (e.offsetX != undefined) {
-                    $form.clk_x = e.offsetX;
-                    $form.clk_y = e.offsetY;
-                } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
-                    var offset = $(this).offset();
-                    $form.clk_x = e.pageX - offset.left;
-                    $form.clk_y = e.pageY - offset.top;
-                } else {
-                    $form.clk_x = e.pageX - this.offsetLeft;
-                    $form.clk_y = e.pageY - this.offsetTop;
-                }
-            }
-            // clear form vars
-            setTimeout(function() { $form.clk = $form.clk_x = $form.clk_y = null; }, 10);
-        });
-    });
-};
-
-
-/**
- * ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
- *
- * @name   ajaxFormUnbind
- * @return jQuery
- * @cat    Plugins/Form
- * @type   jQuery
- */
-$.fn.ajaxFormUnbind = function() {
-    this.unbind('submit.form-plugin');
-    return this.each(function() {
-        $(":submit,input:image", this).unbind('click.form-plugin');
-    });
-
-};
-
-/**
- * formToArray() gathers form element data into an array of objects that can
- * be passed to any of the following ajax functions: $.get, $.post, or load.
- * Each object in the array has both a 'name' and 'value' property.  An example of
- * an array for a simple login form might be:
- *
- * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
- *
- * It is this array that is passed to pre-submit callback functions provided to the
- * ajaxSubmit() and ajaxForm() methods.
- *
- * The semantic argument can be used to force form serialization in semantic order.
- * This is normally true anyway, unless the form contains input elements of type='image'.
- * If your form must be submitted with name/value pairs in semantic order and your form
- * contains an input of type='image" then pass true for this arg, otherwise pass false
- * (or nothing) to avoid the overhead for this logic.
- *
- * @example var data = $("#myForm").formToArray();
- * $.post( "myscript.cgi", data );
- * @desc Collect all the data from a form and submit it to the server.
- *
- * @name formToArray
- * @param semantic true if serialization must maintain strict semantic ordering of elements (slower)
- * @type Array<Object>
- * @cat Plugins/Form
- */
-$.fn.formToArray = function(semantic) {
-    var a = [];
-    if (this.length == 0) return a;
-
-    var form = this[0];
-    var els = semantic ? form.getElementsByTagName('*') : form.elements;
-    if (!els) return a;
-    for(var i=0, max=els.length; i < max; i++) {
-        var el = els[i];
-        var n = el.name;
-        if (!n) continue;
-
-        if (semantic && form.clk && el.type == "image") {
-            // handle image inputs on the fly when semantic == true
-            if(!el.disabled && form.clk == el)
-                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-            continue;
-        }
-
-        var v = $.fieldValue(el, true);
-        if (v && v.constructor == Array) {
-            for(var j=0, jmax=v.length; j < jmax; j++)
-                a.push({name: n, value: v[j]});
-        }
-        else if (v !== null && typeof v != 'undefined')
-            a.push({name: n, value: v});
-    }
-
-    if (!semantic && form.clk) {
-        // input type=='image' are not found in elements array! handle them here
-        var inputs = form.getElementsByTagName("input");
-        for(var i=0, max=inputs.length; i < max; i++) {
-            var input = inputs[i];
-            var n = input.name;
-            if(n && !input.disabled && input.type == "image" && form.clk == input)
-                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-        }
-    }
-    return a;
-};
-
-
-/**
- * Serializes form data into a 'submittable' string. This method will return a string
- * in the format: name1=value1&amp;name2=value2
- *
- * The semantic argument can be used to force form serialization in semantic order.
- * If your form must be submitted with name/value pairs in semantic order then pass
- * true for this arg, otherwise pass false (or nothing) to avoid the overhead for
- * this logic (which can be significant for very large forms).
- *
- * @example var data = $("#myForm").formSerialize();
- * $.ajax('POST', "myscript.cgi", data);
- * @desc Collect all the data from a form into a single string
- *
- * @name formSerialize
- * @param semantic true if serialization must maintain strict semantic ordering of elements (slower)
- * @type String
- * @cat Plugins/Form
- */
-$.fn.formSerialize = function(semantic) {
-    //hand off to jQuery.param for proper encoding
-    return $.param(this.formToArray(semantic));
-};
-
-
-/**
- * Serializes all field elements in the jQuery object into a query string.
- * This method will return a string in the format: name1=value1&amp;name2=value2
- *
- * The successful argument controls whether or not serialization is limited to
- * 'successful' controls (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true.
- *
- * @example var data = $("input").fieldSerialize();
- * @desc Collect the data from all successful input elements into a query string
- *
- * @example var data = $(":radio").fieldSerialize();
- * @desc Collect the data from all successful radio input elements into a query string
- *
- * @example var data = $("#myForm :checkbox").fieldSerialize();
- * @desc Collect the data from all successful checkbox input elements in myForm into a query string
- *
- * @example var data = $("#myForm :checkbox").fieldSerialize(false);
- * @desc Collect the data from all checkbox elements in myForm (even the unchecked ones) into a query string
- *
- * @example var data = $(":input").fieldSerialize();
- * @desc Collect the data from all successful input, select, textarea and button elements into a query string
- *
- * @name fieldSerialize
- * @param successful true if only successful controls should be serialized (default is true)
- * @type String
- * @cat Plugins/Form
- */
-$.fn.fieldSerialize = function(successful) {
-    var a = [];
-    this.each(function() {
-        var n = this.name;
-        if (!n) return;
-        var v = $.fieldValue(this, successful);
-        if (v && v.constructor == Array) {
-            for (var i=0,max=v.length; i < max; i++)
-                a.push({name: n, value: v[i]});
-        }
-        else if (v !== null && typeof v != 'undefined')
-            a.push({name: this.name, value: v});
-    });
-    //hand off to jQuery.param for proper encoding
-    return $.param(a);
-};
-
-
-/**
- * Returns the value(s) of the element in the matched set.  For example, consider the following form:
- *
- *  <form><fieldset>
- *      <input name="A" type="text" />
- *      <input name="A" type="text" />
- *      <input name="B" type="checkbox" value="B1" />
- *      <input name="B" type="checkbox" value="B2"/>
- *      <input name="C" type="radio" value="C1" />
- *      <input name="C" type="radio" value="C2" />
- *  </fieldset></form>
- *
- *  var v = $(':text').fieldValue();
- *  // if no values are entered into the text inputs
- *  v == ['','']
- *  // if values entered into the text inputs are 'foo' and 'bar'
- *  v == ['foo','bar']
- *
- *  var v = $(':checkbox').fieldValue();
- *  // if neither checkbox is checked
- *  v === undefined
- *  // if both checkboxes are checked
- *  v == ['B1', 'B2']
- *
- *  var v = $(':radio').fieldValue();
- *  // if neither radio is checked
- *  v === undefined
- *  // if first radio is checked
- *  v == ['C1']
- *
- * The successful argument controls whether or not the field element must be 'successful'
- * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true.  If this value is false the value(s)
- * for each element is returned.
- *
- * Note: This method *always* returns an array.  If no valid value can be determined the
- *       array will be empty, otherwise it will contain one or more values.
- *
- * @example var data = $("#myPasswordElement").fieldValue();
- * alert(data[0]);
- * @desc Alerts the current value of the myPasswordElement element
- *
- * @example var data = $("#myForm :input").fieldValue();
- * @desc Get the value(s) of the form elements in myForm
- *
- * @example var data = $("#myForm :checkbox").fieldValue();
- * @desc Get the value(s) for the successful checkbox element(s) in the jQuery object.
- *
- * @example var data = $("#mySingleSelect").fieldValue();
- * @desc Get the value(s) of the select control
- *
- * @example var data = $(':text').fieldValue();
- * @desc Get the value(s) of the text input or textarea elements
- *
- * @example var data = $("#myMultiSelect").fieldValue();
- * @desc Get the values for the select-multiple control
- *
- * @name fieldValue
- * @param Boolean successful true if only the values for successful controls should be returned (default is true)
- * @type Array<String>
- * @cat Plugins/Form
- */
-$.fn.fieldValue = function(successful) {
-    for (var val=[], i=0, max=this.length; i < max; i++) {
-        var el = this[i];
-        var v = $.fieldValue(el, successful);
-        if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
-            continue;
-        v.constructor == Array ? $.merge(val, v) : val.push(v);
-    }
-    return val;
-};
-
-/**
- * Returns the value of the field element.
- *
- * The successful argument controls whether or not the field element must be 'successful'
- * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true.  If the given element is not
- * successful and the successful arg is not false then the returned value will be null.
- *
- * Note: If the successful flag is true (default) but the element is not successful, the return will be null
- * Note: The value returned for a successful select-multiple element will always be an array.
- * Note: If the element has no value the return value will be undefined.
- *
- * @example var data = jQuery.fieldValue($("#myPasswordElement")[0]);
- * @desc Gets the current value of the myPasswordElement element
- *
- * @name fieldValue
- * @param Element el The DOM element for which the value will be returned
- * @param Boolean successful true if value returned must be for a successful controls (default is true)
- * @type String or Array<String> or null or undefined
- * @cat Plugins/Form
- */
-$.fieldValue = function(el, successful) {
-    var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
-    if (typeof successful == 'undefined') successful = true;
-
-    if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
-        (t == 'checkbox' || t == 'radio') && !el.checked ||
-        (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
-        tag == 'select' && el.selectedIndex == -1))
-            return null;
-
-    if (tag == 'select') {
-        var index = el.selectedIndex;
-        if (index < 0) return null;
-        var a = [], ops = el.options;
-        var one = (t == 'select-one');
-        var max = (one ? index+1 : ops.length);
-        for(var i=(one ? index : 0); i < max; i++) {
-            var op = ops[i];
-            if (op.selected) {
-                // extra pain for IE...
-                var v = $.browser.msie && !(op.attributes['value'].specified) ? op.text : op.value;
-                if (one) return v;
-                a.push(v);
-            }
-        }
-        return a;
-    }
-    return el.value;
-};
-
-
-/**
- * Clears the form data.  Takes the following actions on the form's input fields:
- *  - input text fields will have their 'value' property set to the empty string
- *  - select elements will have their 'selectedIndex' property set to -1
- *  - checkbox and radio inputs will have their 'checked' property set to false
- *  - inputs of type submit, button, reset, and hidden will *not* be effected
- *  - button elements will *not* be effected
- *
- * @example $('form').clearForm();
- * @desc Clears all forms on the page.
- *
- * @name clearForm
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.clearForm = function() {
-    return this.each(function() {
-        $('input,select,textarea', this).clearFields();
-    });
-};
-
-/**
- * Clears the selected form elements.  Takes the following actions on the matched elements:
- *  - input text fields will have their 'value' property set to the empty string
- *  - select elements will have their 'selectedIndex' property set to -1
- *  - checkbox and radio inputs will have their 'checked' property set to false
- *  - inputs of type submit, button, reset, and hidden will *not* be effected
- *  - button elements will *not* be effected
- *
- * @example $('.myInputs').clearFields();
- * @desc Clears all inputs with class myInputs
- *
- * @name clearFields
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.clearFields = $.fn.clearInputs = function() {
-    return this.each(function() {
-        var t = this.type, tag = this.tagName.toLowerCase();
-        if (t == 'text' || t == 'password' || tag == 'textarea')
-            this.value = '';
-        else if (t == 'checkbox' || t == 'radio')
-            this.checked = false;
-        else if (tag == 'select')
-            this.selectedIndex = -1;
-    });
-};
-
-
-/**
- * Resets the form data.  Causes all form elements to be reset to their original value.
- *
- * @example $('form').resetForm();
- * @desc Resets all forms on the page.
- *
- * @name resetForm
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.resetForm = function() {
-    return this.each(function() {
-        // guard against an input with the name of 'reset'
-        // note that IE reports the reset function as an 'object'
-        if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
-            this.reset();
-    });
-};
-
-
-/**
- * Enables or disables any matching elements.
- *
- * @example $(':radio').enabled(false);
- * @desc Disables all radio buttons
- *
- * @name select
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.enable = function(b) { 
-    if (b == undefined) b = true;
-    return this.each(function() { 
-        this.disabled = !b 
-    });
-};
-
-/**
- * Checks/unchecks any matching checkboxes or radio buttons and
- * selects/deselects and matching option elements.
- *
- * @example $(':checkbox').select();
- * @desc Checks all checkboxes
- *
- * @name select
- * @type jQuery
- * @cat Plugins/Form
- */
-$.fn.select = function(select) {
-    if (select == undefined) select = true;
-    return this.each(function() { 
-        var t = this.type;
-        if (t == 'checkbox' || t == 'radio')
-            this.checked = select;
-        else if (this.tagName.toLowerCase() == 'option') {
-            var $sel = $(this).parent('select');
-            if (select && $sel[0] && $sel[0].type == 'select-one') {
-                // deselect all other options
-                $sel.find('option').select(false);
-            }
-            this.selected = select;
-        }
-    });
-};
-
-})(jQuery);
Index: js/ui/ui.core.js
===================================================================
--- js/ui/ui.core.js	(revision 6370)
+++ js/ui/ui.core.js	(working copy)
@@ -1,291 +0,0 @@
-/*
- * jQuery UI 1.5.2
- *
- * Copyright (c) 2008 Paul Bakaus (ui.jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI
- */
-;(function($) {
-
-$.ui = {
-	plugin: {
-		add: function(module, option, set) {
-			var proto = $.ui[module].prototype;
-			for(var i in set) {
-				proto.plugins[i] = proto.plugins[i] || [];
-				proto.plugins[i].push([option, set[i]]);
-			}
-		},
-		call: function(instance, name, args) {
-			var set = instance.plugins[name];
-			if(!set) { return; }
-			
-			for (var i = 0; i < set.length; i++) {
-				if (instance.options[set[i][0]]) {
-					set[i][1].apply(instance.element, args);
-				}
-			}
-		}	
-	},
-	cssCache: {},
-	css: function(name) {
-		if ($.ui.cssCache[name]) { return $.ui.cssCache[name]; }
-		var tmp = $('<div class="ui-gen">').addClass(name).css({position:'absolute', top:'-5000px', left:'-5000px', display:'block'}).appendTo('body');
-		
-		//if (!$.browser.safari)
-			//tmp.appendTo('body'); 
-		
-		//Opera and Safari set width and height to 0px instead of auto
-		//Safari returns rgba(0,0,0,0) when bgcolor is not set
-		$.ui.cssCache[name] = !!(
-			(!(/auto|default/).test(tmp.css('cursor')) || (/^[1-9]/).test(tmp.css('height')) || (/^[1-9]/).test(tmp.css('width')) || 
-			!(/none/).test(tmp.css('backgroundImage')) || !(/transparent|rgba\(0, 0, 0, 0\)/).test(tmp.css('backgroundColor')))
-		);
-		try { $('body').get(0).removeChild(tmp.get(0));	} catch(e){}
-		return $.ui.cssCache[name];
-	},
-	disableSelection: function(el) {
-		$(el).attr('unselectable', 'on').css('MozUserSelect', 'none');
-	},
-	enableSelection: function(el) {
-		$(el).attr('unselectable', 'off').css('MozUserSelect', '');
-	},
-	hasScroll: function(e, a) {
-		var scroll = /top/.test(a||"top") ? 'scrollTop' : 'scrollLeft', has = false;
-		if (e[scroll] > 0) return true; e[scroll] = 1;
-		has = e[scroll] > 0 ? true : false; e[scroll] = 0;
-		return has;
-	}
-};
-
-
-/** jQuery core modifications and additions **/
-
-var _remove = $.fn.remove;
-$.fn.remove = function() {
-	$("*", this).add(this).triggerHandler("remove");
-	return _remove.apply(this, arguments );
-};
-
-// $.widget is a factory to create jQuery plugins
-// taking some boilerplate code out of the plugin code
-// created by Scott González and Jörn Zaefferer
-function getter(namespace, plugin, method) {
-	var methods = $[namespace][plugin].getter || [];
-	methods = (typeof methods == "string" ? methods.split(/,?\s+/) : methods);
-	return ($.inArray(method, methods) != -1);
-}
-
-$.widget = function(name, prototype) {
-	var namespace = name.split(".")[0];
-	name = name.split(".")[1];
-	
-	// create plugin method
-	$.fn[name] = function(options) {
-		var isMethodCall = (typeof options == 'string'),
-			args = Array.prototype.slice.call(arguments, 1);
-		
-		if (isMethodCall && getter(namespace, name, options)) {
-			var instance = $.data(this[0], name);
-			return (instance ? instance[options].apply(instance, args)
-				: undefined);
-		}
-		
-		return this.each(function() {
-			var instance = $.data(this, name);
-			if (isMethodCall && instance && $.isFunction(instance[options])) {
-				instance[options].apply(instance, args);
-			} else if (!isMethodCall) {
-				$.data(this, name, new $[namespace][name](this, options));
-			}
-		});
-	};
-	
-	// create widget constructor
-	$[namespace][name] = function(element, options) {
-		var self = this;
-		
-		this.widgetName = name;
-		this.widgetBaseClass = namespace + '-' + name;
-		
-		this.options = $.extend({}, $.widget.defaults, $[namespace][name].defaults, options);
-		this.element = $(element)
-			.bind('setData.' + name, function(e, key, value) {
-				return self.setData(key, value);
-			})
-			.bind('getData.' + name, function(e, key) {
-				return self.getData(key);
-			})
-			.bind('remove', function() {
-				return self.destroy();
-			});
-		this.init();
-	};
-	
-	// add widget prototype
-	$[namespace][name].prototype = $.extend({}, $.widget.prototype, prototype);
-};
-
-$.widget.prototype = {
-	init: function() {},
-	destroy: function() {
-		this.element.removeData(this.widgetName);
-	},
-	
-	getData: function(key) {
-		return this.options[key];
-	},
-	setData: function(key, value) {
-		this.options[key] = value;
-		
-		if (key == 'disabled') {
-			this.element[value ? 'addClass' : 'removeClass'](
-				this.widgetBaseClass + '-disabled');
-		}
-	},
-	
-	enable: function() {
-		this.setData('disabled', false);
-	},
-	disable: function() {
-		this.setData('disabled', true);
-	}
-};
-
-$.widget.defaults = {
-	disabled: false
-};
-
-
-/** Mouse Interaction Plugin **/
-
-$.ui.mouse = {
-	mouseInit: function() {
-		var self = this;
-	
-		this.element.bind('mousedown.'+this.widgetName, function(e) {
-			return self.mouseDown(e);
-		});
-		
-		// Prevent text selection in IE
-		if ($.browser.msie) {
-			this._mouseUnselectable = this.element.attr('unselectable');
-			this.element.attr('unselectable', 'on');
-		}
-		
-		this.started = false;
-	},
-	
-	// TODO: make sure destroying one instance of mouse doesn't mess with
-	// other instances of mouse
-	mouseDestroy: function() {
-		this.element.unbind('.'+this.widgetName);
-		
-		// Restore text selection in IE
-		($.browser.msie
-			&& this.element.attr('unselectable', this._mouseUnselectable));
-	},
-	
-	mouseDown: function(e) {
-		// we may have missed mouseup (out of window)
-		(this._mouseStarted && this.mouseUp(e));
-		
-		this._mouseDownEvent = e;
-		
-		var self = this,
-			btnIsLeft = (e.which == 1),
-			elIsCancel = (typeof this.options.cancel == "string" ? $(e.target).parents().add(e.target).filter(this.options.cancel).length : false);
-		if (!btnIsLeft || elIsCancel || !this.mouseCapture(e)) {
-			return true;
-		}
-		
-		this._mouseDelayMet = !this.options.delay;
-		if (!this._mouseDelayMet) {
-			this._mouseDelayTimer = setTimeout(function() {
-				self._mouseDelayMet = true;
-			}, this.options.delay);
-		}
-		
-		if (this.mouseDistanceMet(e) && this.mouseDelayMet(e)) {
-			this._mouseStarted = (this.mouseStart(e) !== false);
-			if (!this._mouseStarted) {
-				e.preventDefault();
-				return true;
-			}
-		}
-		
-		// these delegates are required to keep context
-		this._mouseMoveDelegate = function(e) {
-			return self.mouseMove(e);
-		};
-		this._mouseUpDelegate = function(e) {
-			return self.mouseUp(e);
-		};
-		$(document)
-			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-		
-		return false;
-	},
-	
-	mouseMove: function(e) {
-		// IE mouseup check - mouseup happened when mouse was out of window
-		if ($.browser.msie && !e.button) {
-			return this.mouseUp(e);
-		}
-		
-		if (this._mouseStarted) {
-			this.mouseDrag(e);
-			return false;
-		}
-		
-		if (this.mouseDistanceMet(e) && this.mouseDelayMet(e)) {
-			this._mouseStarted =
-				(this.mouseStart(this._mouseDownEvent, e) !== false);
-			(this._mouseStarted ? this.mouseDrag(e) : this.mouseUp(e));
-		}
-		
-		return !this._mouseStarted;
-	},
-	
-	mouseUp: function(e) {
-		$(document)
-			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-		
-		if (this._mouseStarted) {
-			this._mouseStarted = false;
-			this.mouseStop(e);
-		}
-		
-		return false;
-	},
-	
-	mouseDistanceMet: function(e) {
-		return (Math.max(
-				Math.abs(this._mouseDownEvent.pageX - e.pageX),
-				Math.abs(this._mouseDownEvent.pageY - e.pageY)
-			) >= this.options.distance
-		);
-	},
-	
-	mouseDelayMet: function(e) {
-		return this._mouseDelayMet;
-	},
-	
-	// These are placeholder methods, to be overriden by extending plugin
-	mouseStart: function(e) {},
-	mouseDrag: function(e) {},
-	mouseStop: function(e) {},
-	mouseCapture: function(e) { return true; }
-};
-
-$.ui.mouse.defaults = {
-	cancel: null,
-	distance: 1,
-	delay: 0
-};
-
-})(jQuery);
Index: js/ui/i18n/ui.datepicker-zh-CN.js
===================================================================
--- js/ui/i18n/ui.datepicker-zh-CN.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-zh-CN.js	(working copy)
@@ -1,22 +0,0 @@
-/* Chinese initialisation for the jQuery UI date picker plugin. */
-/* Written by Cloudream (cloudream@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['zh-CN'] = {clearText: '清除', clearStatus: '清除已选日期',
-		closeText: '关闭', closeStatus: '不改变当前选择',
-		prevText: '&lt;上月', prevStatus: '显示上月',
-		nextText: '下月&gt;', nextStatus: '显示下月',
-		currentText: '今天', currentStatus: '显示本月',
-		monthNames: ['一月','二月','三月','四月','五月','六月',
-		'七月','八月','九月','十月','十一月','十二月'],
-		monthNamesShort: ['一','二','三','四','五','六',
-		'七','八','九','十','十一','十二'],
-		monthStatus: '选择月份', yearStatus: '选择年份',
-		weekHeader: '周', weekStatus: '年内周次',
-		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-		dayNamesMin: ['日','一','二','三','四','五','六'],
-		dayStatus: '设置 DD 为一周起始', dateStatus: '选择 m月 d日, DD',
-		dateFormat: 'yy-mm-dd', firstDay: 1, 
-		initStatus: '请选择日期', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['zh-CN']);
-});
Index: js/ui/i18n/ui.datepicker-lt.js
===================================================================
--- js/ui/i18n/ui.datepicker-lt.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-lt.js	(working copy)
@@ -1,25 +0,0 @@
-/**
- * Lithuanian (UTF-8) initialisation for the jQuery UI date picker plugin.
- *
- * @author Arturas Paleicikas <arturas@avalon.lt>
- */
-jQuery(function($){
-	$.datepicker.regional['lt'] = {clearText: 'Išvalyti', clearStatus: '',
-		closeText: 'Uždaryti', closeStatus: '',
-		prevText: '&lt;Atgal',  prevStatus: '',
-		nextText: 'Pirmyn&gt;', nextStatus: '',
-		currentText: 'Šiandien', currentStatus: '',
-		monthNames: ['Sausis','Vasaris','Kovas','Balandis','Gegužė','Birželis',
-		'Liepa','Rugpjūtis','Rugsėjis','Spalis','Lapkritis','Gruodis'],
-		monthNamesShort: ['Sau','Vas','Kov','Bal','Geg','Bir',
-		'Lie','Rugp','Rugs','Spa','Lap','Gru'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: '', weekStatus: '',
-		dayNames: ['sekmadienis','pirmadienis','antradienis','trečiadienis','ketvirtadienis','penktadienis','šeštadienis'],
-		dayNamesShort: ['sek','pir','ant','tre','ket','pen','šeš'],
-		dayNamesMin: ['Se','Pr','An','Tr','Ke','Pe','Še'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'yy-mm-dd', firstDay: 1, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['lt']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-lv.js
===================================================================
--- js/ui/i18n/ui.datepicker-lv.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-lv.js	(working copy)
@@ -1,25 +0,0 @@
-/**
- * Latvian (UTF-8) initialisation for the jQuery UI date picker plugin.
- * @author Arturas Paleicikas <arturas.paleicikas@metasite.net>
- */
-jQuery(function($){
-	$.datepicker.regional['lv'] = {
-		clearText: 'Notīrīt', clearStatus: '',
-		closeText: 'Aizvērt', closeStatus: '',
-		prevText: 'Iepr',  prevStatus: '',
-		nextText: 'Nāka', nextStatus: '',
-		currentText: 'Šodien', currentStatus: '',
-		monthNames: ['Janvāris','Februāris','Marts','Aprīlis','Maijs','Jūnijs',
-		'Jūlijs','Augusts','Septembris','Oktobris','Novembris','Decembris'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jūn',
-		'Jūl','Aug','Sep','Okt','Nov','Dec'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Nav', weekStatus: '',
-		dayNames: ['svētdiena','pirmdiena','otrdiena','trešdiena','ceturtdiena','piektdiena','sestdiena'],
-		dayNamesShort: ['svt','prm','otr','tre','ctr','pkt','sst'],
-		dayNamesMin: ['Sv','Pr','Ot','Tr','Ct','Pk','Ss'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd-mm-yy', firstDay: 1, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['lv']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-ca.js
===================================================================
--- js/ui/i18n/ui.datepicker-ca.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-ca.js	(working copy)
@@ -1,22 +0,0 @@
-/* Inicialitzaci� en catal� per a l'extenci� 'calendar' per jQuery. */
-/* Writers: (joan.leon@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['ca'] = {clearText: 'Netejar', clearStatus: '',
-		closeText: 'Tancar', closeStatus: '',
-		prevText: '&lt;Ant', prevStatus: '',
-		nextText: 'Seg&gt;', nextStatus: '',
-		currentText: 'Avui', currentStatus: '',
-		monthNames: ['Gener','Febrer','Mar&ccedil;','Abril','Maig','Juny',
-		'Juliol','Agost','Setembre','Octubre','Novembre','Desembre'],
-		monthNamesShort: ['Gen','Feb','Mar','Abr','Mai','Jun',
-		'Jul','Ago','Set','Oct','Nov','Des'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Sm', weekStatus: '',
-		dayNames: ['Diumenge','Dilluns','Dimarts','Dimecres','Dijous','Divendres','Dissabte'],
-		dayNamesShort: ['Dug','Dln','Dmt','Dmc','Djs','Dvn','Dsb'],
-		dayNamesMin: ['Dg','Dl','Dt','Dc','Dj','Dv','Ds'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'mm/dd/yy', firstDay: 0, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['ca']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-pt-BR.js
===================================================================
--- js/ui/i18n/ui.datepicker-pt-BR.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-pt-BR.js	(working copy)
@@ -1,22 +0,0 @@
-/* Brazilian initialisation for the jQuery UI date picker plugin. */
-/* Written by Leonildo Costa Silva (leocsilva@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['pt-BR'] = {clearText: 'Limpar', clearStatus: '',
-		closeText: 'Fechar', closeStatus: '',
-		prevText: '&lt;Anterior', prevStatus: '',
-		nextText: 'Pr&oacute;ximo&gt;', nextStatus: '',
-		currentText: 'Hoje', currentStatus: '',
-		monthNames: ['Janeiro','Fevereiro','Mar&ccedil;o','Abril','Maio','Junho',
-		'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
-		monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
-		'Jul','Ago','Set','Out','Nov','Dez'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Sm', weekStatus: '',
-		dayNames: ['Domingo','Segunda-feira','Ter&ccedil;a-feira','Quarta-feira','Quinta-feira','Sexta-feira','Sabado'],
-		dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sab'],
-		dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','Sab'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd/mm/yy', firstDay: 0, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['pt-BR']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-da.js
===================================================================
--- js/ui/i18n/ui.datepicker-da.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-da.js	(working copy)
@@ -1,22 +0,0 @@
-﻿/* Danish initialisation for the jQuery UI date picker plugin. */
-/* Written by Jan Christensen ( deletestuff@gmail.com). */
-jQuery(function($){
-    $.datepicker.regional['da'] = {clearText: 'Nulstil', clearStatus: 'Nulstil den aktuelle dato',
-		closeText: 'Luk', closeStatus: 'Luk uden ændringer',
-        prevText: '&#x3c;Forrige', prevStatus: 'Vis forrige måned',
-		nextText: 'Næste&#x3e;', nextStatus: 'Vis næste måned',
-		currentText: 'Idag', currentStatus: 'Vis aktuel måned',
-        monthNames: ['Januar','Februar','Marts','April','Maj','Juni', 
-        'Juli','August','September','Oktober','November','December'],
-        monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun', 
-        'Jul','Aug','Sep','Okt','Nov','Dec'],
-		monthStatus: 'Vis en anden måned', yearStatus: 'Vis et andet år',
-		weekHeader: 'Uge', weekStatus: 'Årets uge',
-		dayNames: ['Søndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','Lørdag'],
-		dayNamesShort: ['Søn','Man','Tir','Ons','Tor','Fre','Lør'],
-		dayNamesMin: ['Sø','Ma','Ti','On','To','Fr','Lø'],
-		dayStatus: 'Sæt DD som første ugedag', dateStatus: 'Vælg D, M d',
-        dateFormat: 'dd-mm-yy', firstDay: 0, 
-		initStatus: 'Vælg en dato', isRTL: false};
-    $.datepicker.setDefaults($.datepicker.regional['da']); 
-});
Index: js/ui/i18n/ui.datepicker-tr.js
===================================================================
--- js/ui/i18n/ui.datepicker-tr.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-tr.js	(working copy)
@@ -1,22 +0,0 @@
-/* Turkish initialisation for the jQuery UI date picker plugin. */
-/* Written by Izzet Emre Erkan (kara@karalamalar.net). */
-jQuery(function($){
-	$.datepicker.regional['tr'] = {clearText: 'temizle', clearStatus: 'geçerli tarihi temizler',
-		closeText: 'kapat', closeStatus: 'sadece göstergeyi kapat',
-		prevText: '&#x3c;geri', prevStatus: 'önceki ayı göster',
-		nextText: 'ileri&#x3e', nextStatus: 'sonraki ayı göster',
-		currentText: 'bugün', currentStatus: '',
-		monthNames: ['Ocak','Şubat','Mart','Nisan','Mayıs','Haziran',
-		'Temmuz','Ağustos','Eylül','Ekim','Kasım','Aralık'],
-		monthNamesShort: ['Oca','Şub','Mar','Nis','May','Haz',
-		'Tem','Ağu','Eyl','Eki','Kas','Ara'],
-		monthStatus: 'başka ay', yearStatus: 'başka yıl',
-		weekHeader: 'Hf', weekStatus: 'Ayın haftaları',
-		dayNames: ['Pazar','Pazartesi','Salı','Çarşamba','Perşembe','Cuma','Cumartesi'],
-		dayNamesShort: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
-		dayNamesMin: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
-		dayStatus: 'Haftanın ilk gününü belirleyin', dateStatus: 'D, M d seçiniz',
-		dateFormat: 'dd.mm.yy', firstDay: 1, 
-		initStatus: 'Bir tarih seçiniz', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['tr']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-sv.js
===================================================================
--- js/ui/i18n/ui.datepicker-sv.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-sv.js	(working copy)
@@ -1,22 +0,0 @@
-﻿/* Swedish initialisation for the jQuery UI date picker plugin. */
-/* Written by Anders Ekdahl ( anders@nomadiz.se). */
-jQuery(function($){
-    $.datepicker.regional['sv'] = {clearText: 'Rensa', clearStatus: '',
-		closeText: 'Stäng', closeStatus: '',
-        prevText: '&laquo;Förra',  prevStatus: '',
-		nextText: 'Nästa&raquo;', nextStatus: '',
-		currentText: 'Idag', currentStatus: '',
-        monthNames: ['Januari','Februari','Mars','April','Maj','Juni', 
-        'Juli','Augusti','September','Oktober','November','December'],
-        monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun', 
-        'Jul','Aug','Sep','Okt','Nov','Dec'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Ve', weekStatus: '',
-		dayNamesShort: ['Sön','Mån','Tis','Ons','Tor','Fre','Lör'],
-		dayNames: ['Söndag','Måndag','Tisdag','Onsdag','Torsdag','Fredag','Lördag'],
-		dayNamesMin: ['Sö','Må','Ti','On','To','Fr','Lö'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-        dateFormat: 'yy-mm-dd', firstDay: 1, 
-		initStatus: '', isRTL: false};
-    $.datepicker.setDefaults($.datepicker.regional['sv']); 
-});
Index: js/ui/i18n/ui.datepicker-bg.js
===================================================================
--- js/ui/i18n/ui.datepicker-bg.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-bg.js	(working copy)
@@ -1,22 +0,0 @@
-﻿/* Bulgarian initialisation for the jQuery UI date picker plugin. */
-/* Written by Stoyan Kyosev (http://svest.org). */
-jQuery(function($){
-    $.datepicker.regional['bg'] = {clearText: 'изчисти', clearStatus: 'изчисти актуалната дата',
-        closeText: 'затвори', closeStatus: 'затвори без промени',
-        prevText: '&#x3c;назад', prevStatus: 'покажи последния месец',
-        nextText: 'напред&#x3e;', nextStatus: 'покажи следващия месец',
-        currentText: 'днес', currentStatus: '',
-        monthNames: ['Януари','Февруари','Март','Април','Май','Юни',
-        'Юли','Август','Септември','Октомври','Ноември','Декември'],
-        monthNamesShort: ['Яну','Фев','Мар','Апр','Май','Юни',
-        'Юли','Авг','Сеп','Окт','Нов','Дек'],
-        monthStatus: 'покажи друг месец', yearStatus: 'покажи друга година',
-        weekHeader: 'Wk', weekStatus: 'седмица от месеца',
-        dayNames: ['Неделя','Понеделник','Вторник','Сряда','Четвъртък','Петък','Събота'],
-        dayNamesShort: ['Нед','Пон','Вто','Сря','Чет','Пет','Съб'],
-        dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Съ'],
-        dayStatus: 'Сложи DD като първи ден от седмицата', dateStatus: 'Избери D, M d',
-        dateFormat: 'dd.mm.yy', firstDay: 1,
-        initStatus: 'Избери дата', isRTL: false};
-    $.datepicker.setDefaults($.datepicker.regional['bg']);
-});
Index: js/ui/i18n/ui.datepicker-de.js
===================================================================
--- js/ui/i18n/ui.datepicker-de.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-de.js	(working copy)
@@ -1,22 +0,0 @@
-﻿/* German initialisation for the jQuery UI date picker plugin. */
-/* Written by Milian Wolff (mail@milianw.de). */
-jQuery(function($){
-	$.datepicker.regional['de'] = {clearText: 'löschen', clearStatus: 'aktuelles Datum löschen',
-		closeText: 'schließen', closeStatus: 'ohne Änderungen schließen',
-		prevText: '&#x3c;zurück', prevStatus: 'letzten Monat zeigen',
-		nextText: 'Vor&#x3e;', nextStatus: 'nächsten Monat zeigen',
-		currentText: 'heute', currentStatus: '',
-		monthNames: ['Januar','Februar','März','April','Mai','Juni',
-		'Juli','August','September','Oktober','November','Dezember'],
-		monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',
-		'Jul','Aug','Sep','Okt','Nov','Dez'],
-		monthStatus: 'anderen Monat anzeigen', yearStatus: 'anderes Jahr anzeigen',
-		weekHeader: 'Wo', weekStatus: 'Woche des Monats',
-		dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
-		dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-		dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-		dayStatus: 'Setze DD als ersten Wochentag', dateStatus: 'Wähle D, M d',
-		dateFormat: 'dd.mm.yy', firstDay: 1, 
-		initStatus: 'Wähle ein Datum', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['de']);
-});
Index: js/ui/i18n/ui.datepicker-ja.js
===================================================================
--- js/ui/i18n/ui.datepicker-ja.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-ja.js	(working copy)
@@ -1,22 +0,0 @@
-/* Japanese (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Milly. */
-jQuery(function($){
-	$.datepicker.regional['ja'] = {clearText: '&#21066;&#38500;', clearStatus: '',
-		closeText: '&#38281;&#12376;&#12427;', closeStatus: '',
-		prevText: '&lt;&#21069;&#26376;', prevStatus: '',
-		nextText: '&#27425;&#26376;&gt;', nextStatus: '',
-		currentText: '&#20170;&#26085;', currentStatus: '',
-		monthNames: ['1&#26376;','2&#26376;','3&#26376;','4&#26376;','5&#26376;','6&#26376;',
-		'7&#26376;','8&#26376;','9&#26376;','10&#26376;','11&#26376;','12&#26376;'],
-		monthNamesShort: ['1&#26376;','2&#26376;','3&#26376;','4&#26376;','5&#26376;','6&#26376;',
-		'7&#26376;','8&#26376;','9&#26376;','10&#26376;','11&#26376;','12&#26376;'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Wk', weekStatus: '',
-		dayNames: ['&#26085;','&#26376;','&#28779;','&#27700;','&#26408;','&#37329;','&#22303;'],
-		dayNamesShort: ['&#26085;','&#26376;','&#28779;','&#27700;','&#26408;','&#37329;','&#22303;'],
-		dayNamesMin: ['&#26085;','&#26376;','&#28779;','&#27700;','&#26408;','&#37329;','&#22303;'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'yy/mm/dd', firstDay: 0, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['ja']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-he.js
===================================================================
--- js/ui/i18n/ui.datepicker-he.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-he.js	(working copy)
@@ -1,22 +0,0 @@
-﻿/* Hebrew initialisation for the UI Datepicker extension. */
-/* Written by Amir Hardon (ahardon at gmail dot com). */
-jQuery(document).ready(function(){
-	jQuery.datepicker.regional['he'] = {clearText: 'נקה', clearStatus: '',
-		closeText: 'סגור', closeStatus: '',
-		prevText: '&#x3c;הקודם', prevStatus: '',
-		nextText: 'הבא&#x3e;', nextStatus: '',
-		currentText: 'היום', currentStatus: '',
-		monthNames: ['ינואר','פברואר','מרץ','אפריל','מאי','יוני',
-		'יולי','אוגוסט','ספטמבר','אוקטובר','נובמבר','דצמבר'],
-		monthNamesShort: ['1','2','3','4','5','6',
-		'7','8','9','10','11','12'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Sm', weekStatus: '',
-		dayNames: ['ראשון','שני','שלישי','רביעי','חמישי','שישי','שבת'],
-		dayNamesShort: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
-		dayNamesMin: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
-		dayStatus: 'DD', dateStatus: 'DD, M d',
-		dateFormat: 'dd/mm/yy', firstDay: 0, 
-		initStatus: '', isRTL: true};
-	jQuery.datepicker.setDefaults($.datepicker.regional['he']);
-});
Index: js/ui/i18n/ui.datepicker-fi.js
===================================================================
--- js/ui/i18n/ui.datepicker-fi.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-fi.js	(working copy)
@@ -1,24 +0,0 @@
-/* Finnish initialisation for the jQuery UI date picker plugin. */
-/* Written by Harri Kilpi� (harrikilpio@gmail.com). */
-
-$(document).ready(function(){
-    $.datepicker.regional['fi'] = {
-		clearText: 'Tyhjenn&auml;', clearStatus: '',
-		closeText: 'Sulje', closeStatus: '',
-		prevText: '&laquo;Edellinen', prevStatus: '',
-		nextText: 'Seuraava&raquo;', nextStatus: '',
-		currentText: 'T&auml;n&auml;&auml;n', currentStatus: '',
-        monthNames: ['Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kes&auml;kuu',
-        'Hein&auml;kuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu'],
-        monthNamesShort: ['Tammi','Helmi','Maalis','Huhti','Touko','Kes&auml;',
-        'Hein&auml;','Elo','Syys','Loka','Marras','Joulu'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Vk', weekStatus: '',
-		dayNamesShort: ['Su','Ma','Ti','Ke','To','Pe','Su'],
-		dayNames: ['Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai'],
-		dayNamesMin: ['Su','Ma','Ti','Ke','To','Pe','La'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-        dateFormat: 'dd.mm.yy', firstDay: 1,
-		initStatus: '', isRTL: false};
-    $.datepicker.setDefaults($.datepicker.regional['fi']);
-});
Index: js/ui/i18n/ui.datepicker-cs.js
===================================================================
--- js/ui/i18n/ui.datepicker-cs.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-cs.js	(working copy)
@@ -1,22 +0,0 @@
-﻿/* Czech initialisation for the jQuery UI date picker plugin. */
-/* Written by Tomas Muller (tomas@tomas-muller.net). */
-jQuery(function($){
-	$.datepicker.regional['cs'] = {clearText: 'Vymazat', clearStatus: 'Vymaže zadané datum',
-		closeText: 'Zavřít',  closeStatus: 'Zavře kalendář beze změny',
-		prevText: '&#x3c;Dříve', prevStatus: 'Přejít na předchozí měsí',
-		nextText: 'Později&#x3e;', nextStatus: 'Přejít na další měsíc',
-		currentText: 'Nyní', currentStatus: 'Přejde na aktuální měsíc',
-		monthNames: ['leden','únor','březen','duben','květen','červen',
-        'červenec','srpen','září','říjen','listopad','prosinec'],
-		monthNamesShort: ['led','úno','bře','dub','kvě','čer',
-		'čvc','srp','zář','říj','lis','pro'],
-		monthStatus: 'Přejít na jiný měsíc', yearStatus: 'Přejít na jiný rok',
-		weekHeader: 'Týd', weekStatus: 'Týden v roce',
-		dayNames: ['neděle', 'pondělí', 'úterý', 'středa', 'čtvrtek', 'pátek', 'sobota'],
-		dayNamesShort: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'],
-		dayNamesMin: ['ne','po','út','st','čt','pá','so'],
-		dayStatus: 'Nastavit DD jako první den v týdnu', dateStatus: '\'Vyber\' DD, M d',
-		dateFormat: 'dd.mm.yy', firstDay: 1, 
-		initStatus: 'Vyberte datum', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['cs']);
-});
Index: js/ui/i18n/ui.datepicker-es.js
===================================================================
--- js/ui/i18n/ui.datepicker-es.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-es.js	(working copy)
@@ -1,22 +0,0 @@
-/* Inicializaci�n en espa�ol para la extensi�n 'UI date picker' para jQuery. */
-/* Traducido por Vester (xvester@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['es'] = {clearText: 'Limpiar', clearStatus: '',
-		closeText: 'Cerrar', closeStatus: '',
-		prevText: '&lt;Ant', prevStatus: '',
-		nextText: 'Sig&gt;', nextStatus: '',
-		currentText: 'Hoy', currentStatus: '',
-		monthNames: ['Enero','Febrero','Marzo','Abril','Mayo','Junio',
-		'Julio','Agosto','Septiembre','Octubre','Noviembre','Diciembre'],
-		monthNamesShort: ['Ene','Feb','Mar','Abr','May','Jun',
-		'Jul','Ago','Sep','Oct','Nov','Dic'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Sm', weekStatus: '',
-		dayNames: ['Domingo','Lunes','Martes','Mi&eacute;rcoles','Jueves','Viernes','S&aacute;dabo'],
-		dayNamesShort: ['Dom','Lun','Mar','Mi&eacute;','Juv','Vie','S&aacute;b'],
-		dayNamesMin: ['Do','Lu','Ma','Mi','Ju','Vi','S&aacute;'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd/mm/yy', firstDay: 0, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['es']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-ko.js
===================================================================
--- js/ui/i18n/ui.datepicker-ko.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-ko.js	(working copy)
@@ -1,22 +0,0 @@
-/* Korean initialisation for the jQuery calendar extension. */
-/* Written by DaeKwon Kang (ncrash.dk@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['ko'] = {clearText: '지우기', clearStatus: '',
-		closeText: '닫기', closeStatus: '',
-		prevText: '이전달', prevStatus: '',
-		nextText: '다음달', nextStatus: '',
-		currentText: '오늘', currentStatus: '',
-		monthNames: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)',
-			'7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'],
-		monthNamesShort: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)',
-			'7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Wk', weekStatus: '',
-		dayNames: ['일','월','화','수','목','금','토'],
-		dayNamesShort: ['일','월','화','수','목','금','토'],
-		dayNamesMin: ['일','월','화','수','목','금','토'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'yy-mm-dd', firstDay: 0, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['ko']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-is.js
===================================================================
--- js/ui/i18n/ui.datepicker-is.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-is.js	(working copy)
@@ -1,22 +0,0 @@
-/* Icelandic initialisation for the jQuery UI date picker plugin. */
-/* Written by Haukur H. Thorsson (haukur@eskill.is). */
-jQuery(function($){
-	$.datepicker.regional['is'] = {clearText: 'Hreinsa', clearStatus: '',
-		closeText: 'Loka', closeStatus: '',
-		prevText: '< Fyrri', prevStatus: '',
-		nextText: 'N&aelig;sti >', nextStatus: '',
-		currentText: '&Iacute; dag', currentStatus: '',
-		monthNames: ['Jan&uacute;ar','Febr&uacute;ar','Mars','Apr&iacute;l','Ma&iacute','J&uacute;n&iacute;',
-		'J&uacute;l&iacute;','&Aacute;g&uacute;st','September','Okt&oacute;ber','N&oacute;vember','Desember'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Ma&iacute;','J&uacute;n',
-		'J&uacute;l','&Aacute;g&uacute;','Sep','Okt','N&oacute;v','Des'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Vika', weekStatus: '',
-		dayNames: ['Sunnudagur','M&aacute;nudagur','&THORN;ri&eth;judagur','Mi&eth;vikudagur','Fimmtudagur','F&ouml;studagur','Laugardagur'],
-		dayNamesShort: ['Sun','M&aacute;n','&THORN;ri','Mi&eth;','Fim','F&ouml;s','Lau'],
-		dayNamesMin: ['Su','M&aacute;','&THORN;r','Mi','Fi','F&ouml;','La'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd/mm/yy', firstDay: 0, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['is']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-hu.js
===================================================================
--- js/ui/i18n/ui.datepicker-hu.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-hu.js	(working copy)
@@ -1,22 +0,0 @@
-/* Hungarian initialisation for the jQuery UI date picker plugin. */
-/* Written by Istvan Karaszi (jquerycalendar@spam.raszi.hu). */
-jQuery(function($){
-	$.datepicker.regional['hu'] = {clearText: 'törlés', clearStatus: '',
-		closeText: 'bezárás', closeStatus: '',
-		prevText: '&laquo;&nbsp;vissza', prevStatus: '',
-		nextText: 'előre&nbsp;&raquo;', nextStatus: '',
-		currentText: 'ma', currentStatus: '',
-		monthNames: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június',
-		'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'],
-		monthNamesShort: ['Jan', 'Feb', 'Már', 'Ápr', 'Máj', 'Jún',
-		'Júl', 'Aug', 'Szep', 'Okt', 'Nov', 'Dec'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Hé', weekStatus: '',
-		dayNames: ['Vasámap', 'Hétfö', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'],
-		dayNamesShort: ['Vas', 'Hét', 'Ked', 'Sze', 'Csü', 'Pén', 'Szo'],
-		dayNamesMin: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'yy-mm-dd', firstDay: 1, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['hu']);
-});
Index: js/ui/i18n/ui.datepicker-no.js
===================================================================
--- js/ui/i18n/ui.datepicker-no.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-no.js	(working copy)
@@ -1,23 +0,0 @@
-/* Norwegian initialisation for the jQuery UI date picker plugin. */
-/* Written by Naimdjon Takhirov (naimdjon@gmail.com). */
-
-$(document).ready(function(){
-    $.datepicker.regional['no'] = {clearText: 'Tøm', clearStatus: '',
-		closeText: 'Lukk', closeStatus: '',
-        prevText: '&laquo;Forrige',  prevStatus: '',
-		nextText: 'Neste&raquo;', nextStatus: '',
-		currentText: 'I dag', currentStatus: '',
-        monthNames: ['Januar','Februar','Mars','April','Mai','Juni', 
-        'Juli','August','September','Oktober','November','Desember'],
-        monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun', 
-        'Jul','Aug','Sep','Okt','Nov','Des'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Uke', weekStatus: '',
-		dayNamesShort: ['Søn','Man','Tir','Ons','Tor','Fre','Lør'],
-		dayNames: ['Søndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','Lørdag'],
-		dayNamesMin: ['Sø','Ma','Ti','On','To','Fr','Lø'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-        dateFormat: 'yy-mm-dd', firstDay: 0, 
-		initStatus: '', isRTL: false};
-    $.datepicker.setDefaults($.datepicker.regional['no']); 
-});
Index: js/ui/i18n/ui.datepicker-sk.js
===================================================================
--- js/ui/i18n/ui.datepicker-sk.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-sk.js	(working copy)
@@ -1,22 +0,0 @@
-/* Slovak initialisation for the jQuery UI date picker plugin. */
-/* Written by Vojtech Rinik (vojto@hmm.sk). */
-jQuery(function($){
-	$.datepicker.regional['sk'] = {clearText: 'Zmazať', clearStatus: '',
-		closeText: 'Zavrieť', closeStatus: '',
-		prevText: '&lt;Predchádzajúci',  prevStatus: '',
-		nextText: 'Nasledujúci&gt;', nextStatus: '',
-		currentText: 'Dnes', currentStatus: '',
-		monthNames: ['Január','Február','Marec','Apríl','Máj','Jún',
-		'Júl','August','September','Október','November','December'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Máj','Jún',
-		'Júl','Aug','Sep','Okt','Nov','Dec'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Ty', weekStatus: '',
-		dayNames: ['Nedel\'a','Pondelok','Utorok','Streda','Štvrtok','Piatok','Sobota'],
-		dayNamesShort: ['Ned','Pon','Uto','Str','Štv','Pia','Sob'],
-		dayNamesMin: ['Ne','Po','Ut','St','Št','Pia','So'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd.mm.yy', firstDay: 0, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['sk']);
-});
Index: js/ui/i18n/ui.datepicker-uk.js
===================================================================
--- js/ui/i18n/ui.datepicker-uk.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-uk.js	(working copy)
@@ -1,22 +0,0 @@
-/* Ukrainian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Maxim Drogobitskiy (maxdao@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['uk'] = {clearText: 'Очистити', clearStatus: '',
-		closeText: 'Закрити', closeStatus: '',
-		prevText: '&lt;&lt;',  prevStatus: '',
-		nextText: '&gt;&gt;', nextStatus: '',
-		currentText: 'Сьогодні', currentStatus: '',
-		monthNames: ['Січень','Лютий','Березень','Квітень','Травень','Червень',
-		'Липень','Серпень','Вересень','Жовтень','Листопад','Грудень'],
-		monthNamesShort: ['Січ','Лют','Бер','Кві','Тра','Чер',
-		'Лип','Сер','Вер','Жов','Лис','Гру'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Не', weekStatus: '',
-		dayNames: ['неділя','понеділок','вівторок','середа','четвер','пятниця','суббота'],
-		dayNamesShort: ['нед','пнд','вів','срд','чтв','птн','сбт'],
-		dayNamesMin: ['Нд','Пн','Вт','Ср','Чт','Пт','Сб'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd.mm.yy', firstDay: 1, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['uk']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-hy.js
===================================================================
--- js/ui/i18n/ui.datepicker-hy.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-hy.js	(working copy)
@@ -1,22 +0,0 @@
-/* Armenian(UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Levon Zakaryan (levon.zakaryan@gmail.com)*/
-jQuery(function($){
-	$.datepicker.regional['hy'] = {clearText: 'Մաքրել', clearStatus: '',
-		closeText: 'Փակել', closeStatus: '',
-		prevText: '&lt;Նախ.',  prevStatus: '',
-		nextText: 'Հաջ.&gt;', nextStatus: '',
-		currentText: 'Այսօր', currentStatus: '',
-		monthNames: ['Հունվար','Փետրվար','Մարտ','Ապրիլ','Մայիս','Հունիս',
-		'Հուլիս','Օգոստոս','Սեպտեմբեր','Հոկտեմբեր','Նոյեմբեր','Դեկտեմբեր'],
-		monthNamesShort: ['Հունվ','Փետր','Մարտ','Ապր','Մայիս','Հունիս',
-		'Հուլ','Օգս','Սեպ','Հոկ','Նոյ','Դեկ'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'ՇԲՏ', weekStatus: '',
-		dayNames: ['կիրակի','եկուշաբթի','երեքշաբթի','չորեքշաբթի','հինգշաբթի','ուրբաթ','շաբաթ'],
-		dayNamesShort: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
-		dayNamesMin: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd.mm.yy', firstDay: 1, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['hy']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-ro.js
===================================================================
--- js/ui/i18n/ui.datepicker-ro.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-ro.js	(working copy)
@@ -1,22 +0,0 @@
-/* Romanian initialisation for the jQuery UI date picker plugin. */
-/* Written by Edmond L. (ll_edmond@walla.com). */
-jQuery(function($){
-	$.datepicker.regional['ro'] = {clearText: 'Curat', clearStatus: 'Sterge data curenta',
-		closeText: 'Inchide', closeStatus: 'Inchide fara schimbare',
-		prevText: '&#x3c;Anterior', prevStatus: 'Arata luna trecuta',
-		nextText: 'Urmator&#x3e;', nextStatus: 'Arata luna urmatoare',
-		currentText: 'Azi', currentStatus: 'Arata luna curenta',
-		monthNames: ['Ianuarie','Februarie','Martie','Aprilie','Mai','Junie',
-		'Julie','August','Septembrie','Octobrie','Noiembrie','Decembrie'],
-		monthNamesShort: ['Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun',
-		'Jul', 'Aug', 'Sep', 'Oct', 'Noi', 'Dec'],
-		monthStatus: 'Arata o luna diferita', yearStatus: 'Arat un an diferit',
-		weekHeader: 'Sapt', weekStatus: 'Saptamana anului',
-		dayNames: ['Duminica', 'Luni', 'Marti', 'Miercuri', 'Joi', 'Vineri', 'Sambata'],
-		dayNamesShort: ['Dum', 'Lun', 'Mar', 'Mie', 'Joi', 'Vin', 'Sam'],
-		dayNamesMin: ['Du','Lu','Ma','Mi','Jo','Vi','Sa'],
-		dayStatus: 'Seteaza DD ca prima saptamana zi', dateStatus: 'Selecteaza D, M d',
-		dateFormat: 'mm/dd/yy', firstDay: 0, 
-		initStatus: 'Selecteaza o data', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['ro']);
-});
Index: js/ui/i18n/ui.datepicker-ru.js
===================================================================
--- js/ui/i18n/ui.datepicker-ru.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-ru.js	(working copy)
@@ -1,22 +0,0 @@
-/* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */
-/* Written by Andrew Stromnov (stromnov@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['ru'] = {clearText: 'Очистить', clearStatus: '',
-		closeText: 'Закрыть', closeStatus: '',
-		prevText: '&lt;Пред',  prevStatus: '',
-		nextText: 'След&gt;', nextStatus: '',
-		currentText: 'Сегодня', currentStatus: '',
-		monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
-		'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
-		monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
-		'Июл','Авг','Сен','Окт','Ноя','Дек'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Не', weekStatus: '',
-		dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'],
-		dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'],
-		dayNamesMin: ['Вс','Пн','Вт','Ср','Чт','Пт','Сб'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd.mm.yy', firstDay: 1, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['ru']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-id.js
===================================================================
--- js/ui/i18n/ui.datepicker-id.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-id.js	(working copy)
@@ -1,22 +0,0 @@
-/* Indonesian initialisation for the jQuery UI date picker plugin. */
-/* Written by Deden Fathurahman (dedenf@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['id'] = {clearText: 'kosongkan', clearStatus: 'bersihkan tanggal yang sekarang',
-		closeText: 'Tutup', closeStatus: 'Tutup tanpa mengubah',
-		prevText: '&lt;mundur', prevStatus: 'Tampilkan bulan sebelumnya',
-		nextText: 'maju&gt;', nextStatus: 'Tampilkan bulan berikutnya',
-		currentText: 'hari ini', currentStatus: 'Tampilkan bulan sekarang',
-		monthNames: ['Januari','Februari','Maret','April','Mei','Juni',
-		'Juli','Agustus','September','Oktober','Nopember','Desember'],
-		monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
-		'Jul','Agus','Sep','Okt','Nop','Des'],
-		monthStatus: 'Tampilkan bulan yang berbeda', yearStatus: 'Tampilkan tahun yang berbeda',
-		weekHeader: 'Mg', weekStatus: 'Minggu dalam tahun',
-		dayNames: ['Minggu','Senin','Selasa','Rabu','Kamis','Jumat','Sabtu'],
-		dayNamesShort: ['Min','Sen','Sel','Rab','kam','Jum','Sab'],
-		dayNamesMin: ['Mg','Sn','Sl','Rb','Km','jm','Sb'],
-		dayStatus: 'gunakan DD sebagai awal hari dalam minggu', dateStatus: 'pilih le DD, MM d',
-		dateFormat: 'dd/mm/yy', firstDay: 0, 
-		initStatus: 'Pilih Tanggal', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['id']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-ar.js
===================================================================
--- js/ui/i18n/ui.datepicker-ar.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-ar.js	(working copy)
@@ -1,23 +0,0 @@
-﻿/* Arabic Translation for jQuery UI date picker plugin. */
-/* Khaled Al Horani -- koko.dw@gmail.com */
-/* خالد الحوراني -- koko.dw@gmail.com */
-/* NOTE: monthNames are the original months names and thez are the Arabic names, not the new months name فبراير - يناير and there isnät any Arabic roots for these months */
-jQuery(function($){
-	$.datepicker.regional['ar'] = {
-		clearText: 'مسح', clearStatus: 'امسح التاريخ الحالي',
-		closeText: 'إغلاق', closeStatus: 'إغلاق بدون حفظ',
-		prevText: '<السابق', prevStatus: 'عرض الشهر السابق',
-		nextText: 'التالي>', nextStatus: 'عرض الشهر القادم',
-		currentText: 'اليوم', currentStatus: 'عرض الشهر الحالي',
-		monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'آذار', 'حزيران', 'تموز', 'آب', 'أيلول',	'تشرين الأول', 'تشرين الثاني', 'كانون الأول'],
-		monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'],
-		monthStatus: 'عرض شهر آخر', yearStatus: 'عرض سنة آخرى',
-		weekHeader: 'أسبوع', weekStatus: 'أسبوع السنة',
-		dayNames: ['السبت', 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة'],
-		dayNamesShort: ['سبت', 'أحد', 'اثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة'],
-		dayNamesMin: ['سبت', 'أحد', 'اثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة'],
-		dayStatus: 'اختر DD لليوم الأول من الأسبوع', dateStatus: 'اختر D, M d',
-		dateFormat: 'dd/mm/yy', firstDay: 0, 
-		initStatus: 'اختر يوم', isRTL: true};
-	$.datepicker.setDefaults($.datepicker.regional['ar']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-fr.js
===================================================================
--- js/ui/i18n/ui.datepicker-fr.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-fr.js	(working copy)
@@ -1,22 +0,0 @@
-﻿/* French initialisation for the jQuery UI date picker plugin. */
-/* Written by Keith Wood (kbwood@virginbroadband.com.au) and Stéphane Nahmani (sholby@sholby.net). */
-jQuery(function($){
-	$.datepicker.regional['fr'] = {clearText: 'Effacer', clearStatus: '',
-		closeText: 'Fermer', closeStatus: 'Fermer sans modifier',
-		prevText: '&lt;Préc', prevStatus: 'Voir le mois précédent',
-		nextText: 'Suiv&gt;', nextStatus: 'Voir le mois suivant',
-		currentText: 'Courant', currentStatus: 'Voir le mois courant',
-		monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
-		'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
-		monthNamesShort: ['Jan','Fév','Mar','Avr','Mai','Jun',
-		'Jul','Aoû','Sep','Oct','Nov','Déc'],
-		monthStatus: 'Voir un autre mois', yearStatus: 'Voir un autre année',
-		weekHeader: 'Sm', weekStatus: '',
-		dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
-		dayNamesShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
-		dayNamesMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
-		dayStatus: 'Utiliser DD comme premier jour de la semaine', dateStatus: 'Choisir le DD, MM d',
-		dateFormat: 'dd/mm/yy', firstDay: 0, 
-		initStatus: 'Choisir la date', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['fr']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-nl.js
===================================================================
--- js/ui/i18n/ui.datepicker-nl.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-nl.js	(working copy)
@@ -1,21 +0,0 @@
-/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
-jQuery(function($){
-	$.datepicker.regional['nl'] = {clearText: 'Wissen', clearStatus: 'Wis de huidige datum',
-		closeText: 'Sluiten', closeStatus: 'Sluit zonder verandering',
-		prevText: '&lt;Terug', prevStatus: 'Laat de voorgaande maand zien',
-		nextText: 'Volgende&gt;', nextStatus: 'Laat de volgende maand zien',
-		currentText: 'Vandaag', currentStatus: 'Laat de huidige maand zien',
-		monthNames: ['Januari','Februari','Maart','April','Mei','Juni',
-		'Juli','Augustus','September','Oktober','November','December'],
-		monthNamesShort: ['Jan','Feb','Mrt','Apr','Mei','Jun',
-		'Jul','Aug','Sep','Okt','Nov','Dec'],
-		monthStatus: 'Laat een andere maand zien', yearStatus: 'Laat een ander jaar zien',
-		weekHeader: 'Wk', weekStatus: 'Week van het jaar',
-		dayNames: ['Zondag','Maandag','Dinsdag','Woensdag','Donderdag','Vrijdag','Zaterdag'],
-		dayNamesShort: ['Zon','Maa','Din','Woe','Don','Vri','Zat'],
-		dayNamesMin: ['Zo','Ma','Di','Wo','Do','Vr','Za'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd.mm.yy', firstDay: 1, 
-		initStatus: 'Kies een datum', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['nl']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-zh-TW.js
===================================================================
--- js/ui/i18n/ui.datepicker-zh-TW.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-zh-TW.js	(working copy)
@@ -1,23 +0,0 @@
-﻿/* Chinese initialisation for the jQuery UI date picker plugin. */
-/* Written by Ressol (ressol@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['zh-TW'] = {
-		clearText: '清除', clearStatus: '清除已選日期',
-		closeText: '關閉', closeStatus: '不改變目前的選擇',
-		prevText: '&lt;上月', prevStatus: '顯示上月',
-		nextText: '下月&gt;', nextStatus: '顯示下月',
-		currentText: '今天', currentStatus: '顯示本月',
-		monthNames: ['一月','二月','三月','四月','五月','六月',
-		'七月','八月','九月','十月','十一月','十二月'],
-		monthNamesShort: ['一','二','三','四','五','六',
-		'七','八','九','十','十一','十二'],
-		monthStatus: '選擇月份', yearStatus: '選擇年份',
-		weekHeader: '周', weekStatus: '年內周次',
-		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-		dayNamesMin: ['日','一','二','三','四','五','六'],
-		dayStatus: '設定 DD 為一周起始', dateStatus: '選擇 m月 d日, DD',
-		dateFormat: 'yy/mm/dd', firstDay: 1, 
-		initStatus: '請選擇日期', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['zh-TW']);
-});
Index: js/ui/i18n/ui.datepicker-pl.js
===================================================================
--- js/ui/i18n/ui.datepicker-pl.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-pl.js	(working copy)
@@ -1,22 +0,0 @@
-/* Polish initialisation for the jQuery UI date picker plugin. */
-/* Written by Jacek Wysocki (jacek.wysocki@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['pl'] = {clearText: 'Wyczyść', clearStatus: 'Wyczyść obecną datę',
-		closeText: 'Zamknij', closeStatus: 'Zamknij bez zapisywania',
-		prevText: '&#x3c;Poprzedni', prevStatus: 'Pokaż poprzedni miesiąc',
-		nextText: 'Następny&#x3e;', nextStatus: 'Pokaż następny miesiąc',
-		currentText: 'Dziś', currentStatus: 'Pokaż aktualny miesiąc',
-		monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec',
-		'Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'],
-		monthNamesShort: ['Sty','Lu','Mar','Kw','Maj','Cze',
-		'Lip','Sie','Wrz','Pa','Lis','Gru'],
-		monthStatus: 'Pokaż inny miesiąc', yearStatus: 'Pokaż inny rok',
-		weekHeader: 'Tydz', weekStatus: 'Tydzień roku',
-		dayNames: ['Niedziela','Poniedzialek','Wtorek','Środa','Czwartek','Piątek','Sobota'],
-		dayNamesShort: ['Nie','Pn','Wt','Śr','Czw','Pt','So'],
-		dayNamesMin: ['N','Pn','Wt','Śr','Cz','Pt','So'],
-		dayStatus: 'Ustaw DD jako pierwszy dzień tygodnia', dateStatus: 'Wybierz D, M d',
-		dateFormat: 'yy-mm-dd', firstDay: 1, 
-		initStatus: 'Wybierz datę', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['pl']);
-});
Index: js/ui/i18n/ui.datepicker-th.js
===================================================================
--- js/ui/i18n/ui.datepicker-th.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-th.js	(working copy)
@@ -1,22 +0,0 @@
-﻿/* Thai initialisation for the jQuery UI date picker plugin. */
-/* Written by pipo (pipo@sixhead.com). */
-jQuery(function($){
-	$.datepicker.regional['th'] = {clearText: 'ลบ', clearStatus: '',
-		closeText: 'ปิด', closeStatus: '',
-		prevText: '&laquo;&nbsp;ย้อน', prevStatus: '',
-		nextText: 'ถัดไป&nbsp;&raquo;', nextStatus: '',
-		currentText: 'วันนี้', currentStatus: '',
-		monthNames: ['มกราคม','กุมภาพันธ์','มีนาคม','เมษายน','พฤษภาคม','มิถุนายน',
-		'กรกฏาคม','สิงหาคม','กันยายน','ตุลาคม','พฤศจิกายน','ธันวาคม'],
-		monthNamesShort: ['ม.ค.','ก.พ.','มี.ค.','เม.ย.','พ.ค.','มิ.ย.',
-		'ก.ค.','ส.ค.','ก.ย.','ต.ค.','พ.ย.','ธ.ค.'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Sm', weekStatus: '',
-		dayNames: ['อาทิตย์','จันทร์','อังคาร','พุธ','พฤหัสบดี','ศุกร์','เสาร์'],
-		dayNamesShort: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
-		dayNamesMin: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd/mm/yy', firstDay: 0, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['th']);
-});
\ No newline at end of file
Index: js/ui/i18n/ui.datepicker-it.js
===================================================================
--- js/ui/i18n/ui.datepicker-it.js	(revision 6370)
+++ js/ui/i18n/ui.datepicker-it.js	(working copy)
@@ -1,22 +0,0 @@
-/* Italian initialisation for the jQuery UI date picker plugin. */
-/* Written by Apaella (apaella@gmail.com). */
-jQuery(function($){
-	$.datepicker.regional['it'] = {clearText: 'Svuota', clearStatus: '',
-		closeText: 'Chiudi', closeStatus: '',
-		prevText: '&lt;Prec', prevStatus: '',
-		nextText: 'Succ&gt;', nextStatus: '',
-		currentText: 'Oggi', currentStatus: '',
-		monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno',
-		'Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'],
-		monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu',
-		'Lug','Ago','Set','Ott','Nov','Dic'],
-		monthStatus: '', yearStatus: '',
-		weekHeader: 'Sm', weekStatus: '',
-		dayNames: ['Domenica','Luned&#236','Marted&#236','Mercoled&#236','Gioved&#236','Venerd&#236','Sabato'],
-		dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
-		dayNamesMin: ['Do','Lu','Ma','Me','Gio','Ve','Sa'],
-		dayStatus: 'DD', dateStatus: 'D, M d',
-		dateFormat: 'dd/mm/yy', firstDay: 1, 
-		initStatus: '', isRTL: false};
-	$.datepicker.setDefaults($.datepicker.regional['it']);
-});
Index: js/ui/ui.tabs.js
===================================================================
--- js/ui/ui.tabs.js	(revision 6370)
+++ js/ui/ui.tabs.js	(working copy)
@@ -1,599 +0,0 @@
-/*
- * jQuery UI Tabs
- *
- * Copyright (c) 2007, 2008 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Tabs
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.tabs", {
-	init: function() {
-		this.options.event += '.tabs'; // namespace event
-		
-		// create tabs
-		this.tabify(true);
-	},
-	setData: function(key, value) {
-		if ((/^selected/).test(key))
-			this.select(value);
-		else {
-			this.options[key] = value;
-			this.tabify();
-		}
-	},
-	length: function() {
-		return this.$tabs.length;
-	},
-	tabId: function(a) {
-		return a.title && a.title.replace(/\s/g, '_').replace(/[^A-Za-z0-9\-_:\.]/g, '')
-			|| this.options.idPrefix + $.data(a);
-	},
-	ui: function(tab, panel) {
-		return {
-			options: this.options,
-			tab: tab,
-			panel: panel,
-			index: this.$tabs.index(tab)
-		};
-	},
-	tabify: function(init) {
-
-		this.$lis = $('li:has(a[href])', this.element);
-		this.$tabs = this.$lis.map(function() { return $('a', this)[0]; });
-		this.$panels = $([]);
-
-		var self = this, o = this.options;
-
-		this.$tabs.each(function(i, a) {
-			// inline tab
-			if (a.hash && a.hash.replace('#', '')) // Safari 2 reports '#' for an empty hash
-				self.$panels = self.$panels.add(a.hash);
-			// remote tab
-			else if ($(a).attr('href') != '#') { // prevent loading the page itself if href is just "#"
-				$.data(a, 'href.tabs', a.href); // required for restore on destroy
-				$.data(a, 'load.tabs', a.href); // mutable
-				var id = self.tabId(a);
-				a.href = '#' + id;
-				var $panel = $('#' + id);
-				if (!$panel.length) {
-					$panel = $(o.panelTemplate).attr('id', id).addClass(o.panelClass)
-						.insertAfter( self.$panels[i - 1] || self.element );
-					$panel.data('destroy.tabs', true);
-				}
-				self.$panels = self.$panels.add( $panel );
-			}
-			// invalid tab href
-			else
-				o.disabled.push(i + 1);
-		});
-
-		if (init) {
-
-			// attach necessary classes for styling if not present
-			this.element.addClass(o.navClass);
-			this.$panels.each(function() {
-				var $this = $(this);
-				$this.addClass(o.panelClass);
-			});
-
-			// Selected tab
-			// use "selected" option or try to retrieve:
-			// 1. from fragment identifier in url
-			// 2. from cookie
-			// 3. from selected class attribute on <li>
-			if (o.selected === undefined) {
-				if (location.hash) {
-					this.$tabs.each(function(i, a) {
-						if (a.hash == location.hash) {
-							o.selected = i;
-							// prevent page scroll to fragment
-							if ($.browser.msie || $.browser.opera) { // && !o.remote
-								var $toShow = $(location.hash), toShowId = $toShow.attr('id');
-								$toShow.attr('id', '');
-								setTimeout(function() {
-									$toShow.attr('id', toShowId); // restore id
-								}, 500);
-							}
-							scrollTo(0, 0);
-							return false; // break
-						}
-					});
-				}
-				else if (o.cookie) {
-					var index = parseInt($.cookie('ui-tabs' + $.data(self.element)),10);
-					if (index && self.$tabs[index])
-						o.selected = index;
-				}
-				else if (self.$lis.filter('.' + o.selectedClass).length)
-					o.selected = self.$lis.index( self.$lis.filter('.' + o.selectedClass)[0] );
-			}
-			o.selected = o.selected === null || o.selected !== undefined ? o.selected : 0; // first tab selected by default
-
-			// Take disabling tabs via class attribute from HTML
-			// into account and update option properly.
-			// A selected tab cannot become disabled.
-			o.disabled = $.unique(o.disabled.concat(
-				$.map(this.$lis.filter('.' + o.disabledClass),
-					function(n, i) { return self.$lis.index(n); } )
-			)).sort();
-			if ($.inArray(o.selected, o.disabled) != -1)
-				o.disabled.splice($.inArray(o.selected, o.disabled), 1);
-			
-			// highlight selected tab
-			this.$panels.addClass(o.hideClass);
-			this.$lis.removeClass(o.selectedClass);
-			if (o.selected !== null) {
-				this.$panels.eq(o.selected).show().removeClass(o.hideClass); // use show and remove class to show in any case no matter how it has been hidden before
-				this.$lis.eq(o.selected).addClass(o.selectedClass);
-				
-				// seems to be expected behavior that the show callback is fired
-				var onShow = function() {
-					$(self.element).triggerHandler('tabsshow',
-						[self.fakeEvent('tabsshow'), self.ui(self.$tabs[o.selected], self.$panels[o.selected])], o.show);
-				}; 
-
-				// load if remote tab
-				if ($.data(this.$tabs[o.selected], 'load.tabs'))
-					this.load(o.selected, onShow);
-				// just trigger show event
-				else
-					onShow();
-				
-			}
-			
-			// clean up to avoid memory leaks in certain versions of IE 6
-			$(window).bind('unload', function() {
-				self.$tabs.unbind('.tabs');
-				self.$lis = self.$tabs = self.$panels = null;
-			});
-
-		}
-
-		// disable tabs
-		for (var i = 0, li; li = this.$lis[i]; i++)
-			$(li)[$.inArray(i, o.disabled) != -1 && !$(li).hasClass(o.selectedClass) ? 'addClass' : 'removeClass'](o.disabledClass);
-
-		// reset cache if switching from cached to not cached
-		if (o.cache === false)
-			this.$tabs.removeData('cache.tabs');
-		
-		// set up animations
-		var hideFx, showFx, baseFx = { 'min-width': 0, duration: 1 }, baseDuration = 'normal';
-		if (o.fx && o.fx.constructor == Array)
-			hideFx = o.fx[0] || baseFx, showFx = o.fx[1] || baseFx;
-		else
-			hideFx = showFx = o.fx || baseFx;
-
-		// reset some styles to maintain print style sheets etc.
-		var resetCSS = { display: '', overflow: '', height: '' };
-		if (!$.browser.msie) // not in IE to prevent ClearType font issue
-			resetCSS.opacity = '';
-
-		// Hide a tab, animation prevents browser scrolling to fragment,
-		// $show is optional.
-		function hideTab(clicked, $hide, $show) {
-			$hide.animate(hideFx, hideFx.duration || baseDuration, function() { //
-				$hide.addClass(o.hideClass).css(resetCSS); // maintain flexible height and accessibility in print etc.
-				if ($.browser.msie && hideFx.opacity)
-					$hide[0].style.filter = '';
-				if ($show)
-					showTab(clicked, $show, $hide);
-			});
-		}
-
-		// Show a tab, animation prevents browser scrolling to fragment,
-		// $hide is optional.
-		function showTab(clicked, $show, $hide) {
-			if (showFx === baseFx)
-				$show.css('display', 'block'); // prevent occasionally occuring flicker in Firefox cause by gap between showing and hiding the tab panels
-			$show.animate(showFx, showFx.duration || baseDuration, function() {
-				$show.removeClass(o.hideClass).css(resetCSS); // maintain flexible height and accessibility in print etc.
-				if ($.browser.msie && showFx.opacity)
-					$show[0].style.filter = '';
-
-				// callback
-				$(self.element).triggerHandler('tabsshow',
-					[self.fakeEvent('tabsshow'), self.ui(clicked, $show[0])], o.show);
-
-			});
-		}
-
-		// switch a tab
-		function switchTab(clicked, $li, $hide, $show) {
-			/*if (o.bookmarkable && trueClick) { // add to history only if true click occured, not a triggered click
-				$.ajaxHistory.update(clicked.hash);
-			}*/
-			$li.addClass(o.selectedClass)
-				.siblings().removeClass(o.selectedClass);
-			hideTab(clicked, $hide, $show);
-		}
-
-		// attach tab event handler, unbind to avoid duplicates from former tabifying...
-		this.$tabs.unbind('.tabs').bind(o.event, function() {
-
-			//var trueClick = e.clientX; // add to history only if true click occured, not a triggered click
-			var $li = $(this).parents('li:eq(0)'),
-				$hide = self.$panels.filter(':visible'),
-				$show = $(this.hash);
-
-			// If tab is already selected and not unselectable or tab disabled or 
-			// or is already loading or click callback returns false stop here.
-			// Check if click handler returns false last so that it is not executed
-			// for a disabled or loading tab!
-			if (($li.hasClass(o.selectedClass) && !o.unselect)
-				|| $li.hasClass(o.disabledClass) 
-				|| $(this).hasClass(o.loadingClass)
-				|| $(self.element).triggerHandler('tabsselect', [self.fakeEvent('tabsselect'), self.ui(this, $show[0])], o.select) === false
-				) {
-				this.blur();
-				return false;
-			}
-
-			self.options.selected = self.$tabs.index(this);
-
-			// if tab may be closed
-			if (o.unselect) {
-				if ($li.hasClass(o.selectedClass)) {
-					self.options.selected = null;
-					$li.removeClass(o.selectedClass);
-					self.$panels.stop();
-					hideTab(this, $hide);
-					this.blur();
-					return false;
-				} else if (!$hide.length) {
-					self.$panels.stop();
-					var a = this;
-					self.load(self.$tabs.index(this), function() {
-						$li.addClass(o.selectedClass).addClass(o.unselectClass);
-						showTab(a, $show);
-					});
-					this.blur();
-					return false;
-				}
-			}
-
-			if (o.cookie)
-				$.cookie('ui-tabs' + $.data(self.element), self.options.selected, o.cookie);
-
-			// stop possibly running animations
-			self.$panels.stop();
-
-			// show new tab
-			if ($show.length) {
-
-				// prevent scrollbar scrolling to 0 and than back in IE7, happens only if bookmarking/history is enabled
-				/*if ($.browser.msie && o.bookmarkable) {
-					var showId = this.hash.replace('#', '');
-					$show.attr('id', '');
-					setTimeout(function() {
-						$show.attr('id', showId); // restore id
-					}, 0);
-				}*/
-
-				var a = this;
-				self.load(self.$tabs.index(this), $hide.length ? 
-					function() {
-						switchTab(a, $li, $hide, $show);
-					} :
-					function() {
-						$li.addClass(o.selectedClass);
-						showTab(a, $show);
-					}
-				);
-
-				// Set scrollbar to saved position - need to use timeout with 0 to prevent browser scroll to target of hash
-				/*var scrollX = window.pageXOffset || document.documentElement && document.documentElement.scrollLeft || document.body.scrollLeft || 0;
-				var scrollY = window.pageYOffset || document.documentElement && document.documentElement.scrollTop || document.body.scrollTop || 0;
-				setTimeout(function() {
-					scrollTo(scrollX, scrollY);
-				}, 0);*/
-
-			} else
-				throw 'jQuery UI Tabs: Mismatching fragment identifier.';
-
-			// Prevent IE from keeping other link focussed when using the back button
-			// and remove dotted border from clicked link. This is controlled in modern
-			// browsers via CSS, also blur removes focus from address bar in Firefox
-			// which can become a usability and annoying problem with tabsRotate.
-			if ($.browser.msie)
-				this.blur();
-
-			//return o.bookmarkable && !!trueClick; // convert trueClick == undefined to Boolean required in IE
-			return false;
-
-		});
-
-		// disable click if event is configured to something else
-		if (!(/^click/).test(o.event))
-			this.$tabs.bind('click.tabs', function() { return false; });
-
-	},
-	add: function(url, label, index) {
-		if (index == undefined) 
-			index = this.$tabs.length; // append by default
-
-		var o = this.options;
-		var $li = $(o.tabTemplate.replace(/#\{href\}/g, url).replace(/#\{label\}/g, label));
-		$li.data('destroy.tabs', true);
-
-		var id = url.indexOf('#') == 0 ? url.replace('#', '') : this.tabId( $('a:first-child', $li)[0] );
-
-		// try to find an existing element before creating a new one
-		var $panel = $('#' + id);
-		if (!$panel.length) {
-			$panel = $(o.panelTemplate).attr('id', id)
-				.addClass(o.hideClass)
-				.data('destroy.tabs', true);
-		}
-		$panel.addClass(o.panelClass);
-		if (index >= this.$lis.length) {
-			$li.appendTo(this.element);
-			$panel.appendTo(this.element[0].parentNode);
-		} else {
-			$li.insertBefore(this.$lis[index]);
-			$panel.insertBefore(this.$panels[index]);
-		}
-		
-		o.disabled = $.map(o.disabled,
-			function(n, i) { return n >= index ? ++n : n });
-			
-		this.tabify();
-
-		if (this.$tabs.length == 1) {
-			$li.addClass(o.selectedClass);
-			$panel.removeClass(o.hideClass);
-			var href = $.data(this.$tabs[0], 'load.tabs');
-			if (href)
-				this.load(index, href);
-		}
-
-		// callback
-		this.element.triggerHandler('tabsadd',
-			[this.fakeEvent('tabsadd'), this.ui(this.$tabs[index], this.$panels[index])], o.add
-		);
-	},
-	remove: function(index) {
-		var o = this.options, $li = this.$lis.eq(index).remove(),
-			$panel = this.$panels.eq(index).remove();
-
-		// If selected tab was removed focus tab to the right or
-		// in case the last tab was removed the tab to the left.
-		if ($li.hasClass(o.selectedClass) && this.$tabs.length > 1)
-			this.select(index + (index + 1 < this.$tabs.length ? 1 : -1));
-
-		o.disabled = $.map($.grep(o.disabled, function(n, i) { return n != index; }),
-			function(n, i) { return n >= index ? --n : n });
-
-		this.tabify();
-
-		// callback
-		this.element.triggerHandler('tabsremove',
-			[this.fakeEvent('tabsremove'), this.ui($li.find('a')[0], $panel[0])], o.remove
-		);
-	},
-	enable: function(index) {
-		var o = this.options;
-		if ($.inArray(index, o.disabled) == -1)
-			return;
-			
-		var $li = this.$lis.eq(index).removeClass(o.disabledClass);
-		if ($.browser.safari) { // fix disappearing tab (that used opacity indicating disabling) after enabling in Safari 2...
-			$li.css('display', 'inline-block');
-			setTimeout(function() {
-				$li.css('display', 'block');
-			}, 0);
-		}
-
-		o.disabled = $.grep(o.disabled, function(n, i) { return n != index; });
-
-		// callback
-		this.element.triggerHandler('tabsenable',
-			[this.fakeEvent('tabsenable'), this.ui(this.$tabs[index], this.$panels[index])], o.enable
-		);
-
-	},
-	disable: function(index) {
-		var self = this, o = this.options;
-		if (index != o.selected) { // cannot disable already selected tab
-			this.$lis.eq(index).addClass(o.disabledClass);
-
-			o.disabled.push(index);
-			o.disabled.sort();
-
-			// callback
-			this.element.triggerHandler('tabsdisable',
-				[this.fakeEvent('tabsdisable'), this.ui(this.$tabs[index], this.$panels[index])], o.disable
-			);
-		}
-	},
-	select: function(index) {
-		if (typeof index == 'string')
-			index = this.$tabs.index( this.$tabs.filter('[href$=' + index + ']')[0] );
-		this.$tabs.eq(index).trigger(this.options.event);
-	},
-	load: function(index, callback) { // callback is for internal usage only
-		
-		var self = this, o = this.options, $a = this.$tabs.eq(index), a = $a[0],
-				bypassCache = callback == undefined || callback === false, url = $a.data('load.tabs');
-
-		callback = callback || function() {};
-		
-		// no remote or from cache - just finish with callback
-		if (!url || !bypassCache && $.data(a, 'cache.tabs')) {
-			callback();
-			return;
-		}
-
-		// load remote from here on
-		
-		var inner = function(parent) {
-			var $parent = $(parent), $inner = $parent.find('*:last');
-			return $inner.length && $inner.is(':not(img)') && $inner || $parent;
-		};
-		var cleanup = function() {
-			self.$tabs.filter('.' + o.loadingClass).removeClass(o.loadingClass)
-						.each(function() {
-							if (o.spinner)
-								inner(this).parent().html(inner(this).data('label.tabs'));
-						});
-			self.xhr = null;
-		};
-		
-		if (o.spinner) {
-			var label = inner(a).html();
-			inner(a).wrapInner('<em></em>')
-				.find('em').data('label.tabs', label).html(o.spinner);
-		}
-
-		var ajaxOptions = $.extend({}, o.ajaxOptions, {
-			url: url,
-			success: function(r, s) {
-				$(a.hash).html(r);
-				cleanup();
-				
-				if (o.cache)
-					$.data(a, 'cache.tabs', true); // if loaded once do not load them again
-
-				// callbacks
-				$(self.element).triggerHandler('tabsload',
-					[self.fakeEvent('tabsload'), self.ui(self.$tabs[index], self.$panels[index])], o.load
-				);
-				o.ajaxOptions.success && o.ajaxOptions.success(r, s);
-				
-				// This callback is required because the switch has to take
-				// place after loading has completed. Call last in order to 
-				// fire load before show callback...
-				callback();
-			}
-		});
-		if (this.xhr) {
-			// terminate pending requests from other tabs and restore tab label
-			this.xhr.abort();
-			cleanup();
-		}
-		$a.addClass(o.loadingClass);
-		setTimeout(function() { // timeout is again required in IE, "wait" for id being restored
-			self.xhr = $.ajax(ajaxOptions);
-		}, 0);
-
-	},
-	url: function(index, url) {
-		this.$tabs.eq(index).removeData('cache.tabs').data('load.tabs', url);
-	},
-	destroy: function() {
-		var o = this.options;
-		this.element.unbind('.tabs')
-			.removeClass(o.navClass).removeData('tabs');
-		this.$tabs.each(function() {
-			var href = $.data(this, 'href.tabs');
-			if (href)
-				this.href = href;
-			var $this = $(this).unbind('.tabs');
-			$.each(['href', 'load', 'cache'], function(i, prefix) {
-				$this.removeData(prefix + '.tabs');
-			});
-		});
-		this.$lis.add(this.$panels).each(function() {
-			if ($.data(this, 'destroy.tabs'))
-				$(this).remove();
-			else
-				$(this).removeClass([o.selectedClass, o.unselectClass,
-					o.disabledClass, o.panelClass, o.hideClass].join(' '));
-		});
-	},
-	fakeEvent: function(type) {
-		return $.event.fix({
-			type: type,
-			target: this.element[0]
-		});
-	}
-});
-
-$.ui.tabs.defaults = {
-	// basic setup
-	unselect: false,
-	event: 'click',
-	disabled: [],
-	cookie: null, // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
-	// TODO history: false,
-
-	// Ajax
-	spinner: 'Loading&#8230;',
-	cache: false,
-	idPrefix: 'ui-tabs-',
-	ajaxOptions: {},
-
-	// animations
-	fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
-
-	// templates
-	tabTemplate: '<li><a href="#{href}"><span>#{label}</span></a></li>',
-	panelTemplate: '<div></div>',
-
-	// CSS classes
-	navClass: 'ui-tabs-nav',
-	selectedClass: 'ui-tabs-selected',
-	unselectClass: 'ui-tabs-unselect',
-	disabledClass: 'ui-tabs-disabled',
-	panelClass: 'ui-tabs-panel',
-	hideClass: 'ui-tabs-hide',
-	loadingClass: 'ui-tabs-loading'
-};
-
-$.ui.tabs.getter = "length";
-
-/*
- * Tabs Extensions
- */
-
-/*
- * Rotate
- */
-$.extend($.ui.tabs.prototype, {
-	rotation: null,
-	rotate: function(ms, continuing) {
-		
-		continuing = continuing || false;
-		
-		var self = this, t = this.options.selected;
-		
-		function start() {
-			self.rotation = setInterval(function() {
-				t = ++t < self.$tabs.length ? t : 0;
-				self.select(t);
-			}, ms); 
-		}
-		
-		function stop(e) {
-			if (!e || e.clientX) { // only in case of a true click
-				clearInterval(self.rotation);
-			}
-		}
-		
-		// start interval
-		if (ms) {
-			start();
-			if (!continuing)
-				this.$tabs.bind(this.options.event, stop);
-			else
-				this.$tabs.bind(this.options.event, function() {
-					stop();
-					t = self.options.selected;
-					start();
-				});
-		}
-		// stop interval
-		else {
-			stop();
-			this.$tabs.unbind(this.options.event, stop);
-		}
-	}
-});
-
-})(jQuery);
Index: js/ui/effects.clip.js
===================================================================
--- js/ui/effects.clip.js	(revision 6370)
+++ js/ui/effects.clip.js	(working copy)
@@ -1,54 +0,0 @@
-/*
- * jQuery UI Effects Clip
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Clip
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.clip = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left','height','width'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var direction = o.options.direction || 'vertical'; // Default direction
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
-		var animate = el[0].tagName == 'IMG' ? wrapper : el;
-		var ref = {
-			size: (direction == 'vertical') ? 'height' : 'width',
-			position: (direction == 'vertical') ? 'top' : 'left'
-		};
-		var distance = (direction == 'vertical') ? animate.height() : animate.width();
-		if(mode == 'show') { animate.css(ref.size, 0); animate.css(ref.position, distance / 2); } // Shift
-		
-		// Animation
-		var animation = {};
-		animation[ref.size] = mode == 'show' ? distance : 0;
-		animation[ref.position] = mode == 'show' ? 0 : distance / 2;
-			
-		// Animate
-		animate.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(el[0], arguments); // Callback
-			el.dequeue();
-		}}); 
-		
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/effects.scale.js
===================================================================
--- js/ui/effects.scale.js	(revision 6370)
+++ js/ui/effects.scale.js	(working copy)
@@ -1,180 +0,0 @@
-/*
- * jQuery UI Effects Scale
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Scale
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.puff = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this);
-	
-		// Set options
-		var options = $.extend(true, {}, o.options);
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var percent = parseInt(o.options.percent) || 150; // Set default puff percent
-		options.fade = true; // It's not a puff if it doesn't fade! :)
-		var original = {height: el.height(), width: el.width()}; // Save original
-	
-		// Adjust
-		var factor = percent / 100;
-		el.from = (mode == 'hide') ? original : {height: original.height * factor, width: original.width * factor};
-	
-		// Animation
-		options.from = el.from;
-		options.percent = (mode == 'hide') ? percent : 100;
-		options.mode = mode;
-	
-		// Animate
-		el.effect('scale', options, o.duration, o.callback);
-		el.dequeue();
-	});
-	
-};
-
-$.effects.scale = function(o) {
-	
-	return this.queue(function() {
-	
-		// Create element
-		var el = $(this);
-
-		// Set options
-		var options = $.extend(true, {}, o.options);
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var percent = parseInt(o.options.percent) || (parseInt(o.options.percent) == 0 ? 0 : (mode == 'hide' ? 0 : 100)); // Set default scaling percent
-		var direction = o.options.direction || 'both'; // Set default axis
-		var origin = o.options.origin; // The origin of the scaling
-		if (mode != 'effect') { // Set default origin and restore for show/hide
-			options.origin = origin || ['middle','center'];
-			options.restore = true;
-		}
-		var original = {height: el.height(), width: el.width()}; // Save original
-		el.from = o.options.from || (mode == 'show' ? {height: 0, width: 0} : original); // Default from state
-	
-		// Adjust
-		var factor = { // Set scaling factor
-			y: direction != 'horizontal' ? (percent / 100) : 1,
-			x: direction != 'vertical' ? (percent / 100) : 1
-		};
-		el.to = {height: original.height * factor.y, width: original.width * factor.x}; // Set to state
-		
-		if (o.options.fade) { // Fade option to support puff
-			if (mode == 'show') {el.from.opacity = 0; el.to.opacity = 1;};
-			if (mode == 'hide') {el.from.opacity = 1; el.to.opacity = 0;};
-		};
-	
-		// Animation
-		options.from = el.from; options.to = el.to; options.mode = mode;
-	
-		// Animate
-		el.effect('size', options, o.duration, o.callback);
-		el.dequeue();
-	});
-	
-};
-
-$.effects.size = function(o) {
-
-	return this.queue(function() {
-		
-		// Create element
-		var el = $(this), props = ['position','top','left','width','height','overflow','opacity'];
-		var props1 = ['position','top','left','overflow','opacity']; // Always restore
-		var props2 = ['width','height','overflow']; // Copy for children
-		var cProps = ['fontSize'];
-		var vProps = ['borderTopWidth', 'borderBottomWidth', 'paddingTop', 'paddingBottom'];
-		var hProps = ['borderLeftWidth', 'borderRightWidth', 'paddingLeft', 'paddingRight'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var restore = o.options.restore || false; // Default restore
-		var scale = o.options.scale || 'both'; // Default scale mode
-		var origin = o.options.origin; // The origin of the sizing
-		var original = {height: el.height(), width: el.width()}; // Save original
-		el.from = o.options.from || original; // Default from state
-		el.to = o.options.to || original; // Default to state
-		// Adjust
-		if (origin) { // Calculate baseline shifts
-			var baseline = $.effects.getBaseline(origin, original);
-			el.from.top = (original.height - el.from.height) * baseline.y;
-			el.from.left = (original.width - el.from.width) * baseline.x;
-			el.to.top = (original.height - el.to.height) * baseline.y;
-			el.to.left = (original.width - el.to.width) * baseline.x;
-		};
-		var factor = { // Set scaling factor
-			from: {y: el.from.height / original.height, x: el.from.width / original.width},
-			to: {y: el.to.height / original.height, x: el.to.width / original.width}
-		};
-		if (scale == 'box' || scale == 'both') { // Scale the css box
-			if (factor.from.y != factor.to.y) { // Vertical props scaling
-				props = props.concat(vProps);
-				el.from = $.effects.setTransition(el, vProps, factor.from.y, el.from);
-				el.to = $.effects.setTransition(el, vProps, factor.to.y, el.to);
-			};
-			if (factor.from.x != factor.to.x) { // Horizontal props scaling
-				props = props.concat(hProps);
-				el.from = $.effects.setTransition(el, hProps, factor.from.x, el.from);
-				el.to = $.effects.setTransition(el, hProps, factor.to.x, el.to);
-			};
-		};
-		if (scale == 'content' || scale == 'both') { // Scale the content
-			if (factor.from.y != factor.to.y) { // Vertical props scaling
-				props = props.concat(cProps);
-				el.from = $.effects.setTransition(el, cProps, factor.from.y, el.from);
-				el.to = $.effects.setTransition(el, cProps, factor.to.y, el.to);
-			};
-		};
-		$.effects.save(el, restore ? props : props1); el.show(); // Save & Show
-		$.effects.createWrapper(el); // Create Wrapper
-		el.css('overflow','hidden').css(el.from); // Shift
-		
-		// Animate
-		if (scale == 'content' || scale == 'both') { // Scale the children
-			vProps = vProps.concat(['marginTop','marginBottom']).concat(cProps); // Add margins/font-size
-			hProps = hProps.concat(['marginLeft','marginRight']); // Add margins
-			props2 = props.concat(vProps).concat(hProps); // Concat
-			el.find("*[width]").each(function(){
-				child = $(this);
-				if (restore) $.effects.save(child, props2);
-				var c_original = {height: child.height(), width: child.width()}; // Save original
-				child.from = {height: c_original.height * factor.from.y, width: c_original.width * factor.from.x};
-				child.to = {height: c_original.height * factor.to.y, width: c_original.width * factor.to.x};
-				if (factor.from.y != factor.to.y) { // Vertical props scaling
-					child.from = $.effects.setTransition(child, vProps, factor.from.y, child.from);
-					child.to = $.effects.setTransition(child, vProps, factor.to.y, child.to);
-				};
-				if (factor.from.x != factor.to.x) { // Horizontal props scaling
-					child.from = $.effects.setTransition(child, hProps, factor.from.x, child.from);
-					child.to = $.effects.setTransition(child, hProps, factor.to.x, child.to);
-				};
-				child.css(child.from); // Shift children
-				child.animate(child.to, o.duration, o.options.easing, function(){
-					if (restore) $.effects.restore(child, props2); // Restore children
-				}); // Animate children
-			});
-		};
-		
-		// Animate
-		el.animate(el.to, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, restore ? props : props1); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(this, arguments); // Callback
-			el.dequeue();
-		}}); 
-		
-	});
-
-};
-
-})(jQuery);
Index: js/ui/effects.blind.js
===================================================================
--- js/ui/effects.blind.js	(revision 6370)
+++ js/ui/effects.blind.js	(working copy)
@@ -1,49 +0,0 @@
-/*
- * jQuery UI Effects Blind
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Blind
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.blind = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var direction = o.options.direction || 'vertical'; // Default direction
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
-		var ref = (direction == 'vertical') ? 'height' : 'width';
-		var distance = (direction == 'vertical') ? wrapper.height() : wrapper.width();
-		if(mode == 'show') wrapper.css(ref, 0); // Shift
-		
-		// Animation
-		var animation = {};
-		animation[ref] = mode == 'show' ? distance : 0;
-	 
-		// Animate
-		wrapper.animate(animation, o.duration, o.options.easing, function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(el[0], arguments); // Callback
-			el.dequeue();
-		});
-		
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/effects.core.js
===================================================================
--- js/ui/effects.core.js	(revision 6370)
+++ js/ui/effects.core.js	(working copy)
@@ -1,509 +0,0 @@
-/*
- * jQuery UI Effects 1.5.2
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/
- */
-;(function($) {
-
-$.effects = $.effects || {}; //Add the 'effects' scope
-
-$.extend($.effects, {
-	save: function(el, set) {
-		for(var i=0;i<set.length;i++) {
-			if(set[i] !== null) $.data(el[0], "ec.storage."+set[i], el[0].style[set[i]]);
-		}
-	},
-	restore: function(el, set) {
-		for(var i=0;i<set.length;i++) {
-			if(set[i] !== null) el.css(set[i], $.data(el[0], "ec.storage."+set[i]));
-		}
-	},
-	setMode: function(el, mode) {
-		if (mode == 'toggle') mode = el.is(':hidden') ? 'show' : 'hide'; // Set for toggle
-		return mode;
-	},
-	getBaseline: function(origin, original) { // Translates a [top,left] array into a baseline value
-		// this should be a little more flexible in the future to handle a string & hash
-		var y, x;
-		switch (origin[0]) {
-			case 'top': y = 0; break;
-			case 'middle': y = 0.5; break;
-			case 'bottom': y = 1; break;
-			default: y = origin[0] / original.height;
-		};
-		switch (origin[1]) {
-			case 'left': x = 0; break;
-			case 'center': x = 0.5; break;
-			case 'right': x = 1; break;
-			default: x = origin[1] / original.width;
-		};
-		return {x: x, y: y};
-	},
-	createWrapper: function(el) {
-		if (el.parent().attr('id') == 'fxWrapper')
-			return el;
-		var props = {width: el.outerWidth({margin:true}), height: el.outerHeight({margin:true}), 'float': el.css('float')};
-		el.wrap('<div id="fxWrapper" style="font-size:100%;background:transparent;border:none;margin:0;padding:0"></div>');
-		var wrapper = el.parent();
-		if (el.css('position') == 'static'){
-			wrapper.css({position: 'relative'});
-			el.css({position: 'relative'});
-		} else {
-			var top = el.css('top'); if(isNaN(parseInt(top))) top = 'auto';
-			var left = el.css('left'); if(isNaN(parseInt(left))) left = 'auto';
-			wrapper.css({ position: el.css('position'), top: top, left: left, zIndex: el.css('z-index') }).show();
-			el.css({position: 'relative', top:0, left:0});
-		}
-		wrapper.css(props);
-		return wrapper;
-	},
-	removeWrapper: function(el) {
-		if (el.parent().attr('id') == 'fxWrapper')
-			return el.parent().replaceWith(el);
-		return el;
-	},
-	setTransition: function(el, list, factor, val) {
-		val = val || {};
-		$.each(list,function(i, x){
-			unit = el.cssUnit(x);
-			if (unit[0] > 0) val[x] = unit[0] * factor + unit[1];
-		});
-		return val;
-	},
-	animateClass: function(value, duration, easing, callback) {
-
-		var cb = (typeof easing == "function" ? easing : (callback ? callback : null));
-		var ea = (typeof easing == "object" ? easing : null);
-
-		return this.each(function() {
-
-			var offset = {}; var that = $(this); var oldStyleAttr = that.attr("style") || '';
-			if(typeof oldStyleAttr == 'object') oldStyleAttr = oldStyleAttr["cssText"]; /* Stupidly in IE, style is a object.. */
-			if(value.toggle) { that.hasClass(value.toggle) ? value.remove = value.toggle : value.add = value.toggle; }
-
-			//Let's get a style offset
-			var oldStyle = $.extend({}, (document.defaultView ? document.defaultView.getComputedStyle(this,null) : this.currentStyle));
-			if(value.add) that.addClass(value.add); if(value.remove) that.removeClass(value.remove);
-			var newStyle = $.extend({}, (document.defaultView ? document.defaultView.getComputedStyle(this,null) : this.currentStyle));
-			if(value.add) that.removeClass(value.add); if(value.remove) that.addClass(value.remove);
-
-			// The main function to form the object for animation
-			for(var n in newStyle) {
-				if( typeof newStyle[n] != "function" && newStyle[n] /* No functions and null properties */
-				&& n.indexOf("Moz") == -1 && n.indexOf("length") == -1 /* No mozilla spezific render properties. */
-				&& newStyle[n] != oldStyle[n] /* Only values that have changed are used for the animation */
-				&& (n.match(/color/i) || (!n.match(/color/i) && !isNaN(parseInt(newStyle[n],10)))) /* Only things that can be parsed to integers or colors */
-				&& (oldStyle.position != "static" || (oldStyle.position == "static" && !n.match(/left|top|bottom|right/))) /* No need for positions when dealing with static positions */
-				) offset[n] = newStyle[n];
-			}
-
-			that.animate(offset, duration, ea, function() { // Animate the newly constructed offset object
-				// Change style attribute back to original. For stupid IE, we need to clear the damn object.
-				if(typeof $(this).attr("style") == 'object') { $(this).attr("style")["cssText"] = ""; $(this).attr("style")["cssText"] = oldStyleAttr; } else $(this).attr("style", oldStyleAttr);
-				if(value.add) $(this).addClass(value.add); if(value.remove) $(this).removeClass(value.remove);
-				if(cb) cb.apply(this, arguments);
-			});
-
-		});
-	}
-});
-
-//Extend the methods of jQuery
-$.fn.extend({
-	//Save old methods
-	_show: $.fn.show,
-	_hide: $.fn.hide,
-	__toggle: $.fn.toggle,
-	_addClass: $.fn.addClass,
-	_removeClass: $.fn.removeClass,
-	_toggleClass: $.fn.toggleClass,
-	// New ec methods
-	effect: function(fx,o,speed,callback) {
-		return $.effects[fx] ? $.effects[fx].call(this, {method: fx, options: o || {}, duration: speed, callback: callback }) : null;
-	},
-	show: function() {
-		if(!arguments[0] || (arguments[0].constructor == Number || /(slow|normal|fast)/.test(arguments[0])))
-			return this._show.apply(this, arguments);
-		else {
-			var o = arguments[1] || {}; o['mode'] = 'show';
-			return this.effect.apply(this, [arguments[0], o, arguments[2] || o.duration, arguments[3] || o.callback]);
-		}
-	},
-	hide: function() {
-		if(!arguments[0] || (arguments[0].constructor == Number || /(slow|normal|fast)/.test(arguments[0])))
-			return this._hide.apply(this, arguments);
-		else {
-			var o = arguments[1] || {}; o['mode'] = 'hide';
-			return this.effect.apply(this, [arguments[0], o, arguments[2] || o.duration, arguments[3] || o.callback]);
-		}
-	},
-	toggle: function(){
-		if(!arguments[0] || (arguments[0].constructor == Number || /(slow|normal|fast)/.test(arguments[0])) || (arguments[0].constructor == Function))
-			return this.__toggle.apply(this, arguments);
-		else {
-			var o = arguments[1] || {}; o['mode'] = 'toggle';
-			return this.effect.apply(this, [arguments[0], o, arguments[2] || o.duration, arguments[3] || o.callback]);
-		}
-	},
-	addClass: function(classNames,speed,easing,callback) {
-		return speed ? $.effects.animateClass.apply(this, [{ add: classNames },speed,easing,callback]) : this._addClass(classNames);
-	},
-	removeClass: function(classNames,speed,easing,callback) {
-		return speed ? $.effects.animateClass.apply(this, [{ remove: classNames },speed,easing,callback]) : this._removeClass(classNames);
-	},
-	toggleClass: function(classNames,speed,easing,callback) {
-		return speed ? $.effects.animateClass.apply(this, [{ toggle: classNames },speed,easing,callback]) : this._toggleClass(classNames);
-	},
-	morph: function(remove,add,speed,easing,callback) {
-		return $.effects.animateClass.apply(this, [{ add: add, remove: remove },speed,easing,callback]);
-	},
-	switchClass: function() {
-		return this.morph.apply(this, arguments);
-	},
-	// helper functions
-	cssUnit: function(key) {
-		var style = this.css(key), val = [];
-		$.each( ['em','px','%','pt'], function(i, unit){
-			if(style.indexOf(unit) > 0)
-				val = [parseFloat(style), unit];
-		});
-		return val;
-	}
-});
-
-/*
- * jQuery Color Animations
- * Copyright 2007 John Resig
- * Released under the MIT and GPL licenses.
- */
-
-// We override the animation for all of these color styles
-jQuery.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i,attr){
-		jQuery.fx.step[attr] = function(fx){
-				if ( fx.state == 0 ) {
-						fx.start = getColor( fx.elem, attr );
-						fx.end = getRGB( fx.end );
-				}
-
-				fx.elem.style[attr] = "rgb(" + [
-						Math.max(Math.min( parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0]), 255), 0),
-						Math.max(Math.min( parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1]), 255), 0),
-						Math.max(Math.min( parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2]), 255), 0)
-				].join(",") + ")";
-		}
-});
-
-// Color Conversion functions from highlightFade
-// By Blair Mitchelmore
-// http://jquery.offput.ca/highlightFade/
-
-// Parse strings looking for color tuples [255,255,255]
-function getRGB(color) {
-		var result;
-
-		// Check if we're already dealing with an array of colors
-		if ( color && color.constructor == Array && color.length == 3 )
-				return color;
-
-		// Look for rgb(num,num,num)
-		if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
-				return [parseInt(result[1]), parseInt(result[2]), parseInt(result[3])];
-
-		// Look for rgb(num%,num%,num%)
-		if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
-				return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
-
-		// Look for #a0b1c2
-		if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
-				return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
-
-		// Look for #fff
-		if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
-				return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
-
-		// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
-		if (result = /rgba\(0, 0, 0, 0\)/.exec(color))
-				return colors['transparent']
-
-		// Otherwise, we're most likely dealing with a named color
-		return colors[jQuery.trim(color).toLowerCase()];
-}
-
-function getColor(elem, attr) {
-		var color;
-
-		do {
-				color = jQuery.curCSS(elem, attr);
-
-				// Keep going until we find an element that has color, or we hit the body
-				if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") )
-						break;
-
-				attr = "backgroundColor";
-		} while ( elem = elem.parentNode );
-
-		return getRGB(color);
-};
-
-// Some named colors to work with
-// From Interface by Stefan Petre
-// http://interface.eyecon.ro/
-
-var colors = {
-	aqua:[0,255,255],
-	azure:[240,255,255],
-	beige:[245,245,220],
-	black:[0,0,0],
-	blue:[0,0,255],
-	brown:[165,42,42],
-	cyan:[0,255,255],
-	darkblue:[0,0,139],
-	darkcyan:[0,139,139],
-	darkgrey:[169,169,169],
-	darkgreen:[0,100,0],
-	darkkhaki:[189,183,107],
-	darkmagenta:[139,0,139],
-	darkolivegreen:[85,107,47],
-	darkorange:[255,140,0],
-	darkorchid:[153,50,204],
-	darkred:[139,0,0],
-	darksalmon:[233,150,122],
-	darkviolet:[148,0,211],
-	fuchsia:[255,0,255],
-	gold:[255,215,0],
-	green:[0,128,0],
-	indigo:[75,0,130],
-	khaki:[240,230,140],
-	lightblue:[173,216,230],
-	lightcyan:[224,255,255],
-	lightgreen:[144,238,144],
-	lightgrey:[211,211,211],
-	lightpink:[255,182,193],
-	lightyellow:[255,255,224],
-	lime:[0,255,0],
-	magenta:[255,0,255],
-	maroon:[128,0,0],
-	navy:[0,0,128],
-	olive:[128,128,0],
-	orange:[255,165,0],
-	pink:[255,192,203],
-	purple:[128,0,128],
-	violet:[128,0,128],
-	red:[255,0,0],
-	silver:[192,192,192],
-	white:[255,255,255],
-	yellow:[255,255,0],
-	transparent: [255,255,255]
-};
-	
-/*
- * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
- *
- * Uses the built in easing capabilities added In jQuery 1.1
- * to offer multiple easing options
- *
- * TERMS OF USE - jQuery Easing
- * 
- * Open source under the BSD License. 
- * 
- * Copyright © 2008 George McGinley Smith
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list 
- * of conditions and the following disclaimer in the documentation and/or other materials 
- * provided with the distribution.
- * 
- * Neither the name of the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
-*/
-
-// t: current time, b: begInnIng value, c: change In value, d: duration
-jQuery.easing['jswing'] = jQuery.easing['swing'];
-
-jQuery.extend( jQuery.easing,
-{
-	def: 'easeOutQuad',
-	swing: function (x, t, b, c, d) {
-		//alert(jQuery.easing.default);
-		return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
-	},
-	easeInQuad: function (x, t, b, c, d) {
-		return c*(t/=d)*t + b;
-	},
-	easeOutQuad: function (x, t, b, c, d) {
-		return -c *(t/=d)*(t-2) + b;
-	},
-	easeInOutQuad: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t + b;
-		return -c/2 * ((--t)*(t-2) - 1) + b;
-	},
-	easeInCubic: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t + b;
-	},
-	easeOutCubic: function (x, t, b, c, d) {
-		return c*((t=t/d-1)*t*t + 1) + b;
-	},
-	easeInOutCubic: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t + b;
-		return c/2*((t-=2)*t*t + 2) + b;
-	},
-	easeInQuart: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t*t + b;
-	},
-	easeOutQuart: function (x, t, b, c, d) {
-		return -c * ((t=t/d-1)*t*t*t - 1) + b;
-	},
-	easeInOutQuart: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
-		return -c/2 * ((t-=2)*t*t*t - 2) + b;
-	},
-	easeInQuint: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t*t*t + b;
-	},
-	easeOutQuint: function (x, t, b, c, d) {
-		return c*((t=t/d-1)*t*t*t*t + 1) + b;
-	},
-	easeInOutQuint: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
-		return c/2*((t-=2)*t*t*t*t + 2) + b;
-	},
-	easeInSine: function (x, t, b, c, d) {
-		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
-	},
-	easeOutSine: function (x, t, b, c, d) {
-		return c * Math.sin(t/d * (Math.PI/2)) + b;
-	},
-	easeInOutSine: function (x, t, b, c, d) {
-		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
-	},
-	easeInExpo: function (x, t, b, c, d) {
-		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
-	},
-	easeOutExpo: function (x, t, b, c, d) {
-		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
-	},
-	easeInOutExpo: function (x, t, b, c, d) {
-		if (t==0) return b;
-		if (t==d) return b+c;
-		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
-		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
-	},
-	easeInCirc: function (x, t, b, c, d) {
-		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
-	},
-	easeOutCirc: function (x, t, b, c, d) {
-		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
-	},
-	easeInOutCirc: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
-		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
-	},
-	easeInElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
-	},
-	easeOutElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
-	},
-	easeInOutElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
-		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
-	},
-	easeInBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158;
-		return c*(t/=d)*t*((s+1)*t - s) + b;
-	},
-	easeOutBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158;
-		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
-	},
-	easeInOutBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158; 
-		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
-		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
-	},
-	easeInBounce: function (x, t, b, c, d) {
-		return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
-	},
-	easeOutBounce: function (x, t, b, c, d) {
-		if ((t/=d) < (1/2.75)) {
-			return c*(7.5625*t*t) + b;
-		} else if (t < (2/2.75)) {
-			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
-		} else if (t < (2.5/2.75)) {
-			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
-		} else {
-			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
-		}
-	},
-	easeInOutBounce: function (x, t, b, c, d) {
-		if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
-		return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
-	}
-});
-
-/*
- *
- * TERMS OF USE - EASING EQUATIONS
- * 
- * Open source under the BSD License. 
- * 
- * Copyright © 2001 Robert Penner
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list 
- * of conditions and the following disclaimer in the documentation and/or other materials 
- * provided with the distribution.
- * 
- * Neither the name of the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
- */
-
-})(jQuery);
Index: js/ui/effects.shake.js
===================================================================
--- js/ui/effects.shake.js	(revision 6370)
+++ js/ui/effects.shake.js	(working copy)
@@ -1,57 +0,0 @@
-/*
- * jQuery UI Effects Shake
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Shake
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.shake = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var direction = o.options.direction || 'left'; // Default direction
-		var distance = o.options.distance || 20; // Default distance
-		var times = o.options.times || 3; // Default # of times
-		var speed = o.duration || o.options.duration || 140; // Default speed per shake
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		$.effects.createWrapper(el); // Create Wrapper
-		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
-		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
-		
-		// Animation
-		var animation = {}, animation1 = {}, animation2 = {};
-		animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
-		animation1[ref] = (motion == 'pos' ? '+=' : '-=')  + distance * 2;
-		animation2[ref] = (motion == 'pos' ? '-=' : '+=')  + distance * 2;
-		
-		// Animate
-		el.animate(animation, speed, o.options.easing);
-		for (var i = 1; i < times; i++) { // Shakes
-			el.animate(animation1, speed, o.options.easing).animate(animation2, speed, o.options.easing);
-		};
-		el.animate(animation1, speed, o.options.easing).
-		animate(animation, speed / 2, o.options.easing, function(){ // Last shake
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(this, arguments); // Callback
-		});
-		el.queue('fx', function() { el.dequeue(); });
-		el.dequeue();
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/minified/effects.drop.min.js
===================================================================
--- js/ui/minified/effects.drop.min.js	(revision 6370)
+++ js/ui/minified/effects.drop.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.drop=function(B){return this.queue(function(){var E=A(this),D=["position","top","left","opacity"];var I=A.effects.setMode(E,B.options.mode||"hide");var H=B.options.direction||"left";A.effects.save(E,D);E.show();A.effects.createWrapper(E);var F=(H=="up"||H=="down")?"top":"left";var C=(H=="up"||H=="left")?"pos":"neg";var J=B.options.distance||(F=="top"?E.outerHeight({margin:true})/2:E.outerWidth({margin:true})/2);if(I=="show"){E.css("opacity",0).css(F,C=="pos"?-J:J)}var G={opacity:I=="show"?1:0};G[F]=(I=="show"?(C=="pos"?"+=":"-="):(C=="pos"?"-=":"+="))+J;E.animate(G,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(I=="hide"){E.hide()}A.effects.restore(E,D);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}E.dequeue()}})})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.droppable.min.js
===================================================================
--- js/ui/minified/ui.droppable.min.js	(revision 6370)
+++ js/ui/minified/ui.droppable.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.widget("ui.droppable",{init:function(){this.element.addClass("ui-droppable");this.isover=0;this.isout=1;var C=this.options,B=C.accept;C=A.extend(C,{accept:C.accept&&C.accept.constructor==Function?C.accept:function(D){return A(D).is(B)}});this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};A.ui.ddmanager.droppables.push(this)},plugins:{},ui:function(B){return{draggable:(B.currentItem||B.element),helper:B.helper,position:B.position,absolutePosition:B.positionAbs,options:this.options,element:this.element}},destroy:function(){var B=A.ui.ddmanager.droppables;for(var C=0;C<B.length;C++){if(B[C]==this){B.splice(C,1)}}this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable")},over:function(C){var B=A.ui.ddmanager.current;if(!B||(B.currentItem||B.element)[0]==this.element[0]){return }if(this.options.accept.call(this.element,(B.currentItem||B.element))){A.ui.plugin.call(this,"over",[C,this.ui(B)]);this.element.triggerHandler("dropover",[C,this.ui(B)],this.options.over)}},out:function(C){var B=A.ui.ddmanager.current;if(!B||(B.currentItem||B.element)[0]==this.element[0]){return }if(this.options.accept.call(this.element,(B.currentItem||B.element))){A.ui.plugin.call(this,"out",[C,this.ui(B)]);this.element.triggerHandler("dropout",[C,this.ui(B)],this.options.out)}},drop:function(D,C){var B=C||A.ui.ddmanager.current;if(!B||(B.currentItem||B.element)[0]==this.element[0]){return false}var E=false;this.element.find(".ui-droppable").not(".ui-draggable-dragging").each(function(){var F=A.data(this,"droppable");if(F.options.greedy&&A.ui.intersect(B,A.extend(F,{offset:F.element.offset()}),F.options.tolerance)){E=true;return false}});if(E){return false}if(this.options.accept.call(this.element,(B.currentItem||B.element))){A.ui.plugin.call(this,"drop",[D,this.ui(B)]);this.element.triggerHandler("drop",[D,this.ui(B)],this.options.drop);return true}return false},activate:function(C){var B=A.ui.ddmanager.current;A.ui.plugin.call(this,"activate",[C,this.ui(B)]);if(B){this.element.triggerHandler("dropactivate",[C,this.ui(B)],this.options.activate)}},deactivate:function(C){var B=A.ui.ddmanager.current;A.ui.plugin.call(this,"deactivate",[C,this.ui(B)]);if(B){this.element.triggerHandler("dropdeactivate",[C,this.ui(B)],this.options.deactivate)}}});A.extend(A.ui.droppable,{defaults:{disabled:false,tolerance:"intersect"}});A.ui.intersect=function(L,F,J){if(!F.offset){return false}var D=(L.positionAbs||L.position.absolute).left,C=D+L.helperProportions.width,I=(L.positionAbs||L.position.absolute).top,H=I+L.helperProportions.height;var E=F.offset.left,B=E+F.proportions.width,K=F.offset.top,G=K+F.proportions.height;switch(J){case"fit":return(E<D&&C<B&&K<I&&H<G);break;case"intersect":return(E<D+(L.helperProportions.width/2)&&C-(L.helperProportions.width/2)<B&&K<I+(L.helperProportions.height/2)&&H-(L.helperProportions.height/2)<G);break;case"pointer":return(E<((L.positionAbs||L.position.absolute).left+(L.clickOffset||L.offset.click).left)&&((L.positionAbs||L.position.absolute).left+(L.clickOffset||L.offset.click).left)<B&&K<((L.positionAbs||L.position.absolute).top+(L.clickOffset||L.offset.click).top)&&((L.positionAbs||L.position.absolute).top+(L.clickOffset||L.offset.click).top)<G);break;case"touch":return((I>=K&&I<=G)||(H>=K&&H<=G)||(I<K&&H>G))&&((D>=E&&D<=B)||(C>=E&&C<=B)||(D<E&&C>B));break;default:return false;break}};A.ui.ddmanager={current:null,droppables:[],prepareOffsets:function(D,F){var B=A.ui.ddmanager.droppables;var E=F?F.type:null;for(var C=0;C<B.length;C++){if(B[C].options.disabled||(D&&!B[C].options.accept.call(B[C].element,(D.currentItem||D.element)))){continue}B[C].visible=B[C].element.css("display")!="none";if(!B[C].visible){continue}B[C].offset=B[C].element.offset();B[C].proportions={width:B[C].element[0].offsetWidth,height:B[C].element[0].offsetHeight};if(E=="dragstart"||E=="sortactivate"){B[C].activate.call(B[C],F)}}},drop:function(B,C){var D=false;A.each(A.ui.ddmanager.droppables,function(){if(!this.options){return }if(!this.options.disabled&&this.visible&&A.ui.intersect(B,this,this.options.tolerance)){D=this.drop.call(this,C)}if(!this.options.disabled&&this.visible&&this.options.accept.call(this.element,(B.currentItem||B.element))){this.isout=1;this.isover=0;this.deactivate.call(this,C)}});return D},drag:function(B,C){if(B.options.refreshPositions){A.ui.ddmanager.prepareOffsets(B,C)}A.each(A.ui.ddmanager.droppables,function(){if(this.options.disabled||this.greedyChild||!this.visible){return }var E=A.ui.intersect(B,this,this.options.tolerance);var G=!E&&this.isover==1?"isout":(E&&this.isover==0?"isover":null);if(!G){return }var F;if(this.options.greedy){var D=this.element.parents(".ui-droppable:eq(0)");if(D.length){F=A.data(D[0],"droppable");F.greedyChild=(G=="isover"?1:0)}}if(F&&G=="isover"){F["isover"]=0;F["isout"]=1;F.out.call(F,C)}this[G]=1;this[G=="isout"?"isover":"isout"]=0;this[G=="isover"?"over":"out"].call(this,C);if(F&&G=="isout"){F["isout"]=0;F["isover"]=1;F.over.call(F,C)}})}};A.ui.plugin.add("droppable","activeClass",{activate:function(C,B){A(this).addClass(B.options.activeClass)},deactivate:function(C,B){A(this).removeClass(B.options.activeClass)},drop:function(C,B){A(this).removeClass(B.options.activeClass)}});A.ui.plugin.add("droppable","hoverClass",{over:function(C,B){A(this).addClass(B.options.hoverClass)},out:function(C,B){A(this).removeClass(B.options.hoverClass)},drop:function(C,B){A(this).removeClass(B.options.hoverClass)}})})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.draggable.min.js
===================================================================
--- js/ui/minified/ui.draggable.min.js	(revision 6370)
+++ js/ui/minified/ui.draggable.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.widget("ui.draggable",A.extend({},A.ui.mouse,{init:function(){var B=this.options;if(B.helper=="original"&&!(/(relative|absolute|fixed)/).test(this.element.css("position"))){this.element.css("position","relative")}this.element.addClass("ui-draggable");(B.disabled&&this.element.addClass("ui-draggable-disabled"));this.mouseInit()},mouseStart:function(F){var H=this.options;if(this.helper||H.disabled||A(F.target).is(".ui-resizable-handle")){return false}var C=!this.options.handle||!A(this.options.handle,this.element).length?true:false;A(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==F.target){C=true}});if(!C){return false}if(A.ui.ddmanager){A.ui.ddmanager.current=this}this.helper=A.isFunction(H.helper)?A(H.helper.apply(this.element[0],[F])):(H.helper=="clone"?this.element.clone():this.element);if(!this.helper.parents("body").length){this.helper.appendTo((H.appendTo=="parent"?this.element[0].parentNode:H.appendTo))}if(this.helper[0]!=this.element[0]&&!(/(fixed|absolute)/).test(this.helper.css("position"))){this.helper.css("position","absolute")}this.margins={left:(parseInt(this.element.css("marginLeft"),10)||0),top:(parseInt(this.element.css("marginTop"),10)||0)};this.cssPosition=this.helper.css("position");this.offset=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.offset.click={left:F.pageX-this.offset.left,top:F.pageY-this.offset.top};this.offsetParent=this.helper.offsetParent();var B=this.offsetParent.offset();if(this.offsetParent[0]==document.body&&A.browser.mozilla){B={top:0,left:0}}this.offset.parent={top:B.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:B.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)};var E=this.element.position();this.offset.relative=this.cssPosition=="relative"?{top:E.top-(parseInt(this.helper.css("top"),10)||0)+this.offsetParent[0].scrollTop,left:E.left-(parseInt(this.helper.css("left"),10)||0)+this.offsetParent[0].scrollLeft}:{top:0,left:0};this.originalPosition=this.generatePosition(F);this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(H.cursorAt){if(H.cursorAt.left!=undefined){this.offset.click.left=H.cursorAt.left+this.margins.left}if(H.cursorAt.right!=undefined){this.offset.click.left=this.helperProportions.width-H.cursorAt.right+this.margins.left}if(H.cursorAt.top!=undefined){this.offset.click.top=H.cursorAt.top+this.margins.top}if(H.cursorAt.bottom!=undefined){this.offset.click.top=this.helperProportions.height-H.cursorAt.bottom+this.margins.top}}if(H.containment){if(H.containment=="parent"){H.containment=this.helper[0].parentNode}if(H.containment=="document"||H.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,A(H.containment=="document"?document:window).width()-this.offset.relative.left-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.element.css("marginRight"),10)||0),(A(H.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.offset.relative.top-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.element.css("marginBottom"),10)||0)]}if(!(/^(document|window|parent)$/).test(H.containment)){var D=A(H.containment)[0];var G=A(H.containment).offset();this.containment=[G.left+(parseInt(A(D).css("borderLeftWidth"),10)||0)-this.offset.relative.left-this.offset.parent.left,G.top+(parseInt(A(D).css("borderTopWidth"),10)||0)-this.offset.relative.top-this.offset.parent.top,G.left+Math.max(D.scrollWidth,D.offsetWidth)-(parseInt(A(D).css("borderLeftWidth"),10)||0)-this.offset.relative.left-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.element.css("marginRight"),10)||0),G.top+Math.max(D.scrollHeight,D.offsetHeight)-(parseInt(A(D).css("borderTopWidth"),10)||0)-this.offset.relative.top-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.element.css("marginBottom"),10)||0)]}}this.propagate("start",F);this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(A.ui.ddmanager&&!H.dropBehaviour){A.ui.ddmanager.prepareOffsets(this,F)}this.helper.addClass("ui-draggable-dragging");this.mouseDrag(F);return true},convertPositionTo:function(C,D){if(!D){D=this.position}var B=C=="absolute"?1:-1;return{top:(D.top+this.offset.relative.top*B+this.offset.parent.top*B-(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollTop)*B+(this.cssPosition=="fixed"?A(document).scrollTop():0)*B+this.margins.top*B),left:(D.left+this.offset.relative.left*B+this.offset.parent.left*B-(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollLeft)*B+(this.cssPosition=="fixed"?A(document).scrollLeft():0)*B+this.margins.left*B)}},generatePosition:function(E){var F=this.options;var B={top:(E.pageY-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollTop)-(this.cssPosition=="fixed"?A(document).scrollTop():0)),left:(E.pageX-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollLeft)-(this.cssPosition=="fixed"?A(document).scrollLeft():0))};if(!this.originalPosition){return B}if(this.containment){if(B.left<this.containment[0]){B.left=this.containment[0]}if(B.top<this.containment[1]){B.top=this.containment[1]}if(B.left>this.containment[2]){B.left=this.containment[2]}if(B.top>this.containment[3]){B.top=this.containment[3]}}if(F.grid){var D=this.originalPosition.top+Math.round((B.top-this.originalPosition.top)/F.grid[1])*F.grid[1];B.top=this.containment?(!(D<this.containment[1]||D>this.containment[3])?D:(!(D<this.containment[1])?D-F.grid[1]:D+F.grid[1])):D;var C=this.originalPosition.left+Math.round((B.left-this.originalPosition.left)/F.grid[0])*F.grid[0];B.left=this.containment?(!(C<this.containment[0]||C>this.containment[2])?C:(!(C<this.containment[0])?C-F.grid[0]:C+F.grid[0])):C}return B},mouseDrag:function(B){this.position=this.generatePosition(B);this.positionAbs=this.convertPositionTo("absolute");this.position=this.propagate("drag",B)||this.position;if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}if(A.ui.ddmanager){A.ui.ddmanager.drag(this,B)}return false},mouseStop:function(C){var D=false;if(A.ui.ddmanager&&!this.options.dropBehaviour){var D=A.ui.ddmanager.drop(this,C)}if((this.options.revert=="invalid"&&!D)||(this.options.revert=="valid"&&D)||this.options.revert===true){var B=this;A(this.helper).animate(this.originalPosition,parseInt(this.options.revert,10)||500,function(){B.propagate("stop",C);B.clear()})}else{this.propagate("stop",C);this.clear()}return false},clear:function(){this.helper.removeClass("ui-draggable-dragging");if(this.options.helper!="original"&&!this.cancelHelperRemoval){this.helper.remove()}this.helper=null;this.cancelHelperRemoval=false},plugins:{},uiHash:function(B){return{helper:this.helper,position:this.position,absolutePosition:this.positionAbs,options:this.options}},propagate:function(C,B){A.ui.plugin.call(this,C,[B,this.uiHash()]);if(C=="drag"){this.positionAbs=this.convertPositionTo("absolute")}return this.element.triggerHandler(C=="drag"?C:"drag"+C,[B,this.uiHash()],this.options[C])},destroy:function(){if(!this.element.data("draggable")){return }this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable");this.mouseDestroy()}}));A.extend(A.ui.draggable,{defaults:{appendTo:"parent",axis:false,cancel:":input",delay:0,distance:1,helper:"original"}});A.ui.plugin.add("draggable","cursor",{start:function(D,C){var B=A("body");if(B.css("cursor")){C.options._cursor=B.css("cursor")}B.css("cursor",C.options.cursor)},stop:function(C,B){if(B.options._cursor){A("body").css("cursor",B.options._cursor)}}});A.ui.plugin.add("draggable","zIndex",{start:function(D,C){var B=A(C.helper);if(B.css("zIndex")){C.options._zIndex=B.css("zIndex")}B.css("zIndex",C.options.zIndex)},stop:function(C,B){if(B.options._zIndex){A(B.helper).css("zIndex",B.options._zIndex)}}});A.ui.plugin.add("draggable","opacity",{start:function(D,C){var B=A(C.helper);if(B.css("opacity")){C.options._opacity=B.css("opacity")}B.css("opacity",C.options.opacity)},stop:function(C,B){if(B.options._opacity){A(B.helper).css("opacity",B.options._opacity)}}});A.ui.plugin.add("draggable","iframeFix",{start:function(C,B){A(B.options.iframeFix===true?"iframe":B.options.iframeFix).each(function(){A('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1000}).css(A(this).offset()).appendTo("body")})},stop:function(C,B){A("div.DragDropIframeFix").each(function(){this.parentNode.removeChild(this)})}});A.ui.plugin.add("draggable","scroll",{start:function(D,C){var E=C.options;var B=A(this).data("draggable");E.scrollSensitivity=E.scrollSensitivity||20;E.scrollSpeed=E.scrollSpeed||20;B.overflowY=function(F){do{if(/auto|scroll/.test(F.css("overflow"))||(/auto|scroll/).test(F.css("overflow-y"))){return F}F=F.parent()}while(F[0].parentNode);return A(document)}(this);B.overflowX=function(F){do{if(/auto|scroll/.test(F.css("overflow"))||(/auto|scroll/).test(F.css("overflow-x"))){return F}F=F.parent()}while(F[0].parentNode);return A(document)}(this);if(B.overflowY[0]!=document&&B.overflowY[0].tagName!="HTML"){B.overflowYOffset=B.overflowY.offset()}if(B.overflowX[0]!=document&&B.overflowX[0].tagName!="HTML"){B.overflowXOffset=B.overflowX.offset()}},drag:function(D,C){var E=C.options;var B=A(this).data("draggable");if(B.overflowY[0]!=document&&B.overflowY[0].tagName!="HTML"){if((B.overflowYOffset.top+B.overflowY[0].offsetHeight)-D.pageY<E.scrollSensitivity){B.overflowY[0].scrollTop=B.overflowY[0].scrollTop+E.scrollSpeed}if(D.pageY-B.overflowYOffset.top<E.scrollSensitivity){B.overflowY[0].scrollTop=B.overflowY[0].scrollTop-E.scrollSpeed}}else{if(D.pageY-A(document).scrollTop()<E.scrollSensitivity){A(document).scrollTop(A(document).scrollTop()-E.scrollSpeed)}if(A(window).height()-(D.pageY-A(document).scrollTop())<E.scrollSensitivity){A(document).scrollTop(A(document).scrollTop()+E.scrollSpeed)}}if(B.overflowX[0]!=document&&B.overflowX[0].tagName!="HTML"){if((B.overflowXOffset.left+B.overflowX[0].offsetWidth)-D.pageX<E.scrollSensitivity){B.overflowX[0].scrollLeft=B.overflowX[0].scrollLeft+E.scrollSpeed}if(D.pageX-B.overflowXOffset.left<E.scrollSensitivity){B.overflowX[0].scrollLeft=B.overflowX[0].scrollLeft-E.scrollSpeed}}else{if(D.pageX-A(document).scrollLeft()<E.scrollSensitivity){A(document).scrollLeft(A(document).scrollLeft()-E.scrollSpeed)}if(A(window).width()-(D.pageX-A(document).scrollLeft())<E.scrollSensitivity){A(document).scrollLeft(A(document).scrollLeft()+E.scrollSpeed)}}}});A.ui.plugin.add("draggable","snap",{start:function(D,C){var B=A(this).data("draggable");B.snapElements=[];A(C.options.snap===true?".ui-draggable":C.options.snap).each(function(){var F=A(this);var E=F.offset();if(this!=B.element[0]){B.snapElements.push({item:this,width:F.outerWidth(),height:F.outerHeight(),top:E.top,left:E.left})}})},drag:function(J,N){var I=A(this).data("draggable");var L=N.options.snapTolerance||20;var D=N.absolutePosition.left,C=D+I.helperProportions.width,P=N.absolutePosition.top,O=P+I.helperProportions.height;for(var H=I.snapElements.length-1;H>=0;H--){var E=I.snapElements[H].left,B=E+I.snapElements[H].width,R=I.snapElements[H].top,M=R+I.snapElements[H].height;if(!((E-L<D&&D<B+L&&R-L<P&&P<M+L)||(E-L<D&&D<B+L&&R-L<O&&O<M+L)||(E-L<C&&C<B+L&&R-L<P&&P<M+L)||(E-L<C&&C<B+L&&R-L<O&&O<M+L))){continue}if(N.options.snapMode!="inner"){var K=Math.abs(R-O)<=20;var Q=Math.abs(M-P)<=20;var G=Math.abs(E-C)<=20;var F=Math.abs(B-D)<=20;if(K){N.position.top=I.convertPositionTo("relative",{top:R-I.helperProportions.height,left:0}).top}if(Q){N.position.top=I.convertPositionTo("relative",{top:M,left:0}).top}if(G){N.position.left=I.convertPositionTo("relative",{top:0,left:E-I.helperProportions.width}).left}if(F){N.position.left=I.convertPositionTo("relative",{top:0,left:B}).left}}if(N.options.snapMode!="outer"){var K=Math.abs(R-P)<=20;var Q=Math.abs(M-O)<=20;var G=Math.abs(E-D)<=20;var F=Math.abs(B-C)<=20;if(K){N.position.top=I.convertPositionTo("relative",{top:R,left:0}).top}if(Q){N.position.top=I.convertPositionTo("relative",{top:M-I.helperProportions.height,left:0}).top}if(G){N.position.left=I.convertPositionTo("relative",{top:0,left:E}).left}if(F){N.position.left=I.convertPositionTo("relative",{top:0,left:B-I.helperProportions.width}).left}}}}});A.ui.plugin.add("draggable","connectToSortable",{start:function(D,C){var B=A(this).data("draggable");B.sortables=[];A(C.options.connectToSortable).each(function(){if(A.data(this,"sortable")){var E=A.data(this,"sortable");B.sortables.push({instance:E,shouldRevert:E.options.revert});E.refreshItems();E.propagate("activate",D,B)}})},stop:function(D,C){var B=A(this).data("draggable");A.each(B.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;B.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert){this.instance.options.revert=true}this.instance.mouseStop(D);this.instance.element.triggerHandler("sortreceive",[D,A.extend(this.instance.ui(),{sender:B.element})],this.instance.options["receive"]);this.instance.options.helper=this.instance.options._helper}else{this.instance.propagate("deactivate",D,B)}})},drag:function(F,E){var D=A(this).data("draggable"),B=this;var C=function(K){var H=K.left,J=H+K.width,I=K.top,G=I+K.height;return(H<(this.positionAbs.left+this.offset.click.left)&&(this.positionAbs.left+this.offset.click.left)<J&&I<(this.positionAbs.top+this.offset.click.top)&&(this.positionAbs.top+this.offset.click.top)<G)};A.each(D.sortables,function(G){if(C.call(D,this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=A(B).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return E.helper[0]};F.target=this.instance.currentItem[0];this.instance.mouseCapture(F,true);this.instance.mouseStart(F,true,true);this.instance.offset.click.top=D.offset.click.top;this.instance.offset.click.left=D.offset.click.left;this.instance.offset.parent.left-=D.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=D.offset.parent.top-this.instance.offset.parent.top;D.propagate("toSortable",F)}if(this.instance.currentItem){this.instance.mouseDrag(F)}}else{if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance.mouseStop(F,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();if(this.instance.placeholder){this.instance.placeholder.remove()}D.propagate("fromSortable",F)}}})}});A.ui.plugin.add("draggable","stack",{start:function(D,B){var C=A.makeArray(A(B.options.stack.group)).sort(function(F,E){return(parseInt(A(F).css("zIndex"),10)||B.options.stack.min)-(parseInt(A(E).css("zIndex"),10)||B.options.stack.min)});A(C).each(function(E){this.style.zIndex=B.options.stack.min+E});this[0].style.zIndex=B.options.stack.min+C.length}})})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.highlight.min.js
===================================================================
--- js/ui/minified/effects.highlight.min.js	(revision 6370)
+++ js/ui/minified/effects.highlight.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.highlight=function(B){return this.queue(function(){var E=A(this),D=["backgroundImage","backgroundColor","opacity"];var H=A.effects.setMode(E,B.options.mode||"show");var C=B.options.color||"#ffff99";var G=E.css("backgroundColor");A.effects.save(E,D);E.show();E.css({backgroundImage:"none",backgroundColor:C});var F={backgroundColor:G};if(H=="hide"){F["opacity"]=0}E.animate(F,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(H=="hide"){E.hide()}A.effects.restore(E,D);if(H=="show"&&jQuery.browser.msie){this.style.removeAttribute("filter")}if(B.callback){B.callback.apply(this,arguments)}E.dequeue()}})})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.sortable.min.js
===================================================================
--- js/ui/minified/ui.sortable.min.js	(revision 6370)
+++ js/ui/minified/ui.sortable.min.js	(working copy)
@@ -1 +0,0 @@
-(function(B){function A(E,D){var C=B.browser.safari&&B.browser.version<522;if(E.contains&&!C){return E.contains(D)}if(E.compareDocumentPosition){return !!(E.compareDocumentPosition(D)&16)}while(D=D.parentNode){if(D==E){return true}}return false}B.widget("ui.sortable",B.extend({},B.ui.mouse,{init:function(){var C=this.options;this.containerCache={};this.element.addClass("ui-sortable");this.refresh();this.floating=this.items.length?(/left|right/).test(this.items[0].item.css("float")):false;if(!(/(relative|absolute|fixed)/).test(this.element.css("position"))){this.element.css("position","relative")}this.offset=this.element.offset();this.mouseInit()},plugins:{},ui:function(C){return{helper:(C||this)["helper"],placeholder:(C||this)["placeholder"]||B([]),position:(C||this)["position"],absolutePosition:(C||this)["positionAbs"],options:this.options,element:this.element,item:(C||this)["currentItem"],sender:C?C.element:null}},propagate:function(F,E,C,D){B.ui.plugin.call(this,F,[E,this.ui(C)]);if(!D){this.element.triggerHandler(F=="sort"?F:"sort"+F,[E,this.ui(C)],this.options[F])}},serialize:function(E){var C=(B.isFunction(this.options.items)?this.options.items.call(this.element):B(this.options.items,this.element)).not(".ui-sortable-helper");var D=[];E=E||{};C.each(function(){var F=(B(this).attr(E.attribute||"id")||"").match(E.expression||(/(.+)[-=_](.+)/));if(F){D.push((E.key||F[1])+"[]="+(E.key&&E.expression?F[1]:F[2]))}});return D.join("&")},toArray:function(C){var D=(B.isFunction(this.options.items)?this.options.items.call(this.element):B(this.options.items,this.element)).not(".ui-sortable-helper");var E=[];D.each(function(){E.push(B(this).attr(C||"id"))});return E},intersectsWith:function(J){var E=this.positionAbs.left,D=E+this.helperProportions.width,I=this.positionAbs.top,H=I+this.helperProportions.height;var F=J.left,C=F+J.width,K=J.top,G=K+J.height;if(this.options.tolerance=="pointer"||this.options.forcePointerForContainers||(this.options.tolerance=="guess"&&this.helperProportions[this.floating?"width":"height"]>J[this.floating?"width":"height"])){return(I+this.offset.click.top>K&&I+this.offset.click.top<G&&E+this.offset.click.left>F&&E+this.offset.click.left<C)}else{return(F<E+(this.helperProportions.width/2)&&D-(this.helperProportions.width/2)<C&&K<I+(this.helperProportions.height/2)&&H-(this.helperProportions.height/2)<G)}},intersectsWithEdge:function(J){var E=this.positionAbs.left,D=E+this.helperProportions.width,I=this.positionAbs.top,H=I+this.helperProportions.height;var F=J.left,C=F+J.width,K=J.top,G=K+J.height;if(this.options.tolerance=="pointer"||(this.options.tolerance=="guess"&&this.helperProportions[this.floating?"width":"height"]>J[this.floating?"width":"height"])){if(!(I+this.offset.click.top>K&&I+this.offset.click.top<G&&E+this.offset.click.left>F&&E+this.offset.click.left<C)){return false}if(this.floating){if(E+this.offset.click.left>F&&E+this.offset.click.left<F+J.width/2){return 2}if(E+this.offset.click.left>F+J.width/2&&E+this.offset.click.left<C){return 1}}else{if(I+this.offset.click.top>K&&I+this.offset.click.top<K+J.height/2){return 2}if(I+this.offset.click.top>K+J.height/2&&I+this.offset.click.top<G){return 1}}}else{if(!(F<E+(this.helperProportions.width/2)&&D-(this.helperProportions.width/2)<C&&K<I+(this.helperProportions.height/2)&&H-(this.helperProportions.height/2)<G)){return false}if(this.floating){if(D>F&&E<F){return 2}if(E<C&&D>C){return 1}}else{if(H>K&&I<K){return 1}if(I<G&&H>G){return 2}}}return false},refresh:function(){this.refreshItems();this.refreshPositions()},refreshItems:function(){this.items=[];this.containers=[this];var D=this.items;var C=this;var F=[[B.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):B(this.options.items,this.element),this]];if(this.options.connectWith){for(var G=this.options.connectWith.length-1;G>=0;G--){var I=B(this.options.connectWith[G]);for(var E=I.length-1;E>=0;E--){var H=B.data(I[E],"sortable");if(H&&!H.options.disabled){F.push([B.isFunction(H.options.items)?H.options.items.call(H.element):B(H.options.items,H.element),H]);this.containers.push(H)}}}}for(var G=F.length-1;G>=0;G--){F[G][0].each(function(){B.data(this,"sortable-item",F[G][1]);D.push({item:B(this),instance:F[G][1],width:0,height:0,left:0,top:0})})}},refreshPositions:function(D){if(this.offsetParent){var C=this.offsetParent.offset();this.offset.parent={top:C.top+this.offsetParentBorders.top,left:C.left+this.offsetParentBorders.left}}for(var F=this.items.length-1;F>=0;F--){if(this.items[F].instance!=this.currentContainer&&this.currentContainer&&this.items[F].item[0]!=this.currentItem[0]){continue}var E=this.options.toleranceElement?B(this.options.toleranceElement,this.items[F].item):this.items[F].item;if(!D){this.items[F].width=E[0].offsetWidth;this.items[F].height=E[0].offsetHeight}var G=E.offset();this.items[F].left=G.left;this.items[F].top=G.top}if(this.options.custom&&this.options.custom.refreshContainers){this.options.custom.refreshContainers.call(this)}else{for(var F=this.containers.length-1;F>=0;F--){var G=this.containers[F].element.offset();this.containers[F].containerCache.left=G.left;this.containers[F].containerCache.top=G.top;this.containers[F].containerCache.width=this.containers[F].element.outerWidth();this.containers[F].containerCache.height=this.containers[F].element.outerHeight()}}},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this.mouseDestroy();for(var C=this.items.length-1;C>=0;C--){this.items[C].item.removeData("sortable-item")}},createPlaceholder:function(E){var C=E||this,F=C.options;if(F.placeholder.constructor==String){var D=F.placeholder;F.placeholder={element:function(){return B("<div></div>").addClass(D)[0]},update:function(G,H){H.css(G.offset()).css({width:G.outerWidth(),height:G.outerHeight()})}}}C.placeholder=B(F.placeholder.element.call(C.element,C.currentItem)).appendTo("body").css({position:"absolute"});F.placeholder.update.call(C.element,C.currentItem,C.placeholder)},contactContainers:function(F){for(var D=this.containers.length-1;D>=0;D--){if(this.intersectsWith(this.containers[D].containerCache)){if(!this.containers[D].containerCache.over){if(this.currentContainer!=this.containers[D]){var I=10000;var H=null;var E=this.positionAbs[this.containers[D].floating?"left":"top"];for(var C=this.items.length-1;C>=0;C--){if(!A(this.containers[D].element[0],this.items[C].item[0])){continue}var G=this.items[C][this.containers[D].floating?"left":"top"];if(Math.abs(G-E)<I){I=Math.abs(G-E);H=this.items[C]}}if(!H&&!this.options.dropOnEmpty){continue}if(this.placeholder){this.placeholder.remove()}if(this.containers[D].options.placeholder){this.containers[D].createPlaceholder(this)}else{this.placeholder=null}this.currentContainer=this.containers[D];H?this.rearrange(F,H,null,true):this.rearrange(F,null,this.containers[D].element,true);this.propagate("change",F);this.containers[D].propagate("change",F,this)}this.containers[D].propagate("over",F,this);this.containers[D].containerCache.over=1}}else{if(this.containers[D].containerCache.over){this.containers[D].propagate("out",F,this);this.containers[D].containerCache.over=0}}}},mouseCapture:function(G,F){if(this.options.disabled||this.options.type=="static"){return false}this.refreshItems();var E=null,D=this,C=B(G.target).parents().each(function(){if(B.data(this,"sortable-item")==D){E=B(this);return false}});if(B.data(G.target,"sortable-item")==D){E=B(G.target)}if(!E){return false}if(this.options.handle&&!F){var H=false;B(this.options.handle,E).find("*").andSelf().each(function(){if(this==G.target){H=true}});if(!H){return false}}this.currentItem=E;return true},mouseStart:function(H,F,C){var J=this.options;this.currentContainer=this;this.refreshPositions();this.helper=typeof J.helper=="function"?B(J.helper.apply(this.element[0],[H,this.currentItem])):this.currentItem.clone();if(!this.helper.parents("body").length){B(J.appendTo!="parent"?J.appendTo:this.currentItem[0].parentNode)[0].appendChild(this.helper[0])}this.helper.css({position:"absolute",clear:"both"}).addClass("ui-sortable-helper");this.margins={left:(parseInt(this.currentItem.css("marginLeft"),10)||0),top:(parseInt(this.currentItem.css("marginTop"),10)||0)};this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.offset.click={left:H.pageX-this.offset.left,top:H.pageY-this.offset.top};this.offsetParent=this.helper.offsetParent();var D=this.offsetParent.offset();this.offsetParentBorders={top:(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)};this.offset.parent={top:D.top+this.offsetParentBorders.top,left:D.left+this.offsetParentBorders.left};this.originalPosition=this.generatePosition(H);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(J.placeholder){this.createPlaceholder()}this.propagate("start",H);this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(J.cursorAt){if(J.cursorAt.left!=undefined){this.offset.click.left=J.cursorAt.left}if(J.cursorAt.right!=undefined){this.offset.click.left=this.helperProportions.width-J.cursorAt.right}if(J.cursorAt.top!=undefined){this.offset.click.top=J.cursorAt.top}if(J.cursorAt.bottom!=undefined){this.offset.click.top=this.helperProportions.height-J.cursorAt.bottom}}if(J.containment){if(J.containment=="parent"){J.containment=this.helper[0].parentNode}if(J.containment=="document"||J.containment=="window"){this.containment=[0-this.offset.parent.left,0-this.offset.parent.top,B(J.containment=="document"?document:window).width()-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.element.css("marginRight"),10)||0),(B(J.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.element.css("marginBottom"),10)||0)]}if(!(/^(document|window|parent)$/).test(J.containment)){var G=B(J.containment)[0];var I=B(J.containment).offset();this.containment=[I.left+(parseInt(B(G).css("borderLeftWidth"),10)||0)-this.offset.parent.left,I.top+(parseInt(B(G).css("borderTopWidth"),10)||0)-this.offset.parent.top,I.left+Math.max(G.scrollWidth,G.offsetWidth)-(parseInt(B(G).css("borderLeftWidth"),10)||0)-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.currentItem.css("marginRight"),10)||0),I.top+Math.max(G.scrollHeight,G.offsetHeight)-(parseInt(B(G).css("borderTopWidth"),10)||0)-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.currentItem.css("marginBottom"),10)||0)]}}if(this.options.placeholder!="clone"){this.currentItem.css("visibility","hidden")}if(!C){for(var E=this.containers.length-1;E>=0;E--){this.containers[E].propagate("activate",H,this)}}if(B.ui.ddmanager){B.ui.ddmanager.current=this}if(B.ui.ddmanager&&!J.dropBehaviour){B.ui.ddmanager.prepareOffsets(this,H)}this.dragging=true;this.mouseDrag(H);return true},convertPositionTo:function(D,E){if(!E){E=this.position}var C=D=="absolute"?1:-1;return{top:(E.top+this.offset.parent.top*C-(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)*C+this.margins.top*C),left:(E.left+this.offset.parent.left*C-(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft)*C+this.margins.left*C)}},generatePosition:function(F){var G=this.options;var C={top:(F.pageY-this.offset.click.top-this.offset.parent.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)),left:(F.pageX-this.offset.click.left-this.offset.parent.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft))};if(!this.originalPosition){return C}if(this.containment){if(C.left<this.containment[0]){C.left=this.containment[0]}if(C.top<this.containment[1]){C.top=this.containment[1]}if(C.left>this.containment[2]){C.left=this.containment[2]}if(C.top>this.containment[3]){C.top=this.containment[3]}}if(G.grid){var E=this.originalPosition.top+Math.round((C.top-this.originalPosition.top)/G.grid[1])*G.grid[1];C.top=this.containment?(!(E<this.containment[1]||E>this.containment[3])?E:(!(E<this.containment[1])?E-G.grid[1]:E+G.grid[1])):E;var D=this.originalPosition.left+Math.round((C.left-this.originalPosition.left)/G.grid[0])*G.grid[0];C.left=this.containment?(!(D<this.containment[0]||D>this.containment[2])?D:(!(D<this.containment[0])?D-G.grid[0]:D+G.grid[0])):D}return C},mouseDrag:function(D){this.position=this.generatePosition(D);this.positionAbs=this.convertPositionTo("absolute");B.ui.plugin.call(this,"sort",[D,this.ui()]);this.positionAbs=this.convertPositionTo("absolute");this.helper[0].style.left=this.position.left+"px";this.helper[0].style.top=this.position.top+"px";for(var C=this.items.length-1;C>=0;C--){var E=this.intersectsWithEdge(this.items[C]);if(!E){continue}if(this.items[C].item[0]!=this.currentItem[0]&&this.currentItem[E==1?"next":"prev"]()[0]!=this.items[C].item[0]&&!A(this.currentItem[0],this.items[C].item[0])&&(this.options.type=="semi-dynamic"?!A(this.element[0],this.items[C].item[0]):true)){this.direction=E==1?"down":"up";this.rearrange(D,this.items[C]);this.propagate("change",D);break}}this.contactContainers(D);if(B.ui.ddmanager){B.ui.ddmanager.drag(this,D)}this.element.triggerHandler("sort",[D,this.ui()],this.options["sort"]);return false},rearrange:function(H,G,D,F){D?D[0].appendChild(this.currentItem[0]):G.item[0].parentNode.insertBefore(this.currentItem[0],(this.direction=="down"?G.item[0]:G.item[0].nextSibling));this.counter=this.counter?++this.counter:1;var E=this,C=this.counter;window.setTimeout(function(){if(C==E.counter){E.refreshPositions(!F)}},0);if(this.options.placeholder){this.options.placeholder.update.call(this.element,this.currentItem,this.placeholder)}},mouseStop:function(E,D){if(B.ui.ddmanager&&!this.options.dropBehaviour){B.ui.ddmanager.drop(this,E)}if(this.options.revert){var C=this;var F=C.currentItem.offset();if(C.placeholder){C.placeholder.animate({opacity:"hide"},(parseInt(this.options.revert,10)||500)-50)}B(this.helper).animate({left:F.left-this.offset.parent.left-C.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:F.top-this.offset.parent.top-C.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){C.clear(E)})}else{this.clear(E,D)}return false},clear:function(E,D){if(this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0]){this.propagate("update",E,null,D)}if(!A(this.element[0],this.currentItem[0])){this.propagate("remove",E,null,D);for(var C=this.containers.length-1;C>=0;C--){if(A(this.containers[C].element[0],this.currentItem[0])){this.containers[C].propagate("update",E,this,D);this.containers[C].propagate("receive",E,this,D)}}}for(var C=this.containers.length-1;C>=0;C--){this.containers[C].propagate("deactivate",E,this,D);if(this.containers[C].containerCache.over){this.containers[C].propagate("out",E,this);this.containers[C].containerCache.over=0}}this.dragging=false;if(this.cancelHelperRemoval){this.propagate("stop",E,null,D);return false}B(this.currentItem).css("visibility","");if(this.placeholder){this.placeholder.remove()}this.helper.remove();this.helper=null;this.propagate("stop",E,null,D);return true}}));B.extend(B.ui.sortable,{getter:"serialize toArray",defaults:{helper:"clone",tolerance:"guess",distance:1,delay:0,scroll:true,scrollSensitivity:20,scrollSpeed:20,cancel:":input",items:"> *",zIndex:1000,dropOnEmpty:true,appendTo:"parent"}});B.ui.plugin.add("sortable","cursor",{start:function(E,D){var C=B("body");if(C.css("cursor")){D.options._cursor=C.css("cursor")}C.css("cursor",D.options.cursor)},stop:function(D,C){if(C.options._cursor){B("body").css("cursor",C.options._cursor)}}});B.ui.plugin.add("sortable","zIndex",{start:function(E,D){var C=D.helper;if(C.css("zIndex")){D.options._zIndex=C.css("zIndex")}C.css("zIndex",D.options.zIndex)},stop:function(D,C){if(C.options._zIndex){B(C.helper).css("zIndex",C.options._zIndex)}}});B.ui.plugin.add("sortable","opacity",{start:function(E,D){var C=D.helper;if(C.css("opacity")){D.options._opacity=C.css("opacity")}C.css("opacity",D.options.opacity)},stop:function(D,C){if(C.options._opacity){B(C.helper).css("opacity",C.options._opacity)}}});B.ui.plugin.add("sortable","scroll",{start:function(E,D){var F=D.options;var C=B(this).data("sortable");C.overflowY=function(G){do{if(/auto|scroll/.test(G.css("overflow"))||(/auto|scroll/).test(G.css("overflow-y"))){return G}G=G.parent()}while(G[0].parentNode);return B(document)}(C.currentItem);C.overflowX=function(G){do{if(/auto|scroll/.test(G.css("overflow"))||(/auto|scroll/).test(G.css("overflow-x"))){return G}G=G.parent()}while(G[0].parentNode);return B(document)}(C.currentItem);if(C.overflowY[0]!=document&&C.overflowY[0].tagName!="HTML"){C.overflowYOffset=C.overflowY.offset()}if(C.overflowX[0]!=document&&C.overflowX[0].tagName!="HTML"){C.overflowXOffset=C.overflowX.offset()}},sort:function(E,D){var F=D.options;var C=B(this).data("sortable");if(C.overflowY[0]!=document&&C.overflowY[0].tagName!="HTML"){if((C.overflowYOffset.top+C.overflowY[0].offsetHeight)-E.pageY<F.scrollSensitivity){C.overflowY[0].scrollTop=C.overflowY[0].scrollTop+F.scrollSpeed}if(E.pageY-C.overflowYOffset.top<F.scrollSensitivity){C.overflowY[0].scrollTop=C.overflowY[0].scrollTop-F.scrollSpeed}}else{if(E.pageY-B(document).scrollTop()<F.scrollSensitivity){B(document).scrollTop(B(document).scrollTop()-F.scrollSpeed)}if(B(window).height()-(E.pageY-B(document).scrollTop())<F.scrollSensitivity){B(document).scrollTop(B(document).scrollTop()+F.scrollSpeed)}}if(C.overflowX[0]!=document&&C.overflowX[0].tagName!="HTML"){if((C.overflowXOffset.left+C.overflowX[0].offsetWidth)-E.pageX<F.scrollSensitivity){C.overflowX[0].scrollLeft=C.overflowX[0].scrollLeft+F.scrollSpeed}if(E.pageX-C.overflowXOffset.left<F.scrollSensitivity){C.overflowX[0].scrollLeft=C.overflowX[0].scrollLeft-F.scrollSpeed}}else{if(E.pageX-B(document).scrollLeft()<F.scrollSensitivity){B(document).scrollLeft(B(document).scrollLeft()-F.scrollSpeed)}if(B(window).width()-(E.pageX-B(document).scrollLeft())<F.scrollSensitivity){B(document).scrollLeft(B(document).scrollLeft()+F.scrollSpeed)}}}});B.ui.plugin.add("sortable","axis",{sort:function(E,D){var C=B(this).data("sortable");if(D.options.axis=="y"){C.position.left=C.originalPosition.left}if(D.options.axis=="x"){C.position.top=C.originalPosition.top}}})})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.datepicker.min.js
===================================================================
--- js/ui/minified/ui.datepicker.min.js	(revision 6370)
+++ js/ui/minified/ui.datepicker.min.js	(working copy)
@@ -1 +0,0 @@
-(function($){var PROP_NAME="datepicker";function Datepicker(){this.debug=false;this._curInst=null;this._disabledInputs=[];this._datepickerShowing=false;this._inDialog=false;this._mainDivId="ui-datepicker-div";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._promptClass="ui-datepicker-prompt";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this.regional=[];this.regional[""]={clearText:"Clear",clearStatus:"Erase the current date",closeText:"Close",closeStatus:"Close without change",prevText:"&#x3c;Prev",prevStatus:"Show the previous month",nextText:"Next&#x3e;",nextStatus:"Show the next month",currentText:"Today",currentStatus:"Show the current month",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],monthStatus:"Show a different month",yearStatus:"Show a different year",weekHeader:"Wk",weekStatus:"Week of the year",dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],dayStatus:"Set DD as first week day",dateStatus:"Select DD, M d",dateFormat:"mm/dd/yy",firstDay:0,initStatus:"Select a date",isRTL:false};this._defaults={showOn:"focus",showAnim:"show",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,closeAtTop:true,mandatory:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:true,changeYear:true,yearRange:"-10:+10",changeFirstDay:true,highlightWeek:false,showOtherMonths:false,showWeeks:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",showStatus:false,statusForDate:this.dateStatus,minDate:null,maxDate:null,duration:"normal",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,stepMonths:1,rangeSelect:false,rangeSeparator:" - ",altField:"",altFormat:""};$.extend(this._defaults,this.regional[""]);this.dpDiv=$('<div id="'+this._mainDivId+'" style="display: none;"></div>')}$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",log:function(){if(this.debug){console.log.apply("",arguments)}},setDefaults:function(settings){extendRemove(this._defaults,settings||{});return this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase();var inline=(nodeName=="div"||nodeName=="span");if(!target.id){target.id="dp"+new Date().getTime()}var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{});if(nodeName=="input"){this._connectDatepicker(target,inst)}else{if(inline){this._inlineDatepicker(target,inst)}}},_newInst:function(target,inline){return{id:target[0].id,input:target,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:inline,dpDiv:(!inline?this.dpDiv:$('<div class="ui-datepicker-inline"></div>'))}},_connectDatepicker:function(target,inst){var input=$(target);if(input.hasClass(this.markerClassName)){return }var appendText=this._get(inst,"appendText");var isRTL=this._get(inst,"isRTL");if(appendText){input[isRTL?"before":"after"]('<span class="'+this._appendClass+'">'+appendText+"</span>")}var showOn=this._get(inst,"showOn");if(showOn=="focus"||showOn=="both"){input.focus(this._showDatepicker)}if(showOn=="button"||showOn=="both"){var buttonText=this._get(inst,"buttonText");var buttonImage=this._get(inst,"buttonImage");var trigger=$(this._get(inst,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:buttonImage,alt:buttonText,title:buttonText}):$('<button type="button"></button>').addClass(this._triggerClass).html(buttonImage==""?buttonText:$("<img/>").attr({src:buttonImage,alt:buttonText,title:buttonText})));input[isRTL?"before":"after"](trigger);trigger.click(function(){if($.datepicker._datepickerShowing&&$.datepicker._lastInput==target){$.datepicker._hideDatepicker()}else{$.datepicker._showDatepicker(target)}return false})}input.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});$.data(target,PROP_NAME,inst)},_inlineDatepicker:function(target,inst){var input=$(target);if(input.hasClass(this.markerClassName)){return }input.addClass(this.markerClassName).append(inst.dpDiv).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});$.data(target,PROP_NAME,inst);this._setDate(inst,this._getDefaultDate(inst));this._updateDatepicker(inst)},_inlineShow:function(inst){var numMonths=this._getNumberOfMonths(inst);inst.dpDiv.width(numMonths[1]*$(".ui-datepicker",inst.dpDiv[0]).width())},_dialogDatepicker:function(input,dateText,onSelect,settings,pos){var inst=this._dialogInst;if(!inst){var id="dp"+new Date().getTime();this._dialogInput=$('<input type="text" id="'+id+'" size="1" style="position: absolute; top: -100px;"/>');this._dialogInput.keydown(this._doKeyDown);$("body").append(this._dialogInput);inst=this._dialogInst=this._newInst(this._dialogInput,false);inst.settings={};$.data(this._dialogInput[0],PROP_NAME,inst)}extendRemove(inst.settings,settings||{});this._dialogInput.val(dateText);this._pos=(pos?(pos.length?pos:[pos.pageX,pos.pageY]):null);if(!this._pos){var browserWidth=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;var browserHeight=window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;var scrollX=document.documentElement.scrollLeft||document.body.scrollLeft;var scrollY=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[(browserWidth/2)-100+scrollX,(browserHeight/2)-150+scrollY]}this._dialogInput.css("left",this._pos[0]+"px").css("top",this._pos[1]+"px");inst.settings.onSelect=onSelect;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);if($.blockUI){$.blockUI(this.dpDiv)}$.data(this._dialogInput[0],PROP_NAME,inst);return this},_destroyDatepicker:function(target){var nodeName=target.nodeName.toLowerCase();var $target=$(target);$.removeData(target,PROP_NAME);if(nodeName=="input"){$target.siblings("."+this._appendClass).remove().end().siblings("."+this._triggerClass).remove().end().removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress)}else{if(nodeName=="div"||nodeName=="span"){$target.removeClass(this.markerClassName).empty()}}},_enableDatepicker:function(target){target.disabled=false;$(target).siblings("button."+this._triggerClass).each(function(){this.disabled=false}).end().siblings("img."+this._triggerClass).css({opacity:"1.0",cursor:""});this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)})},_disableDatepicker:function(target){target.disabled=true;$(target).siblings("button."+this._triggerClass).each(function(){this.disabled=true}).end().siblings("img."+this._triggerClass).css({opacity:"0.5",cursor:"default"});this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)});this._disabledInputs[this._disabledInputs.length]=target},_isDisabledDatepicker:function(target){if(!target){return false}for(var i=0;i<this._disabledInputs.length;i++){if(this._disabledInputs[i]==target){return true}}return false},_changeDatepicker:function(target,name,value){var settings=name||{};if(typeof name=="string"){settings={};settings[name]=value}if(inst=$.data(target,PROP_NAME)){extendRemove(inst.settings,settings);this._updateDatepicker(inst)}},_setDateDatepicker:function(target,date,endDate){var inst=$.data(target,PROP_NAME);if(inst){this._setDate(inst,date,endDate);this._updateDatepicker(inst)}},_getDateDatepicker:function(target){var inst=$.data(target,PROP_NAME);if(inst){this._setDateFromField(inst)}return(inst?this._getDate(inst):null)},_doKeyDown:function(e){var inst=$.data(e.target,PROP_NAME);var handled=true;if($.datepicker._datepickerShowing){switch(e.keyCode){case 9:$.datepicker._hideDatepicker(null,"");break;case 13:$.datepicker._selectDay(e.target,inst.selectedMonth,inst.selectedYear,$("td.ui-datepicker-days-cell-over",inst.dpDiv)[0]);return false;break;case 27:$.datepicker._hideDatepicker(null,$.datepicker._get(inst,"duration"));break;case 33:$.datepicker._adjustDate(e.target,(e.ctrlKey?-1:-$.datepicker._get(inst,"stepMonths")),(e.ctrlKey?"Y":"M"));break;case 34:$.datepicker._adjustDate(e.target,(e.ctrlKey?+1:+$.datepicker._get(inst,"stepMonths")),(e.ctrlKey?"Y":"M"));break;case 35:if(e.ctrlKey){$.datepicker._clearDate(e.target)}break;case 36:if(e.ctrlKey){$.datepicker._gotoToday(e.target)}break;case 37:if(e.ctrlKey){$.datepicker._adjustDate(e.target,-1,"D")}break;case 38:if(e.ctrlKey){$.datepicker._adjustDate(e.target,-7,"D")}break;case 39:if(e.ctrlKey){$.datepicker._adjustDate(e.target,+1,"D")}break;case 40:if(e.ctrlKey){$.datepicker._adjustDate(e.target,+7,"D")}break;default:handled=false}}else{if(e.keyCode==36&&e.ctrlKey){$.datepicker._showDatepicker(this)}else{handled=false}}if(handled){e.preventDefault();e.stopPropagation()}},_doKeyPress:function(e){var inst=$.data(e.target,PROP_NAME);var chars=$.datepicker._possibleChars($.datepicker._get(inst,"dateFormat"));var chr=String.fromCharCode(e.charCode==undefined?e.keyCode:e.charCode);return e.ctrlKey||(chr<" "||!chars||chars.indexOf(chr)>-1)},_showDatepicker:function(input){input=input.target||input;if(input.nodeName.toLowerCase()!="input"){input=$("input",input.parentNode)[0]}if($.datepicker._isDisabledDatepicker(input)||$.datepicker._lastInput==input){return }var inst=$.data(input,PROP_NAME);var beforeShow=$.datepicker._get(inst,"beforeShow");extendRemove(inst.settings,(beforeShow?beforeShow.apply(input,[input,inst]):{}));$.datepicker._hideDatepicker(null,"");$.datepicker._lastInput=input;$.datepicker._setDateFromField(inst);if($.datepicker._inDialog){input.value=""}if(!$.datepicker._pos){$.datepicker._pos=$.datepicker._findPos(input);$.datepicker._pos[1]+=input.offsetHeight}var isFixed=false;$(input).parents().each(function(){isFixed|=$(this).css("position")=="fixed";return !isFixed});if(isFixed&&$.browser.opera){$.datepicker._pos[0]-=document.documentElement.scrollLeft;$.datepicker._pos[1]-=document.documentElement.scrollTop}var offset={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null;inst.rangeStart=null;inst.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});$.datepicker._updateDatepicker(inst);inst.dpDiv.width($.datepicker._getNumberOfMonths(inst)[1]*$(".ui-datepicker",inst.dpDiv[0])[0].offsetWidth);offset=$.datepicker._checkOffset(inst,offset,isFixed);inst.dpDiv.css({position:($.datepicker._inDialog&&$.blockUI?"static":(isFixed?"fixed":"absolute")),display:"none",left:offset.left+"px",top:offset.top+"px"});if(!inst.inline){var showAnim=$.datepicker._get(inst,"showAnim")||"show";var duration=$.datepicker._get(inst,"duration");var postProcess=function(){$.datepicker._datepickerShowing=true;if($.browser.msie&&parseInt($.browser.version)<7){$("iframe.ui-datepicker-cover").css({width:inst.dpDiv.width()+4,height:inst.dpDiv.height()+4})}};if($.effects&&$.effects[showAnim]){inst.dpDiv.show(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[showAnim](duration,postProcess)}if(duration==""){postProcess()}if(inst.input[0].type!="hidden"){inst.input[0].focus()}$.datepicker._curInst=inst}},_updateDatepicker:function(inst){var dims={width:inst.dpDiv.width()+4,height:inst.dpDiv.height()+4};inst.dpDiv.empty().append(this._generateDatepicker(inst)).find("iframe.ui-datepicker-cover").css({width:dims.width,height:dims.height});var numMonths=this._getNumberOfMonths(inst);inst.dpDiv[(numMonths[0]!=1||numMonths[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");inst.dpDiv[(this._get(inst,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");if(inst.input&&inst.input[0].type!="hidden"){$(inst.input[0]).focus()}},_checkOffset:function(inst,offset,isFixed){var pos=inst.input?this._findPos(inst.input[0]):null;var browserWidth=window.innerWidth||document.documentElement.clientWidth;var browserHeight=window.innerHeight||document.documentElement.clientHeight;var scrollX=document.documentElement.scrollLeft||document.body.scrollLeft;var scrollY=document.documentElement.scrollTop||document.body.scrollTop;if(this._get(inst,"isRTL")||(offset.left+inst.dpDiv.width()-scrollX)>browserWidth){offset.left=Math.max((isFixed?0:scrollX),pos[0]+(inst.input?inst.input.width():0)-(isFixed?scrollX:0)-inst.dpDiv.width()-(isFixed&&$.browser.opera?document.documentElement.scrollLeft:0))}else{offset.left-=(isFixed?scrollX:0)}if((offset.top+inst.dpDiv.height()-scrollY)>browserHeight){offset.top=Math.max((isFixed?0:scrollY),pos[1]-(isFixed?scrollY:0)-(this._inDialog?0:inst.dpDiv.height())-(isFixed&&$.browser.opera?document.documentElement.scrollTop:0))}else{offset.top-=(isFixed?scrollY:0)}return offset},_findPos:function(obj){while(obj&&(obj.type=="hidden"||obj.nodeType!=1)){obj=obj.nextSibling}var position=$(obj).offset();return[position.left,position.top]},_hideDatepicker:function(input,duration){var inst=this._curInst;if(!inst){return }var rangeSelect=this._get(inst,"rangeSelect");if(rangeSelect&&this._stayOpen){this._selectDate("#"+inst.id,this._formatDate(inst,inst.currentDay,inst.currentMonth,inst.currentYear))}this._stayOpen=false;if(this._datepickerShowing){duration=(duration!=null?duration:this._get(inst,"duration"));var showAnim=this._get(inst,"showAnim");var postProcess=function(){$.datepicker._tidyDialog(inst)};if(duration!=""&&$.effects&&$.effects[showAnim]){inst.dpDiv.hide(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[(duration==""?"hide":(showAnim=="slideDown"?"slideUp":(showAnim=="fadeIn"?"fadeOut":"hide")))](duration,postProcess)}if(duration==""){this._tidyDialog(inst)}var onClose=this._get(inst,"onClose");if(onClose){onClose.apply((inst.input?inst.input[0]:null),[this._getDate(inst),inst])}this._datepickerShowing=false;this._lastInput=null;inst.settings.prompt=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if($.blockUI){$.unblockUI();$("body").append(this.dpDiv)}}this._inDialog=false}this._curInst=null},_tidyDialog:function(inst){inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker");$("."+this._promptClass,inst.dpDiv).remove()},_checkExternalClick:function(event){if(!$.datepicker._curInst){return }var $target=$(event.target);if(($target.parents("#"+$.datepicker._mainDivId).length==0)&&!$target.hasClass($.datepicker.markerClassName)&&!$target.hasClass($.datepicker._triggerClass)&&$.datepicker._datepickerShowing&&!($.datepicker._inDialog&&$.blockUI)){$.datepicker._hideDatepicker(null,"")}},_adjustDate:function(id,offset,period){var target=$(id);var inst=$.data(target[0],PROP_NAME);this._adjustInstDate(inst,offset,period);this._updateDatepicker(inst)},_gotoToday:function(id){var target=$(id);var inst=$.data(target[0],PROP_NAME);if(this._get(inst,"gotoCurrent")&&inst.currentDay){inst.selectedDay=inst.currentDay;inst.drawMonth=inst.selectedMonth=inst.currentMonth;inst.drawYear=inst.selectedYear=inst.currentYear}else{var date=new Date();inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear()}this._adjustDate(target);this._notifyChange(inst)},_selectMonthYear:function(id,select,period){var target=$(id);var inst=$.data(target[0],PROP_NAME);inst._selectingMonthYear=false;inst[period=="M"?"drawMonth":"drawYear"]=select.options[select.selectedIndex].value-0;this._adjustDate(target);this._notifyChange(inst)},_clickMonthYear:function(id){var target=$(id);var inst=$.data(target[0],PROP_NAME);if(inst.input&&inst._selectingMonthYear&&!$.browser.msie){inst.input[0].focus()}inst._selectingMonthYear=!inst._selectingMonthYear},_changeFirstDay:function(id,day){var target=$(id);var inst=$.data(target[0],PROP_NAME);inst.settings.firstDay=day;this._updateDatepicker(inst)},_selectDay:function(id,month,year,td){if($(td).hasClass(this._unselectableClass)){return }var target=$(id);var inst=$.data(target[0],PROP_NAME);var rangeSelect=this._get(inst,"rangeSelect");if(rangeSelect){this._stayOpen=!this._stayOpen;if(this._stayOpen){$(".ui-datepicker td").removeClass(this._currentClass);$(td).addClass(this._currentClass)}}inst.selectedDay=inst.currentDay=$("a",td).html();inst.selectedMonth=inst.currentMonth=month;inst.selectedYear=inst.currentYear=year;if(this._stayOpen){inst.endDay=inst.endMonth=inst.endYear=null}else{if(rangeSelect){inst.endDay=inst.currentDay;inst.endMonth=inst.currentMonth;inst.endYear=inst.currentYear}}this._selectDate(id,this._formatDate(inst,inst.currentDay,inst.currentMonth,inst.currentYear));if(this._stayOpen){inst.rangeStart=new Date(inst.currentYear,inst.currentMonth,inst.currentDay);this._updateDatepicker(inst)}else{if(rangeSelect){inst.selectedDay=inst.currentDay=inst.rangeStart.getDate();inst.selectedMonth=inst.currentMonth=inst.rangeStart.getMonth();inst.selectedYear=inst.currentYear=inst.rangeStart.getFullYear();inst.rangeStart=null;if(inst.inline){this._updateDatepicker(inst)}}}},_clearDate:function(id){var target=$(id);var inst=$.data(target[0],PROP_NAME);if(this._get(inst,"mandatory")){return }this._stayOpen=false;inst.endDay=inst.endMonth=inst.endYear=inst.rangeStart=null;this._selectDate(target,"")},_selectDate:function(id,dateStr){var target=$(id);var inst=$.data(target[0],PROP_NAME);dateStr=(dateStr!=null?dateStr:this._formatDate(inst));if(this._get(inst,"rangeSelect")&&dateStr){dateStr=(inst.rangeStart?this._formatDate(inst,inst.rangeStart):dateStr)+this._get(inst,"rangeSeparator")+dateStr}if(inst.input){inst.input.val(dateStr)}this._updateAlternate(inst);var onSelect=this._get(inst,"onSelect");if(onSelect){onSelect.apply((inst.input?inst.input[0]:null),[dateStr,inst])}else{if(inst.input){inst.input.trigger("change")}}if(inst.inline){this._updateDatepicker(inst)}else{if(!this._stayOpen){this._hideDatepicker(null,this._get(inst,"duration"));this._lastInput=inst.input[0];if(typeof (inst.input[0])!="object"){inst.input[0].focus()}this._lastInput=null}}},_updateAlternate:function(inst){var altField=this._get(inst,"altField");if(altField){var altFormat=this._get(inst,"altFormat");var date=this._getDate(inst);dateStr=(isArray(date)?(!date[0]&&!date[1]?"":this.formatDate(altFormat,date[0],this._getFormatConfig(inst))+this._get(inst,"rangeSeparator")+this.formatDate(altFormat,date[1]||date[0],this._getFormatConfig(inst))):this.formatDate(altFormat,date,this._getFormatConfig(inst)));$(altField).each(function(){$(this).val(dateStr)})}},noWeekends:function(date){var day=date.getDay();return[(day>0&&day<6),""]},iso8601Week:function(date){var checkDate=new Date(date.getFullYear(),date.getMonth(),date.getDate(),(date.getTimezoneOffset()/-60));var firstMon=new Date(checkDate.getFullYear(),1-1,4);var firstDay=firstMon.getDay()||7;firstMon.setDate(firstMon.getDate()+1-firstDay);if(firstDay<4&&checkDate<firstMon){checkDate.setDate(checkDate.getDate()-3);return $.datepicker.iso8601Week(checkDate)}else{if(checkDate>new Date(checkDate.getFullYear(),12-1,28)){firstDay=new Date(checkDate.getFullYear()+1,1-1,4).getDay()||7;if(firstDay>4&&(checkDate.getDay()||7)<firstDay-3){checkDate.setDate(checkDate.getDate()+3);return $.datepicker.iso8601Week(checkDate)}}}return Math.floor(((checkDate-firstMon)/86400000)/7)+1},dateStatus:function(date,inst){return $.datepicker.formatDate($.datepicker._get(inst,"dateStatus"),date,$.datepicker._getFormatConfig(inst))},parseDate:function(format,value,settings){if(format==null||value==null){throw"Invalid arguments"}value=(typeof value=="object"?value.toString():value+"");if(value==""){return null}var shortYearCutoff=(settings?settings.shortYearCutoff:null)||this._defaults.shortYearCutoff;var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var year=-1;var month=-1;var day=-1;var literal=false;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var getNumber=function(match){lookAhead(match);var origSize=(match=="@"?14:(match=="y"?4:2));var size=origSize;var num=0;while(size>0&&iValue<value.length&&value.charAt(iValue)>="0"&&value.charAt(iValue)<="9"){num=num*10+(value.charAt(iValue++)-0);size--}if(size==origSize){throw"Missing number at position "+iValue}return num};var getName=function(match,shortNames,longNames){var names=(lookAhead(match)?longNames:shortNames);var size=0;for(var j=0;j<names.length;j++){size=Math.max(size,names[j].length)}var name="";var iInit=iValue;while(size>0&&iValue<value.length){name+=value.charAt(iValue++);for(var i=0;i<names.length;i++){if(name==names[i]){return i+1}}size--}throw"Unknown name at position "+iInit};var checkLiteral=function(){if(value.charAt(iValue)!=format.charAt(iFormat)){throw"Unexpected literal at position "+iValue}iValue++};var iValue=0;for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{checkLiteral()}}else{switch(format.charAt(iFormat)){case"d":day=getNumber("d");break;case"D":getName("D",dayNamesShort,dayNames);break;case"m":month=getNumber("m");break;case"M":month=getName("M",monthNamesShort,monthNames);break;case"y":year=getNumber("y");break;case"@":var date=new Date(getNumber("@"));year=date.getFullYear();month=date.getMonth()+1;day=date.getDate();break;case"'":if(lookAhead("'")){checkLiteral()}else{literal=true}break;default:checkLiteral()}}}if(year<100){year+=new Date().getFullYear()-new Date().getFullYear()%100+(year<=shortYearCutoff?0:-100)}var date=new Date(year,month-1,day);if(date.getFullYear()!=year||date.getMonth()+1!=month||date.getDate()!=day){throw"Invalid date"}return date},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TIMESTAMP:"@",W3C:"yy-mm-dd",formatDate:function(format,date,settings){if(!date){return""}var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var formatNumber=function(match,value){return(lookAhead(match)&&value<10?"0":"")+value};var formatName=function(match,value,shortNames,longNames){return(lookAhead(match)?longNames[value]:shortNames[value])};var output="";var literal=false;if(date){for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{output+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":output+=formatNumber("d",date.getDate());break;case"D":output+=formatName("D",date.getDay(),dayNamesShort,dayNames);break;case"m":output+=formatNumber("m",date.getMonth()+1);break;case"M":output+=formatName("M",date.getMonth(),monthNamesShort,monthNames);break;case"y":output+=(lookAhead("y")?date.getFullYear():(date.getYear()%100<10?"0":"")+date.getYear()%100);break;case"@":output+=date.getTime();break;case"'":if(lookAhead("'")){output+="'"}else{literal=true}break;default:output+=format.charAt(iFormat)}}}}return output},_possibleChars:function(format){var chars="";var literal=false;for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{chars+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":case"m":case"y":case"@":chars+="0123456789";break;case"D":case"M":return null;case"'":if(lookAhead("'")){chars+="'"}else{literal=true}break;default:chars+=format.charAt(iFormat)}}}return chars},_get:function(inst,name){return inst.settings[name]!==undefined?inst.settings[name]:this._defaults[name]},_setDateFromField:function(inst){var dateFormat=this._get(inst,"dateFormat");var dates=inst.input?inst.input.val().split(this._get(inst,"rangeSeparator")):null;inst.endDay=inst.endMonth=inst.endYear=null;var date=defaultDate=this._getDefaultDate(inst);if(dates.length>0){var settings=this._getFormatConfig(inst);if(dates.length>1){date=this.parseDate(dateFormat,dates[1],settings)||defaultDate;inst.endDay=date.getDate();inst.endMonth=date.getMonth();inst.endYear=date.getFullYear()}try{date=this.parseDate(dateFormat,dates[0],settings)||defaultDate}catch(e){this.log(e);date=defaultDate}}inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();inst.currentDay=(dates[0]?date.getDate():0);inst.currentMonth=(dates[0]?date.getMonth():0);inst.currentYear=(dates[0]?date.getFullYear():0);this._adjustInstDate(inst)},_getDefaultDate:function(inst){var date=this._determineDate(this._get(inst,"defaultDate"),new Date());var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");date=(minDate&&date<minDate?minDate:date);date=(maxDate&&date>maxDate?maxDate:date);return date},_determineDate:function(date,defaultDate){var offsetNumeric=function(offset){var date=new Date();date.setUTCDate(date.getUTCDate()+offset);return date};var offsetString=function(offset,getDaysInMonth){var date=new Date();var year=date.getFullYear();var month=date.getMonth();var day=date.getDate();var pattern=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;var matches=pattern.exec(offset);while(matches){switch(matches[2]||"d"){case"d":case"D":day+=(matches[1]-0);break;case"w":case"W":day+=(matches[1]*7);break;case"m":case"M":month+=(matches[1]-0);day=Math.min(day,getDaysInMonth(year,month));break;case"y":case"Y":year+=(matches[1]-0);day=Math.min(day,getDaysInMonth(year,month));break}matches=pattern.exec(offset)}return new Date(year,month,day)};return(date==null?defaultDate:(typeof date=="string"?offsetString(date,this._getDaysInMonth):(typeof date=="number"?offsetNumeric(date):date)))},_setDate:function(inst,date,endDate){var clear=!(date);date=this._determineDate(date,new Date());inst.selectedDay=inst.currentDay=date.getDate();inst.drawMonth=inst.selectedMonth=inst.currentMonth=date.getMonth();inst.drawYear=inst.selectedYear=inst.currentYear=date.getFullYear();if(this._get(inst,"rangeSelect")){if(endDate){endDate=this._determineDate(endDate,null);inst.endDay=endDate.getDate();inst.endMonth=endDate.getMonth();inst.endYear=endDate.getFullYear()}else{inst.endDay=inst.currentDay;inst.endMonth=inst.currentMonth;inst.endYear=inst.currentYear}}this._adjustInstDate(inst);if(inst.input){inst.input.val(clear?"":this._formatDate(inst)+(!this._get(inst,"rangeSelect")?"":this._get(inst,"rangeSeparator")+this._formatDate(inst,inst.endDay,inst.endMonth,inst.endYear)))}},_getDate:function(inst){var startDate=(!inst.currentYear||(inst.input&&inst.input.val()=="")?null:new Date(inst.currentYear,inst.currentMonth,inst.currentDay));if(this._get(inst,"rangeSelect")){return[inst.rangeStart||startDate,(!inst.endYear?null:new Date(inst.endYear,inst.endMonth,inst.endDay))]}else{return startDate}},_generateDatepicker:function(inst){var today=new Date();today=new Date(today.getFullYear(),today.getMonth(),today.getDate());var showStatus=this._get(inst,"showStatus");var isRTL=this._get(inst,"isRTL");var clear=(this._get(inst,"mandatory")?"":'<div class="ui-datepicker-clear"><a onclick="jQuery.datepicker._clearDate(\'#'+inst.id+"');\""+(showStatus?this._addStatus(inst,this._get(inst,"clearStatus")||"&#xa0;"):"")+">"+this._get(inst,"clearText")+"</a></div>");var controls='<div class="ui-datepicker-control">'+(isRTL?"":clear)+'<div class="ui-datepicker-close"><a onclick="jQuery.datepicker._hideDatepicker();"'+(showStatus?this._addStatus(inst,this._get(inst,"closeStatus")||"&#xa0;"):"")+">"+this._get(inst,"closeText")+"</a></div>"+(isRTL?clear:"")+"</div>";var prompt=this._get(inst,"prompt");var closeAtTop=this._get(inst,"closeAtTop");var hideIfNoPrevNext=this._get(inst,"hideIfNoPrevNext");var navigationAsDateFormat=this._get(inst,"navigationAsDateFormat");var numMonths=this._getNumberOfMonths(inst);var stepMonths=this._get(inst,"stepMonths");var isMultiMonth=(numMonths[0]!=1||numMonths[1]!=1);var currentDate=(!inst.currentDay?new Date(9999,9,9):new Date(inst.currentYear,inst.currentMonth,inst.currentDay));var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");var drawMonth=inst.drawMonth;var drawYear=inst.drawYear;if(maxDate){var maxDraw=new Date(maxDate.getFullYear(),maxDate.getMonth()-numMonths[1]+1,maxDate.getDate());maxDraw=(minDate&&maxDraw<minDate?minDate:maxDraw);while(new Date(drawYear,drawMonth,1)>maxDraw){drawMonth--;if(drawMonth<0){drawMonth=11;drawYear--}}}var prevText=this._get(inst,"prevText");prevText=(!navigationAsDateFormat?prevText:this.formatDate(prevText,new Date(drawYear,drawMonth-stepMonths,1),this._getFormatConfig(inst)));var prev='<div class="ui-datepicker-prev">'+(this._canAdjustMonth(inst,-1,drawYear,drawMonth)?"<a onclick=\"jQuery.datepicker._adjustDate('#"+inst.id+"', -"+stepMonths+", 'M');\""+(showStatus?this._addStatus(inst,this._get(inst,"prevStatus")||"&#xa0;"):"")+">"+prevText+"</a>":(hideIfNoPrevNext?"":"<label>"+prevText+"</label>"))+"</div>";var nextText=this._get(inst,"nextText");nextText=(!navigationAsDateFormat?nextText:this.formatDate(nextText,new Date(drawYear,drawMonth+stepMonths,1),this._getFormatConfig(inst)));var next='<div class="ui-datepicker-next">'+(this._canAdjustMonth(inst,+1,drawYear,drawMonth)?"<a onclick=\"jQuery.datepicker._adjustDate('#"+inst.id+"', +"+stepMonths+", 'M');\""+(showStatus?this._addStatus(inst,this._get(inst,"nextStatus")||"&#xa0;"):"")+">"+nextText+"</a>":(hideIfNoPrevNext?"":"<label>"+nextText+"</label>"))+"</div>";var currentText=this._get(inst,"currentText");currentText=(!navigationAsDateFormat?currentText:this.formatDate(currentText,today,this._getFormatConfig(inst)));var html=(prompt?'<div class="'+this._promptClass+'">'+prompt+"</div>":"")+(closeAtTop&&!inst.inline?controls:"")+'<div class="ui-datepicker-links">'+(isRTL?next:prev)+(this._isInRange(inst,(this._get(inst,"gotoCurrent")&&inst.currentDay?currentDate:today))?'<div class="ui-datepicker-current"><a onclick="jQuery.datepicker._gotoToday(\'#'+inst.id+"');\""+(showStatus?this._addStatus(inst,this._get(inst,"currentStatus")||"&#xa0;"):"")+">"+currentText+"</a></div>":"")+(isRTL?prev:next)+"</div>";var firstDay=this._get(inst,"firstDay");var changeFirstDay=this._get(inst,"changeFirstDay");var dayNames=this._get(inst,"dayNames");var dayNamesShort=this._get(inst,"dayNamesShort");var dayNamesMin=this._get(inst,"dayNamesMin");var monthNames=this._get(inst,"monthNames");var beforeShowDay=this._get(inst,"beforeShowDay");var highlightWeek=this._get(inst,"highlightWeek");var showOtherMonths=this._get(inst,"showOtherMonths");var showWeeks=this._get(inst,"showWeeks");var calculateWeek=this._get(inst,"calculateWeek")||this.iso8601Week;var status=(showStatus?this._get(inst,"dayStatus")||"&#xa0;":"");var dateStatus=this._get(inst,"statusForDate")||this.dateStatus;var endDate=inst.endDay?new Date(inst.endYear,inst.endMonth,inst.endDay):currentDate;for(var row=0;row<numMonths[0];row++){for(var col=0;col<numMonths[1];col++){var selectedDate=new Date(drawYear,drawMonth,inst.selectedDay);html+='<div class="ui-datepicker-one-month'+(col==0?" ui-datepicker-new-row":"")+'">'+this._generateMonthYearHeader(inst,drawMonth,drawYear,minDate,maxDate,selectedDate,row>0||col>0,showStatus,monthNames)+'<table class="ui-datepicker" cellpadding="0" cellspacing="0"><thead><tr class="ui-datepicker-title-row">'+(showWeeks?"<td>"+this._get(inst,"weekHeader")+"</td>":"");for(var dow=0;dow<7;dow++){var day=(dow+firstDay)%7;var dayStatus=(status.indexOf("DD")>-1?status.replace(/DD/,dayNames[day]):status.replace(/D/,dayNamesShort[day]));html+="<td"+((dow+firstDay+6)%7>=5?' class="ui-datepicker-week-end-cell"':"")+">"+(!changeFirstDay?"<span":"<a onclick=\"jQuery.datepicker._changeFirstDay('#"+inst.id+"', "+day+');"')+(showStatus?this._addStatus(inst,dayStatus):"")+' title="'+dayNames[day]+'">'+dayNamesMin[day]+(changeFirstDay?"</a>":"</span>")+"</td>"}html+="</tr></thead><tbody>";var daysInMonth=this._getDaysInMonth(drawYear,drawMonth);if(drawYear==inst.selectedYear&&drawMonth==inst.selectedMonth){inst.selectedDay=Math.min(inst.selectedDay,daysInMonth)}var leadDays=(this._getFirstDayOfMonth(drawYear,drawMonth)-firstDay+7)%7;var printDate=new Date(drawYear,drawMonth,1-leadDays);var numRows=(isMultiMonth?6:Math.ceil((leadDays+daysInMonth)/7));for(var dRow=0;dRow<numRows;dRow++){html+='<tr class="ui-datepicker-days-row">'+(showWeeks?'<td class="ui-datepicker-week-col">'+calculateWeek(printDate)+"</td>":"");for(var dow=0;dow<7;dow++){var daySettings=(beforeShowDay?beforeShowDay.apply((inst.input?inst.input[0]:null),[printDate]):[true,""]);var otherMonth=(printDate.getMonth()!=drawMonth);var unselectable=otherMonth||!daySettings[0]||(minDate&&printDate<minDate)||(maxDate&&printDate>maxDate);html+='<td class="ui-datepicker-days-cell'+((dow+firstDay+6)%7>=5?" ui-datepicker-week-end-cell":"")+(otherMonth?" ui-datepicker-otherMonth":"")+(printDate.getTime()==selectedDate.getTime()&&drawMonth==inst.selectedMonth?" ui-datepicker-days-cell-over":"")+(unselectable?" "+this._unselectableClass:"")+(otherMonth&&!showOtherMonths?"":" "+daySettings[1]+(printDate.getTime()>=currentDate.getTime()&&printDate.getTime()<=endDate.getTime()?" "+this._currentClass:"")+(printDate.getTime()==today.getTime()?" ui-datepicker-today":""))+'"'+((!otherMonth||showOtherMonths)&&daySettings[2]?' title="'+daySettings[2]+'"':"")+(unselectable?(highlightWeek?" onmouseover=\"jQuery(this).parent().addClass('ui-datepicker-week-over');\" onmouseout=\"jQuery(this).parent().removeClass('ui-datepicker-week-over');\"":""):" onmouseover=\"jQuery(this).addClass('ui-datepicker-days-cell-over')"+(highlightWeek?".parent().addClass('ui-datepicker-week-over')":"")+";"+(!showStatus||(otherMonth&&!showOtherMonths)?"":"jQuery('#ui-datepicker-status-"+inst.id+"').html('"+(dateStatus.apply((inst.input?inst.input[0]:null),[printDate,inst])||"&#xa0;")+"');")+"\" onmouseout=\"jQuery(this).removeClass('ui-datepicker-days-cell-over')"+(highlightWeek?".parent().removeClass('ui-datepicker-week-over')":"")+";"+(!showStatus||(otherMonth&&!showOtherMonths)?"":"jQuery('#ui-datepicker-status-"+inst.id+"').html('&#xa0;');")+'" onclick="jQuery.datepicker._selectDay(\'#'+inst.id+"',"+drawMonth+","+drawYear+', this);"')+">"+(otherMonth?(showOtherMonths?printDate.getDate():"&#xa0;"):(unselectable?printDate.getDate():"<a>"+printDate.getDate()+"</a>"))+"</td>";printDate.setUTCDate(printDate.getUTCDate()+1)}html+="</tr>"}drawMonth++;if(drawMonth>11){drawMonth=0;drawYear++}html+="</tbody></table></div>"}}html+=(showStatus?'<div style="clear: both;"></div><div id="ui-datepicker-status-'+inst.id+'" class="ui-datepicker-status">'+(this._get(inst,"initStatus")||"&#xa0;")+"</div>":"")+(!closeAtTop&&!inst.inline?controls:"")+'<div style="clear: both;"></div>'+($.browser.msie&&parseInt($.browser.version)<7&&!inst.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover"></iframe>':"");return html},_generateMonthYearHeader:function(inst,drawMonth,drawYear,minDate,maxDate,selectedDate,secondary,showStatus,monthNames){minDate=(inst.rangeStart&&minDate&&selectedDate<minDate?selectedDate:minDate);var html='<div class="ui-datepicker-header">';if(secondary||!this._get(inst,"changeMonth")){html+=monthNames[drawMonth]+"&#xa0;"}else{var inMinYear=(minDate&&minDate.getFullYear()==drawYear);var inMaxYear=(maxDate&&maxDate.getFullYear()==drawYear);html+='<select class="ui-datepicker-new-month" onchange="jQuery.datepicker._selectMonthYear(\'#'+inst.id+"', this, 'M');\" onclick=\"jQuery.datepicker._clickMonthYear('#"+inst.id+"');\""+(showStatus?this._addStatus(inst,this._get(inst,"monthStatus")||"&#xa0;"):"")+">";for(var month=0;month<12;month++){if((!inMinYear||month>=minDate.getMonth())&&(!inMaxYear||month<=maxDate.getMonth())){html+='<option value="'+month+'"'+(month==drawMonth?' selected="selected"':"")+">"+monthNames[month]+"</option>"}}html+="</select>"}if(secondary||!this._get(inst,"changeYear")){html+=drawYear}else{var years=this._get(inst,"yearRange").split(":");var year=0;var endYear=0;if(years.length!=2){year=drawYear-10;endYear=drawYear+10}else{if(years[0].charAt(0)=="+"||years[0].charAt(0)=="-"){year=endYear=new Date().getFullYear();year+=parseInt(years[0],10);endYear+=parseInt(years[1],10)}else{year=parseInt(years[0],10);endYear=parseInt(years[1],10)}}year=(minDate?Math.max(year,minDate.getFullYear()):year);endYear=(maxDate?Math.min(endYear,maxDate.getFullYear()):endYear);html+='<select class="ui-datepicker-new-year" onchange="jQuery.datepicker._selectMonthYear(\'#'+inst.id+"', this, 'Y');\" onclick=\"jQuery.datepicker._clickMonthYear('#"+inst.id+"');\""+(showStatus?this._addStatus(inst,this._get(inst,"yearStatus")||"&#xa0;"):"")+">";for(;year<=endYear;year++){html+='<option value="'+year+'"'+(year==drawYear?' selected="selected"':"")+">"+year+"</option>"}html+="</select>"}html+="</div>";return html},_addStatus:function(inst,text){return" onmouseover=\"jQuery('#ui-datepicker-status-"+inst.id+"').html('"+text+"');\" onmouseout=\"jQuery('#ui-datepicker-status-"+inst.id+"').html('&#xa0;');\""},_adjustInstDate:function(inst,offset,period){var year=inst.drawYear+(period=="Y"?offset:0);var month=inst.drawMonth+(period=="M"?offset:0);var day=Math.min(inst.selectedDay,this._getDaysInMonth(year,month))+(period=="D"?offset:0);var date=new Date(year,month,day);var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");date=(minDate&&date<minDate?minDate:date);date=(maxDate&&date>maxDate?maxDate:date);inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();if(period=="M"||period=="Y"){this._notifyChange(inst)}},_notifyChange:function(inst){var onChange=this._get(inst,"onChangeMonthYear");if(onChange){onChange.apply((inst.input?inst.input[0]:null),[new Date(inst.selectedYear,inst.selectedMonth,1),inst])}},_getNumberOfMonths:function(inst){var numMonths=this._get(inst,"numberOfMonths");return(numMonths==null?[1,1]:(typeof numMonths=="number"?[1,numMonths]:numMonths))},_getMinMaxDate:function(inst,minMax,checkRange){var date=this._determineDate(this._get(inst,minMax+"Date"),null);if(date){date.setHours(0);date.setMinutes(0);date.setSeconds(0);date.setMilliseconds(0)}return(!checkRange||!inst.rangeStart?date:(!date||inst.rangeStart>date?inst.rangeStart:date))},_getDaysInMonth:function(year,month){return 32-new Date(year,month,32).getDate()},_getFirstDayOfMonth:function(year,month){return new Date(year,month,1).getDay()},_canAdjustMonth:function(inst,offset,curYear,curMonth){var numMonths=this._getNumberOfMonths(inst);var date=new Date(curYear,curMonth+(offset<0?offset:numMonths[1]),1);if(offset<0){date.setDate(this._getDaysInMonth(date.getFullYear(),date.getMonth()))}return this._isInRange(inst,date)},_isInRange:function(inst,date){var newMinDate=(!inst.rangeStart?null:new Date(inst.selectedYear,inst.selectedMonth,inst.selectedDay));newMinDate=(newMinDate&&inst.rangeStart<newMinDate?inst.rangeStart:newMinDate);var minDate=newMinDate||this._getMinMaxDate(inst,"min");var maxDate=this._getMinMaxDate(inst,"max");return((!minDate||date>=minDate)&&(!maxDate||date<=maxDate))},_getFormatConfig:function(inst){var shortYearCutoff=this._get(inst,"shortYearCutoff");shortYearCutoff=(typeof shortYearCutoff!="string"?shortYearCutoff:new Date().getFullYear()%100+parseInt(shortYearCutoff,10));return{shortYearCutoff:shortYearCutoff,dayNamesShort:this._get(inst,"dayNamesShort"),dayNames:this._get(inst,"dayNames"),monthNamesShort:this._get(inst,"monthNamesShort"),monthNames:this._get(inst,"monthNames")}},_formatDate:function(inst,day,month,year){if(!day){inst.currentDay=inst.selectedDay;inst.currentMonth=inst.selectedMonth;inst.currentYear=inst.selectedYear}var date=(day?(typeof day=="object"?day:new Date(year,month,day)):new Date(inst.currentYear,inst.currentMonth,inst.currentDay));return this.formatDate(this._get(inst,"dateFormat"),date,this._getFormatConfig(inst))}});function extendRemove(target,props){$.extend(target,props);for(var name in props){if(props[name]==null||props[name]==undefined){target[name]=props[name]}}return target}function isArray(a){return(a&&(($.browser.safari&&typeof a=="object"&&a.length)||(a.constructor&&a.constructor.toString().match(/\Array\(\)/))))}$.fn.datepicker=function(options){var otherArgs=Array.prototype.slice.call(arguments,1);if(typeof options=="string"&&(options=="isDisabled"||options=="getDate")){return $.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this[0]].concat(otherArgs))}return this.each(function(){typeof options=="string"?$.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this].concat(otherArgs)):$.datepicker._attachDatepicker(this,options)})};$.datepicker=new Datepicker();$(document).ready(function(){$(document.body).append($.datepicker.dpDiv).mousedown($.datepicker._checkExternalClick)})})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.bounce.min.js
===================================================================
--- js/ui/minified/effects.bounce.min.js	(revision 6370)
+++ js/ui/minified/effects.bounce.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.bounce=function(B){return this.queue(function(){var E=A(this),K=["position","top","left"];var J=A.effects.setMode(E,B.options.mode||"effect");var M=B.options.direction||"up";var C=B.options.distance||20;var D=B.options.times||5;var G=B.duration||250;if(/show|hide/.test(J)){K.push("opacity")}A.effects.save(E,K);E.show();A.effects.createWrapper(E);var F=(M=="up"||M=="down")?"top":"left";var O=(M=="up"||M=="left")?"pos":"neg";var C=B.options.distance||(F=="top"?E.outerHeight({margin:true})/3:E.outerWidth({margin:true})/3);if(J=="show"){E.css("opacity",0).css(F,O=="pos"?-C:C)}if(J=="hide"){C=C/(D*2)}if(J!="hide"){D--}if(J=="show"){var H={opacity:1};H[F]=(O=="pos"?"+=":"-=")+C;E.animate(H,G/2,B.options.easing);C=C/2;D--}for(var I=0;I<D;I++){var N={},L={};N[F]=(O=="pos"?"-=":"+=")+C;L[F]=(O=="pos"?"+=":"-=")+C;E.animate(N,G/2,B.options.easing).animate(L,G/2,B.options.easing);C=(J=="hide")?C*2:C/2}if(J=="hide"){var H={opacity:0};H[F]=(O=="pos"?"-=":"+=")+C;E.animate(H,G/2,B.options.easing,function(){E.hide();A.effects.restore(E,K);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}})}else{var N={},L={};N[F]=(O=="pos"?"-=":"+=")+C;L[F]=(O=="pos"?"+=":"-=")+C;E.animate(N,G/2,B.options.easing).animate(L,G/2,B.options.easing,function(){A.effects.restore(E,K);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}})}E.queue("fx",function(){E.dequeue()});E.dequeue()})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.pulsate.min.js
===================================================================
--- js/ui/minified/effects.pulsate.min.js	(revision 6370)
+++ js/ui/minified/effects.pulsate.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.pulsate=function(B){return this.queue(function(){var D=A(this);var F=A.effects.setMode(D,B.options.mode||"show");var E=B.options.times||5;if(F=="hide"){E--}if(D.is(":hidden")){D.css("opacity",0);D.show();D.animate({opacity:1},B.duration/2,B.options.easing);E=E-2}for(var C=0;C<E;C++){D.animate({opacity:0},B.duration/2,B.options.easing).animate({opacity:1},B.duration/2,B.options.easing)}if(F=="hide"){D.animate({opacity:0},B.duration/2,B.options.easing,function(){D.hide();if(B.callback){B.callback.apply(this,arguments)}})}else{D.animate({opacity:0},B.duration/2,B.options.easing).animate({opacity:1},B.duration/2,B.options.easing,function(){if(B.callback){B.callback.apply(this,arguments)}})}D.queue("fx",function(){D.dequeue()});D.dequeue()})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.resizable.min.js
===================================================================
--- js/ui/minified/ui.resizable.min.js	(revision 6370)
+++ js/ui/minified/ui.resizable.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.widget("ui.resizable",A.extend({},A.ui.mouse,{init:function(){var M=this,N=this.options;var Q=this.element.css("position");this.originalElement=this.element;this.element.addClass("ui-resizable").css({position:/static/.test(Q)?"relative":Q});A.extend(N,{_aspectRatio:!!(N.aspectRatio),helper:N.helper||N.ghost||N.animate?N.helper||"proxy":null,knobHandles:N.knobHandles===true?"ui-resizable-knob-handle":N.knobHandles});var H="1px solid #DEDEDE";N.defaultTheme={"ui-resizable":{display:"block"},"ui-resizable-handle":{position:"absolute",background:"#F2F2F2",fontSize:"0.1px"},"ui-resizable-n":{cursor:"n-resize",height:"4px",left:"0px",right:"0px",borderTop:H},"ui-resizable-s":{cursor:"s-resize",height:"4px",left:"0px",right:"0px",borderBottom:H},"ui-resizable-e":{cursor:"e-resize",width:"4px",top:"0px",bottom:"0px",borderRight:H},"ui-resizable-w":{cursor:"w-resize",width:"4px",top:"0px",bottom:"0px",borderLeft:H},"ui-resizable-se":{cursor:"se-resize",width:"4px",height:"4px",borderRight:H,borderBottom:H},"ui-resizable-sw":{cursor:"sw-resize",width:"4px",height:"4px",borderBottom:H,borderLeft:H},"ui-resizable-ne":{cursor:"ne-resize",width:"4px",height:"4px",borderRight:H,borderTop:H},"ui-resizable-nw":{cursor:"nw-resize",width:"4px",height:"4px",borderLeft:H,borderTop:H}};N.knobTheme={"ui-resizable-handle":{background:"#F2F2F2",border:"1px solid #808080",height:"8px",width:"8px"},"ui-resizable-n":{cursor:"n-resize",top:"0px",left:"45%"},"ui-resizable-s":{cursor:"s-resize",bottom:"0px",left:"45%"},"ui-resizable-e":{cursor:"e-resize",right:"0px",top:"45%"},"ui-resizable-w":{cursor:"w-resize",left:"0px",top:"45%"},"ui-resizable-se":{cursor:"se-resize",right:"0px",bottom:"0px"},"ui-resizable-sw":{cursor:"sw-resize",left:"0px",bottom:"0px"},"ui-resizable-nw":{cursor:"nw-resize",left:"0px",top:"0px"},"ui-resizable-ne":{cursor:"ne-resize",right:"0px",top:"0px"}};N._nodeName=this.element[0].nodeName;if(N._nodeName.match(/canvas|textarea|input|select|button|img/i)){var B=this.element;if(/relative/.test(B.css("position"))&&A.browser.opera){B.css({position:"relative",top:"auto",left:"auto"})}B.wrap(A('<div class="ui-wrapper"	style="overflow: hidden;"></div>').css({position:B.css("position"),width:B.outerWidth(),height:B.outerHeight(),top:B.css("top"),left:B.css("left")}));var J=this.element;this.element=this.element.parent();this.element.data("resizable",this);this.element.css({marginLeft:J.css("marginLeft"),marginTop:J.css("marginTop"),marginRight:J.css("marginRight"),marginBottom:J.css("marginBottom")});J.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});if(A.browser.safari&&N.preventDefault){J.css("resize","none")}N.proportionallyResize=J.css({position:"static",zoom:1,display:"block"});this.element.css({margin:J.css("margin")});this._proportionallyResize()}if(!N.handles){N.handles=!A(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}}if(N.handles.constructor==String){N.zIndex=N.zIndex||1000;if(N.handles=="all"){N.handles="n,e,s,w,se,sw,ne,nw"}var O=N.handles.split(",");N.handles={};var G={handle:"position: absolute; display: none; overflow:hidden;",n:"top: 0pt; width:100%;",e:"right: 0pt; height:100%;",s:"bottom: 0pt; width:100%;",w:"left: 0pt; height:100%;",se:"bottom: 0pt; right: 0px;",sw:"bottom: 0pt; left: 0px;",ne:"top: 0pt; right: 0px;",nw:"top: 0pt; left: 0px;"};for(var R=0;R<O.length;R++){var S=A.trim(O[R]),L=N.defaultTheme,F="ui-resizable-"+S,C=!A.ui.css(F)&&!N.knobHandles,P=A.ui.css("ui-resizable-knob-handle"),T=A.extend(L[F],L["ui-resizable-handle"]),D=A.extend(N.knobTheme[F],!P?N.knobTheme["ui-resizable-handle"]:{});var K=/sw|se|ne|nw/.test(S)?{zIndex:++N.zIndex}:{};var I=(C?G[S]:""),E=A(['<div class="ui-resizable-handle ',F,'" style="',I,G.handle,'"></div>'].join("")).css(K);N.handles[S]=".ui-resizable-"+S;this.element.append(E.css(C?T:{}).css(N.knobHandles?D:{}).addClass(N.knobHandles?"ui-resizable-knob-handle":"").addClass(N.knobHandles))}if(N.knobHandles){this.element.addClass("ui-resizable-knob").css(!A.ui.css("ui-resizable-knob")?{}:{})}}this._renderAxis=function(Y){Y=Y||this.element;for(var V in N.handles){if(N.handles[V].constructor==String){N.handles[V]=A(N.handles[V],this.element).show()}if(N.transparent){N.handles[V].css({opacity:0})}if(this.element.is(".ui-wrapper")&&N._nodeName.match(/textarea|input|select|button/i)){var W=A(N.handles[V],this.element),X=0;X=/sw|ne|nw|se|n|s/.test(V)?W.outerHeight():W.outerWidth();var U=["padding",/ne|nw|n/.test(V)?"Top":/se|sw|s/.test(V)?"Bottom":/^e$/.test(V)?"Right":"Left"].join("");if(!N.transparent){Y.css(U,X)}this._proportionallyResize()}if(!A(N.handles[V]).length){continue}}};this._renderAxis(this.element);N._handles=A(".ui-resizable-handle",M.element);if(N.disableSelection){N._handles.each(function(U,V){A.ui.disableSelection(V)})}N._handles.mouseover(function(){if(!N.resizing){if(this.className){var U=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}M.axis=N.axis=U&&U[1]?U[1]:"se"}});if(N.autoHide){N._handles.hide();A(M.element).addClass("ui-resizable-autohide").hover(function(){A(this).removeClass("ui-resizable-autohide");N._handles.show()},function(){if(!N.resizing){A(this).addClass("ui-resizable-autohide");N._handles.hide()}})}this.mouseInit()},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,options:this.options,originalSize:this.originalSize,originalPosition:this.originalPosition}},propagate:function(C,B){A.ui.plugin.call(this,C,[B,this.ui()]);if(C!="resize"){this.element.triggerHandler(["resize",C].join(""),[B,this.ui()],this.options[C])}},destroy:function(){var D=this.element,C=D.children(".ui-resizable").get(0);this.mouseDestroy();var B=function(E){A(E).removeClass("ui-resizable ui-resizable-disabled").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};B(D);if(D.is(".ui-wrapper")&&C){D.parent().append(A(C).css({position:D.css("position"),width:D.outerWidth(),height:D.outerHeight(),top:D.css("top"),left:D.css("left")})).end().remove();B(C)}},mouseStart:function(K){if(this.options.disabled){return false}var J=false;for(var H in this.options.handles){if(A(this.options.handles[H])[0]==K.target){J=true}}if(!J){return false}var C=this.options,B=this.element.position(),D=this.element,I=function(O){return parseInt(O,10)||0},G=A.browser.msie&&A.browser.version<7;C.resizing=true;C.documentScroll={top:A(document).scrollTop(),left:A(document).scrollLeft()};if(D.is(".ui-draggable")||(/absolute/).test(D.css("position"))){var M=A.browser.msie&&!C.containment&&(/absolute/).test(D.css("position"))&&!(/relative/).test(D.parent().css("position"));var L=M?C.documentScroll.top:0,F=M?C.documentScroll.left:0;D.css({position:"absolute",top:(B.top+L),left:(B.left+F)})}if(A.browser.opera&&/relative/.test(D.css("position"))){D.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var N=I(this.helper.css("left")),E=I(this.helper.css("top"));if(C.containment){N+=A(C.containment).scrollLeft()||0;E+=A(C.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:N,top:E};this.size=C.helper||G?{width:D.outerWidth(),height:D.outerHeight()}:{width:D.width(),height:D.height()};this.originalSize=C.helper||G?{width:D.outerWidth(),height:D.outerHeight()}:{width:D.width(),height:D.height()};this.originalPosition={left:N,top:E};this.sizeDiff={width:D.outerWidth()-D.width(),height:D.outerHeight()-D.height()};this.originalMousePosition={left:K.pageX,top:K.pageY};C.aspectRatio=(typeof C.aspectRatio=="number")?C.aspectRatio:((this.originalSize.height/this.originalSize.width)||1);if(C.preserveCursor){A("body").css("cursor",this.axis+"-resize")}this.propagate("start",K);return true},mouseDrag:function(I){var D=this.helper,C=this.options,J={},M=this,F=this.originalMousePosition,K=this.axis;var N=(I.pageX-F.left)||0,L=(I.pageY-F.top)||0;var E=this._change[K];if(!E){return false}var H=E.apply(this,[I,N,L]),G=A.browser.msie&&A.browser.version<7,B=this.sizeDiff;if(C._aspectRatio||I.shiftKey){H=this._updateRatio(H,I)}H=this._respectSize(H,I);this.propagate("resize",I);D.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!C.helper&&C.proportionallyResize){this._proportionallyResize()}this._updateCache(H);this.element.triggerHandler("resize",[I,this.ui()],this.options["resize"]);return false},mouseStop:function(I){this.options.resizing=false;var E=this.options,H=function(M){return parseInt(M,10)||0},K=this;if(E.helper){var D=E.proportionallyResize,B=D&&(/textarea/i).test(D.get(0).nodeName),C=B&&A.ui.hasScroll(D.get(0),"left")?0:K.sizeDiff.height,G=B?0:K.sizeDiff.width;var L={width:(K.size.width-G),height:(K.size.height-C)},F=(parseInt(K.element.css("left"),10)+(K.position.left-K.originalPosition.left))||null,J=(parseInt(K.element.css("top"),10)+(K.position.top-K.originalPosition.top))||null;if(!E.animate){this.element.css(A.extend(L,{top:J,left:F}))}if(E.helper&&!E.animate){this._proportionallyResize()}}if(E.preserveCursor){A("body").css("cursor","auto")}this.propagate("stop",I);if(E.helper){this.helper.remove()}return false},_updateCache:function(B){var C=this.options;this.offset=this.helper.offset();if(B.left){this.position.left=B.left}if(B.top){this.position.top=B.top}if(B.height){this.size.height=B.height}if(B.width){this.size.width=B.width}},_updateRatio:function(D,E){var F=this.options,G=this.position,C=this.size,B=this.axis;if(D.height){D.width=(C.height/F.aspectRatio)}else{if(D.width){D.height=(C.width*F.aspectRatio)}}if(B=="sw"){D.left=G.left+(C.width-D.width);D.top=null}if(B=="nw"){D.top=G.top+(C.height-D.height);D.left=G.left+(C.width-D.width)}return D},_respectSize:function(H,I){var F=this.helper,E=this.options,N=E._aspectRatio||I.shiftKey,M=this.axis,P=H.width&&E.maxWidth&&E.maxWidth<H.width,J=H.height&&E.maxHeight&&E.maxHeight<H.height,D=H.width&&E.minWidth&&E.minWidth>H.width,O=H.height&&E.minHeight&&E.minHeight>H.height;if(D){H.width=E.minWidth}if(O){H.height=E.minHeight}if(P){H.width=E.maxWidth}if(J){H.height=E.maxHeight}var C=this.originalPosition.left+this.originalSize.width,L=this.position.top+this.size.height;var G=/sw|nw|w/.test(M),B=/nw|ne|n/.test(M);if(D&&G){H.left=C-E.minWidth}if(P&&G){H.left=C-E.maxWidth}if(O&&B){H.top=L-E.minHeight}if(J&&B){H.top=L-E.maxHeight}var K=!H.width&&!H.height;if(K&&!H.left&&H.top){H.top=null}else{if(K&&!H.top&&H.left){H.left=null}}return H},_proportionallyResize:function(){var F=this.options;if(!F.proportionallyResize){return }var D=F.proportionallyResize,C=this.helper||this.element;if(!F.borderDif){var B=[D.css("borderTopWidth"),D.css("borderRightWidth"),D.css("borderBottomWidth"),D.css("borderLeftWidth")],E=[D.css("paddingTop"),D.css("paddingRight"),D.css("paddingBottom"),D.css("paddingLeft")];F.borderDif=A.map(B,function(G,I){var H=parseInt(G,10)||0,J=parseInt(E[I],10)||0;return H+J})}D.css({height:(C.height()-F.borderDif[0]-F.borderDif[2])+"px",width:(C.width()-F.borderDif[1]-F.borderDif[3])+"px"})},_renderProxy:function(){var C=this.element,F=this.options;this.elementOffset=C.offset();if(F.helper){this.helper=this.helper||A('<div style="overflow:hidden;"></div>');var B=A.browser.msie&&A.browser.version<7,D=(B?1:0),E=(B?2:-1);this.helper.addClass(F.helper).css({width:C.outerWidth()+E,height:C.outerHeight()+E,position:"absolute",left:this.elementOffset.left-D+"px",top:this.elementOffset.top-D+"px",zIndex:++F.zIndex});this.helper.appendTo("body");if(F.disableSelection){A.ui.disableSelection(this.helper.get(0))}}else{this.helper=C}},_change:{e:function(D,C,B){return{width:this.originalSize.width+C}},w:function(F,C,B){var G=this.options,D=this.originalSize,E=this.originalPosition;return{left:E.left+C,width:D.width-C}},n:function(F,C,B){var G=this.options,D=this.originalSize,E=this.originalPosition;return{top:E.top+B,height:D.height-B}},s:function(D,C,B){return{height:this.originalSize.height+B}},se:function(D,C,B){return A.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[D,C,B]))},sw:function(D,C,B){return A.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[D,C,B]))},ne:function(D,C,B){return A.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[D,C,B]))},nw:function(D,C,B){return A.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[D,C,B]))}}}));A.extend(A.ui.resizable,{defaults:{cancel:":input",distance:1,delay:0,preventDefault:true,transparent:false,minWidth:10,minHeight:10,aspectRatio:false,disableSelection:true,preserveCursor:true,autoHide:false,knobHandles:false}});A.ui.plugin.add("resizable","containment",{start:function(I,K){var E=K.options,M=A(this).data("resizable"),G=M.element;var C=E.containment,F=(C instanceof A)?C.get(0):(/parent/.test(C))?G.parent().get(0):C;if(!F){return }M.containerElement=A(F);if(/document/.test(C)||C==document){M.containerOffset={left:0,top:0};M.containerPosition={left:0,top:0};M.parentData={element:A(document),left:0,top:0,width:A(document).width(),height:A(document).height()||document.body.parentNode.scrollHeight}}else{M.containerOffset=A(F).offset();M.containerPosition=A(F).position();M.containerSize={height:A(F).innerHeight(),width:A(F).innerWidth()};var J=M.containerOffset,B=M.containerSize.height,H=M.containerSize.width,D=(A.ui.hasScroll(F,"left")?F.scrollWidth:H),L=(A.ui.hasScroll(F)?F.scrollHeight:B);M.parentData={element:F,left:J.left,top:J.top,width:D,height:L}}},resize:function(H,K){var E=K.options,N=A(this).data("resizable"),C=N.containerSize,J=N.containerOffset,G=N.size,I=N.position,L=E._aspectRatio||H.shiftKey,B={top:0,left:0},D=N.containerElement;if(D[0]!=document&&/static/.test(D.css("position"))){B=N.containerPosition}if(I.left<(E.helper?J.left:B.left)){N.size.width=N.size.width+(E.helper?(N.position.left-J.left):(N.position.left-B.left));if(L){N.size.height=N.size.width*E.aspectRatio}N.position.left=E.helper?J.left:B.left}if(I.top<(E.helper?J.top:0)){N.size.height=N.size.height+(E.helper?(N.position.top-J.top):N.position.top);if(L){N.size.width=N.size.height/E.aspectRatio}N.position.top=E.helper?J.top:0}var F=(E.helper?N.offset.left-J.left:(N.position.left-B.left))+N.sizeDiff.width,M=(E.helper?N.offset.top-J.top:N.position.top)+N.sizeDiff.height;if(F+N.size.width>=N.parentData.width){N.size.width=N.parentData.width-F;if(L){N.size.height=N.size.width*E.aspectRatio}}if(M+N.size.height>=N.parentData.height){N.size.height=N.parentData.height-M;if(L){N.size.width=N.size.height/E.aspectRatio}}},stop:function(G,J){var C=J.options,L=A(this).data("resizable"),H=L.position,I=L.containerOffset,B=L.containerPosition,D=L.containerElement;var E=A(L.helper),M=E.offset(),K=E.innerWidth(),F=E.innerHeight();if(C.helper&&!C.animate&&/relative/.test(D.css("position"))){A(this).css({left:(M.left-I.left),top:(M.top-I.top),width:K,height:F})}if(C.helper&&!C.animate&&/static/.test(D.css("position"))){A(this).css({left:B.left+(M.left-I.left),top:B.top+(M.top-I.top),width:K,height:F})}}});A.ui.plugin.add("resizable","grid",{resize:function(H,J){var D=J.options,L=A(this).data("resizable"),G=L.size,E=L.originalSize,F=L.originalPosition,K=L.axis,I=D._aspectRatio||H.shiftKey;D.grid=typeof D.grid=="number"?[D.grid,D.grid]:D.grid;var C=Math.round((G.width-E.width)/(D.grid[0]||1))*(D.grid[0]||1),B=Math.round((G.height-E.height)/(D.grid[1]||1))*(D.grid[1]||1);if(/^(se|s|e)$/.test(K)){L.size.width=E.width+C;L.size.height=E.height+B}else{if(/^(ne)$/.test(K)){L.size.width=E.width+C;L.size.height=E.height+B;L.position.top=F.top-B}else{if(/^(sw)$/.test(K)){L.size.width=E.width+C;L.size.height=E.height+B;L.position.left=F.left-C}else{L.size.width=E.width+C;L.size.height=E.height+B;L.position.top=F.top-B;L.position.left=F.left-C}}}}});A.ui.plugin.add("resizable","animate",{stop:function(I,K){var F=K.options,L=A(this).data("resizable");var E=F.proportionallyResize,B=E&&(/textarea/i).test(E.get(0).nodeName),C=B&&A.ui.hasScroll(E.get(0),"left")?0:L.sizeDiff.height,H=B?0:L.sizeDiff.width;var D={width:(L.size.width-H),height:(L.size.height-C)},G=(parseInt(L.element.css("left"),10)+(L.position.left-L.originalPosition.left))||null,J=(parseInt(L.element.css("top"),10)+(L.position.top-L.originalPosition.top))||null;L.element.animate(A.extend(D,J&&G?{top:J,left:G}:{}),{duration:F.animateDuration||"slow",easing:F.animateEasing||"swing",step:function(){var M={width:parseInt(L.element.css("width"),10),height:parseInt(L.element.css("height"),10),top:parseInt(L.element.css("top"),10),left:parseInt(L.element.css("left"),10)};if(E){E.css({width:M.width,height:M.height})}L._updateCache(M);L.propagate("animate",I)}})}});A.ui.plugin.add("resizable","ghost",{start:function(E,D){var F=D.options,B=A(this).data("resizable"),G=F.proportionallyResize,C=B.size;if(!G){B.ghost=B.element.clone()}else{B.ghost=G.clone()}B.ghost.css({opacity:0.25,display:"block",position:"relative",height:C.height,width:C.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof F.ghost=="string"?F.ghost:"");B.ghost.appendTo(B.helper)},resize:function(D,C){var E=C.options,B=A(this).data("resizable"),F=E.proportionallyResize;if(B.ghost){B.ghost.css({position:"relative",height:B.size.height,width:B.size.width})}},stop:function(D,C){var E=C.options,B=A(this).data("resizable"),F=E.proportionallyResize;if(B.ghost&&B.helper){B.helper.get(0).removeChild(B.ghost.get(0))}}});A.ui.plugin.add("resizable","alsoResize",{start:function(E,C){var F=C.options,B=A(this).data("resizable"),D=function(G){A(G).each(function(){A(this).data("resizable-alsoresize",{width:parseInt(A(this).width(),10),height:parseInt(A(this).height(),10),left:parseInt(A(this).css("left"),10),top:parseInt(A(this).css("top"),10)})})};if(typeof (F.alsoResize)=="object"){if(F.alsoResize.length){F.alsoResize=F.alsoResize[0];D(F.alsoResize)}else{A.each(F.alsoResize,function(G,H){D(G)})}}else{D(F.alsoResize)}},resize:function(F,E){var G=E.options,C=A(this).data("resizable"),D=C.originalSize,I=C.originalPosition;var H={height:(C.size.height-D.height)||0,width:(C.size.width-D.width)||0,top:(C.position.top-I.top)||0,left:(C.position.left-I.left)||0},B=function(J,K){A(J).each(function(){var N=A(this).data("resizable-alsoresize"),M={},L=K&&K.length?K:["width","height","top","left"];A.each(L||["width","height","top","left"],function(O,Q){var P=(N[Q]||0)+(H[Q]||0);if(P&&P>=0){M[Q]=P||null}});A(this).css(M)})};if(typeof (G.alsoResize)=="object"){A.each(G.alsoResize,function(J,K){B(J,K)})}else{B(G.alsoResize)}},stop:function(C,B){A(this).removeData("resizable-alsoresize-start")}})})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.slider.min.js
===================================================================
--- js/ui/minified/ui.slider.min.js	(revision 6370)
+++ js/ui/minified/ui.slider.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.fn.unwrap=A.fn.unwrap||function(B){return this.each(function(){A(this).parents(B).eq(0).after(this).remove()})};A.widget("ui.slider",{plugins:{},ui:function(B){return{options:this.options,handle:this.currentHandle,value:this.options.axis!="both"||!this.options.axis?Math.round(this.value(null,this.options.axis=="vertical"?"y":"x")):{x:Math.round(this.value(null,"x")),y:Math.round(this.value(null,"y"))},range:this.getRange()}},propagate:function(C,B){A.ui.plugin.call(this,C,[B,this.ui()]);this.element.triggerHandler(C=="slide"?C:"slide"+C,[B,this.ui()],this.options[C])},destroy:function(){this.element.removeClass("ui-slider ui-slider-disabled").removeData("slider").unbind(".slider");if(this.handle&&this.handle.length){this.handle.unwrap("a");this.handle.each(function(){A(this).data("mouse").mouseDestroy()})}this.generated&&this.generated.remove()},setData:function(B,C){A.widget.prototype.setData.apply(this,arguments);if(/min|max|steps/.test(B)){this.initBoundaries()}if(B=="range"){C?this.handle.length==2&&this.createRange():this.removeRange()}},init:function(){var B=this;this.element.addClass("ui-slider");this.initBoundaries();this.handle=A(this.options.handle,this.element);if(!this.handle.length){B.handle=B.generated=A(B.options.handles||[0]).map(function(){var D=A("<div/>").addClass("ui-slider-handle").appendTo(B.element);if(this.id){D.attr("id",this.id)}return D[0]})}var C=function(D){this.element=A(D);this.element.data("mouse",this);this.options=B.options;this.element.bind("mousedown",function(){if(B.currentHandle){this.blur(B.currentHandle)}B.focus(this,1)});this.mouseInit()};A.extend(C.prototype,A.ui.mouse,{mouseStart:function(D){return B.start.call(B,D,this.element[0])},mouseStop:function(D){return B.stop.call(B,D,this.element[0])},mouseDrag:function(D){return B.drag.call(B,D,this.element[0])},mouseCapture:function(){return true},trigger:function(D){this.mouseDown(D)}});A(this.handle).each(function(){new C(this)}).wrap('<a href="javascript:void(0)" style="outline:none;border:none;"></a>').parent().bind("focus",function(D){B.focus(this.firstChild)}).bind("blur",function(D){B.blur(this.firstChild)}).bind("keydown",function(D){if(!B.options.noKeyboard){B.keydown(D.keyCode,this.firstChild)}});this.element.bind("mousedown.slider",function(D){B.click.apply(B,[D]);B.currentHandle.data("mouse").trigger(D);B.firstValue=B.firstValue+1});A.each(this.options.handles||[],function(D,E){B.moveTo(E.start,D,true)});if(!isNaN(this.options.startValue)){this.moveTo(this.options.startValue,0,true)}this.previousHandle=A(this.handle[0]);if(this.handle.length==2&&this.options.range){this.createRange()}},initBoundaries:function(){var B=this.element[0],C=this.options;this.actualSize={width:this.element.outerWidth(),height:this.element.outerHeight()};A.extend(C,{axis:C.axis||(B.offsetWidth<B.offsetHeight?"vertical":"horizontal"),max:!isNaN(parseInt(C.max,10))?{x:parseInt(C.max,10),y:parseInt(C.max,10)}:({x:C.max&&C.max.x||100,y:C.max&&C.max.y||100}),min:!isNaN(parseInt(C.min,10))?{x:parseInt(C.min,10),y:parseInt(C.min,10)}:({x:C.min&&C.min.x||0,y:C.min&&C.min.y||0})});C.realMax={x:C.max.x-C.min.x,y:C.max.y-C.min.y};C.stepping={x:C.stepping&&C.stepping.x||parseInt(C.stepping,10)||(C.steps?C.realMax.x/(C.steps.x||parseInt(C.steps,10)||C.realMax.x):0),y:C.stepping&&C.stepping.y||parseInt(C.stepping,10)||(C.steps?C.realMax.y/(C.steps.y||parseInt(C.steps,10)||C.realMax.y):0)}},keydown:function(C,B){if(/(37|38|39|40)/.test(C)){this.moveTo({x:/(37|39)/.test(C)?(C==37?"-":"+")+"="+this.oneStep("x"):0,y:/(38|40)/.test(C)?(C==38?"-":"+")+"="+this.oneStep("y"):0},B)}},focus:function(B,C){this.currentHandle=A(B).addClass("ui-slider-handle-active");if(C){this.currentHandle.parent()[0].focus()}},blur:function(B){A(B).removeClass("ui-slider-handle-active");if(this.currentHandle&&this.currentHandle[0]==B){this.previousHandle=this.currentHandle;this.currentHandle=null}},click:function(C){var D=[C.pageX,C.pageY];var B=false;this.handle.each(function(){if(this==C.target){B=true}});if(B||this.options.disabled||!(this.currentHandle||this.previousHandle)){return }if(!this.currentHandle&&this.previousHandle){this.focus(this.previousHandle,true)}this.offset=this.element.offset();this.moveTo({y:this.convertValue(C.pageY-this.offset.top-this.currentHandle[0].offsetHeight/2,"y"),x:this.convertValue(C.pageX-this.offset.left-this.currentHandle[0].offsetWidth/2,"x")},null,!this.options.distance)},createRange:function(){if(this.rangeElement){return }this.rangeElement=A("<div></div>").addClass("ui-slider-range").css({position:"absolute"}).appendTo(this.element);this.updateRange()},removeRange:function(){this.rangeElement.remove();this.rangeElement=null},updateRange:function(){var C=this.options.axis=="vertical"?"top":"left";var B=this.options.axis=="vertical"?"height":"width";this.rangeElement.css(C,(parseInt(A(this.handle[0]).css(C),10)||0)+this.handleSize(0,this.options.axis=="vertical"?"y":"x")/2);this.rangeElement.css(B,(parseInt(A(this.handle[1]).css(C),10)||0)-(parseInt(A(this.handle[0]).css(C),10)||0))},getRange:function(){return this.rangeElement?this.convertValue(parseInt(this.rangeElement.css(this.options.axis=="vertical"?"height":"width"),10),this.options.axis=="vertical"?"y":"x"):null},handleIndex:function(){return this.handle.index(this.currentHandle[0])},value:function(D,B){if(this.handle.length==1){this.currentHandle=this.handle}if(!B){B=this.options.axis=="vertical"?"y":"x"}var C=A(D!=undefined&&D!==null?this.handle[D]||D:this.currentHandle);if(C.data("mouse").sliderValue){return parseInt(C.data("mouse").sliderValue[B],10)}else{return parseInt(((parseInt(C.css(B=="x"?"left":"top"),10)/(this.actualSize[B=="x"?"width":"height"]-this.handleSize(D,B)))*this.options.realMax[B])+this.options.min[B],10)}},convertValue:function(C,B){return this.options.min[B]+(C/(this.actualSize[B=="x"?"width":"height"]-this.handleSize(null,B)))*this.options.realMax[B]},translateValue:function(C,B){return((C-this.options.min[B])/this.options.realMax[B])*(this.actualSize[B=="x"?"width":"height"]-this.handleSize(null,B))},translateRange:function(D,B){if(this.rangeElement){if(this.currentHandle[0]==this.handle[0]&&D>=this.translateValue(this.value(1),B)){D=this.translateValue(this.value(1,B)-this.oneStep(B),B)}if(this.currentHandle[0]==this.handle[1]&&D<=this.translateValue(this.value(0),B)){D=this.translateValue(this.value(0,B)+this.oneStep(B),B)}}if(this.options.handles){var C=this.options.handles[this.handleIndex()];if(D<this.translateValue(C.min,B)){D=this.translateValue(C.min,B)}else{if(D>this.translateValue(C.max,B)){D=this.translateValue(C.max,B)}}}return D},translateLimits:function(C,B){if(C>=this.actualSize[B=="x"?"width":"height"]-this.handleSize(null,B)){C=this.actualSize[B=="x"?"width":"height"]-this.handleSize(null,B)}if(C<=0){C=0}return C},handleSize:function(C,B){return A(C!=undefined&&C!==null?this.handle[C]:this.currentHandle)[0]["offset"+(B=="x"?"Width":"Height")]},oneStep:function(B){return this.options.stepping[B]||1},start:function(C,B){var D=this.options;if(D.disabled){return false}this.actualSize={width:this.element.outerWidth(),height:this.element.outerHeight()};if(!this.currentHandle){this.focus(this.previousHandle,true)}this.offset=this.element.offset();this.handleOffset=this.currentHandle.offset();this.clickOffset={top:C.pageY-this.handleOffset.top,left:C.pageX-this.handleOffset.left};this.firstValue=this.value();this.propagate("start",C);this.drag(C,B);return true},stop:function(B){this.propagate("stop",B);if(this.firstValue!=this.value()){this.propagate("change",B)}this.focus(this.currentHandle,true);return false},drag:function(E,D){var F=this.options;var B={top:E.pageY-this.offset.top-this.clickOffset.top,left:E.pageX-this.offset.left-this.clickOffset.left};if(!this.currentHandle){this.focus(this.previousHandle,true)}B.left=this.translateLimits(B.left,"x");B.top=this.translateLimits(B.top,"y");if(F.stepping.x){var C=this.convertValue(B.left,"x");C=Math.round(C/F.stepping.x)*F.stepping.x;B.left=this.translateValue(C,"x")}if(F.stepping.y){var C=this.convertValue(B.top,"y");C=Math.round(C/F.stepping.y)*F.stepping.y;B.top=this.translateValue(C,"y")}B.left=this.translateRange(B.left,"x");B.top=this.translateRange(B.top,"y");if(F.axis!="vertical"){this.currentHandle.css({left:B.left})}if(F.axis!="horizontal"){this.currentHandle.css({top:B.top})}this.currentHandle.data("mouse").sliderValue={x:Math.round(this.convertValue(B.left,"x"))||0,y:Math.round(this.convertValue(B.top,"y"))||0};if(this.rangeElement){this.updateRange()}this.propagate("slide",E);return false},moveTo:function(F,E,G){var H=this.options;this.actualSize={width:this.element.outerWidth(),height:this.element.outerHeight()};if(E==undefined&&!this.currentHandle&&this.handle.length!=1){return false}if(E==undefined&&!this.currentHandle){E=0}if(E!=undefined){this.currentHandle=this.previousHandle=A(this.handle[E]||E)}if(F.x!==undefined&&F.y!==undefined){var B=F.x,I=F.y}else{var B=F,I=F}if(B!==undefined&&B.constructor!=Number){var D=/^\-\=/.test(B),C=/^\+\=/.test(B);if(D||C){B=this.value(null,"x")+parseInt(B.replace(D?"=":"+=",""),10)}else{B=isNaN(parseInt(B,10))?undefined:parseInt(B,10)}}if(I!==undefined&&I.constructor!=Number){var D=/^\-\=/.test(I),C=/^\+\=/.test(I);if(D||C){I=this.value(null,"y")+parseInt(I.replace(D?"=":"+=",""),10)}else{I=isNaN(parseInt(I,10))?undefined:parseInt(I,10)}}if(H.axis!="vertical"&&B!==undefined){if(H.stepping.x){B=Math.round(B/H.stepping.x)*H.stepping.x}B=this.translateValue(B,"x");B=this.translateLimits(B,"x");B=this.translateRange(B,"x");H.animate?this.currentHandle.stop().animate({left:B},(Math.abs(parseInt(this.currentHandle.css("left"))-B))*(!isNaN(parseInt(H.animate))?H.animate:5)):this.currentHandle.css({left:B})}if(H.axis!="horizontal"&&I!==undefined){if(H.stepping.y){I=Math.round(I/H.stepping.y)*H.stepping.y}I=this.translateValue(I,"y");I=this.translateLimits(I,"y");I=this.translateRange(I,"y");H.animate?this.currentHandle.stop().animate({top:I},(Math.abs(parseInt(this.currentHandle.css("top"))-I))*(!isNaN(parseInt(H.animate))?H.animate:5)):this.currentHandle.css({top:I})}if(this.rangeElement){this.updateRange()}this.currentHandle.data("mouse").sliderValue={x:Math.round(this.convertValue(B,"x"))||0,y:Math.round(this.convertValue(I,"y"))||0};if(!G){this.propagate("start",null);this.propagate("stop",null);this.propagate("change",null);this.propagate("slide",null)}}});A.ui.slider.getter="value";A.ui.slider.defaults={handle:".ui-slider-handle",distance:1,animate:false}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.fold.min.js
===================================================================
--- js/ui/minified/effects.fold.min.js	(revision 6370)
+++ js/ui/minified/effects.fold.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.fold=function(B){return this.queue(function(){var E=A(this),J=["position","top","left"];var G=A.effects.setMode(E,B.options.mode||"hide");var N=B.options.size||15;var M=!(!B.options.horizFirst);A.effects.save(E,J);E.show();var D=A.effects.createWrapper(E).css({overflow:"hidden"});var H=((G=="show")!=M);var F=H?["width","height"]:["height","width"];var C=H?[D.width(),D.height()]:[D.height(),D.width()];var I=/([0-9]+)%/.exec(N);if(I){N=parseInt(I[1])/100*C[G=="hide"?0:1]}if(G=="show"){D.css(M?{height:0,width:N}:{height:N,width:0})}var L={},K={};L[F[0]]=G=="show"?C[0]:N;K[F[1]]=G=="show"?C[1]:0;D.animate(L,B.duration/2,B.options.easing).animate(K,B.duration/2,B.options.easing,function(){if(G=="hide"){E.hide()}A.effects.restore(E,J);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(E[0],arguments)}E.dequeue()})})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.transfer.min.js
===================================================================
--- js/ui/minified/effects.transfer.min.js	(revision 6370)
+++ js/ui/minified/effects.transfer.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.transfer=function(B){return this.queue(function(){var E=A(this);var G=A.effects.setMode(E,B.options.mode||"effect");var F=A(B.options.to);var C=E.offset();var D=A('<div class="ui-effects-transfer"></div>').appendTo(document.body);if(B.options.className){D.addClass(B.options.className)}D.addClass(B.options.className);D.css({top:C.top,left:C.left,height:E.outerHeight()-parseInt(D.css("borderTopWidth"))-parseInt(D.css("borderBottomWidth")),width:E.outerWidth()-parseInt(D.css("borderLeftWidth"))-parseInt(D.css("borderRightWidth")),position:"absolute"});C=F.offset();animation={top:C.top,left:C.left,height:F.outerHeight()-parseInt(D.css("borderTopWidth"))-parseInt(D.css("borderBottomWidth")),width:F.outerWidth()-parseInt(D.css("borderLeftWidth"))-parseInt(D.css("borderRightWidth"))};D.animate(animation,B.duration,B.options.easing,function(){D.remove();if(B.callback){B.callback.apply(E[0],arguments)}E.dequeue()})})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/jquery.ui.all.min.js
===================================================================
--- js/ui/minified/jquery.ui.all.min.js	(revision 6370)
+++ js/ui/minified/jquery.ui.all.min.js	(working copy)
@@ -1 +0,0 @@
-(function(C){C.ui={plugin:{add:function(E,F,H){var G=C.ui[E].prototype;for(var D in H){G.plugins[D]=G.plugins[D]||[];G.plugins[D].push([F,H[D]])}},call:function(D,F,E){var H=D.plugins[F];if(!H){return }for(var G=0;G<H.length;G++){if(D.options[H[G][0]]){H[G][1].apply(D.element,E)}}}},cssCache:{},css:function(D){if(C.ui.cssCache[D]){return C.ui.cssCache[D]}var E=C('<div class="ui-gen">').addClass(D).css({position:"absolute",top:"-5000px",left:"-5000px",display:"block"}).appendTo("body");C.ui.cssCache[D]=!!((!(/auto|default/).test(E.css("cursor"))||(/^[1-9]/).test(E.css("height"))||(/^[1-9]/).test(E.css("width"))||!(/none/).test(E.css("backgroundImage"))||!(/transparent|rgba\(0, 0, 0, 0\)/).test(E.css("backgroundColor"))));try{C("body").get(0).removeChild(E.get(0))}catch(F){}return C.ui.cssCache[D]},disableSelection:function(D){C(D).attr("unselectable","on").css("MozUserSelect","none")},enableSelection:function(D){C(D).attr("unselectable","off").css("MozUserSelect","")},hasScroll:function(G,E){var D=/top/.test(E||"top")?"scrollTop":"scrollLeft",F=false;if(G[D]>0){return true}G[D]=1;F=G[D]>0?true:false;G[D]=0;return F}};var B=C.fn.remove;C.fn.remove=function(){C("*",this).add(this).triggerHandler("remove");return B.apply(this,arguments)};function A(E,F,G){var D=C[E][F].getter||[];D=(typeof D=="string"?D.split(/,?\s+/):D);return(C.inArray(G,D)!=-1)}C.widget=function(E,D){var F=E.split(".")[0];E=E.split(".")[1];C.fn[E]=function(J){var H=(typeof J=="string"),I=Array.prototype.slice.call(arguments,1);if(H&&A(F,E,J)){var G=C.data(this[0],E);return(G?G[J].apply(G,I):undefined)}return this.each(function(){var K=C.data(this,E);if(H&&K&&C.isFunction(K[J])){K[J].apply(K,I)}else{if(!H){C.data(this,E,new C[F][E](this,J))}}})};C[F][E]=function(I,H){var G=this;this.widgetName=E;this.widgetBaseClass=F+"-"+E;this.options=C.extend({},C.widget.defaults,C[F][E].defaults,H);this.element=C(I).bind("setData."+E,function(L,J,K){return G.setData(J,K)}).bind("getData."+E,function(K,J){return G.getData(J)}).bind("remove",function(){return G.destroy()});this.init()};C[F][E].prototype=C.extend({},C.widget.prototype,D)};C.widget.prototype={init:function(){},destroy:function(){this.element.removeData(this.widgetName)},getData:function(D){return this.options[D]},setData:function(D,E){this.options[D]=E;if(D=="disabled"){this.element[E?"addClass":"removeClass"](this.widgetBaseClass+"-disabled")}},enable:function(){this.setData("disabled",false)},disable:function(){this.setData("disabled",true)}};C.widget.defaults={disabled:false};C.ui.mouse={mouseInit:function(){var D=this;this.element.bind("mousedown."+this.widgetName,function(E){return D.mouseDown(E)});if(C.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},mouseDestroy:function(){this.element.unbind("."+this.widgetName);(C.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},mouseDown:function(F){(this._mouseStarted&&this.mouseUp(F));this._mouseDownEvent=F;var E=this,G=(F.which==1),D=(typeof this.options.cancel=="string"?C(F.target).parents().add(F.target).filter(this.options.cancel).length:false);if(!G||D||!this.mouseCapture(F)){return true}this._mouseDelayMet=!this.options.delay;if(!this._mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){E._mouseDelayMet=true},this.options.delay)}if(this.mouseDistanceMet(F)&&this.mouseDelayMet(F)){this._mouseStarted=(this.mouseStart(F)!==false);if(!this._mouseStarted){F.preventDefault();return true}}this._mouseMoveDelegate=function(H){return E.mouseMove(H)};this._mouseUpDelegate=function(H){return E.mouseUp(H)};C(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);return false},mouseMove:function(D){if(C.browser.msie&&!D.button){return this.mouseUp(D)}if(this._mouseStarted){this.mouseDrag(D);return false}if(this.mouseDistanceMet(D)&&this.mouseDelayMet(D)){this._mouseStarted=(this.mouseStart(this._mouseDownEvent,D)!==false);(this._mouseStarted?this.mouseDrag(D):this.mouseUp(D))}return !this._mouseStarted},mouseUp:function(D){C(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this.mouseStop(D)}return false},mouseDistanceMet:function(D){return(Math.max(Math.abs(this._mouseDownEvent.pageX-D.pageX),Math.abs(this._mouseDownEvent.pageY-D.pageY))>=this.options.distance)},mouseDelayMet:function(D){return this._mouseDelayMet},mouseStart:function(D){},mouseDrag:function(D){},mouseStop:function(D){},mouseCapture:function(D){return true}};C.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery);(function(A){A.widget("ui.draggable",A.extend({},A.ui.mouse,{init:function(){var B=this.options;if(B.helper=="original"&&!(/(relative|absolute|fixed)/).test(this.element.css("position"))){this.element.css("position","relative")}this.element.addClass("ui-draggable");(B.disabled&&this.element.addClass("ui-draggable-disabled"));this.mouseInit()},mouseStart:function(F){var H=this.options;if(this.helper||H.disabled||A(F.target).is(".ui-resizable-handle")){return false}var C=!this.options.handle||!A(this.options.handle,this.element).length?true:false;A(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==F.target){C=true}});if(!C){return false}if(A.ui.ddmanager){A.ui.ddmanager.current=this}this.helper=A.isFunction(H.helper)?A(H.helper.apply(this.element[0],[F])):(H.helper=="clone"?this.element.clone():this.element);if(!this.helper.parents("body").length){this.helper.appendTo((H.appendTo=="parent"?this.element[0].parentNode:H.appendTo))}if(this.helper[0]!=this.element[0]&&!(/(fixed|absolute)/).test(this.helper.css("position"))){this.helper.css("position","absolute")}this.margins={left:(parseInt(this.element.css("marginLeft"),10)||0),top:(parseInt(this.element.css("marginTop"),10)||0)};this.cssPosition=this.helper.css("position");this.offset=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.offset.click={left:F.pageX-this.offset.left,top:F.pageY-this.offset.top};this.offsetParent=this.helper.offsetParent();var B=this.offsetParent.offset();if(this.offsetParent[0]==document.body&&A.browser.mozilla){B={top:0,left:0}}this.offset.parent={top:B.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:B.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)};var E=this.element.position();this.offset.relative=this.cssPosition=="relative"?{top:E.top-(parseInt(this.helper.css("top"),10)||0)+this.offsetParent[0].scrollTop,left:E.left-(parseInt(this.helper.css("left"),10)||0)+this.offsetParent[0].scrollLeft}:{top:0,left:0};this.originalPosition=this.generatePosition(F);this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(H.cursorAt){if(H.cursorAt.left!=undefined){this.offset.click.left=H.cursorAt.left+this.margins.left}if(H.cursorAt.right!=undefined){this.offset.click.left=this.helperProportions.width-H.cursorAt.right+this.margins.left}if(H.cursorAt.top!=undefined){this.offset.click.top=H.cursorAt.top+this.margins.top}if(H.cursorAt.bottom!=undefined){this.offset.click.top=this.helperProportions.height-H.cursorAt.bottom+this.margins.top}}if(H.containment){if(H.containment=="parent"){H.containment=this.helper[0].parentNode}if(H.containment=="document"||H.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,A(H.containment=="document"?document:window).width()-this.offset.relative.left-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.element.css("marginRight"),10)||0),(A(H.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.offset.relative.top-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.element.css("marginBottom"),10)||0)]}if(!(/^(document|window|parent)$/).test(H.containment)){var D=A(H.containment)[0];var G=A(H.containment).offset();this.containment=[G.left+(parseInt(A(D).css("borderLeftWidth"),10)||0)-this.offset.relative.left-this.offset.parent.left,G.top+(parseInt(A(D).css("borderTopWidth"),10)||0)-this.offset.relative.top-this.offset.parent.top,G.left+Math.max(D.scrollWidth,D.offsetWidth)-(parseInt(A(D).css("borderLeftWidth"),10)||0)-this.offset.relative.left-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.element.css("marginRight"),10)||0),G.top+Math.max(D.scrollHeight,D.offsetHeight)-(parseInt(A(D).css("borderTopWidth"),10)||0)-this.offset.relative.top-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.element.css("marginBottom"),10)||0)]}}this.propagate("start",F);this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(A.ui.ddmanager&&!H.dropBehaviour){A.ui.ddmanager.prepareOffsets(this,F)}this.helper.addClass("ui-draggable-dragging");this.mouseDrag(F);return true},convertPositionTo:function(C,D){if(!D){D=this.position}var B=C=="absolute"?1:-1;return{top:(D.top+this.offset.relative.top*B+this.offset.parent.top*B-(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollTop)*B+(this.cssPosition=="fixed"?A(document).scrollTop():0)*B+this.margins.top*B),left:(D.left+this.offset.relative.left*B+this.offset.parent.left*B-(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollLeft)*B+(this.cssPosition=="fixed"?A(document).scrollLeft():0)*B+this.margins.left*B)}},generatePosition:function(E){var F=this.options;var B={top:(E.pageY-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollTop)-(this.cssPosition=="fixed"?A(document).scrollTop():0)),left:(E.pageX-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition=="fixed"||(this.cssPosition=="absolute"&&this.offsetParent[0]==document.body)?0:this.offsetParent[0].scrollLeft)-(this.cssPosition=="fixed"?A(document).scrollLeft():0))};if(!this.originalPosition){return B}if(this.containment){if(B.left<this.containment[0]){B.left=this.containment[0]}if(B.top<this.containment[1]){B.top=this.containment[1]}if(B.left>this.containment[2]){B.left=this.containment[2]}if(B.top>this.containment[3]){B.top=this.containment[3]}}if(F.grid){var D=this.originalPosition.top+Math.round((B.top-this.originalPosition.top)/F.grid[1])*F.grid[1];B.top=this.containment?(!(D<this.containment[1]||D>this.containment[3])?D:(!(D<this.containment[1])?D-F.grid[1]:D+F.grid[1])):D;var C=this.originalPosition.left+Math.round((B.left-this.originalPosition.left)/F.grid[0])*F.grid[0];B.left=this.containment?(!(C<this.containment[0]||C>this.containment[2])?C:(!(C<this.containment[0])?C-F.grid[0]:C+F.grid[0])):C}return B},mouseDrag:function(B){this.position=this.generatePosition(B);this.positionAbs=this.convertPositionTo("absolute");this.position=this.propagate("drag",B)||this.position;if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}if(A.ui.ddmanager){A.ui.ddmanager.drag(this,B)}return false},mouseStop:function(C){var D=false;if(A.ui.ddmanager&&!this.options.dropBehaviour){var D=A.ui.ddmanager.drop(this,C)}if((this.options.revert=="invalid"&&!D)||(this.options.revert=="valid"&&D)||this.options.revert===true){var B=this;A(this.helper).animate(this.originalPosition,parseInt(this.options.revert,10)||500,function(){B.propagate("stop",C);B.clear()})}else{this.propagate("stop",C);this.clear()}return false},clear:function(){this.helper.removeClass("ui-draggable-dragging");if(this.options.helper!="original"&&!this.cancelHelperRemoval){this.helper.remove()}this.helper=null;this.cancelHelperRemoval=false},plugins:{},uiHash:function(B){return{helper:this.helper,position:this.position,absolutePosition:this.positionAbs,options:this.options}},propagate:function(C,B){A.ui.plugin.call(this,C,[B,this.uiHash()]);if(C=="drag"){this.positionAbs=this.convertPositionTo("absolute")}return this.element.triggerHandler(C=="drag"?C:"drag"+C,[B,this.uiHash()],this.options[C])},destroy:function(){if(!this.element.data("draggable")){return }this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable");this.mouseDestroy()}}));A.extend(A.ui.draggable,{defaults:{appendTo:"parent",axis:false,cancel:":input",delay:0,distance:1,helper:"original"}});A.ui.plugin.add("draggable","cursor",{start:function(D,C){var B=A("body");if(B.css("cursor")){C.options._cursor=B.css("cursor")}B.css("cursor",C.options.cursor)},stop:function(C,B){if(B.options._cursor){A("body").css("cursor",B.options._cursor)}}});A.ui.plugin.add("draggable","zIndex",{start:function(D,C){var B=A(C.helper);if(B.css("zIndex")){C.options._zIndex=B.css("zIndex")}B.css("zIndex",C.options.zIndex)},stop:function(C,B){if(B.options._zIndex){A(B.helper).css("zIndex",B.options._zIndex)}}});A.ui.plugin.add("draggable","opacity",{start:function(D,C){var B=A(C.helper);if(B.css("opacity")){C.options._opacity=B.css("opacity")}B.css("opacity",C.options.opacity)},stop:function(C,B){if(B.options._opacity){A(B.helper).css("opacity",B.options._opacity)}}});A.ui.plugin.add("draggable","iframeFix",{start:function(C,B){A(B.options.iframeFix===true?"iframe":B.options.iframeFix).each(function(){A('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1000}).css(A(this).offset()).appendTo("body")})},stop:function(C,B){A("div.DragDropIframeFix").each(function(){this.parentNode.removeChild(this)})}});A.ui.plugin.add("draggable","scroll",{start:function(D,C){var E=C.options;var B=A(this).data("draggable");E.scrollSensitivity=E.scrollSensitivity||20;E.scrollSpeed=E.scrollSpeed||20;B.overflowY=function(F){do{if(/auto|scroll/.test(F.css("overflow"))||(/auto|scroll/).test(F.css("overflow-y"))){return F}F=F.parent()}while(F[0].parentNode);return A(document)}(this);B.overflowX=function(F){do{if(/auto|scroll/.test(F.css("overflow"))||(/auto|scroll/).test(F.css("overflow-x"))){return F}F=F.parent()}while(F[0].parentNode);return A(document)}(this);if(B.overflowY[0]!=document&&B.overflowY[0].tagName!="HTML"){B.overflowYOffset=B.overflowY.offset()}if(B.overflowX[0]!=document&&B.overflowX[0].tagName!="HTML"){B.overflowXOffset=B.overflowX.offset()}},drag:function(D,C){var E=C.options;var B=A(this).data("draggable");if(B.overflowY[0]!=document&&B.overflowY[0].tagName!="HTML"){if((B.overflowYOffset.top+B.overflowY[0].offsetHeight)-D.pageY<E.scrollSensitivity){B.overflowY[0].scrollTop=B.overflowY[0].scrollTop+E.scrollSpeed}if(D.pageY-B.overflowYOffset.top<E.scrollSensitivity){B.overflowY[0].scrollTop=B.overflowY[0].scrollTop-E.scrollSpeed}}else{if(D.pageY-A(document).scrollTop()<E.scrollSensitivity){A(document).scrollTop(A(document).scrollTop()-E.scrollSpeed)}if(A(window).height()-(D.pageY-A(document).scrollTop())<E.scrollSensitivity){A(document).scrollTop(A(document).scrollTop()+E.scrollSpeed)}}if(B.overflowX[0]!=document&&B.overflowX[0].tagName!="HTML"){if((B.overflowXOffset.left+B.overflowX[0].offsetWidth)-D.pageX<E.scrollSensitivity){B.overflowX[0].scrollLeft=B.overflowX[0].scrollLeft+E.scrollSpeed}if(D.pageX-B.overflowXOffset.left<E.scrollSensitivity){B.overflowX[0].scrollLeft=B.overflowX[0].scrollLeft-E.scrollSpeed}}else{if(D.pageX-A(document).scrollLeft()<E.scrollSensitivity){A(document).scrollLeft(A(document).scrollLeft()-E.scrollSpeed)}if(A(window).width()-(D.pageX-A(document).scrollLeft())<E.scrollSensitivity){A(document).scrollLeft(A(document).scrollLeft()+E.scrollSpeed)}}}});A.ui.plugin.add("draggable","snap",{start:function(D,C){var B=A(this).data("draggable");B.snapElements=[];A(C.options.snap===true?".ui-draggable":C.options.snap).each(function(){var F=A(this);var E=F.offset();if(this!=B.element[0]){B.snapElements.push({item:this,width:F.outerWidth(),height:F.outerHeight(),top:E.top,left:E.left})}})},drag:function(J,N){var I=A(this).data("draggable");var L=N.options.snapTolerance||20;var D=N.absolutePosition.left,C=D+I.helperProportions.width,P=N.absolutePosition.top,O=P+I.helperProportions.height;for(var H=I.snapElements.length-1;H>=0;H--){var E=I.snapElements[H].left,B=E+I.snapElements[H].width,R=I.snapElements[H].top,M=R+I.snapElements[H].height;if(!((E-L<D&&D<B+L&&R-L<P&&P<M+L)||(E-L<D&&D<B+L&&R-L<O&&O<M+L)||(E-L<C&&C<B+L&&R-L<P&&P<M+L)||(E-L<C&&C<B+L&&R-L<O&&O<M+L))){continue}if(N.options.snapMode!="inner"){var K=Math.abs(R-O)<=20;var Q=Math.abs(M-P)<=20;var G=Math.abs(E-C)<=20;var F=Math.abs(B-D)<=20;if(K){N.position.top=I.convertPositionTo("relative",{top:R-I.helperProportions.height,left:0}).top}if(Q){N.position.top=I.convertPositionTo("relative",{top:M,left:0}).top}if(G){N.position.left=I.convertPositionTo("relative",{top:0,left:E-I.helperProportions.width}).left}if(F){N.position.left=I.convertPositionTo("relative",{top:0,left:B}).left}}if(N.options.snapMode!="outer"){var K=Math.abs(R-P)<=20;var Q=Math.abs(M-O)<=20;var G=Math.abs(E-D)<=20;var F=Math.abs(B-C)<=20;if(K){N.position.top=I.convertPositionTo("relative",{top:R,left:0}).top}if(Q){N.position.top=I.convertPositionTo("relative",{top:M-I.helperProportions.height,left:0}).top}if(G){N.position.left=I.convertPositionTo("relative",{top:0,left:E}).left}if(F){N.position.left=I.convertPositionTo("relative",{top:0,left:B-I.helperProportions.width}).left}}}}});A.ui.plugin.add("draggable","connectToSortable",{start:function(D,C){var B=A(this).data("draggable");B.sortables=[];A(C.options.connectToSortable).each(function(){if(A.data(this,"sortable")){var E=A.data(this,"sortable");B.sortables.push({instance:E,shouldRevert:E.options.revert});E.refreshItems();E.propagate("activate",D,B)}})},stop:function(D,C){var B=A(this).data("draggable");A.each(B.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;B.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert){this.instance.options.revert=true}this.instance.mouseStop(D);this.instance.element.triggerHandler("sortreceive",[D,A.extend(this.instance.ui(),{sender:B.element})],this.instance.options["receive"]);this.instance.options.helper=this.instance.options._helper}else{this.instance.propagate("deactivate",D,B)}})},drag:function(F,E){var D=A(this).data("draggable"),B=this;var C=function(K){var H=K.left,J=H+K.width,I=K.top,G=I+K.height;return(H<(this.positionAbs.left+this.offset.click.left)&&(this.positionAbs.left+this.offset.click.left)<J&&I<(this.positionAbs.top+this.offset.click.top)&&(this.positionAbs.top+this.offset.click.top)<G)};A.each(D.sortables,function(G){if(C.call(D,this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=A(B).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return E.helper[0]};F.target=this.instance.currentItem[0];this.instance.mouseCapture(F,true);this.instance.mouseStart(F,true,true);this.instance.offset.click.top=D.offset.click.top;this.instance.offset.click.left=D.offset.click.left;this.instance.offset.parent.left-=D.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=D.offset.parent.top-this.instance.offset.parent.top;D.propagate("toSortable",F)}if(this.instance.currentItem){this.instance.mouseDrag(F)}}else{if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance.mouseStop(F,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();if(this.instance.placeholder){this.instance.placeholder.remove()}D.propagate("fromSortable",F)}}})}});A.ui.plugin.add("draggable","stack",{start:function(D,B){var C=A.makeArray(A(B.options.stack.group)).sort(function(F,E){return(parseInt(A(F).css("zIndex"),10)||B.options.stack.min)-(parseInt(A(E).css("zIndex"),10)||B.options.stack.min)});A(C).each(function(E){this.style.zIndex=B.options.stack.min+E});this[0].style.zIndex=B.options.stack.min+C.length}})})(jQuery);(function(A){A.widget("ui.droppable",{init:function(){this.element.addClass("ui-droppable");this.isover=0;this.isout=1;var C=this.options,B=C.accept;C=A.extend(C,{accept:C.accept&&C.accept.constructor==Function?C.accept:function(D){return A(D).is(B)}});this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};A.ui.ddmanager.droppables.push(this)},plugins:{},ui:function(B){return{draggable:(B.currentItem||B.element),helper:B.helper,position:B.position,absolutePosition:B.positionAbs,options:this.options,element:this.element}},destroy:function(){var B=A.ui.ddmanager.droppables;for(var C=0;C<B.length;C++){if(B[C]==this){B.splice(C,1)}}this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable")},over:function(C){var B=A.ui.ddmanager.current;if(!B||(B.currentItem||B.element)[0]==this.element[0]){return }if(this.options.accept.call(this.element,(B.currentItem||B.element))){A.ui.plugin.call(this,"over",[C,this.ui(B)]);this.element.triggerHandler("dropover",[C,this.ui(B)],this.options.over)}},out:function(C){var B=A.ui.ddmanager.current;if(!B||(B.currentItem||B.element)[0]==this.element[0]){return }if(this.options.accept.call(this.element,(B.currentItem||B.element))){A.ui.plugin.call(this,"out",[C,this.ui(B)]);this.element.triggerHandler("dropout",[C,this.ui(B)],this.options.out)}},drop:function(D,C){var B=C||A.ui.ddmanager.current;if(!B||(B.currentItem||B.element)[0]==this.element[0]){return false}var E=false;this.element.find(".ui-droppable").not(".ui-draggable-dragging").each(function(){var F=A.data(this,"droppable");if(F.options.greedy&&A.ui.intersect(B,A.extend(F,{offset:F.element.offset()}),F.options.tolerance)){E=true;return false}});if(E){return false}if(this.options.accept.call(this.element,(B.currentItem||B.element))){A.ui.plugin.call(this,"drop",[D,this.ui(B)]);this.element.triggerHandler("drop",[D,this.ui(B)],this.options.drop);return true}return false},activate:function(C){var B=A.ui.ddmanager.current;A.ui.plugin.call(this,"activate",[C,this.ui(B)]);if(B){this.element.triggerHandler("dropactivate",[C,this.ui(B)],this.options.activate)}},deactivate:function(C){var B=A.ui.ddmanager.current;A.ui.plugin.call(this,"deactivate",[C,this.ui(B)]);if(B){this.element.triggerHandler("dropdeactivate",[C,this.ui(B)],this.options.deactivate)}}});A.extend(A.ui.droppable,{defaults:{disabled:false,tolerance:"intersect"}});A.ui.intersect=function(L,F,J){if(!F.offset){return false}var D=(L.positionAbs||L.position.absolute).left,C=D+L.helperProportions.width,I=(L.positionAbs||L.position.absolute).top,H=I+L.helperProportions.height;var E=F.offset.left,B=E+F.proportions.width,K=F.offset.top,G=K+F.proportions.height;switch(J){case"fit":return(E<D&&C<B&&K<I&&H<G);break;case"intersect":return(E<D+(L.helperProportions.width/2)&&C-(L.helperProportions.width/2)<B&&K<I+(L.helperProportions.height/2)&&H-(L.helperProportions.height/2)<G);break;case"pointer":return(E<((L.positionAbs||L.position.absolute).left+(L.clickOffset||L.offset.click).left)&&((L.positionAbs||L.position.absolute).left+(L.clickOffset||L.offset.click).left)<B&&K<((L.positionAbs||L.position.absolute).top+(L.clickOffset||L.offset.click).top)&&((L.positionAbs||L.position.absolute).top+(L.clickOffset||L.offset.click).top)<G);break;case"touch":return((I>=K&&I<=G)||(H>=K&&H<=G)||(I<K&&H>G))&&((D>=E&&D<=B)||(C>=E&&C<=B)||(D<E&&C>B));break;default:return false;break}};A.ui.ddmanager={current:null,droppables:[],prepareOffsets:function(D,F){var B=A.ui.ddmanager.droppables;var E=F?F.type:null;for(var C=0;C<B.length;C++){if(B[C].options.disabled||(D&&!B[C].options.accept.call(B[C].element,(D.currentItem||D.element)))){continue}B[C].visible=B[C].element.css("display")!="none";if(!B[C].visible){continue}B[C].offset=B[C].element.offset();B[C].proportions={width:B[C].element[0].offsetWidth,height:B[C].element[0].offsetHeight};if(E=="dragstart"||E=="sortactivate"){B[C].activate.call(B[C],F)}}},drop:function(B,C){var D=false;A.each(A.ui.ddmanager.droppables,function(){if(!this.options){return }if(!this.options.disabled&&this.visible&&A.ui.intersect(B,this,this.options.tolerance)){D=this.drop.call(this,C)}if(!this.options.disabled&&this.visible&&this.options.accept.call(this.element,(B.currentItem||B.element))){this.isout=1;this.isover=0;this.deactivate.call(this,C)}});return D},drag:function(B,C){if(B.options.refreshPositions){A.ui.ddmanager.prepareOffsets(B,C)}A.each(A.ui.ddmanager.droppables,function(){if(this.options.disabled||this.greedyChild||!this.visible){return }var E=A.ui.intersect(B,this,this.options.tolerance);var G=!E&&this.isover==1?"isout":(E&&this.isover==0?"isover":null);if(!G){return }var F;if(this.options.greedy){var D=this.element.parents(".ui-droppable:eq(0)");if(D.length){F=A.data(D[0],"droppable");F.greedyChild=(G=="isover"?1:0)}}if(F&&G=="isover"){F["isover"]=0;F["isout"]=1;F.out.call(F,C)}this[G]=1;this[G=="isout"?"isover":"isout"]=0;this[G=="isover"?"over":"out"].call(this,C);if(F&&G=="isout"){F["isout"]=0;F["isover"]=1;F.over.call(F,C)}})}};A.ui.plugin.add("droppable","activeClass",{activate:function(C,B){A(this).addClass(B.options.activeClass)},deactivate:function(C,B){A(this).removeClass(B.options.activeClass)},drop:function(C,B){A(this).removeClass(B.options.activeClass)}});A.ui.plugin.add("droppable","hoverClass",{over:function(C,B){A(this).addClass(B.options.hoverClass)},out:function(C,B){A(this).removeClass(B.options.hoverClass)},drop:function(C,B){A(this).removeClass(B.options.hoverClass)}})})(jQuery);(function(A){A.widget("ui.resizable",A.extend({},A.ui.mouse,{init:function(){var M=this,N=this.options;var Q=this.element.css("position");this.originalElement=this.element;this.element.addClass("ui-resizable").css({position:/static/.test(Q)?"relative":Q});A.extend(N,{_aspectRatio:!!(N.aspectRatio),helper:N.helper||N.ghost||N.animate?N.helper||"proxy":null,knobHandles:N.knobHandles===true?"ui-resizable-knob-handle":N.knobHandles});var H="1px solid #DEDEDE";N.defaultTheme={"ui-resizable":{display:"block"},"ui-resizable-handle":{position:"absolute",background:"#F2F2F2",fontSize:"0.1px"},"ui-resizable-n":{cursor:"n-resize",height:"4px",left:"0px",right:"0px",borderTop:H},"ui-resizable-s":{cursor:"s-resize",height:"4px",left:"0px",right:"0px",borderBottom:H},"ui-resizable-e":{cursor:"e-resize",width:"4px",top:"0px",bottom:"0px",borderRight:H},"ui-resizable-w":{cursor:"w-resize",width:"4px",top:"0px",bottom:"0px",borderLeft:H},"ui-resizable-se":{cursor:"se-resize",width:"4px",height:"4px",borderRight:H,borderBottom:H},"ui-resizable-sw":{cursor:"sw-resize",width:"4px",height:"4px",borderBottom:H,borderLeft:H},"ui-resizable-ne":{cursor:"ne-resize",width:"4px",height:"4px",borderRight:H,borderTop:H},"ui-resizable-nw":{cursor:"nw-resize",width:"4px",height:"4px",borderLeft:H,borderTop:H}};N.knobTheme={"ui-resizable-handle":{background:"#F2F2F2",border:"1px solid #808080",height:"8px",width:"8px"},"ui-resizable-n":{cursor:"n-resize",top:"0px",left:"45%"},"ui-resizable-s":{cursor:"s-resize",bottom:"0px",left:"45%"},"ui-resizable-e":{cursor:"e-resize",right:"0px",top:"45%"},"ui-resizable-w":{cursor:"w-resize",left:"0px",top:"45%"},"ui-resizable-se":{cursor:"se-resize",right:"0px",bottom:"0px"},"ui-resizable-sw":{cursor:"sw-resize",left:"0px",bottom:"0px"},"ui-resizable-nw":{cursor:"nw-resize",left:"0px",top:"0px"},"ui-resizable-ne":{cursor:"ne-resize",right:"0px",top:"0px"}};N._nodeName=this.element[0].nodeName;if(N._nodeName.match(/canvas|textarea|input|select|button|img/i)){var B=this.element;if(/relative/.test(B.css("position"))&&A.browser.opera){B.css({position:"relative",top:"auto",left:"auto"})}B.wrap(A('<div class="ui-wrapper"	style="overflow: hidden;"></div>').css({position:B.css("position"),width:B.outerWidth(),height:B.outerHeight(),top:B.css("top"),left:B.css("left")}));var J=this.element;this.element=this.element.parent();this.element.data("resizable",this);this.element.css({marginLeft:J.css("marginLeft"),marginTop:J.css("marginTop"),marginRight:J.css("marginRight"),marginBottom:J.css("marginBottom")});J.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});if(A.browser.safari&&N.preventDefault){J.css("resize","none")}N.proportionallyResize=J.css({position:"static",zoom:1,display:"block"});this.element.css({margin:J.css("margin")});this._proportionallyResize()}if(!N.handles){N.handles=!A(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}}if(N.handles.constructor==String){N.zIndex=N.zIndex||1000;if(N.handles=="all"){N.handles="n,e,s,w,se,sw,ne,nw"}var O=N.handles.split(",");N.handles={};var G={handle:"position: absolute; display: none; overflow:hidden;",n:"top: 0pt; width:100%;",e:"right: 0pt; height:100%;",s:"bottom: 0pt; width:100%;",w:"left: 0pt; height:100%;",se:"bottom: 0pt; right: 0px;",sw:"bottom: 0pt; left: 0px;",ne:"top: 0pt; right: 0px;",nw:"top: 0pt; left: 0px;"};for(var R=0;R<O.length;R++){var S=A.trim(O[R]),L=N.defaultTheme,F="ui-resizable-"+S,C=!A.ui.css(F)&&!N.knobHandles,P=A.ui.css("ui-resizable-knob-handle"),T=A.extend(L[F],L["ui-resizable-handle"]),D=A.extend(N.knobTheme[F],!P?N.knobTheme["ui-resizable-handle"]:{});var K=/sw|se|ne|nw/.test(S)?{zIndex:++N.zIndex}:{};var I=(C?G[S]:""),E=A(['<div class="ui-resizable-handle ',F,'" style="',I,G.handle,'"></div>'].join("")).css(K);N.handles[S]=".ui-resizable-"+S;this.element.append(E.css(C?T:{}).css(N.knobHandles?D:{}).addClass(N.knobHandles?"ui-resizable-knob-handle":"").addClass(N.knobHandles))}if(N.knobHandles){this.element.addClass("ui-resizable-knob").css(!A.ui.css("ui-resizable-knob")?{}:{})}}this._renderAxis=function(Y){Y=Y||this.element;for(var V in N.handles){if(N.handles[V].constructor==String){N.handles[V]=A(N.handles[V],this.element).show()}if(N.transparent){N.handles[V].css({opacity:0})}if(this.element.is(".ui-wrapper")&&N._nodeName.match(/textarea|input|select|button/i)){var W=A(N.handles[V],this.element),X=0;X=/sw|ne|nw|se|n|s/.test(V)?W.outerHeight():W.outerWidth();var U=["padding",/ne|nw|n/.test(V)?"Top":/se|sw|s/.test(V)?"Bottom":/^e$/.test(V)?"Right":"Left"].join("");if(!N.transparent){Y.css(U,X)}this._proportionallyResize()}if(!A(N.handles[V]).length){continue}}};this._renderAxis(this.element);N._handles=A(".ui-resizable-handle",M.element);if(N.disableSelection){N._handles.each(function(U,V){A.ui.disableSelection(V)})}N._handles.mouseover(function(){if(!N.resizing){if(this.className){var U=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}M.axis=N.axis=U&&U[1]?U[1]:"se"}});if(N.autoHide){N._handles.hide();A(M.element).addClass("ui-resizable-autohide").hover(function(){A(this).removeClass("ui-resizable-autohide");N._handles.show()},function(){if(!N.resizing){A(this).addClass("ui-resizable-autohide");N._handles.hide()}})}this.mouseInit()},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,options:this.options,originalSize:this.originalSize,originalPosition:this.originalPosition}},propagate:function(C,B){A.ui.plugin.call(this,C,[B,this.ui()]);if(C!="resize"){this.element.triggerHandler(["resize",C].join(""),[B,this.ui()],this.options[C])}},destroy:function(){var D=this.element,C=D.children(".ui-resizable").get(0);this.mouseDestroy();var B=function(E){A(E).removeClass("ui-resizable ui-resizable-disabled").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};B(D);if(D.is(".ui-wrapper")&&C){D.parent().append(A(C).css({position:D.css("position"),width:D.outerWidth(),height:D.outerHeight(),top:D.css("top"),left:D.css("left")})).end().remove();B(C)}},mouseStart:function(K){if(this.options.disabled){return false}var J=false;for(var H in this.options.handles){if(A(this.options.handles[H])[0]==K.target){J=true}}if(!J){return false}var C=this.options,B=this.element.position(),D=this.element,I=function(O){return parseInt(O,10)||0},G=A.browser.msie&&A.browser.version<7;C.resizing=true;C.documentScroll={top:A(document).scrollTop(),left:A(document).scrollLeft()};if(D.is(".ui-draggable")||(/absolute/).test(D.css("position"))){var M=A.browser.msie&&!C.containment&&(/absolute/).test(D.css("position"))&&!(/relative/).test(D.parent().css("position"));var L=M?C.documentScroll.top:0,F=M?C.documentScroll.left:0;D.css({position:"absolute",top:(B.top+L),left:(B.left+F)})}if(A.browser.opera&&/relative/.test(D.css("position"))){D.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var N=I(this.helper.css("left")),E=I(this.helper.css("top"));if(C.containment){N+=A(C.containment).scrollLeft()||0;E+=A(C.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:N,top:E};this.size=C.helper||G?{width:D.outerWidth(),height:D.outerHeight()}:{width:D.width(),height:D.height()};this.originalSize=C.helper||G?{width:D.outerWidth(),height:D.outerHeight()}:{width:D.width(),height:D.height()};this.originalPosition={left:N,top:E};this.sizeDiff={width:D.outerWidth()-D.width(),height:D.outerHeight()-D.height()};this.originalMousePosition={left:K.pageX,top:K.pageY};C.aspectRatio=(typeof C.aspectRatio=="number")?C.aspectRatio:((this.originalSize.height/this.originalSize.width)||1);if(C.preserveCursor){A("body").css("cursor",this.axis+"-resize")}this.propagate("start",K);return true},mouseDrag:function(I){var D=this.helper,C=this.options,J={},M=this,F=this.originalMousePosition,K=this.axis;var N=(I.pageX-F.left)||0,L=(I.pageY-F.top)||0;var E=this._change[K];if(!E){return false}var H=E.apply(this,[I,N,L]),G=A.browser.msie&&A.browser.version<7,B=this.sizeDiff;if(C._aspectRatio||I.shiftKey){H=this._updateRatio(H,I)}H=this._respectSize(H,I);this.propagate("resize",I);D.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!C.helper&&C.proportionallyResize){this._proportionallyResize()}this._updateCache(H);this.element.triggerHandler("resize",[I,this.ui()],this.options["resize"]);return false},mouseStop:function(I){this.options.resizing=false;var E=this.options,H=function(M){return parseInt(M,10)||0},K=this;if(E.helper){var D=E.proportionallyResize,B=D&&(/textarea/i).test(D.get(0).nodeName),C=B&&A.ui.hasScroll(D.get(0),"left")?0:K.sizeDiff.height,G=B?0:K.sizeDiff.width;var L={width:(K.size.width-G),height:(K.size.height-C)},F=(parseInt(K.element.css("left"),10)+(K.position.left-K.originalPosition.left))||null,J=(parseInt(K.element.css("top"),10)+(K.position.top-K.originalPosition.top))||null;if(!E.animate){this.element.css(A.extend(L,{top:J,left:F}))}if(E.helper&&!E.animate){this._proportionallyResize()}}if(E.preserveCursor){A("body").css("cursor","auto")}this.propagate("stop",I);if(E.helper){this.helper.remove()}return false},_updateCache:function(B){var C=this.options;this.offset=this.helper.offset();if(B.left){this.position.left=B.left}if(B.top){this.position.top=B.top}if(B.height){this.size.height=B.height}if(B.width){this.size.width=B.width}},_updateRatio:function(D,E){var F=this.options,G=this.position,C=this.size,B=this.axis;if(D.height){D.width=(C.height/F.aspectRatio)}else{if(D.width){D.height=(C.width*F.aspectRatio)}}if(B=="sw"){D.left=G.left+(C.width-D.width);D.top=null}if(B=="nw"){D.top=G.top+(C.height-D.height);D.left=G.left+(C.width-D.width)}return D},_respectSize:function(H,I){var F=this.helper,E=this.options,N=E._aspectRatio||I.shiftKey,M=this.axis,P=H.width&&E.maxWidth&&E.maxWidth<H.width,J=H.height&&E.maxHeight&&E.maxHeight<H.height,D=H.width&&E.minWidth&&E.minWidth>H.width,O=H.height&&E.minHeight&&E.minHeight>H.height;if(D){H.width=E.minWidth}if(O){H.height=E.minHeight}if(P){H.width=E.maxWidth}if(J){H.height=E.maxHeight}var C=this.originalPosition.left+this.originalSize.width,L=this.position.top+this.size.height;var G=/sw|nw|w/.test(M),B=/nw|ne|n/.test(M);if(D&&G){H.left=C-E.minWidth}if(P&&G){H.left=C-E.maxWidth}if(O&&B){H.top=L-E.minHeight}if(J&&B){H.top=L-E.maxHeight}var K=!H.width&&!H.height;if(K&&!H.left&&H.top){H.top=null}else{if(K&&!H.top&&H.left){H.left=null}}return H},_proportionallyResize:function(){var F=this.options;if(!F.proportionallyResize){return }var D=F.proportionallyResize,C=this.helper||this.element;if(!F.borderDif){var B=[D.css("borderTopWidth"),D.css("borderRightWidth"),D.css("borderBottomWidth"),D.css("borderLeftWidth")],E=[D.css("paddingTop"),D.css("paddingRight"),D.css("paddingBottom"),D.css("paddingLeft")];F.borderDif=A.map(B,function(G,I){var H=parseInt(G,10)||0,J=parseInt(E[I],10)||0;return H+J})}D.css({height:(C.height()-F.borderDif[0]-F.borderDif[2])+"px",width:(C.width()-F.borderDif[1]-F.borderDif[3])+"px"})},_renderProxy:function(){var C=this.element,F=this.options;this.elementOffset=C.offset();if(F.helper){this.helper=this.helper||A('<div style="overflow:hidden;"></div>');var B=A.browser.msie&&A.browser.version<7,D=(B?1:0),E=(B?2:-1);this.helper.addClass(F.helper).css({width:C.outerWidth()+E,height:C.outerHeight()+E,position:"absolute",left:this.elementOffset.left-D+"px",top:this.elementOffset.top-D+"px",zIndex:++F.zIndex});this.helper.appendTo("body");if(F.disableSelection){A.ui.disableSelection(this.helper.get(0))}}else{this.helper=C}},_change:{e:function(D,C,B){return{width:this.originalSize.width+C}},w:function(F,C,B){var G=this.options,D=this.originalSize,E=this.originalPosition;return{left:E.left+C,width:D.width-C}},n:function(F,C,B){var G=this.options,D=this.originalSize,E=this.originalPosition;return{top:E.top+B,height:D.height-B}},s:function(D,C,B){return{height:this.originalSize.height+B}},se:function(D,C,B){return A.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[D,C,B]))},sw:function(D,C,B){return A.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[D,C,B]))},ne:function(D,C,B){return A.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[D,C,B]))},nw:function(D,C,B){return A.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[D,C,B]))}}}));A.extend(A.ui.resizable,{defaults:{cancel:":input",distance:1,delay:0,preventDefault:true,transparent:false,minWidth:10,minHeight:10,aspectRatio:false,disableSelection:true,preserveCursor:true,autoHide:false,knobHandles:false}});A.ui.plugin.add("resizable","containment",{start:function(I,K){var E=K.options,M=A(this).data("resizable"),G=M.element;var C=E.containment,F=(C instanceof A)?C.get(0):(/parent/.test(C))?G.parent().get(0):C;if(!F){return }M.containerElement=A(F);if(/document/.test(C)||C==document){M.containerOffset={left:0,top:0};M.containerPosition={left:0,top:0};M.parentData={element:A(document),left:0,top:0,width:A(document).width(),height:A(document).height()||document.body.parentNode.scrollHeight}}else{M.containerOffset=A(F).offset();M.containerPosition=A(F).position();M.containerSize={height:A(F).innerHeight(),width:A(F).innerWidth()};var J=M.containerOffset,B=M.containerSize.height,H=M.containerSize.width,D=(A.ui.hasScroll(F,"left")?F.scrollWidth:H),L=(A.ui.hasScroll(F)?F.scrollHeight:B);M.parentData={element:F,left:J.left,top:J.top,width:D,height:L}}},resize:function(H,K){var E=K.options,N=A(this).data("resizable"),C=N.containerSize,J=N.containerOffset,G=N.size,I=N.position,L=E._aspectRatio||H.shiftKey,B={top:0,left:0},D=N.containerElement;if(D[0]!=document&&/static/.test(D.css("position"))){B=N.containerPosition}if(I.left<(E.helper?J.left:B.left)){N.size.width=N.size.width+(E.helper?(N.position.left-J.left):(N.position.left-B.left));if(L){N.size.height=N.size.width*E.aspectRatio}N.position.left=E.helper?J.left:B.left}if(I.top<(E.helper?J.top:0)){N.size.height=N.size.height+(E.helper?(N.position.top-J.top):N.position.top);if(L){N.size.width=N.size.height/E.aspectRatio}N.position.top=E.helper?J.top:0}var F=(E.helper?N.offset.left-J.left:(N.position.left-B.left))+N.sizeDiff.width,M=(E.helper?N.offset.top-J.top:N.position.top)+N.sizeDiff.height;if(F+N.size.width>=N.parentData.width){N.size.width=N.parentData.width-F;if(L){N.size.height=N.size.width*E.aspectRatio}}if(M+N.size.height>=N.parentData.height){N.size.height=N.parentData.height-M;if(L){N.size.width=N.size.height/E.aspectRatio}}},stop:function(G,J){var C=J.options,L=A(this).data("resizable"),H=L.position,I=L.containerOffset,B=L.containerPosition,D=L.containerElement;var E=A(L.helper),M=E.offset(),K=E.innerWidth(),F=E.innerHeight();if(C.helper&&!C.animate&&/relative/.test(D.css("position"))){A(this).css({left:(M.left-I.left),top:(M.top-I.top),width:K,height:F})}if(C.helper&&!C.animate&&/static/.test(D.css("position"))){A(this).css({left:B.left+(M.left-I.left),top:B.top+(M.top-I.top),width:K,height:F})}}});A.ui.plugin.add("resizable","grid",{resize:function(H,J){var D=J.options,L=A(this).data("resizable"),G=L.size,E=L.originalSize,F=L.originalPosition,K=L.axis,I=D._aspectRatio||H.shiftKey;D.grid=typeof D.grid=="number"?[D.grid,D.grid]:D.grid;var C=Math.round((G.width-E.width)/(D.grid[0]||1))*(D.grid[0]||1),B=Math.round((G.height-E.height)/(D.grid[1]||1))*(D.grid[1]||1);if(/^(se|s|e)$/.test(K)){L.size.width=E.width+C;L.size.height=E.height+B}else{if(/^(ne)$/.test(K)){L.size.width=E.width+C;L.size.height=E.height+B;L.position.top=F.top-B}else{if(/^(sw)$/.test(K)){L.size.width=E.width+C;L.size.height=E.height+B;L.position.left=F.left-C}else{L.size.width=E.width+C;L.size.height=E.height+B;L.position.top=F.top-B;L.position.left=F.left-C}}}}});A.ui.plugin.add("resizable","animate",{stop:function(I,K){var F=K.options,L=A(this).data("resizable");var E=F.proportionallyResize,B=E&&(/textarea/i).test(E.get(0).nodeName),C=B&&A.ui.hasScroll(E.get(0),"left")?0:L.sizeDiff.height,H=B?0:L.sizeDiff.width;var D={width:(L.size.width-H),height:(L.size.height-C)},G=(parseInt(L.element.css("left"),10)+(L.position.left-L.originalPosition.left))||null,J=(parseInt(L.element.css("top"),10)+(L.position.top-L.originalPosition.top))||null;L.element.animate(A.extend(D,J&&G?{top:J,left:G}:{}),{duration:F.animateDuration||"slow",easing:F.animateEasing||"swing",step:function(){var M={width:parseInt(L.element.css("width"),10),height:parseInt(L.element.css("height"),10),top:parseInt(L.element.css("top"),10),left:parseInt(L.element.css("left"),10)};if(E){E.css({width:M.width,height:M.height})}L._updateCache(M);L.propagate("animate",I)}})}});A.ui.plugin.add("resizable","ghost",{start:function(E,D){var F=D.options,B=A(this).data("resizable"),G=F.proportionallyResize,C=B.size;if(!G){B.ghost=B.element.clone()}else{B.ghost=G.clone()}B.ghost.css({opacity:0.25,display:"block",position:"relative",height:C.height,width:C.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof F.ghost=="string"?F.ghost:"");B.ghost.appendTo(B.helper)},resize:function(D,C){var E=C.options,B=A(this).data("resizable"),F=E.proportionallyResize;if(B.ghost){B.ghost.css({position:"relative",height:B.size.height,width:B.size.width})}},stop:function(D,C){var E=C.options,B=A(this).data("resizable"),F=E.proportionallyResize;if(B.ghost&&B.helper){B.helper.get(0).removeChild(B.ghost.get(0))}}});A.ui.plugin.add("resizable","alsoResize",{start:function(E,C){var F=C.options,B=A(this).data("resizable"),D=function(G){A(G).each(function(){A(this).data("resizable-alsoresize",{width:parseInt(A(this).width(),10),height:parseInt(A(this).height(),10),left:parseInt(A(this).css("left"),10),top:parseInt(A(this).css("top"),10)})})};if(typeof (F.alsoResize)=="object"){if(F.alsoResize.length){F.alsoResize=F.alsoResize[0];D(F.alsoResize)}else{A.each(F.alsoResize,function(G,H){D(G)})}}else{D(F.alsoResize)}},resize:function(F,E){var G=E.options,C=A(this).data("resizable"),D=C.originalSize,I=C.originalPosition;var H={height:(C.size.height-D.height)||0,width:(C.size.width-D.width)||0,top:(C.position.top-I.top)||0,left:(C.position.left-I.left)||0},B=function(J,K){A(J).each(function(){var N=A(this).data("resizable-alsoresize"),M={},L=K&&K.length?K:["width","height","top","left"];A.each(L||["width","height","top","left"],function(O,Q){var P=(N[Q]||0)+(H[Q]||0);if(P&&P>=0){M[Q]=P||null}});A(this).css(M)})};if(typeof (G.alsoResize)=="object"){A.each(G.alsoResize,function(J,K){B(J,K)})}else{B(G.alsoResize)}},stop:function(C,B){A(this).removeData("resizable-alsoresize-start")}})})(jQuery);(function(A){A.widget("ui.selectable",A.extend({},A.ui.mouse,{init:function(){var B=this;this.element.addClass("ui-selectable");this.dragged=false;var C;this.refresh=function(){C=A(B.options.filter,B.element[0]);C.each(function(){var D=A(this);var E=D.offset();A.data(this,"selectable-item",{element:this,$element:D,left:E.left,top:E.top,right:E.left+D.width(),bottom:E.top+D.height(),startselected:false,selected:D.hasClass("ui-selected"),selecting:D.hasClass("ui-selecting"),unselecting:D.hasClass("ui-unselecting")})})};this.refresh();this.selectees=C.addClass("ui-selectee");this.mouseInit();this.helper=A(document.createElement("div")).css({border:"1px dotted black"})},toggle:function(){if(this.options.disabled){this.enable()}else{this.disable()}},destroy:function(){this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this.mouseDestroy()},mouseStart:function(E){var C=this;this.opos=[E.pageX,E.pageY];if(this.options.disabled){return }var D=this.options;this.selectees=A(D.filter,this.element[0]);this.element.triggerHandler("selectablestart",[E,{"selectable":this.element[0],"options":D}],D.start);A("body").append(this.helper);this.helper.css({"z-index":100,"position":"absolute","left":E.clientX,"top":E.clientY,"width":0,"height":0});if(D.autoRefresh){this.refresh()}this.selectees.filter(".ui-selected").each(function(){var F=A.data(this,"selectable-item");F.startselected=true;if(!E.ctrlKey){F.$element.removeClass("ui-selected");F.selected=false;F.$element.addClass("ui-unselecting");F.unselecting=true;C.element.triggerHandler("selectableunselecting",[E,{selectable:C.element[0],unselecting:F.element,options:D}],D.unselecting)}});var B=false;A(E.target).parents().andSelf().each(function(){if(A.data(this,"selectable-item")){B=true}});return this.options.keyboard?!B:true},mouseDrag:function(I){var C=this;this.dragged=true;if(this.options.disabled){return }var E=this.options;var D=this.opos[0],H=this.opos[1],B=I.pageX,G=I.pageY;if(D>B){var F=B;B=D;D=F}if(H>G){var F=G;G=H;H=F}this.helper.css({left:D,top:H,width:B-D,height:G-H});this.selectees.each(function(){var J=A.data(this,"selectable-item");if(!J||J.element==C.element[0]){return }var K=false;if(E.tolerance=="touch"){K=(!(J.left>B||J.right<D||J.top>G||J.bottom<H))}else{if(E.tolerance=="fit"){K=(J.left>D&&J.right<B&&J.top>H&&J.bottom<G)}}if(K){if(J.selected){J.$element.removeClass("ui-selected");J.selected=false}if(J.unselecting){J.$element.removeClass("ui-unselecting");J.unselecting=false}if(!J.selecting){J.$element.addClass("ui-selecting");J.selecting=true;C.element.triggerHandler("selectableselecting",[I,{selectable:C.element[0],selecting:J.element,options:E}],E.selecting)}}else{if(J.selecting){if(I.ctrlKey&&J.startselected){J.$element.removeClass("ui-selecting");J.selecting=false;J.$element.addClass("ui-selected");J.selected=true}else{J.$element.removeClass("ui-selecting");J.selecting=false;if(J.startselected){J.$element.addClass("ui-unselecting");J.unselecting=true}C.element.triggerHandler("selectableunselecting",[I,{selectable:C.element[0],unselecting:J.element,options:E}],E.unselecting)}}if(J.selected){if(!I.ctrlKey&&!J.startselected){J.$element.removeClass("ui-selected");J.selected=false;J.$element.addClass("ui-unselecting");J.unselecting=true;C.element.triggerHandler("selectableunselecting",[I,{selectable:C.element[0],unselecting:J.element,options:E}],E.unselecting)}}}});return false},mouseStop:function(D){var B=this;this.dragged=false;var C=this.options;A(".ui-unselecting",this.element[0]).each(function(){var E=A.data(this,"selectable-item");E.$element.removeClass("ui-unselecting");E.unselecting=false;E.startselected=false;B.element.triggerHandler("selectableunselected",[D,{selectable:B.element[0],unselected:E.element,options:C}],C.unselected)});A(".ui-selecting",this.element[0]).each(function(){var E=A.data(this,"selectable-item");E.$element.removeClass("ui-selecting").addClass("ui-selected");E.selecting=false;E.selected=true;E.startselected=true;B.element.triggerHandler("selectableselected",[D,{selectable:B.element[0],selected:E.element,options:C}],C.selected)});this.element.triggerHandler("selectablestop",[D,{selectable:B.element[0],options:this.options}],this.options.stop);this.helper.remove();return false}}));A.extend(A.ui.selectable,{defaults:{distance:1,delay:0,cancel:":input",appendTo:"body",autoRefresh:true,filter:"*",tolerance:"touch"}})})(jQuery);(function(B){function A(E,D){var C=B.browser.safari&&B.browser.version<522;if(E.contains&&!C){return E.contains(D)}if(E.compareDocumentPosition){return !!(E.compareDocumentPosition(D)&16)}while(D=D.parentNode){if(D==E){return true}}return false}B.widget("ui.sortable",B.extend({},B.ui.mouse,{init:function(){var C=this.options;this.containerCache={};this.element.addClass("ui-sortable");this.refresh();this.floating=this.items.length?(/left|right/).test(this.items[0].item.css("float")):false;if(!(/(relative|absolute|fixed)/).test(this.element.css("position"))){this.element.css("position","relative")}this.offset=this.element.offset();this.mouseInit()},plugins:{},ui:function(C){return{helper:(C||this)["helper"],placeholder:(C||this)["placeholder"]||B([]),position:(C||this)["position"],absolutePosition:(C||this)["positionAbs"],options:this.options,element:this.element,item:(C||this)["currentItem"],sender:C?C.element:null}},propagate:function(F,E,C,D){B.ui.plugin.call(this,F,[E,this.ui(C)]);if(!D){this.element.triggerHandler(F=="sort"?F:"sort"+F,[E,this.ui(C)],this.options[F])}},serialize:function(E){var C=(B.isFunction(this.options.items)?this.options.items.call(this.element):B(this.options.items,this.element)).not(".ui-sortable-helper");var D=[];E=E||{};C.each(function(){var F=(B(this).attr(E.attribute||"id")||"").match(E.expression||(/(.+)[-=_](.+)/));if(F){D.push((E.key||F[1])+"[]="+(E.key&&E.expression?F[1]:F[2]))}});return D.join("&")},toArray:function(C){var D=(B.isFunction(this.options.items)?this.options.items.call(this.element):B(this.options.items,this.element)).not(".ui-sortable-helper");var E=[];D.each(function(){E.push(B(this).attr(C||"id"))});return E},intersectsWith:function(J){var E=this.positionAbs.left,D=E+this.helperProportions.width,I=this.positionAbs.top,H=I+this.helperProportions.height;var F=J.left,C=F+J.width,K=J.top,G=K+J.height;if(this.options.tolerance=="pointer"||this.options.forcePointerForContainers||(this.options.tolerance=="guess"&&this.helperProportions[this.floating?"width":"height"]>J[this.floating?"width":"height"])){return(I+this.offset.click.top>K&&I+this.offset.click.top<G&&E+this.offset.click.left>F&&E+this.offset.click.left<C)}else{return(F<E+(this.helperProportions.width/2)&&D-(this.helperProportions.width/2)<C&&K<I+(this.helperProportions.height/2)&&H-(this.helperProportions.height/2)<G)}},intersectsWithEdge:function(J){var E=this.positionAbs.left,D=E+this.helperProportions.width,I=this.positionAbs.top,H=I+this.helperProportions.height;var F=J.left,C=F+J.width,K=J.top,G=K+J.height;if(this.options.tolerance=="pointer"||(this.options.tolerance=="guess"&&this.helperProportions[this.floating?"width":"height"]>J[this.floating?"width":"height"])){if(!(I+this.offset.click.top>K&&I+this.offset.click.top<G&&E+this.offset.click.left>F&&E+this.offset.click.left<C)){return false}if(this.floating){if(E+this.offset.click.left>F&&E+this.offset.click.left<F+J.width/2){return 2}if(E+this.offset.click.left>F+J.width/2&&E+this.offset.click.left<C){return 1}}else{if(I+this.offset.click.top>K&&I+this.offset.click.top<K+J.height/2){return 2}if(I+this.offset.click.top>K+J.height/2&&I+this.offset.click.top<G){return 1}}}else{if(!(F<E+(this.helperProportions.width/2)&&D-(this.helperProportions.width/2)<C&&K<I+(this.helperProportions.height/2)&&H-(this.helperProportions.height/2)<G)){return false}if(this.floating){if(D>F&&E<F){return 2}if(E<C&&D>C){return 1}}else{if(H>K&&I<K){return 1}if(I<G&&H>G){return 2}}}return false},refresh:function(){this.refreshItems();this.refreshPositions()},refreshItems:function(){this.items=[];this.containers=[this];var D=this.items;var C=this;var F=[[B.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):B(this.options.items,this.element),this]];if(this.options.connectWith){for(var G=this.options.connectWith.length-1;G>=0;G--){var I=B(this.options.connectWith[G]);for(var E=I.length-1;E>=0;E--){var H=B.data(I[E],"sortable");if(H&&!H.options.disabled){F.push([B.isFunction(H.options.items)?H.options.items.call(H.element):B(H.options.items,H.element),H]);this.containers.push(H)}}}}for(var G=F.length-1;G>=0;G--){F[G][0].each(function(){B.data(this,"sortable-item",F[G][1]);D.push({item:B(this),instance:F[G][1],width:0,height:0,left:0,top:0})})}},refreshPositions:function(D){if(this.offsetParent){var C=this.offsetParent.offset();this.offset.parent={top:C.top+this.offsetParentBorders.top,left:C.left+this.offsetParentBorders.left}}for(var F=this.items.length-1;F>=0;F--){if(this.items[F].instance!=this.currentContainer&&this.currentContainer&&this.items[F].item[0]!=this.currentItem[0]){continue}var E=this.options.toleranceElement?B(this.options.toleranceElement,this.items[F].item):this.items[F].item;if(!D){this.items[F].width=E[0].offsetWidth;this.items[F].height=E[0].offsetHeight}var G=E.offset();this.items[F].left=G.left;this.items[F].top=G.top}if(this.options.custom&&this.options.custom.refreshContainers){this.options.custom.refreshContainers.call(this)}else{for(var F=this.containers.length-1;F>=0;F--){var G=this.containers[F].element.offset();this.containers[F].containerCache.left=G.left;this.containers[F].containerCache.top=G.top;this.containers[F].containerCache.width=this.containers[F].element.outerWidth();this.containers[F].containerCache.height=this.containers[F].element.outerHeight()}}},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this.mouseDestroy();for(var C=this.items.length-1;C>=0;C--){this.items[C].item.removeData("sortable-item")}},createPlaceholder:function(E){var C=E||this,F=C.options;if(F.placeholder.constructor==String){var D=F.placeholder;F.placeholder={element:function(){return B("<div></div>").addClass(D)[0]},update:function(G,H){H.css(G.offset()).css({width:G.outerWidth(),height:G.outerHeight()})}}}C.placeholder=B(F.placeholder.element.call(C.element,C.currentItem)).appendTo("body").css({position:"absolute"});F.placeholder.update.call(C.element,C.currentItem,C.placeholder)},contactContainers:function(F){for(var D=this.containers.length-1;D>=0;D--){if(this.intersectsWith(this.containers[D].containerCache)){if(!this.containers[D].containerCache.over){if(this.currentContainer!=this.containers[D]){var I=10000;var H=null;var E=this.positionAbs[this.containers[D].floating?"left":"top"];for(var C=this.items.length-1;C>=0;C--){if(!A(this.containers[D].element[0],this.items[C].item[0])){continue}var G=this.items[C][this.containers[D].floating?"left":"top"];if(Math.abs(G-E)<I){I=Math.abs(G-E);H=this.items[C]}}if(!H&&!this.options.dropOnEmpty){continue}if(this.placeholder){this.placeholder.remove()}if(this.containers[D].options.placeholder){this.containers[D].createPlaceholder(this)}else{this.placeholder=null}this.currentContainer=this.containers[D];H?this.rearrange(F,H,null,true):this.rearrange(F,null,this.containers[D].element,true);this.propagate("change",F);this.containers[D].propagate("change",F,this)}this.containers[D].propagate("over",F,this);this.containers[D].containerCache.over=1}}else{if(this.containers[D].containerCache.over){this.containers[D].propagate("out",F,this);this.containers[D].containerCache.over=0}}}},mouseCapture:function(G,F){if(this.options.disabled||this.options.type=="static"){return false}this.refreshItems();var E=null,D=this,C=B(G.target).parents().each(function(){if(B.data(this,"sortable-item")==D){E=B(this);return false}});if(B.data(G.target,"sortable-item")==D){E=B(G.target)}if(!E){return false}if(this.options.handle&&!F){var H=false;B(this.options.handle,E).find("*").andSelf().each(function(){if(this==G.target){H=true}});if(!H){return false}}this.currentItem=E;return true},mouseStart:function(H,F,C){var J=this.options;this.currentContainer=this;this.refreshPositions();this.helper=typeof J.helper=="function"?B(J.helper.apply(this.element[0],[H,this.currentItem])):this.currentItem.clone();if(!this.helper.parents("body").length){B(J.appendTo!="parent"?J.appendTo:this.currentItem[0].parentNode)[0].appendChild(this.helper[0])}this.helper.css({position:"absolute",clear:"both"}).addClass("ui-sortable-helper");this.margins={left:(parseInt(this.currentItem.css("marginLeft"),10)||0),top:(parseInt(this.currentItem.css("marginTop"),10)||0)};this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.offset.click={left:H.pageX-this.offset.left,top:H.pageY-this.offset.top};this.offsetParent=this.helper.offsetParent();var D=this.offsetParent.offset();this.offsetParentBorders={top:(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)};this.offset.parent={top:D.top+this.offsetParentBorders.top,left:D.left+this.offsetParentBorders.left};this.originalPosition=this.generatePosition(H);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(J.placeholder){this.createPlaceholder()}this.propagate("start",H);this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()};if(J.cursorAt){if(J.cursorAt.left!=undefined){this.offset.click.left=J.cursorAt.left}if(J.cursorAt.right!=undefined){this.offset.click.left=this.helperProportions.width-J.cursorAt.right}if(J.cursorAt.top!=undefined){this.offset.click.top=J.cursorAt.top}if(J.cursorAt.bottom!=undefined){this.offset.click.top=this.helperProportions.height-J.cursorAt.bottom}}if(J.containment){if(J.containment=="parent"){J.containment=this.helper[0].parentNode}if(J.containment=="document"||J.containment=="window"){this.containment=[0-this.offset.parent.left,0-this.offset.parent.top,B(J.containment=="document"?document:window).width()-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.element.css("marginRight"),10)||0),(B(J.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.element.css("marginBottom"),10)||0)]}if(!(/^(document|window|parent)$/).test(J.containment)){var G=B(J.containment)[0];var I=B(J.containment).offset();this.containment=[I.left+(parseInt(B(G).css("borderLeftWidth"),10)||0)-this.offset.parent.left,I.top+(parseInt(B(G).css("borderTopWidth"),10)||0)-this.offset.parent.top,I.left+Math.max(G.scrollWidth,G.offsetWidth)-(parseInt(B(G).css("borderLeftWidth"),10)||0)-this.offset.parent.left-this.helperProportions.width-this.margins.left-(parseInt(this.currentItem.css("marginRight"),10)||0),I.top+Math.max(G.scrollHeight,G.offsetHeight)-(parseInt(B(G).css("borderTopWidth"),10)||0)-this.offset.parent.top-this.helperProportions.height-this.margins.top-(parseInt(this.currentItem.css("marginBottom"),10)||0)]}}if(this.options.placeholder!="clone"){this.currentItem.css("visibility","hidden")}if(!C){for(var E=this.containers.length-1;E>=0;E--){this.containers[E].propagate("activate",H,this)}}if(B.ui.ddmanager){B.ui.ddmanager.current=this}if(B.ui.ddmanager&&!J.dropBehaviour){B.ui.ddmanager.prepareOffsets(this,H)}this.dragging=true;this.mouseDrag(H);return true},convertPositionTo:function(D,E){if(!E){E=this.position}var C=D=="absolute"?1:-1;return{top:(E.top+this.offset.parent.top*C-(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)*C+this.margins.top*C),left:(E.left+this.offset.parent.left*C-(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft)*C+this.margins.left*C)}},generatePosition:function(F){var G=this.options;var C={top:(F.pageY-this.offset.click.top-this.offset.parent.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)),left:(F.pageX-this.offset.click.left-this.offset.parent.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft))};if(!this.originalPosition){return C}if(this.containment){if(C.left<this.containment[0]){C.left=this.containment[0]}if(C.top<this.containment[1]){C.top=this.containment[1]}if(C.left>this.containment[2]){C.left=this.containment[2]}if(C.top>this.containment[3]){C.top=this.containment[3]}}if(G.grid){var E=this.originalPosition.top+Math.round((C.top-this.originalPosition.top)/G.grid[1])*G.grid[1];C.top=this.containment?(!(E<this.containment[1]||E>this.containment[3])?E:(!(E<this.containment[1])?E-G.grid[1]:E+G.grid[1])):E;var D=this.originalPosition.left+Math.round((C.left-this.originalPosition.left)/G.grid[0])*G.grid[0];C.left=this.containment?(!(D<this.containment[0]||D>this.containment[2])?D:(!(D<this.containment[0])?D-G.grid[0]:D+G.grid[0])):D}return C},mouseDrag:function(D){this.position=this.generatePosition(D);this.positionAbs=this.convertPositionTo("absolute");B.ui.plugin.call(this,"sort",[D,this.ui()]);this.positionAbs=this.convertPositionTo("absolute");this.helper[0].style.left=this.position.left+"px";this.helper[0].style.top=this.position.top+"px";for(var C=this.items.length-1;C>=0;C--){var E=this.intersectsWithEdge(this.items[C]);if(!E){continue}if(this.items[C].item[0]!=this.currentItem[0]&&this.currentItem[E==1?"next":"prev"]()[0]!=this.items[C].item[0]&&!A(this.currentItem[0],this.items[C].item[0])&&(this.options.type=="semi-dynamic"?!A(this.element[0],this.items[C].item[0]):true)){this.direction=E==1?"down":"up";this.rearrange(D,this.items[C]);this.propagate("change",D);break}}this.contactContainers(D);if(B.ui.ddmanager){B.ui.ddmanager.drag(this,D)}this.element.triggerHandler("sort",[D,this.ui()],this.options["sort"]);return false},rearrange:function(H,G,D,F){D?D[0].appendChild(this.currentItem[0]):G.item[0].parentNode.insertBefore(this.currentItem[0],(this.direction=="down"?G.item[0]:G.item[0].nextSibling));this.counter=this.counter?++this.counter:1;var E=this,C=this.counter;window.setTimeout(function(){if(C==E.counter){E.refreshPositions(!F)}},0);if(this.options.placeholder){this.options.placeholder.update.call(this.element,this.currentItem,this.placeholder)}},mouseStop:function(E,D){if(B.ui.ddmanager&&!this.options.dropBehaviour){B.ui.ddmanager.drop(this,E)}if(this.options.revert){var C=this;var F=C.currentItem.offset();if(C.placeholder){C.placeholder.animate({opacity:"hide"},(parseInt(this.options.revert,10)||500)-50)}B(this.helper).animate({left:F.left-this.offset.parent.left-C.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:F.top-this.offset.parent.top-C.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){C.clear(E)})}else{this.clear(E,D)}return false},clear:function(E,D){if(this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0]){this.propagate("update",E,null,D)}if(!A(this.element[0],this.currentItem[0])){this.propagate("remove",E,null,D);for(var C=this.containers.length-1;C>=0;C--){if(A(this.containers[C].element[0],this.currentItem[0])){this.containers[C].propagate("update",E,this,D);this.containers[C].propagate("receive",E,this,D)}}}for(var C=this.containers.length-1;C>=0;C--){this.containers[C].propagate("deactivate",E,this,D);if(this.containers[C].containerCache.over){this.containers[C].propagate("out",E,this);this.containers[C].containerCache.over=0}}this.dragging=false;if(this.cancelHelperRemoval){this.propagate("stop",E,null,D);return false}B(this.currentItem).css("visibility","");if(this.placeholder){this.placeholder.remove()}this.helper.remove();this.helper=null;this.propagate("stop",E,null,D);return true}}));B.extend(B.ui.sortable,{getter:"serialize toArray",defaults:{helper:"clone",tolerance:"guess",distance:1,delay:0,scroll:true,scrollSensitivity:20,scrollSpeed:20,cancel:":input",items:"> *",zIndex:1000,dropOnEmpty:true,appendTo:"parent"}});B.ui.plugin.add("sortable","cursor",{start:function(E,D){var C=B("body");if(C.css("cursor")){D.options._cursor=C.css("cursor")}C.css("cursor",D.options.cursor)},stop:function(D,C){if(C.options._cursor){B("body").css("cursor",C.options._cursor)}}});B.ui.plugin.add("sortable","zIndex",{start:function(E,D){var C=D.helper;if(C.css("zIndex")){D.options._zIndex=C.css("zIndex")}C.css("zIndex",D.options.zIndex)},stop:function(D,C){if(C.options._zIndex){B(C.helper).css("zIndex",C.options._zIndex)}}});B.ui.plugin.add("sortable","opacity",{start:function(E,D){var C=D.helper;if(C.css("opacity")){D.options._opacity=C.css("opacity")}C.css("opacity",D.options.opacity)},stop:function(D,C){if(C.options._opacity){B(C.helper).css("opacity",C.options._opacity)}}});B.ui.plugin.add("sortable","scroll",{start:function(E,D){var F=D.options;var C=B(this).data("sortable");C.overflowY=function(G){do{if(/auto|scroll/.test(G.css("overflow"))||(/auto|scroll/).test(G.css("overflow-y"))){return G}G=G.parent()}while(G[0].parentNode);return B(document)}(C.currentItem);C.overflowX=function(G){do{if(/auto|scroll/.test(G.css("overflow"))||(/auto|scroll/).test(G.css("overflow-x"))){return G}G=G.parent()}while(G[0].parentNode);return B(document)}(C.currentItem);if(C.overflowY[0]!=document&&C.overflowY[0].tagName!="HTML"){C.overflowYOffset=C.overflowY.offset()}if(C.overflowX[0]!=document&&C.overflowX[0].tagName!="HTML"){C.overflowXOffset=C.overflowX.offset()}},sort:function(E,D){var F=D.options;var C=B(this).data("sortable");if(C.overflowY[0]!=document&&C.overflowY[0].tagName!="HTML"){if((C.overflowYOffset.top+C.overflowY[0].offsetHeight)-E.pageY<F.scrollSensitivity){C.overflowY[0].scrollTop=C.overflowY[0].scrollTop+F.scrollSpeed}if(E.pageY-C.overflowYOffset.top<F.scrollSensitivity){C.overflowY[0].scrollTop=C.overflowY[0].scrollTop-F.scrollSpeed}}else{if(E.pageY-B(document).scrollTop()<F.scrollSensitivity){B(document).scrollTop(B(document).scrollTop()-F.scrollSpeed)}if(B(window).height()-(E.pageY-B(document).scrollTop())<F.scrollSensitivity){B(document).scrollTop(B(document).scrollTop()+F.scrollSpeed)}}if(C.overflowX[0]!=document&&C.overflowX[0].tagName!="HTML"){if((C.overflowXOffset.left+C.overflowX[0].offsetWidth)-E.pageX<F.scrollSensitivity){C.overflowX[0].scrollLeft=C.overflowX[0].scrollLeft+F.scrollSpeed}if(E.pageX-C.overflowXOffset.left<F.scrollSensitivity){C.overflowX[0].scrollLeft=C.overflowX[0].scrollLeft-F.scrollSpeed}}else{if(E.pageX-B(document).scrollLeft()<F.scrollSensitivity){B(document).scrollLeft(B(document).scrollLeft()-F.scrollSpeed)}if(B(window).width()-(E.pageX-B(document).scrollLeft())<F.scrollSensitivity){B(document).scrollLeft(B(document).scrollLeft()+F.scrollSpeed)}}}});B.ui.plugin.add("sortable","axis",{sort:function(E,D){var C=B(this).data("sortable");if(D.options.axis=="y"){C.position.left=C.originalPosition.left}if(D.options.axis=="x"){C.position.top=C.originalPosition.top}}})})(jQuery);(function(C){C.effects=C.effects||{};C.extend(C.effects,{save:function(F,G){for(var E=0;E<G.length;E++){if(G[E]!==null){C.data(F[0],"ec.storage."+G[E],F[0].style[G[E]])}}},restore:function(F,G){for(var E=0;E<G.length;E++){if(G[E]!==null){F.css(G[E],C.data(F[0],"ec.storage."+G[E]))}}},setMode:function(E,F){if(F=="toggle"){F=E.is(":hidden")?"show":"hide"}return F},getBaseline:function(F,G){var H,E;switch(F[0]){case"top":H=0;break;case"middle":H=0.5;break;case"bottom":H=1;break;default:H=F[0]/G.height}switch(F[1]){case"left":E=0;break;case"center":E=0.5;break;case"right":E=1;break;default:E=F[1]/G.width}return{x:E,y:H}},createWrapper:function(F){if(F.parent().attr("id")=="fxWrapper"){return F}var E={width:F.outerWidth({margin:true}),height:F.outerHeight({margin:true}),"float":F.css("float")};F.wrap('<div id="fxWrapper" style="font-size:100%;background:transparent;border:none;margin:0;padding:0"></div>');var I=F.parent();if(F.css("position")=="static"){I.css({position:"relative"});F.css({position:"relative"})}else{var H=F.css("top");if(isNaN(parseInt(H))){H="auto"}var G=F.css("left");if(isNaN(parseInt(G))){G="auto"}I.css({position:F.css("position"),top:H,left:G,zIndex:F.css("z-index")}).show();F.css({position:"relative",top:0,left:0})}I.css(E);return I},removeWrapper:function(E){if(E.parent().attr("id")=="fxWrapper"){return E.parent().replaceWith(E)}return E},setTransition:function(F,G,E,H){H=H||{};C.each(G,function(J,I){unit=F.cssUnit(I);if(unit[0]>0){H[I]=unit[0]*E+unit[1]}});return H},animateClass:function(G,H,J,I){var E=(typeof J=="function"?J:(I?I:null));var F=(typeof J=="object"?J:null);return this.each(function(){var O={};var M=C(this);var N=M.attr("style")||"";if(typeof N=="object"){N=N["cssText"]}if(G.toggle){M.hasClass(G.toggle)?G.remove=G.toggle:G.add=G.toggle}var K=C.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(G.add){M.addClass(G.add)}if(G.remove){M.removeClass(G.remove)}var L=C.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(G.add){M.removeClass(G.add)}if(G.remove){M.addClass(G.remove)}for(var P in L){if(typeof L[P]!="function"&&L[P]&&P.indexOf("Moz")==-1&&P.indexOf("length")==-1&&L[P]!=K[P]&&(P.match(/color/i)||(!P.match(/color/i)&&!isNaN(parseInt(L[P],10))))&&(K.position!="static"||(K.position=="static"&&!P.match(/left|top|bottom|right/)))){O[P]=L[P]}}M.animate(O,H,F,function(){if(typeof C(this).attr("style")=="object"){C(this).attr("style")["cssText"]="";C(this).attr("style")["cssText"]=N}else{C(this).attr("style",N)}if(G.add){C(this).addClass(G.add)}if(G.remove){C(this).removeClass(G.remove)}if(E){E.apply(this,arguments)}})})}});C.fn.extend({_show:C.fn.show,_hide:C.fn.hide,__toggle:C.fn.toggle,_addClass:C.fn.addClass,_removeClass:C.fn.removeClass,_toggleClass:C.fn.toggleClass,effect:function(E,G,F,H){return C.effects[E]?C.effects[E].call(this,{method:E,options:G||{},duration:F,callback:H}):null},show:function(){if(!arguments[0]||(arguments[0].constructor==Number||/(slow|normal|fast)/.test(arguments[0]))){return this._show.apply(this,arguments)}else{var E=arguments[1]||{};E["mode"]="show";return this.effect.apply(this,[arguments[0],E,arguments[2]||E.duration,arguments[3]||E.callback])}},hide:function(){if(!arguments[0]||(arguments[0].constructor==Number||/(slow|normal|fast)/.test(arguments[0]))){return this._hide.apply(this,arguments)}else{var E=arguments[1]||{};E["mode"]="hide";return this.effect.apply(this,[arguments[0],E,arguments[2]||E.duration,arguments[3]||E.callback])}},toggle:function(){if(!arguments[0]||(arguments[0].constructor==Number||/(slow|normal|fast)/.test(arguments[0]))||(arguments[0].constructor==Function)){return this.__toggle.apply(this,arguments)}else{var E=arguments[1]||{};E["mode"]="toggle";return this.effect.apply(this,[arguments[0],E,arguments[2]||E.duration,arguments[3]||E.callback])}},addClass:function(F,E,H,G){return E?C.effects.animateClass.apply(this,[{add:F},E,H,G]):this._addClass(F)},removeClass:function(F,E,H,G){return E?C.effects.animateClass.apply(this,[{remove:F},E,H,G]):this._removeClass(F)},toggleClass:function(F,E,H,G){return E?C.effects.animateClass.apply(this,[{toggle:F},E,H,G]):this._toggleClass(F)},morph:function(E,G,F,I,H){return C.effects.animateClass.apply(this,[{add:G,remove:E},F,I,H])},switchClass:function(){return this.morph.apply(this,arguments)},cssUnit:function(E){var F=this.css(E),G=[];C.each(["em","px","%","pt"],function(H,I){if(F.indexOf(I)>0){G=[parseFloat(F),I]}});return G}});jQuery.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(F,E){jQuery.fx.step[E]=function(G){if(G.state==0){G.start=D(G.elem,E);G.end=B(G.end)}G.elem.style[E]="rgb("+[Math.max(Math.min(parseInt((G.pos*(G.end[0]-G.start[0]))+G.start[0]),255),0),Math.max(Math.min(parseInt((G.pos*(G.end[1]-G.start[1]))+G.start[1]),255),0),Math.max(Math.min(parseInt((G.pos*(G.end[2]-G.start[2]))+G.start[2]),255),0)].join(",")+")"}});function B(F){var E;if(F&&F.constructor==Array&&F.length==3){return F}if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(F)){return[parseInt(E[1]),parseInt(E[2]),parseInt(E[3])]}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return[parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55]}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return[parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16)]}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return[parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16)]}if(E=/rgba\(0, 0, 0, 0\)/.exec(F)){return A["transparent"]}return A[jQuery.trim(F).toLowerCase()]}function D(G,E){var F;do{F=jQuery.curCSS(G,E);if(F!=""&&F!="transparent"||jQuery.nodeName(G,"body")){break}E="backgroundColor"}while(G=G.parentNode);return B(F)}var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]};jQuery.easing["jswing"]=jQuery.easing["swing"];jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(F,G,E,I,H){return jQuery.easing[jQuery.easing.def](F,G,E,I,H)},easeInQuad:function(F,G,E,I,H){return I*(G/=H)*G+E},easeOutQuad:function(F,G,E,I,H){return -I*(G/=H)*(G-2)+E},easeInOutQuad:function(F,G,E,I,H){if((G/=H/2)<1){return I/2*G*G+E}return -I/2*((--G)*(G-2)-1)+E},easeInCubic:function(F,G,E,I,H){return I*(G/=H)*G*G+E},easeOutCubic:function(F,G,E,I,H){return I*((G=G/H-1)*G*G+1)+E},easeInOutCubic:function(F,G,E,I,H){if((G/=H/2)<1){return I/2*G*G*G+E}return I/2*((G-=2)*G*G+2)+E},easeInQuart:function(F,G,E,I,H){return I*(G/=H)*G*G*G+E},easeOutQuart:function(F,G,E,I,H){return -I*((G=G/H-1)*G*G*G-1)+E},easeInOutQuart:function(F,G,E,I,H){if((G/=H/2)<1){return I/2*G*G*G*G+E}return -I/2*((G-=2)*G*G*G-2)+E},easeInQuint:function(F,G,E,I,H){return I*(G/=H)*G*G*G*G+E},easeOutQuint:function(F,G,E,I,H){return I*((G=G/H-1)*G*G*G*G+1)+E},easeInOutQuint:function(F,G,E,I,H){if((G/=H/2)<1){return I/2*G*G*G*G*G+E}return I/2*((G-=2)*G*G*G*G+2)+E},easeInSine:function(F,G,E,I,H){return -I*Math.cos(G/H*(Math.PI/2))+I+E},easeOutSine:function(F,G,E,I,H){return I*Math.sin(G/H*(Math.PI/2))+E},easeInOutSine:function(F,G,E,I,H){return -I/2*(Math.cos(Math.PI*G/H)-1)+E},easeInExpo:function(F,G,E,I,H){return(G==0)?E:I*Math.pow(2,10*(G/H-1))+E},easeOutExpo:function(F,G,E,I,H){return(G==H)?E+I:I*(-Math.pow(2,-10*G/H)+1)+E},easeInOutExpo:function(F,G,E,I,H){if(G==0){return E}if(G==H){return E+I}if((G/=H/2)<1){return I/2*Math.pow(2,10*(G-1))+E}return I/2*(-Math.pow(2,-10*--G)+2)+E},easeInCirc:function(F,G,E,I,H){return -I*(Math.sqrt(1-(G/=H)*G)-1)+E},easeOutCirc:function(F,G,E,I,H){return I*Math.sqrt(1-(G=G/H-1)*G)+E},easeInOutCirc:function(F,G,E,I,H){if((G/=H/2)<1){return -I/2*(Math.sqrt(1-G*G)-1)+E}return I/2*(Math.sqrt(1-(G-=2)*G)+1)+E},easeInElastic:function(F,H,E,L,K){var I=1.70158;var J=0;var G=L;if(H==0){return E}if((H/=K)==1){return E+L}if(!J){J=K*0.3}if(G<Math.abs(L)){G=L;var I=J/4}else{var I=J/(2*Math.PI)*Math.asin(L/G)}return -(G*Math.pow(2,10*(H-=1))*Math.sin((H*K-I)*(2*Math.PI)/J))+E},easeOutElastic:function(F,H,E,L,K){var I=1.70158;var J=0;var G=L;if(H==0){return E}if((H/=K)==1){return E+L}if(!J){J=K*0.3}if(G<Math.abs(L)){G=L;var I=J/4}else{var I=J/(2*Math.PI)*Math.asin(L/G)}return G*Math.pow(2,-10*H)*Math.sin((H*K-I)*(2*Math.PI)/J)+L+E},easeInOutElastic:function(F,H,E,L,K){var I=1.70158;var J=0;var G=L;if(H==0){return E}if((H/=K/2)==2){return E+L}if(!J){J=K*(0.3*1.5)}if(G<Math.abs(L)){G=L;var I=J/4}else{var I=J/(2*Math.PI)*Math.asin(L/G)}if(H<1){return -0.5*(G*Math.pow(2,10*(H-=1))*Math.sin((H*K-I)*(2*Math.PI)/J))+E}return G*Math.pow(2,-10*(H-=1))*Math.sin((H*K-I)*(2*Math.PI)/J)*0.5+L+E},easeInBack:function(F,G,E,J,I,H){if(H==undefined){H=1.70158}return J*(G/=I)*G*((H+1)*G-H)+E},easeOutBack:function(F,G,E,J,I,H){if(H==undefined){H=1.70158}return J*((G=G/I-1)*G*((H+1)*G+H)+1)+E},easeInOutBack:function(F,G,E,J,I,H){if(H==undefined){H=1.70158}if((G/=I/2)<1){return J/2*(G*G*(((H*=(1.525))+1)*G-H))+E}return J/2*((G-=2)*G*(((H*=(1.525))+1)*G+H)+2)+E},easeInBounce:function(F,G,E,I,H){return I-jQuery.easing.easeOutBounce(F,H-G,0,I,H)+E},easeOutBounce:function(F,G,E,I,H){if((G/=H)<(1/2.75)){return I*(7.5625*G*G)+E}else{if(G<(2/2.75)){return I*(7.5625*(G-=(1.5/2.75))*G+0.75)+E}else{if(G<(2.5/2.75)){return I*(7.5625*(G-=(2.25/2.75))*G+0.9375)+E}else{return I*(7.5625*(G-=(2.625/2.75))*G+0.984375)+E}}}},easeInOutBounce:function(F,G,E,I,H){if(G<H/2){return jQuery.easing.easeInBounce(F,G*2,0,I,H)*0.5+E}return jQuery.easing.easeOutBounce(F,G*2-H,0,I,H)*0.5+I*0.5+E}})})(jQuery);(function(A){A.effects.blind=function(B){return this.queue(function(){var D=A(this),C=["position","top","left"];var H=A.effects.setMode(D,B.options.mode||"hide");var G=B.options.direction||"vertical";A.effects.save(D,C);D.show();var J=A.effects.createWrapper(D).css({overflow:"hidden"});var E=(G=="vertical")?"height":"width";var I=(G=="vertical")?J.height():J.width();if(H=="show"){J.css(E,0)}var F={};F[E]=H=="show"?I:0;J.animate(F,B.duration,B.options.easing,function(){if(H=="hide"){D.hide()}A.effects.restore(D,C);A.effects.removeWrapper(D);if(B.callback){B.callback.apply(D[0],arguments)}D.dequeue()})})}})(jQuery);(function(A){A.effects.bounce=function(B){return this.queue(function(){var E=A(this),K=["position","top","left"];var J=A.effects.setMode(E,B.options.mode||"effect");var M=B.options.direction||"up";var C=B.options.distance||20;var D=B.options.times||5;var G=B.duration||250;if(/show|hide/.test(J)){K.push("opacity")}A.effects.save(E,K);E.show();A.effects.createWrapper(E);var F=(M=="up"||M=="down")?"top":"left";var O=(M=="up"||M=="left")?"pos":"neg";var C=B.options.distance||(F=="top"?E.outerHeight({margin:true})/3:E.outerWidth({margin:true})/3);if(J=="show"){E.css("opacity",0).css(F,O=="pos"?-C:C)}if(J=="hide"){C=C/(D*2)}if(J!="hide"){D--}if(J=="show"){var H={opacity:1};H[F]=(O=="pos"?"+=":"-=")+C;E.animate(H,G/2,B.options.easing);C=C/2;D--}for(var I=0;I<D;I++){var N={},L={};N[F]=(O=="pos"?"-=":"+=")+C;L[F]=(O=="pos"?"+=":"-=")+C;E.animate(N,G/2,B.options.easing).animate(L,G/2,B.options.easing);C=(J=="hide")?C*2:C/2}if(J=="hide"){var H={opacity:0};H[F]=(O=="pos"?"-=":"+=")+C;E.animate(H,G/2,B.options.easing,function(){E.hide();A.effects.restore(E,K);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}})}else{var N={},L={};N[F]=(O=="pos"?"-=":"+=")+C;L[F]=(O=="pos"?"+=":"-=")+C;E.animate(N,G/2,B.options.easing).animate(L,G/2,B.options.easing,function(){A.effects.restore(E,K);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}})}E.queue("fx",function(){E.dequeue()});E.dequeue()})}})(jQuery);(function(A){A.effects.clip=function(B){return this.queue(function(){var F=A(this),J=["position","top","left","height","width"];var I=A.effects.setMode(F,B.options.mode||"hide");var K=B.options.direction||"vertical";A.effects.save(F,J);F.show();var C=A.effects.createWrapper(F).css({overflow:"hidden"});var E=F[0].tagName=="IMG"?C:F;var G={size:(K=="vertical")?"height":"width",position:(K=="vertical")?"top":"left"};var D=(K=="vertical")?E.height():E.width();if(I=="show"){E.css(G.size,0);E.css(G.position,D/2)}var H={};H[G.size]=I=="show"?D:0;H[G.position]=I=="show"?0:D/2;E.animate(H,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(I=="hide"){F.hide()}A.effects.restore(F,J);A.effects.removeWrapper(F);if(B.callback){B.callback.apply(F[0],arguments)}F.dequeue()}})})}})(jQuery);(function(A){A.effects.drop=function(B){return this.queue(function(){var E=A(this),D=["position","top","left","opacity"];var I=A.effects.setMode(E,B.options.mode||"hide");var H=B.options.direction||"left";A.effects.save(E,D);E.show();A.effects.createWrapper(E);var F=(H=="up"||H=="down")?"top":"left";var C=(H=="up"||H=="left")?"pos":"neg";var J=B.options.distance||(F=="top"?E.outerHeight({margin:true})/2:E.outerWidth({margin:true})/2);if(I=="show"){E.css("opacity",0).css(F,C=="pos"?-J:J)}var G={opacity:I=="show"?1:0};G[F]=(I=="show"?(C=="pos"?"+=":"-="):(C=="pos"?"-=":"+="))+J;E.animate(G,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(I=="hide"){E.hide()}A.effects.restore(E,D);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}E.dequeue()}})})}})(jQuery);(function(A){A.effects.explode=function(B){return this.queue(function(){var I=B.options.pieces?Math.round(Math.sqrt(B.options.pieces)):3;var E=B.options.pieces?Math.round(Math.sqrt(B.options.pieces)):3;B.options.mode=B.options.mode=="toggle"?(A(this).is(":visible")?"hide":"show"):B.options.mode;var H=A(this).show().css("visibility","hidden");var J=H.offset();J.top-=parseInt(H.css("marginTop"))||0;J.left-=parseInt(H.css("marginLeft"))||0;var G=H.outerWidth(true);var C=H.outerHeight(true);for(var F=0;F<I;F++){for(var D=0;D<E;D++){H.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-D*(G/E),top:-F*(C/I)}).parent().addClass("effects-explode").css({position:"absolute",overflow:"hidden",width:G/E,height:C/I,left:J.left+D*(G/E)+(B.options.mode=="show"?(D-Math.floor(E/2))*(G/E):0),top:J.top+F*(C/I)+(B.options.mode=="show"?(F-Math.floor(I/2))*(C/I):0),opacity:B.options.mode=="show"?0:1}).animate({left:J.left+D*(G/E)+(B.options.mode=="show"?0:(D-Math.floor(E/2))*(G/E)),top:J.top+F*(C/I)+(B.options.mode=="show"?0:(F-Math.floor(I/2))*(C/I)),opacity:B.options.mode=="show"?1:0},B.duration||500)}}setTimeout(function(){B.options.mode=="show"?H.css({visibility:"visible"}):H.css({visibility:"visible"}).hide();if(B.callback){B.callback.apply(H[0])}H.dequeue();A(".effects-explode").remove()},B.duration||500)})}})(jQuery);(function(A){A.effects.fold=function(B){return this.queue(function(){var E=A(this),J=["position","top","left"];var G=A.effects.setMode(E,B.options.mode||"hide");var N=B.options.size||15;var M=!(!B.options.horizFirst);A.effects.save(E,J);E.show();var D=A.effects.createWrapper(E).css({overflow:"hidden"});var H=((G=="show")!=M);var F=H?["width","height"]:["height","width"];var C=H?[D.width(),D.height()]:[D.height(),D.width()];var I=/([0-9]+)%/.exec(N);if(I){N=parseInt(I[1])/100*C[G=="hide"?0:1]}if(G=="show"){D.css(M?{height:0,width:N}:{height:N,width:0})}var L={},K={};L[F[0]]=G=="show"?C[0]:N;K[F[1]]=G=="show"?C[1]:0;D.animate(L,B.duration/2,B.options.easing).animate(K,B.duration/2,B.options.easing,function(){if(G=="hide"){E.hide()}A.effects.restore(E,J);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(E[0],arguments)}E.dequeue()})})}})(jQuery);(function(A){A.effects.highlight=function(B){return this.queue(function(){var E=A(this),D=["backgroundImage","backgroundColor","opacity"];var H=A.effects.setMode(E,B.options.mode||"show");var C=B.options.color||"#ffff99";var G=E.css("backgroundColor");A.effects.save(E,D);E.show();E.css({backgroundImage:"none",backgroundColor:C});var F={backgroundColor:G};if(H=="hide"){F["opacity"]=0}E.animate(F,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(H=="hide"){E.hide()}A.effects.restore(E,D);if(H=="show"&&jQuery.browser.msie){this.style.removeAttribute("filter")}if(B.callback){B.callback.apply(this,arguments)}E.dequeue()}})})}})(jQuery);(function(A){A.effects.pulsate=function(B){return this.queue(function(){var D=A(this);var F=A.effects.setMode(D,B.options.mode||"show");var E=B.options.times||5;if(F=="hide"){E--}if(D.is(":hidden")){D.css("opacity",0);D.show();D.animate({opacity:1},B.duration/2,B.options.easing);E=E-2}for(var C=0;C<E;C++){D.animate({opacity:0},B.duration/2,B.options.easing).animate({opacity:1},B.duration/2,B.options.easing)}if(F=="hide"){D.animate({opacity:0},B.duration/2,B.options.easing,function(){D.hide();if(B.callback){B.callback.apply(this,arguments)}})}else{D.animate({opacity:0},B.duration/2,B.options.easing).animate({opacity:1},B.duration/2,B.options.easing,function(){if(B.callback){B.callback.apply(this,arguments)}})}D.queue("fx",function(){D.dequeue()});D.dequeue()})}})(jQuery);(function(A){A.effects.puff=function(B){return this.queue(function(){var F=A(this);var C=A.extend(true,{},B.options);var H=A.effects.setMode(F,B.options.mode||"hide");var G=parseInt(B.options.percent)||150;C.fade=true;var E={height:F.height(),width:F.width()};var D=G/100;F.from=(H=="hide")?E:{height:E.height*D,width:E.width*D};C.from=F.from;C.percent=(H=="hide")?G:100;C.mode=H;F.effect("scale",C,B.duration,B.callback);F.dequeue()})};A.effects.scale=function(B){return this.queue(function(){var G=A(this);var D=A.extend(true,{},B.options);var J=A.effects.setMode(G,B.options.mode||"effect");var H=parseInt(B.options.percent)||(parseInt(B.options.percent)==0?0:(J=="hide"?0:100));var I=B.options.direction||"both";var C=B.options.origin;if(J!="effect"){D.origin=C||["middle","center"];D.restore=true}var F={height:G.height(),width:G.width()};G.from=B.options.from||(J=="show"?{height:0,width:0}:F);var E={y:I!="horizontal"?(H/100):1,x:I!="vertical"?(H/100):1};G.to={height:F.height*E.y,width:F.width*E.x};if(B.options.fade){if(J=="show"){G.from.opacity=0;G.to.opacity=1}if(J=="hide"){G.from.opacity=1;G.to.opacity=0}}D.from=G.from;D.to=G.to;D.mode=J;G.effect("size",D,B.duration,B.callback);G.dequeue()})};A.effects.size=function(B){return this.queue(function(){var C=A(this),N=["position","top","left","width","height","overflow","opacity"];var M=["position","top","left","overflow","opacity"];var J=["width","height","overflow"];var P=["fontSize"];var K=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"];var F=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"];var G=A.effects.setMode(C,B.options.mode||"effect");var I=B.options.restore||false;var E=B.options.scale||"both";var O=B.options.origin;var D={height:C.height(),width:C.width()};C.from=B.options.from||D;C.to=B.options.to||D;if(O){var H=A.effects.getBaseline(O,D);C.from.top=(D.height-C.from.height)*H.y;C.from.left=(D.width-C.from.width)*H.x;C.to.top=(D.height-C.to.height)*H.y;C.to.left=(D.width-C.to.width)*H.x}var L={from:{y:C.from.height/D.height,x:C.from.width/D.width},to:{y:C.to.height/D.height,x:C.to.width/D.width}};if(E=="box"||E=="both"){if(L.from.y!=L.to.y){N=N.concat(K);C.from=A.effects.setTransition(C,K,L.from.y,C.from);C.to=A.effects.setTransition(C,K,L.to.y,C.to)}if(L.from.x!=L.to.x){N=N.concat(F);C.from=A.effects.setTransition(C,F,L.from.x,C.from);C.to=A.effects.setTransition(C,F,L.to.x,C.to)}}if(E=="content"||E=="both"){if(L.from.y!=L.to.y){N=N.concat(P);C.from=A.effects.setTransition(C,P,L.from.y,C.from);C.to=A.effects.setTransition(C,P,L.to.y,C.to)}}A.effects.save(C,I?N:M);C.show();A.effects.createWrapper(C);C.css("overflow","hidden").css(C.from);if(E=="content"||E=="both"){K=K.concat(["marginTop","marginBottom"]).concat(P);F=F.concat(["marginLeft","marginRight"]);J=N.concat(K).concat(F);C.find("*[width]").each(function(){child=A(this);if(I){A.effects.save(child,J)}var Q={height:child.height(),width:child.width()};child.from={height:Q.height*L.from.y,width:Q.width*L.from.x};child.to={height:Q.height*L.to.y,width:Q.width*L.to.x};if(L.from.y!=L.to.y){child.from=A.effects.setTransition(child,K,L.from.y,child.from);child.to=A.effects.setTransition(child,K,L.to.y,child.to)}if(L.from.x!=L.to.x){child.from=A.effects.setTransition(child,F,L.from.x,child.from);child.to=A.effects.setTransition(child,F,L.to.x,child.to)}child.css(child.from);child.animate(child.to,B.duration,B.options.easing,function(){if(I){A.effects.restore(child,J)}})})}C.animate(C.to,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(G=="hide"){C.hide()}A.effects.restore(C,I?N:M);A.effects.removeWrapper(C);if(B.callback){B.callback.apply(this,arguments)}C.dequeue()}})})}})(jQuery);(function(A){A.effects.shake=function(B){return this.queue(function(){var E=A(this),K=["position","top","left"];var J=A.effects.setMode(E,B.options.mode||"effect");var M=B.options.direction||"left";var C=B.options.distance||20;var D=B.options.times||3;var G=B.duration||B.options.duration||140;A.effects.save(E,K);E.show();A.effects.createWrapper(E);var F=(M=="up"||M=="down")?"top":"left";var O=(M=="up"||M=="left")?"pos":"neg";var H={},N={},L={};H[F]=(O=="pos"?"-=":"+=")+C;N[F]=(O=="pos"?"+=":"-=")+C*2;L[F]=(O=="pos"?"-=":"+=")+C*2;E.animate(H,G,B.options.easing);for(var I=1;I<D;I++){E.animate(N,G,B.options.easing).animate(L,G,B.options.easing)}E.animate(N,G,B.options.easing).animate(H,G/2,B.options.easing,function(){A.effects.restore(E,K);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}});E.queue("fx",function(){E.dequeue()});E.dequeue()})}})(jQuery);(function(A){A.effects.slide=function(B){return this.queue(function(){var E=A(this),D=["position","top","left"];var I=A.effects.setMode(E,B.options.mode||"show");var H=B.options.direction||"left";A.effects.save(E,D);E.show();A.effects.createWrapper(E).css({overflow:"hidden"});var F=(H=="up"||H=="down")?"top":"left";var C=(H=="up"||H=="left")?"pos":"neg";var J=B.options.distance||(F=="top"?E.outerHeight({margin:true}):E.outerWidth({margin:true}));if(I=="show"){E.css(F,C=="pos"?-J:J)}var G={};G[F]=(I=="show"?(C=="pos"?"+=":"-="):(C=="pos"?"-=":"+="))+J;E.animate(G,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(I=="hide"){E.hide()}A.effects.restore(E,D);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}E.dequeue()}})})}})(jQuery);(function(A){A.effects.transfer=function(B){return this.queue(function(){var E=A(this);var G=A.effects.setMode(E,B.options.mode||"effect");var F=A(B.options.to);var C=E.offset();var D=A('<div class="ui-effects-transfer"></div>').appendTo(document.body);if(B.options.className){D.addClass(B.options.className)}D.addClass(B.options.className);D.css({top:C.top,left:C.left,height:E.outerHeight()-parseInt(D.css("borderTopWidth"))-parseInt(D.css("borderBottomWidth")),width:E.outerWidth()-parseInt(D.css("borderLeftWidth"))-parseInt(D.css("borderRightWidth")),position:"absolute"});C=F.offset();animation={top:C.top,left:C.left,height:F.outerHeight()-parseInt(D.css("borderTopWidth"))-parseInt(D.css("borderBottomWidth")),width:F.outerWidth()-parseInt(D.css("borderLeftWidth"))-parseInt(D.css("borderRightWidth"))};D.animate(animation,B.duration,B.options.easing,function(){D.remove();if(B.callback){B.callback.apply(E[0],arguments)}E.dequeue()})})}})(jQuery);(function(E){E.widget("ui.accordion",{init:function(){var G=this.options;if(G.navigation){var J=this.element.find("a").filter(G.navigationFilter);if(J.length){if(J.filter(G.header).length){G.active=J}else{G.active=J.parent().parent().prev();J.addClass("current")}}}G.headers=this.element.find(G.header);G.active=C(G.headers,G.active);if(E.browser.msie){this.element.find("a").css("zoom","1")}if(!this.element.hasClass("ui-accordion")){this.element.addClass("ui-accordion");E("<span class='ui-accordion-left'/>").insertBefore(G.headers);E("<span class='ui-accordion-right'/>").appendTo(G.headers);G.headers.addClass("ui-accordion-header").attr("tabindex","0")}var I;if(G.fillSpace){I=this.element.parent().height();G.headers.each(function(){I-=E(this).outerHeight()});var H=0;G.headers.next().each(function(){H=Math.max(H,E(this).innerHeight()-E(this).height())}).height(I-H)}else{if(G.autoHeight){I=0;G.headers.next().each(function(){I=Math.max(I,E(this).outerHeight())}).height(I)}}G.headers.not(G.active||"").next().hide();G.active.parent().andSelf().addClass(G.selectedClass);if(G.event){this.element.bind((G.event)+".accordion",F)}},activate:function(G){F.call(this.element[0],{target:C(this.options.headers,G)[0]})},destroy:function(){this.options.headers.next().css("display","");if(this.options.fillSpace||this.options.autoHeight){this.options.headers.next().css("height","")}E.removeData(this.element[0],"accordion");this.element.removeClass("ui-accordion").unbind(".accordion")}});function B(H,G){return function(){return H.apply(G,arguments)}}function D(I){if(!E.data(this,"accordion")){return }var G=E.data(this,"accordion");var H=G.options;H.running=I?0:--H.running;if(H.running){return }if(H.clearStyle){H.toShow.add(H.toHide).css({height:"",overflow:""})}E(this).triggerHandler("accordionchange",[E.event.fix({type:"accordionchange",target:G.element[0]}),H.data],H.change)}function A(G,K,L,J,M){var I=E.data(this,"accordion").options;I.toShow=G;I.toHide=K;I.data=L;var H=B(D,this);I.running=K.size()===0?G.size():K.size();if(I.animated){if(!I.alwaysOpen&&J){E.ui.accordion.animations[I.animated]({toShow:jQuery([]),toHide:K,complete:H,down:M,autoHeight:I.autoHeight})}else{E.ui.accordion.animations[I.animated]({toShow:G,toHide:K,complete:H,down:M,autoHeight:I.autoHeight})}}else{if(!I.alwaysOpen&&J){G.toggle()}else{K.hide();G.show()}H(true)}}function F(L){var J=E.data(this,"accordion").options;if(J.disabled){return false}if(!L.target&&!J.alwaysOpen){J.active.parent().andSelf().toggleClass(J.selectedClass);var I=J.active.next(),M={options:J,newHeader:jQuery([]),oldHeader:J.active,newContent:jQuery([]),oldContent:I},G=(J.active=E([]));A.call(this,G,I,M);return false}var K=E(L.target);K=E(K.parents(J.header)[0]||K);var H=K[0]==J.active[0];if(J.running||(J.alwaysOpen&&H)){return false}if(!K.is(J.header)){return }J.active.parent().andSelf().toggleClass(J.selectedClass);if(!H){K.parent().andSelf().addClass(J.selectedClass)}var G=K.next(),I=J.active.next(),M={options:J,newHeader:K,oldHeader:J.active,newContent:G,oldContent:I},N=J.headers.index(J.active[0])>J.headers.index(K[0]);J.active=H?E([]):K;A.call(this,G,I,M,H,N);return false}function C(H,G){return G!=undefined?typeof G=="number"?H.filter(":eq("+G+")"):H.not(H.not(G)):G===false?E([]):H.filter(":eq(0)")}E.extend(E.ui.accordion,{defaults:{selectedClass:"selected",alwaysOpen:true,animated:"slide",event:"click",header:"a",autoHeight:true,running:0,navigationFilter:function(){return this.href.toLowerCase()==location.href.toLowerCase()}},animations:{slide:function(G,I){G=E.extend({easing:"swing",duration:300},G,I);if(!G.toHide.size()){G.toShow.animate({height:"show"},G);return }var H=G.toHide.height(),J=G.toShow.height(),K=J/H;G.toShow.css({height:0,overflow:"hidden"}).show();G.toHide.filter(":hidden").each(G.complete).end().filter(":visible").animate({height:"hide"},{step:function(L){var M=(H-L)*K;if(E.browser.msie||E.browser.opera){M=Math.ceil(M)}G.toShow.height(M)},duration:G.duration,easing:G.easing,complete:function(){if(!G.autoHeight){G.toShow.css("height","auto")}G.complete()}})},bounceslide:function(G){this.slide(G,{easing:G.down?"bounceout":"swing",duration:G.down?1000:200})},easeslide:function(G){this.slide(G,{easing:"easeinout",duration:700})}}});E.fn.activate=function(G){return this.accordion("activate",G)}})(jQuery);(function($){var PROP_NAME="datepicker";function Datepicker(){this.debug=false;this._curInst=null;this._disabledInputs=[];this._datepickerShowing=false;this._inDialog=false;this._mainDivId="ui-datepicker-div";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._promptClass="ui-datepicker-prompt";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this.regional=[];this.regional[""]={clearText:"Clear",clearStatus:"Erase the current date",closeText:"Close",closeStatus:"Close without change",prevText:"&#x3c;Prev",prevStatus:"Show the previous month",nextText:"Next&#x3e;",nextStatus:"Show the next month",currentText:"Today",currentStatus:"Show the current month",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],monthStatus:"Show a different month",yearStatus:"Show a different year",weekHeader:"Wk",weekStatus:"Week of the year",dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],dayStatus:"Set DD as first week day",dateStatus:"Select DD, M d",dateFormat:"mm/dd/yy",firstDay:0,initStatus:"Select a date",isRTL:false};this._defaults={showOn:"focus",showAnim:"show",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,closeAtTop:true,mandatory:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:true,changeYear:true,yearRange:"-10:+10",changeFirstDay:true,highlightWeek:false,showOtherMonths:false,showWeeks:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",showStatus:false,statusForDate:this.dateStatus,minDate:null,maxDate:null,duration:"normal",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,stepMonths:1,rangeSelect:false,rangeSeparator:" - ",altField:"",altFormat:""};$.extend(this._defaults,this.regional[""]);this.dpDiv=$('<div id="'+this._mainDivId+'" style="display: none;"></div>')}$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",log:function(){if(this.debug){console.log.apply("",arguments)}},setDefaults:function(settings){extendRemove(this._defaults,settings||{});return this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase();var inline=(nodeName=="div"||nodeName=="span");if(!target.id){target.id="dp"+new Date().getTime()}var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{});if(nodeName=="input"){this._connectDatepicker(target,inst)}else{if(inline){this._inlineDatepicker(target,inst)}}},_newInst:function(target,inline){return{id:target[0].id,input:target,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:inline,dpDiv:(!inline?this.dpDiv:$('<div class="ui-datepicker-inline"></div>'))}},_connectDatepicker:function(target,inst){var input=$(target);if(input.hasClass(this.markerClassName)){return }var appendText=this._get(inst,"appendText");var isRTL=this._get(inst,"isRTL");if(appendText){input[isRTL?"before":"after"]('<span class="'+this._appendClass+'">'+appendText+"</span>")}var showOn=this._get(inst,"showOn");if(showOn=="focus"||showOn=="both"){input.focus(this._showDatepicker)}if(showOn=="button"||showOn=="both"){var buttonText=this._get(inst,"buttonText");var buttonImage=this._get(inst,"buttonImage");var trigger=$(this._get(inst,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:buttonImage,alt:buttonText,title:buttonText}):$('<button type="button"></button>').addClass(this._triggerClass).html(buttonImage==""?buttonText:$("<img/>").attr({src:buttonImage,alt:buttonText,title:buttonText})));input[isRTL?"before":"after"](trigger);trigger.click(function(){if($.datepicker._datepickerShowing&&$.datepicker._lastInput==target){$.datepicker._hideDatepicker()}else{$.datepicker._showDatepicker(target)}return false})}input.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});$.data(target,PROP_NAME,inst)},_inlineDatepicker:function(target,inst){var input=$(target);if(input.hasClass(this.markerClassName)){return }input.addClass(this.markerClassName).append(inst.dpDiv).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});$.data(target,PROP_NAME,inst);this._setDate(inst,this._getDefaultDate(inst));this._updateDatepicker(inst)},_inlineShow:function(inst){var numMonths=this._getNumberOfMonths(inst);inst.dpDiv.width(numMonths[1]*$(".ui-datepicker",inst.dpDiv[0]).width())},_dialogDatepicker:function(input,dateText,onSelect,settings,pos){var inst=this._dialogInst;if(!inst){var id="dp"+new Date().getTime();this._dialogInput=$('<input type="text" id="'+id+'" size="1" style="position: absolute; top: -100px;"/>');this._dialogInput.keydown(this._doKeyDown);$("body").append(this._dialogInput);inst=this._dialogInst=this._newInst(this._dialogInput,false);inst.settings={};$.data(this._dialogInput[0],PROP_NAME,inst)}extendRemove(inst.settings,settings||{});this._dialogInput.val(dateText);this._pos=(pos?(pos.length?pos:[pos.pageX,pos.pageY]):null);if(!this._pos){var browserWidth=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;var browserHeight=window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;var scrollX=document.documentElement.scrollLeft||document.body.scrollLeft;var scrollY=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[(browserWidth/2)-100+scrollX,(browserHeight/2)-150+scrollY]}this._dialogInput.css("left",this._pos[0]+"px").css("top",this._pos[1]+"px");inst.settings.onSelect=onSelect;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);if($.blockUI){$.blockUI(this.dpDiv)}$.data(this._dialogInput[0],PROP_NAME,inst);return this},_destroyDatepicker:function(target){var nodeName=target.nodeName.toLowerCase();var $target=$(target);$.removeData(target,PROP_NAME);if(nodeName=="input"){$target.siblings("."+this._appendClass).remove().end().siblings("."+this._triggerClass).remove().end().removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress)}else{if(nodeName=="div"||nodeName=="span"){$target.removeClass(this.markerClassName).empty()}}},_enableDatepicker:function(target){target.disabled=false;$(target).siblings("button."+this._triggerClass).each(function(){this.disabled=false}).end().siblings("img."+this._triggerClass).css({opacity:"1.0",cursor:""});this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)})},_disableDatepicker:function(target){target.disabled=true;$(target).siblings("button."+this._triggerClass).each(function(){this.disabled=true}).end().siblings("img."+this._triggerClass).css({opacity:"0.5",cursor:"default"});this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)});this._disabledInputs[this._disabledInputs.length]=target},_isDisabledDatepicker:function(target){if(!target){return false}for(var i=0;i<this._disabledInputs.length;i++){if(this._disabledInputs[i]==target){return true}}return false},_changeDatepicker:function(target,name,value){var settings=name||{};if(typeof name=="string"){settings={};settings[name]=value}if(inst=$.data(target,PROP_NAME)){extendRemove(inst.settings,settings);this._updateDatepicker(inst)}},_setDateDatepicker:function(target,date,endDate){var inst=$.data(target,PROP_NAME);if(inst){this._setDate(inst,date,endDate);this._updateDatepicker(inst)}},_getDateDatepicker:function(target){var inst=$.data(target,PROP_NAME);if(inst){this._setDateFromField(inst)}return(inst?this._getDate(inst):null)},_doKeyDown:function(e){var inst=$.data(e.target,PROP_NAME);var handled=true;if($.datepicker._datepickerShowing){switch(e.keyCode){case 9:$.datepicker._hideDatepicker(null,"");break;case 13:$.datepicker._selectDay(e.target,inst.selectedMonth,inst.selectedYear,$("td.ui-datepicker-days-cell-over",inst.dpDiv)[0]);return false;break;case 27:$.datepicker._hideDatepicker(null,$.datepicker._get(inst,"duration"));break;case 33:$.datepicker._adjustDate(e.target,(e.ctrlKey?-1:-$.datepicker._get(inst,"stepMonths")),(e.ctrlKey?"Y":"M"));break;case 34:$.datepicker._adjustDate(e.target,(e.ctrlKey?+1:+$.datepicker._get(inst,"stepMonths")),(e.ctrlKey?"Y":"M"));break;case 35:if(e.ctrlKey){$.datepicker._clearDate(e.target)}break;case 36:if(e.ctrlKey){$.datepicker._gotoToday(e.target)}break;case 37:if(e.ctrlKey){$.datepicker._adjustDate(e.target,-1,"D")}break;case 38:if(e.ctrlKey){$.datepicker._adjustDate(e.target,-7,"D")}break;case 39:if(e.ctrlKey){$.datepicker._adjustDate(e.target,+1,"D")}break;case 40:if(e.ctrlKey){$.datepicker._adjustDate(e.target,+7,"D")}break;default:handled=false}}else{if(e.keyCode==36&&e.ctrlKey){$.datepicker._showDatepicker(this)}else{handled=false}}if(handled){e.preventDefault();e.stopPropagation()}},_doKeyPress:function(e){var inst=$.data(e.target,PROP_NAME);var chars=$.datepicker._possibleChars($.datepicker._get(inst,"dateFormat"));var chr=String.fromCharCode(e.charCode==undefined?e.keyCode:e.charCode);return e.ctrlKey||(chr<" "||!chars||chars.indexOf(chr)>-1)},_showDatepicker:function(input){input=input.target||input;if(input.nodeName.toLowerCase()!="input"){input=$("input",input.parentNode)[0]}if($.datepicker._isDisabledDatepicker(input)||$.datepicker._lastInput==input){return }var inst=$.data(input,PROP_NAME);var beforeShow=$.datepicker._get(inst,"beforeShow");extendRemove(inst.settings,(beforeShow?beforeShow.apply(input,[input,inst]):{}));$.datepicker._hideDatepicker(null,"");$.datepicker._lastInput=input;$.datepicker._setDateFromField(inst);if($.datepicker._inDialog){input.value=""}if(!$.datepicker._pos){$.datepicker._pos=$.datepicker._findPos(input);$.datepicker._pos[1]+=input.offsetHeight}var isFixed=false;$(input).parents().each(function(){isFixed|=$(this).css("position")=="fixed";return !isFixed});if(isFixed&&$.browser.opera){$.datepicker._pos[0]-=document.documentElement.scrollLeft;$.datepicker._pos[1]-=document.documentElement.scrollTop}var offset={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null;inst.rangeStart=null;inst.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});$.datepicker._updateDatepicker(inst);inst.dpDiv.width($.datepicker._getNumberOfMonths(inst)[1]*$(".ui-datepicker",inst.dpDiv[0])[0].offsetWidth);offset=$.datepicker._checkOffset(inst,offset,isFixed);inst.dpDiv.css({position:($.datepicker._inDialog&&$.blockUI?"static":(isFixed?"fixed":"absolute")),display:"none",left:offset.left+"px",top:offset.top+"px"});if(!inst.inline){var showAnim=$.datepicker._get(inst,"showAnim")||"show";var duration=$.datepicker._get(inst,"duration");var postProcess=function(){$.datepicker._datepickerShowing=true;if($.browser.msie&&parseInt($.browser.version)<7){$("iframe.ui-datepicker-cover").css({width:inst.dpDiv.width()+4,height:inst.dpDiv.height()+4})}};if($.effects&&$.effects[showAnim]){inst.dpDiv.show(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[showAnim](duration,postProcess)}if(duration==""){postProcess()}if(inst.input[0].type!="hidden"){inst.input[0].focus()}$.datepicker._curInst=inst}},_updateDatepicker:function(inst){var dims={width:inst.dpDiv.width()+4,height:inst.dpDiv.height()+4};inst.dpDiv.empty().append(this._generateDatepicker(inst)).find("iframe.ui-datepicker-cover").css({width:dims.width,height:dims.height});var numMonths=this._getNumberOfMonths(inst);inst.dpDiv[(numMonths[0]!=1||numMonths[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");inst.dpDiv[(this._get(inst,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");if(inst.input&&inst.input[0].type!="hidden"){$(inst.input[0]).focus()}},_checkOffset:function(inst,offset,isFixed){var pos=inst.input?this._findPos(inst.input[0]):null;var browserWidth=window.innerWidth||document.documentElement.clientWidth;var browserHeight=window.innerHeight||document.documentElement.clientHeight;var scrollX=document.documentElement.scrollLeft||document.body.scrollLeft;var scrollY=document.documentElement.scrollTop||document.body.scrollTop;if(this._get(inst,"isRTL")||(offset.left+inst.dpDiv.width()-scrollX)>browserWidth){offset.left=Math.max((isFixed?0:scrollX),pos[0]+(inst.input?inst.input.width():0)-(isFixed?scrollX:0)-inst.dpDiv.width()-(isFixed&&$.browser.opera?document.documentElement.scrollLeft:0))}else{offset.left-=(isFixed?scrollX:0)}if((offset.top+inst.dpDiv.height()-scrollY)>browserHeight){offset.top=Math.max((isFixed?0:scrollY),pos[1]-(isFixed?scrollY:0)-(this._inDialog?0:inst.dpDiv.height())-(isFixed&&$.browser.opera?document.documentElement.scrollTop:0))}else{offset.top-=(isFixed?scrollY:0)}return offset},_findPos:function(obj){while(obj&&(obj.type=="hidden"||obj.nodeType!=1)){obj=obj.nextSibling}var position=$(obj).offset();return[position.left,position.top]},_hideDatepicker:function(input,duration){var inst=this._curInst;if(!inst){return }var rangeSelect=this._get(inst,"rangeSelect");if(rangeSelect&&this._stayOpen){this._selectDate("#"+inst.id,this._formatDate(inst,inst.currentDay,inst.currentMonth,inst.currentYear))}this._stayOpen=false;if(this._datepickerShowing){duration=(duration!=null?duration:this._get(inst,"duration"));var showAnim=this._get(inst,"showAnim");var postProcess=function(){$.datepicker._tidyDialog(inst)};if(duration!=""&&$.effects&&$.effects[showAnim]){inst.dpDiv.hide(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[(duration==""?"hide":(showAnim=="slideDown"?"slideUp":(showAnim=="fadeIn"?"fadeOut":"hide")))](duration,postProcess)}if(duration==""){this._tidyDialog(inst)}var onClose=this._get(inst,"onClose");if(onClose){onClose.apply((inst.input?inst.input[0]:null),[this._getDate(inst),inst])}this._datepickerShowing=false;this._lastInput=null;inst.settings.prompt=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if($.blockUI){$.unblockUI();$("body").append(this.dpDiv)}}this._inDialog=false}this._curInst=null},_tidyDialog:function(inst){inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker");$("."+this._promptClass,inst.dpDiv).remove()},_checkExternalClick:function(event){if(!$.datepicker._curInst){return }var $target=$(event.target);if(($target.parents("#"+$.datepicker._mainDivId).length==0)&&!$target.hasClass($.datepicker.markerClassName)&&!$target.hasClass($.datepicker._triggerClass)&&$.datepicker._datepickerShowing&&!($.datepicker._inDialog&&$.blockUI)){$.datepicker._hideDatepicker(null,"")}},_adjustDate:function(id,offset,period){var target=$(id);var inst=$.data(target[0],PROP_NAME);this._adjustInstDate(inst,offset,period);this._updateDatepicker(inst)},_gotoToday:function(id){var target=$(id);var inst=$.data(target[0],PROP_NAME);if(this._get(inst,"gotoCurrent")&&inst.currentDay){inst.selectedDay=inst.currentDay;inst.drawMonth=inst.selectedMonth=inst.currentMonth;inst.drawYear=inst.selectedYear=inst.currentYear}else{var date=new Date();inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear()}this._adjustDate(target);this._notifyChange(inst)},_selectMonthYear:function(id,select,period){var target=$(id);var inst=$.data(target[0],PROP_NAME);inst._selectingMonthYear=false;inst[period=="M"?"drawMonth":"drawYear"]=select.options[select.selectedIndex].value-0;this._adjustDate(target);this._notifyChange(inst)},_clickMonthYear:function(id){var target=$(id);var inst=$.data(target[0],PROP_NAME);if(inst.input&&inst._selectingMonthYear&&!$.browser.msie){inst.input[0].focus()}inst._selectingMonthYear=!inst._selectingMonthYear},_changeFirstDay:function(id,day){var target=$(id);var inst=$.data(target[0],PROP_NAME);inst.settings.firstDay=day;this._updateDatepicker(inst)},_selectDay:function(id,month,year,td){if($(td).hasClass(this._unselectableClass)){return }var target=$(id);var inst=$.data(target[0],PROP_NAME);var rangeSelect=this._get(inst,"rangeSelect");if(rangeSelect){this._stayOpen=!this._stayOpen;if(this._stayOpen){$(".ui-datepicker td").removeClass(this._currentClass);$(td).addClass(this._currentClass)}}inst.selectedDay=inst.currentDay=$("a",td).html();inst.selectedMonth=inst.currentMonth=month;inst.selectedYear=inst.currentYear=year;if(this._stayOpen){inst.endDay=inst.endMonth=inst.endYear=null}else{if(rangeSelect){inst.endDay=inst.currentDay;inst.endMonth=inst.currentMonth;inst.endYear=inst.currentYear}}this._selectDate(id,this._formatDate(inst,inst.currentDay,inst.currentMonth,inst.currentYear));if(this._stayOpen){inst.rangeStart=new Date(inst.currentYear,inst.currentMonth,inst.currentDay);this._updateDatepicker(inst)}else{if(rangeSelect){inst.selectedDay=inst.currentDay=inst.rangeStart.getDate();inst.selectedMonth=inst.currentMonth=inst.rangeStart.getMonth();inst.selectedYear=inst.currentYear=inst.rangeStart.getFullYear();inst.rangeStart=null;if(inst.inline){this._updateDatepicker(inst)}}}},_clearDate:function(id){var target=$(id);var inst=$.data(target[0],PROP_NAME);if(this._get(inst,"mandatory")){return }this._stayOpen=false;inst.endDay=inst.endMonth=inst.endYear=inst.rangeStart=null;this._selectDate(target,"")},_selectDate:function(id,dateStr){var target=$(id);var inst=$.data(target[0],PROP_NAME);dateStr=(dateStr!=null?dateStr:this._formatDate(inst));if(this._get(inst,"rangeSelect")&&dateStr){dateStr=(inst.rangeStart?this._formatDate(inst,inst.rangeStart):dateStr)+this._get(inst,"rangeSeparator")+dateStr}if(inst.input){inst.input.val(dateStr)}this._updateAlternate(inst);var onSelect=this._get(inst,"onSelect");if(onSelect){onSelect.apply((inst.input?inst.input[0]:null),[dateStr,inst])}else{if(inst.input){inst.input.trigger("change")}}if(inst.inline){this._updateDatepicker(inst)}else{if(!this._stayOpen){this._hideDatepicker(null,this._get(inst,"duration"));this._lastInput=inst.input[0];if(typeof (inst.input[0])!="object"){inst.input[0].focus()}this._lastInput=null}}},_updateAlternate:function(inst){var altField=this._get(inst,"altField");if(altField){var altFormat=this._get(inst,"altFormat");var date=this._getDate(inst);dateStr=(isArray(date)?(!date[0]&&!date[1]?"":this.formatDate(altFormat,date[0],this._getFormatConfig(inst))+this._get(inst,"rangeSeparator")+this.formatDate(altFormat,date[1]||date[0],this._getFormatConfig(inst))):this.formatDate(altFormat,date,this._getFormatConfig(inst)));$(altField).each(function(){$(this).val(dateStr)})}},noWeekends:function(date){var day=date.getDay();return[(day>0&&day<6),""]},iso8601Week:function(date){var checkDate=new Date(date.getFullYear(),date.getMonth(),date.getDate(),(date.getTimezoneOffset()/-60));var firstMon=new Date(checkDate.getFullYear(),1-1,4);var firstDay=firstMon.getDay()||7;firstMon.setDate(firstMon.getDate()+1-firstDay);if(firstDay<4&&checkDate<firstMon){checkDate.setDate(checkDate.getDate()-3);return $.datepicker.iso8601Week(checkDate)}else{if(checkDate>new Date(checkDate.getFullYear(),12-1,28)){firstDay=new Date(checkDate.getFullYear()+1,1-1,4).getDay()||7;if(firstDay>4&&(checkDate.getDay()||7)<firstDay-3){checkDate.setDate(checkDate.getDate()+3);return $.datepicker.iso8601Week(checkDate)}}}return Math.floor(((checkDate-firstMon)/86400000)/7)+1},dateStatus:function(date,inst){return $.datepicker.formatDate($.datepicker._get(inst,"dateStatus"),date,$.datepicker._getFormatConfig(inst))},parseDate:function(format,value,settings){if(format==null||value==null){throw"Invalid arguments"}value=(typeof value=="object"?value.toString():value+"");if(value==""){return null}var shortYearCutoff=(settings?settings.shortYearCutoff:null)||this._defaults.shortYearCutoff;var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var year=-1;var month=-1;var day=-1;var literal=false;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var getNumber=function(match){lookAhead(match);var origSize=(match=="@"?14:(match=="y"?4:2));var size=origSize;var num=0;while(size>0&&iValue<value.length&&value.charAt(iValue)>="0"&&value.charAt(iValue)<="9"){num=num*10+(value.charAt(iValue++)-0);size--}if(size==origSize){throw"Missing number at position "+iValue}return num};var getName=function(match,shortNames,longNames){var names=(lookAhead(match)?longNames:shortNames);var size=0;for(var j=0;j<names.length;j++){size=Math.max(size,names[j].length)}var name="";var iInit=iValue;while(size>0&&iValue<value.length){name+=value.charAt(iValue++);for(var i=0;i<names.length;i++){if(name==names[i]){return i+1}}size--}throw"Unknown name at position "+iInit};var checkLiteral=function(){if(value.charAt(iValue)!=format.charAt(iFormat)){throw"Unexpected literal at position "+iValue}iValue++};var iValue=0;for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{checkLiteral()}}else{switch(format.charAt(iFormat)){case"d":day=getNumber("d");break;case"D":getName("D",dayNamesShort,dayNames);break;case"m":month=getNumber("m");break;case"M":month=getName("M",monthNamesShort,monthNames);break;case"y":year=getNumber("y");break;case"@":var date=new Date(getNumber("@"));year=date.getFullYear();month=date.getMonth()+1;day=date.getDate();break;case"'":if(lookAhead("'")){checkLiteral()}else{literal=true}break;default:checkLiteral()}}}if(year<100){year+=new Date().getFullYear()-new Date().getFullYear()%100+(year<=shortYearCutoff?0:-100)}var date=new Date(year,month-1,day);if(date.getFullYear()!=year||date.getMonth()+1!=month||date.getDate()!=day){throw"Invalid date"}return date},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TIMESTAMP:"@",W3C:"yy-mm-dd",formatDate:function(format,date,settings){if(!date){return""}var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var formatNumber=function(match,value){return(lookAhead(match)&&value<10?"0":"")+value};var formatName=function(match,value,shortNames,longNames){return(lookAhead(match)?longNames[value]:shortNames[value])};var output="";var literal=false;if(date){for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{output+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":output+=formatNumber("d",date.getDate());break;case"D":output+=formatName("D",date.getDay(),dayNamesShort,dayNames);break;case"m":output+=formatNumber("m",date.getMonth()+1);break;case"M":output+=formatName("M",date.getMonth(),monthNamesShort,monthNames);break;case"y":output+=(lookAhead("y")?date.getFullYear():(date.getYear()%100<10?"0":"")+date.getYear()%100);break;case"@":output+=date.getTime();break;case"'":if(lookAhead("'")){output+="'"}else{literal=true}break;default:output+=format.charAt(iFormat)}}}}return output},_possibleChars:function(format){var chars="";var literal=false;for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{chars+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":case"m":case"y":case"@":chars+="0123456789";break;case"D":case"M":return null;case"'":if(lookAhead("'")){chars+="'"}else{literal=true}break;default:chars+=format.charAt(iFormat)}}}return chars},_get:function(inst,name){return inst.settings[name]!==undefined?inst.settings[name]:this._defaults[name]},_setDateFromField:function(inst){var dateFormat=this._get(inst,"dateFormat");var dates=inst.input?inst.input.val().split(this._get(inst,"rangeSeparator")):null;inst.endDay=inst.endMonth=inst.endYear=null;var date=defaultDate=this._getDefaultDate(inst);if(dates.length>0){var settings=this._getFormatConfig(inst);if(dates.length>1){date=this.parseDate(dateFormat,dates[1],settings)||defaultDate;inst.endDay=date.getDate();inst.endMonth=date.getMonth();inst.endYear=date.getFullYear()}try{date=this.parseDate(dateFormat,dates[0],settings)||defaultDate}catch(e){this.log(e);date=defaultDate}}inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();inst.currentDay=(dates[0]?date.getDate():0);inst.currentMonth=(dates[0]?date.getMonth():0);inst.currentYear=(dates[0]?date.getFullYear():0);this._adjustInstDate(inst)},_getDefaultDate:function(inst){var date=this._determineDate(this._get(inst,"defaultDate"),new Date());var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");date=(minDate&&date<minDate?minDate:date);date=(maxDate&&date>maxDate?maxDate:date);return date},_determineDate:function(date,defaultDate){var offsetNumeric=function(offset){var date=new Date();date.setUTCDate(date.getUTCDate()+offset);return date};var offsetString=function(offset,getDaysInMonth){var date=new Date();var year=date.getFullYear();var month=date.getMonth();var day=date.getDate();var pattern=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;var matches=pattern.exec(offset);while(matches){switch(matches[2]||"d"){case"d":case"D":day+=(matches[1]-0);break;case"w":case"W":day+=(matches[1]*7);break;case"m":case"M":month+=(matches[1]-0);day=Math.min(day,getDaysInMonth(year,month));break;case"y":case"Y":year+=(matches[1]-0);day=Math.min(day,getDaysInMonth(year,month));break}matches=pattern.exec(offset)}return new Date(year,month,day)};return(date==null?defaultDate:(typeof date=="string"?offsetString(date,this._getDaysInMonth):(typeof date=="number"?offsetNumeric(date):date)))},_setDate:function(inst,date,endDate){var clear=!(date);date=this._determineDate(date,new Date());inst.selectedDay=inst.currentDay=date.getDate();inst.drawMonth=inst.selectedMonth=inst.currentMonth=date.getMonth();inst.drawYear=inst.selectedYear=inst.currentYear=date.getFullYear();if(this._get(inst,"rangeSelect")){if(endDate){endDate=this._determineDate(endDate,null);inst.endDay=endDate.getDate();inst.endMonth=endDate.getMonth();inst.endYear=endDate.getFullYear()}else{inst.endDay=inst.currentDay;inst.endMonth=inst.currentMonth;inst.endYear=inst.currentYear}}this._adjustInstDate(inst);if(inst.input){inst.input.val(clear?"":this._formatDate(inst)+(!this._get(inst,"rangeSelect")?"":this._get(inst,"rangeSeparator")+this._formatDate(inst,inst.endDay,inst.endMonth,inst.endYear)))}},_getDate:function(inst){var startDate=(!inst.currentYear||(inst.input&&inst.input.val()=="")?null:new Date(inst.currentYear,inst.currentMonth,inst.currentDay));if(this._get(inst,"rangeSelect")){return[inst.rangeStart||startDate,(!inst.endYear?null:new Date(inst.endYear,inst.endMonth,inst.endDay))]}else{return startDate}},_generateDatepicker:function(inst){var today=new Date();today=new Date(today.getFullYear(),today.getMonth(),today.getDate());var showStatus=this._get(inst,"showStatus");var isRTL=this._get(inst,"isRTL");var clear=(this._get(inst,"mandatory")?"":'<div class="ui-datepicker-clear"><a onclick="jQuery.datepicker._clearDate(\'#'+inst.id+"');\""+(showStatus?this._addStatus(inst,this._get(inst,"clearStatus")||"&#xa0;"):"")+">"+this._get(inst,"clearText")+"</a></div>");var controls='<div class="ui-datepicker-control">'+(isRTL?"":clear)+'<div class="ui-datepicker-close"><a onclick="jQuery.datepicker._hideDatepicker();"'+(showStatus?this._addStatus(inst,this._get(inst,"closeStatus")||"&#xa0;"):"")+">"+this._get(inst,"closeText")+"</a></div>"+(isRTL?clear:"")+"</div>";var prompt=this._get(inst,"prompt");var closeAtTop=this._get(inst,"closeAtTop");var hideIfNoPrevNext=this._get(inst,"hideIfNoPrevNext");var navigationAsDateFormat=this._get(inst,"navigationAsDateFormat");var numMonths=this._getNumberOfMonths(inst);var stepMonths=this._get(inst,"stepMonths");var isMultiMonth=(numMonths[0]!=1||numMonths[1]!=1);var currentDate=(!inst.currentDay?new Date(9999,9,9):new Date(inst.currentYear,inst.currentMonth,inst.currentDay));var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");var drawMonth=inst.drawMonth;var drawYear=inst.drawYear;if(maxDate){var maxDraw=new Date(maxDate.getFullYear(),maxDate.getMonth()-numMonths[1]+1,maxDate.getDate());maxDraw=(minDate&&maxDraw<minDate?minDate:maxDraw);while(new Date(drawYear,drawMonth,1)>maxDraw){drawMonth--;if(drawMonth<0){drawMonth=11;drawYear--}}}var prevText=this._get(inst,"prevText");prevText=(!navigationAsDateFormat?prevText:this.formatDate(prevText,new Date(drawYear,drawMonth-stepMonths,1),this._getFormatConfig(inst)));var prev='<div class="ui-datepicker-prev">'+(this._canAdjustMonth(inst,-1,drawYear,drawMonth)?"<a onclick=\"jQuery.datepicker._adjustDate('#"+inst.id+"', -"+stepMonths+", 'M');\""+(showStatus?this._addStatus(inst,this._get(inst,"prevStatus")||"&#xa0;"):"")+">"+prevText+"</a>":(hideIfNoPrevNext?"":"<label>"+prevText+"</label>"))+"</div>";var nextText=this._get(inst,"nextText");nextText=(!navigationAsDateFormat?nextText:this.formatDate(nextText,new Date(drawYear,drawMonth+stepMonths,1),this._getFormatConfig(inst)));var next='<div class="ui-datepicker-next">'+(this._canAdjustMonth(inst,+1,drawYear,drawMonth)?"<a onclick=\"jQuery.datepicker._adjustDate('#"+inst.id+"', +"+stepMonths+", 'M');\""+(showStatus?this._addStatus(inst,this._get(inst,"nextStatus")||"&#xa0;"):"")+">"+nextText+"</a>":(hideIfNoPrevNext?"":"<label>"+nextText+"</label>"))+"</div>";var currentText=this._get(inst,"currentText");currentText=(!navigationAsDateFormat?currentText:this.formatDate(currentText,today,this._getFormatConfig(inst)));var html=(prompt?'<div class="'+this._promptClass+'">'+prompt+"</div>":"")+(closeAtTop&&!inst.inline?controls:"")+'<div class="ui-datepicker-links">'+(isRTL?next:prev)+(this._isInRange(inst,(this._get(inst,"gotoCurrent")&&inst.currentDay?currentDate:today))?'<div class="ui-datepicker-current"><a onclick="jQuery.datepicker._gotoToday(\'#'+inst.id+"');\""+(showStatus?this._addStatus(inst,this._get(inst,"currentStatus")||"&#xa0;"):"")+">"+currentText+"</a></div>":"")+(isRTL?prev:next)+"</div>";var firstDay=this._get(inst,"firstDay");var changeFirstDay=this._get(inst,"changeFirstDay");var dayNames=this._get(inst,"dayNames");var dayNamesShort=this._get(inst,"dayNamesShort");var dayNamesMin=this._get(inst,"dayNamesMin");var monthNames=this._get(inst,"monthNames");var beforeShowDay=this._get(inst,"beforeShowDay");var highlightWeek=this._get(inst,"highlightWeek");var showOtherMonths=this._get(inst,"showOtherMonths");var showWeeks=this._get(inst,"showWeeks");var calculateWeek=this._get(inst,"calculateWeek")||this.iso8601Week;var status=(showStatus?this._get(inst,"dayStatus")||"&#xa0;":"");var dateStatus=this._get(inst,"statusForDate")||this.dateStatus;var endDate=inst.endDay?new Date(inst.endYear,inst.endMonth,inst.endDay):currentDate;for(var row=0;row<numMonths[0];row++){for(var col=0;col<numMonths[1];col++){var selectedDate=new Date(drawYear,drawMonth,inst.selectedDay);html+='<div class="ui-datepicker-one-month'+(col==0?" ui-datepicker-new-row":"")+'">'+this._generateMonthYearHeader(inst,drawMonth,drawYear,minDate,maxDate,selectedDate,row>0||col>0,showStatus,monthNames)+'<table class="ui-datepicker" cellpadding="0" cellspacing="0"><thead><tr class="ui-datepicker-title-row">'+(showWeeks?"<td>"+this._get(inst,"weekHeader")+"</td>":"");for(var dow=0;dow<7;dow++){var day=(dow+firstDay)%7;var dayStatus=(status.indexOf("DD")>-1?status.replace(/DD/,dayNames[day]):status.replace(/D/,dayNamesShort[day]));html+="<td"+((dow+firstDay+6)%7>=5?' class="ui-datepicker-week-end-cell"':"")+">"+(!changeFirstDay?"<span":"<a onclick=\"jQuery.datepicker._changeFirstDay('#"+inst.id+"', "+day+');"')+(showStatus?this._addStatus(inst,dayStatus):"")+' title="'+dayNames[day]+'">'+dayNamesMin[day]+(changeFirstDay?"</a>":"</span>")+"</td>"}html+="</tr></thead><tbody>";var daysInMonth=this._getDaysInMonth(drawYear,drawMonth);if(drawYear==inst.selectedYear&&drawMonth==inst.selectedMonth){inst.selectedDay=Math.min(inst.selectedDay,daysInMonth)}var leadDays=(this._getFirstDayOfMonth(drawYear,drawMonth)-firstDay+7)%7;var printDate=new Date(drawYear,drawMonth,1-leadDays);var numRows=(isMultiMonth?6:Math.ceil((leadDays+daysInMonth)/7));for(var dRow=0;dRow<numRows;dRow++){html+='<tr class="ui-datepicker-days-row">'+(showWeeks?'<td class="ui-datepicker-week-col">'+calculateWeek(printDate)+"</td>":"");for(var dow=0;dow<7;dow++){var daySettings=(beforeShowDay?beforeShowDay.apply((inst.input?inst.input[0]:null),[printDate]):[true,""]);var otherMonth=(printDate.getMonth()!=drawMonth);var unselectable=otherMonth||!daySettings[0]||(minDate&&printDate<minDate)||(maxDate&&printDate>maxDate);html+='<td class="ui-datepicker-days-cell'+((dow+firstDay+6)%7>=5?" ui-datepicker-week-end-cell":"")+(otherMonth?" ui-datepicker-otherMonth":"")+(printDate.getTime()==selectedDate.getTime()&&drawMonth==inst.selectedMonth?" ui-datepicker-days-cell-over":"")+(unselectable?" "+this._unselectableClass:"")+(otherMonth&&!showOtherMonths?"":" "+daySettings[1]+(printDate.getTime()>=currentDate.getTime()&&printDate.getTime()<=endDate.getTime()?" "+this._currentClass:"")+(printDate.getTime()==today.getTime()?" ui-datepicker-today":""))+'"'+((!otherMonth||showOtherMonths)&&daySettings[2]?' title="'+daySettings[2]+'"':"")+(unselectable?(highlightWeek?" onmouseover=\"jQuery(this).parent().addClass('ui-datepicker-week-over');\" onmouseout=\"jQuery(this).parent().removeClass('ui-datepicker-week-over');\"":""):" onmouseover=\"jQuery(this).addClass('ui-datepicker-days-cell-over')"+(highlightWeek?".parent().addClass('ui-datepicker-week-over')":"")+";"+(!showStatus||(otherMonth&&!showOtherMonths)?"":"jQuery('#ui-datepicker-status-"+inst.id+"').html('"+(dateStatus.apply((inst.input?inst.input[0]:null),[printDate,inst])||"&#xa0;")+"');")+"\" onmouseout=\"jQuery(this).removeClass('ui-datepicker-days-cell-over')"+(highlightWeek?".parent().removeClass('ui-datepicker-week-over')":"")+";"+(!showStatus||(otherMonth&&!showOtherMonths)?"":"jQuery('#ui-datepicker-status-"+inst.id+"').html('&#xa0;');")+'" onclick="jQuery.datepicker._selectDay(\'#'+inst.id+"',"+drawMonth+","+drawYear+', this);"')+">"+(otherMonth?(showOtherMonths?printDate.getDate():"&#xa0;"):(unselectable?printDate.getDate():"<a>"+printDate.getDate()+"</a>"))+"</td>";printDate.setUTCDate(printDate.getUTCDate()+1)}html+="</tr>"}drawMonth++;if(drawMonth>11){drawMonth=0;drawYear++}html+="</tbody></table></div>"}}html+=(showStatus?'<div style="clear: both;"></div><div id="ui-datepicker-status-'+inst.id+'" class="ui-datepicker-status">'+(this._get(inst,"initStatus")||"&#xa0;")+"</div>":"")+(!closeAtTop&&!inst.inline?controls:"")+'<div style="clear: both;"></div>'+($.browser.msie&&parseInt($.browser.version)<7&&!inst.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover"></iframe>':"");return html},_generateMonthYearHeader:function(inst,drawMonth,drawYear,minDate,maxDate,selectedDate,secondary,showStatus,monthNames){minDate=(inst.rangeStart&&minDate&&selectedDate<minDate?selectedDate:minDate);var html='<div class="ui-datepicker-header">';if(secondary||!this._get(inst,"changeMonth")){html+=monthNames[drawMonth]+"&#xa0;"}else{var inMinYear=(minDate&&minDate.getFullYear()==drawYear);var inMaxYear=(maxDate&&maxDate.getFullYear()==drawYear);html+='<select class="ui-datepicker-new-month" onchange="jQuery.datepicker._selectMonthYear(\'#'+inst.id+"', this, 'M');\" onclick=\"jQuery.datepicker._clickMonthYear('#"+inst.id+"');\""+(showStatus?this._addStatus(inst,this._get(inst,"monthStatus")||"&#xa0;"):"")+">";for(var month=0;month<12;month++){if((!inMinYear||month>=minDate.getMonth())&&(!inMaxYear||month<=maxDate.getMonth())){html+='<option value="'+month+'"'+(month==drawMonth?' selected="selected"':"")+">"+monthNames[month]+"</option>"}}html+="</select>"}if(secondary||!this._get(inst,"changeYear")){html+=drawYear}else{var years=this._get(inst,"yearRange").split(":");var year=0;var endYear=0;if(years.length!=2){year=drawYear-10;endYear=drawYear+10}else{if(years[0].charAt(0)=="+"||years[0].charAt(0)=="-"){year=endYear=new Date().getFullYear();year+=parseInt(years[0],10);endYear+=parseInt(years[1],10)}else{year=parseInt(years[0],10);endYear=parseInt(years[1],10)}}year=(minDate?Math.max(year,minDate.getFullYear()):year);endYear=(maxDate?Math.min(endYear,maxDate.getFullYear()):endYear);html+='<select class="ui-datepicker-new-year" onchange="jQuery.datepicker._selectMonthYear(\'#'+inst.id+"', this, 'Y');\" onclick=\"jQuery.datepicker._clickMonthYear('#"+inst.id+"');\""+(showStatus?this._addStatus(inst,this._get(inst,"yearStatus")||"&#xa0;"):"")+">";for(;year<=endYear;year++){html+='<option value="'+year+'"'+(year==drawYear?' selected="selected"':"")+">"+year+"</option>"}html+="</select>"}html+="</div>";return html},_addStatus:function(inst,text){return" onmouseover=\"jQuery('#ui-datepicker-status-"+inst.id+"').html('"+text+"');\" onmouseout=\"jQuery('#ui-datepicker-status-"+inst.id+"').html('&#xa0;');\""},_adjustInstDate:function(inst,offset,period){var year=inst.drawYear+(period=="Y"?offset:0);var month=inst.drawMonth+(period=="M"?offset:0);var day=Math.min(inst.selectedDay,this._getDaysInMonth(year,month))+(period=="D"?offset:0);var date=new Date(year,month,day);var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");date=(minDate&&date<minDate?minDate:date);date=(maxDate&&date>maxDate?maxDate:date);inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();if(period=="M"||period=="Y"){this._notifyChange(inst)}},_notifyChange:function(inst){var onChange=this._get(inst,"onChangeMonthYear");if(onChange){onChange.apply((inst.input?inst.input[0]:null),[new Date(inst.selectedYear,inst.selectedMonth,1),inst])}},_getNumberOfMonths:function(inst){var numMonths=this._get(inst,"numberOfMonths");return(numMonths==null?[1,1]:(typeof numMonths=="number"?[1,numMonths]:numMonths))},_getMinMaxDate:function(inst,minMax,checkRange){var date=this._determineDate(this._get(inst,minMax+"Date"),null);if(date){date.setHours(0);date.setMinutes(0);date.setSeconds(0);date.setMilliseconds(0)}return(!checkRange||!inst.rangeStart?date:(!date||inst.rangeStart>date?inst.rangeStart:date))},_getDaysInMonth:function(year,month){return 32-new Date(year,month,32).getDate()},_getFirstDayOfMonth:function(year,month){return new Date(year,month,1).getDay()},_canAdjustMonth:function(inst,offset,curYear,curMonth){var numMonths=this._getNumberOfMonths(inst);var date=new Date(curYear,curMonth+(offset<0?offset:numMonths[1]),1);if(offset<0){date.setDate(this._getDaysInMonth(date.getFullYear(),date.getMonth()))}return this._isInRange(inst,date)},_isInRange:function(inst,date){var newMinDate=(!inst.rangeStart?null:new Date(inst.selectedYear,inst.selectedMonth,inst.selectedDay));newMinDate=(newMinDate&&inst.rangeStart<newMinDate?inst.rangeStart:newMinDate);var minDate=newMinDate||this._getMinMaxDate(inst,"min");var maxDate=this._getMinMaxDate(inst,"max");return((!minDate||date>=minDate)&&(!maxDate||date<=maxDate))},_getFormatConfig:function(inst){var shortYearCutoff=this._get(inst,"shortYearCutoff");shortYearCutoff=(typeof shortYearCutoff!="string"?shortYearCutoff:new Date().getFullYear()%100+parseInt(shortYearCutoff,10));return{shortYearCutoff:shortYearCutoff,dayNamesShort:this._get(inst,"dayNamesShort"),dayNames:this._get(inst,"dayNames"),monthNamesShort:this._get(inst,"monthNamesShort"),monthNames:this._get(inst,"monthNames")}},_formatDate:function(inst,day,month,year){if(!day){inst.currentDay=inst.selectedDay;inst.currentMonth=inst.selectedMonth;inst.currentYear=inst.selectedYear}var date=(day?(typeof day=="object"?day:new Date(year,month,day)):new Date(inst.currentYear,inst.currentMonth,inst.currentDay));return this.formatDate(this._get(inst,"dateFormat"),date,this._getFormatConfig(inst))}});function extendRemove(target,props){$.extend(target,props);for(var name in props){if(props[name]==null||props[name]==undefined){target[name]=props[name]}}return target}function isArray(a){return(a&&(($.browser.safari&&typeof a=="object"&&a.length)||(a.constructor&&a.constructor.toString().match(/\Array\(\)/))))}$.fn.datepicker=function(options){var otherArgs=Array.prototype.slice.call(arguments,1);if(typeof options=="string"&&(options=="isDisabled"||options=="getDate")){return $.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this[0]].concat(otherArgs))}return this.each(function(){typeof options=="string"?$.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this].concat(otherArgs)):$.datepicker._attachDatepicker(this,options)})};$.datepicker=new Datepicker();$(document).ready(function(){$(document.body).append($.datepicker.dpDiv).mousedown($.datepicker._checkExternalClick)})})(jQuery);(function(B){var A={dragStart:"start.draggable",drag:"drag.draggable",dragStop:"stop.draggable",maxHeight:"maxHeight.resizable",minHeight:"minHeight.resizable",maxWidth:"maxWidth.resizable",minWidth:"minWidth.resizable",resizeStart:"start.resizable",resize:"drag.resizable",resizeStop:"stop.resizable"};B.widget("ui.dialog",{init:function(){var J=this,K=this.options,D=typeof K.resizable=="string"?K.resizable:"n,e,s,w,se,sw,ne,nw",E=this.element.addClass("ui-dialog-content").wrap("<div/>").wrap("<div/>"),G=(this.uiDialogContainer=E.parent().addClass("ui-dialog-container").css({position:"relative",width:"100%",height:"100%"})),H=K.title||E.attr("title")||"",C=(this.uiDialogTitlebar=B('<div class="ui-dialog-titlebar"/>')).append('<span class="ui-dialog-title">'+H+"</span>").append('<a href="#" class="ui-dialog-titlebar-close"><span>X</span></a>').prependTo(G),I=(this.uiDialog=G.parent()).appendTo(document.body).hide().addClass("ui-dialog").addClass(K.dialogClass).addClass(E.attr("className")).removeClass("ui-dialog-content").css({position:"absolute",width:K.width,height:K.height,overflow:"hidden",zIndex:K.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(L){if(K.closeOnEscape){var M=27;(L.keyCode&&L.keyCode==M&&J.close())}}).mousedown(function(){J.moveToTop()}),F=(this.uiDialogButtonPane=B("<div/>")).addClass("ui-dialog-buttonpane").css({position:"absolute",bottom:0}).appendTo(I);this.uiDialogTitlebarClose=B(".ui-dialog-titlebar-close",C).hover(function(){B(this).addClass("ui-dialog-titlebar-close-hover")},function(){B(this).removeClass("ui-dialog-titlebar-close-hover")}).mousedown(function(L){L.stopPropagation()}).click(function(){J.close();return false});this.uiDialogTitlebar.find("*").add(this.uiDialogTitlebar).each(function(){B.ui.disableSelection(this)});if(B.fn.draggable){I.draggable({cancel:".ui-dialog-content",helper:K.dragHelper,handle:".ui-dialog-titlebar",start:function(M,L){J.moveToTop();(K.dragStart&&K.dragStart.apply(J.element[0],arguments))},drag:function(M,L){(K.drag&&K.drag.apply(J.element[0],arguments))},stop:function(M,L){(K.dragStop&&K.dragStop.apply(J.element[0],arguments));B.ui.dialog.overlay.resize()}});(K.draggable||I.draggable("disable"))}if(B.fn.resizable){I.resizable({cancel:".ui-dialog-content",helper:K.resizeHelper,maxWidth:K.maxWidth,maxHeight:K.maxHeight,minWidth:K.minWidth,minHeight:K.minHeight,start:function(){(K.resizeStart&&K.resizeStart.apply(J.element[0],arguments))},resize:function(M,L){(K.autoResize&&J.size.apply(J));(K.resize&&K.resize.apply(J.element[0],arguments))},handles:D,stop:function(M,L){(K.autoResize&&J.size.apply(J));(K.resizeStop&&K.resizeStop.apply(J.element[0],arguments));B.ui.dialog.overlay.resize()}});(K.resizable||I.resizable("disable"))}this.createButtons(K.buttons);this.isOpen=false;(K.bgiframe&&B.fn.bgiframe&&I.bgiframe());(K.autoOpen&&this.open())},setData:function(C,D){(A[C]&&this.uiDialog.data(A[C],D));switch(C){case"buttons":this.createButtons(D);break;case"draggable":this.uiDialog.draggable(D?"enable":"disable");break;case"height":this.uiDialog.height(D);break;case"position":this.position(D);break;case"resizable":(typeof D=="string"&&this.uiDialog.data("handles.resizable",D));this.uiDialog.resizable(D?"enable":"disable");break;case"title":B(".ui-dialog-title",this.uiDialogTitlebar).text(D);break;case"width":this.uiDialog.width(D);break}B.widget.prototype.setData.apply(this,arguments)},position:function(H){var D=B(window),E=B(document),F=E.scrollTop(),C=E.scrollLeft(),G=F;if(B.inArray(H,["center","top","right","bottom","left"])>=0){H=[H=="right"||H=="left"?H:"center",H=="top"||H=="bottom"?H:"middle"]}if(H.constructor!=Array){H=["center","middle"]}if(H[0].constructor==Number){C+=H[0]}else{switch(H[0]){case"left":C+=0;break;case"right":C+=D.width()-this.uiDialog.width();break;default:case"center":C+=(D.width()-this.uiDialog.width())/2}}if(H[1].constructor==Number){F+=H[1]}else{switch(H[1]){case"top":F+=0;break;case"bottom":F+=D.height()-this.uiDialog.height();break;default:case"middle":F+=(D.height()-this.uiDialog.height())/2}}F=Math.max(F,G);this.uiDialog.css({top:F,left:C})},size:function(){var D=this.uiDialogContainer,G=this.uiDialogTitlebar,E=this.element,F=parseInt(E.css("margin-top"),10)+parseInt(E.css("margin-bottom"),10),C=parseInt(E.css("margin-left"),10)+parseInt(E.css("margin-right"),10);E.height(D.height()-G.outerHeight()-F);E.width(D.width()-C)},open:function(){if(this.isOpen){return }this.overlay=this.options.modal?new B.ui.dialog.overlay(this):null;(this.uiDialog.next().length>0)&&this.uiDialog.appendTo("body");this.position(this.options.position);this.uiDialog.show(this.options.show);this.options.autoResize&&this.size();this.moveToTop(true);var C=null;var D={options:this.options};this.uiDialogTitlebarClose.focus();this.element.triggerHandler("dialogopen",[C,D],this.options.open);this.isOpen=true},moveToTop:function(E){if((this.options.modal&&!E)||(!this.options.stack&&!this.options.modal)){return this.element.triggerHandler("dialogfocus",[null,{options:this.options}],this.options.focus)}var D=this.options.zIndex,C=this.options;B(".ui-dialog:visible").each(function(){D=Math.max(D,parseInt(B(this).css("z-index"),10)||C.zIndex)});(this.overlay&&this.overlay.$el.css("z-index",++D));this.uiDialog.css("z-index",++D);this.element.triggerHandler("dialogfocus",[null,{options:this.options}],this.options.focus)},close:function(){(this.overlay&&this.overlay.destroy());this.uiDialog.hide(this.options.hide);var D=null;var C={options:this.options};this.element.triggerHandler("dialogclose",[D,C],this.options.close);B.ui.dialog.overlay.resize();this.isOpen=false},destroy:function(){(this.overlay&&this.overlay.destroy());this.uiDialog.hide();this.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content").hide().appendTo("body");this.uiDialog.remove()},createButtons:function(F){var E=this,C=false,D=this.uiDialogButtonPane;D.empty().hide();B.each(F,function(){return !(C=true)});if(C){D.show();B.each(F,function(G,H){B("<button/>").text(G).click(function(){H.apply(E.element[0],arguments)}).appendTo(D)})}}});B.extend(B.ui.dialog,{defaults:{autoOpen:true,autoResize:true,bgiframe:false,buttons:{},closeOnEscape:true,draggable:true,height:200,minHeight:100,minWidth:150,modal:false,overlay:{},position:"center",resizable:true,stack:true,width:300,zIndex:1000},overlay:function(C){this.$el=B.ui.dialog.overlay.create(C)}});B.extend(B.ui.dialog.overlay,{instances:[],events:B.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(C){return C+".dialog-overlay"}).join(" "),create:function(D){if(this.instances.length===0){setTimeout(function(){B("a, :input").bind(B.ui.dialog.overlay.events,function(){var F=false;var H=B(this).parents(".ui-dialog");if(H.length){var E=B(".ui-dialog-overlay");if(E.length){var G=parseInt(E.css("z-index"),10);E.each(function(){G=Math.max(G,parseInt(B(this).css("z-index"),10))});F=parseInt(H.css("z-index"),10)>G}else{F=true}}return F})},1);B(document).bind("keydown.dialog-overlay",function(E){var F=27;(E.keyCode&&E.keyCode==F&&D.close())});B(window).bind("resize.dialog-overlay",B.ui.dialog.overlay.resize)}var C=B("<div/>").appendTo(document.body).addClass("ui-dialog-overlay").css(B.extend({borderWidth:0,margin:0,padding:0,position:"absolute",top:0,left:0,width:this.width(),height:this.height()},D.options.overlay));(D.options.bgiframe&&B.fn.bgiframe&&C.bgiframe());this.instances.push(C);return C},destroy:function(C){this.instances.splice(B.inArray(this.instances,C),1);if(this.instances.length===0){B("a, :input").add([document,window]).unbind(".dialog-overlay")}C.remove()},height:function(){if(B.browser.msie&&B.browser.version<7){var D=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);var C=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);if(D<C){return B(window).height()+"px"}else{return D+"px"}}else{return B(document).height()+"px"}},width:function(){if(B.browser.msie&&B.browser.version<7){var C=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);var D=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);if(C<D){return B(window).width()+"px"}else{return C+"px"}}else{return B(document).width()+"px"}},resize:function(){var C=B([]);B.each(B.ui.dialog.overlay.instances,function(){C=C.add(this)});C.css({width:0,height:0}).css({width:B.ui.dialog.overlay.width(),height:B.ui.dialog.overlay.height()})}});B.extend(B.ui.dialog.overlay.prototype,{destroy:function(){B.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);(function(A){A.fn.unwrap=A.fn.unwrap||function(B){return this.each(function(){A(this).parents(B).eq(0).after(this).remove()})};A.widget("ui.slider",{plugins:{},ui:function(B){return{options:this.options,handle:this.currentHandle,value:this.options.axis!="both"||!this.options.axis?Math.round(this.value(null,this.options.axis=="vertical"?"y":"x")):{x:Math.round(this.value(null,"x")),y:Math.round(this.value(null,"y"))},range:this.getRange()}},propagate:function(C,B){A.ui.plugin.call(this,C,[B,this.ui()]);this.element.triggerHandler(C=="slide"?C:"slide"+C,[B,this.ui()],this.options[C])},destroy:function(){this.element.removeClass("ui-slider ui-slider-disabled").removeData("slider").unbind(".slider");if(this.handle&&this.handle.length){this.handle.unwrap("a");this.handle.each(function(){A(this).data("mouse").mouseDestroy()})}this.generated&&this.generated.remove()},setData:function(B,C){A.widget.prototype.setData.apply(this,arguments);if(/min|max|steps/.test(B)){this.initBoundaries()}if(B=="range"){C?this.handle.length==2&&this.createRange():this.removeRange()}},init:function(){var B=this;this.element.addClass("ui-slider");this.initBoundaries();this.handle=A(this.options.handle,this.element);if(!this.handle.length){B.handle=B.generated=A(B.options.handles||[0]).map(function(){var D=A("<div/>").addClass("ui-slider-handle").appendTo(B.element);if(this.id){D.attr("id",this.id)}return D[0]})}var C=function(D){this.element=A(D);this.element.data("mouse",this);this.options=B.options;this.element.bind("mousedown",function(){if(B.currentHandle){this.blur(B.currentHandle)}B.focus(this,1)});this.mouseInit()};A.extend(C.prototype,A.ui.mouse,{mouseStart:function(D){return B.start.call(B,D,this.element[0])},mouseStop:function(D){return B.stop.call(B,D,this.element[0])},mouseDrag:function(D){return B.drag.call(B,D,this.element[0])},mouseCapture:function(){return true},trigger:function(D){this.mouseDown(D)}});A(this.handle).each(function(){new C(this)}).wrap('<a href="javascript:void(0)" style="outline:none;border:none;"></a>').parent().bind("focus",function(D){B.focus(this.firstChild)}).bind("blur",function(D){B.blur(this.firstChild)}).bind("keydown",function(D){if(!B.options.noKeyboard){B.keydown(D.keyCode,this.firstChild)}});this.element.bind("mousedown.slider",function(D){B.click.apply(B,[D]);B.currentHandle.data("mouse").trigger(D);B.firstValue=B.firstValue+1});A.each(this.options.handles||[],function(D,E){B.moveTo(E.start,D,true)});if(!isNaN(this.options.startValue)){this.moveTo(this.options.startValue,0,true)}this.previousHandle=A(this.handle[0]);if(this.handle.length==2&&this.options.range){this.createRange()}},initBoundaries:function(){var B=this.element[0],C=this.options;this.actualSize={width:this.element.outerWidth(),height:this.element.outerHeight()};A.extend(C,{axis:C.axis||(B.offsetWidth<B.offsetHeight?"vertical":"horizontal"),max:!isNaN(parseInt(C.max,10))?{x:parseInt(C.max,10),y:parseInt(C.max,10)}:({x:C.max&&C.max.x||100,y:C.max&&C.max.y||100}),min:!isNaN(parseInt(C.min,10))?{x:parseInt(C.min,10),y:parseInt(C.min,10)}:({x:C.min&&C.min.x||0,y:C.min&&C.min.y||0})});C.realMax={x:C.max.x-C.min.x,y:C.max.y-C.min.y};C.stepping={x:C.stepping&&C.stepping.x||parseInt(C.stepping,10)||(C.steps?C.realMax.x/(C.steps.x||parseInt(C.steps,10)||C.realMax.x):0),y:C.stepping&&C.stepping.y||parseInt(C.stepping,10)||(C.steps?C.realMax.y/(C.steps.y||parseInt(C.steps,10)||C.realMax.y):0)}},keydown:function(C,B){if(/(37|38|39|40)/.test(C)){this.moveTo({x:/(37|39)/.test(C)?(C==37?"-":"+")+"="+this.oneStep("x"):0,y:/(38|40)/.test(C)?(C==38?"-":"+")+"="+this.oneStep("y"):0},B)}},focus:function(B,C){this.currentHandle=A(B).addClass("ui-slider-handle-active");if(C){this.currentHandle.parent()[0].focus()}},blur:function(B){A(B).removeClass("ui-slider-handle-active");if(this.currentHandle&&this.currentHandle[0]==B){this.previousHandle=this.currentHandle;this.currentHandle=null}},click:function(C){var D=[C.pageX,C.pageY];var B=false;this.handle.each(function(){if(this==C.target){B=true}});if(B||this.options.disabled||!(this.currentHandle||this.previousHandle)){return }if(!this.currentHandle&&this.previousHandle){this.focus(this.previousHandle,true)}this.offset=this.element.offset();this.moveTo({y:this.convertValue(C.pageY-this.offset.top-this.currentHandle[0].offsetHeight/2,"y"),x:this.convertValue(C.pageX-this.offset.left-this.currentHandle[0].offsetWidth/2,"x")},null,!this.options.distance)},createRange:function(){if(this.rangeElement){return }this.rangeElement=A("<div></div>").addClass("ui-slider-range").css({position:"absolute"}).appendTo(this.element);this.updateRange()},removeRange:function(){this.rangeElement.remove();this.rangeElement=null},updateRange:function(){var C=this.options.axis=="vertical"?"top":"left";var B=this.options.axis=="vertical"?"height":"width";this.rangeElement.css(C,(parseInt(A(this.handle[0]).css(C),10)||0)+this.handleSize(0,this.options.axis=="vertical"?"y":"x")/2);this.rangeElement.css(B,(parseInt(A(this.handle[1]).css(C),10)||0)-(parseInt(A(this.handle[0]).css(C),10)||0))},getRange:function(){return this.rangeElement?this.convertValue(parseInt(this.rangeElement.css(this.options.axis=="vertical"?"height":"width"),10),this.options.axis=="vertical"?"y":"x"):null},handleIndex:function(){return this.handle.index(this.currentHandle[0])},value:function(D,B){if(this.handle.length==1){this.currentHandle=this.handle}if(!B){B=this.options.axis=="vertical"?"y":"x"}var C=A(D!=undefined&&D!==null?this.handle[D]||D:this.currentHandle);if(C.data("mouse").sliderValue){return parseInt(C.data("mouse").sliderValue[B],10)}else{return parseInt(((parseInt(C.css(B=="x"?"left":"top"),10)/(this.actualSize[B=="x"?"width":"height"]-this.handleSize(D,B)))*this.options.realMax[B])+this.options.min[B],10)}},convertValue:function(C,B){return this.options.min[B]+(C/(this.actualSize[B=="x"?"width":"height"]-this.handleSize(null,B)))*this.options.realMax[B]},translateValue:function(C,B){return((C-this.options.min[B])/this.options.realMax[B])*(this.actualSize[B=="x"?"width":"height"]-this.handleSize(null,B))},translateRange:function(D,B){if(this.rangeElement){if(this.currentHandle[0]==this.handle[0]&&D>=this.translateValue(this.value(1),B)){D=this.translateValue(this.value(1,B)-this.oneStep(B),B)}if(this.currentHandle[0]==this.handle[1]&&D<=this.translateValue(this.value(0),B)){D=this.translateValue(this.value(0,B)+this.oneStep(B),B)}}if(this.options.handles){var C=this.options.handles[this.handleIndex()];if(D<this.translateValue(C.min,B)){D=this.translateValue(C.min,B)}else{if(D>this.translateValue(C.max,B)){D=this.translateValue(C.max,B)}}}return D},translateLimits:function(C,B){if(C>=this.actualSize[B=="x"?"width":"height"]-this.handleSize(null,B)){C=this.actualSize[B=="x"?"width":"height"]-this.handleSize(null,B)}if(C<=0){C=0}return C},handleSize:function(C,B){return A(C!=undefined&&C!==null?this.handle[C]:this.currentHandle)[0]["offset"+(B=="x"?"Width":"Height")]},oneStep:function(B){return this.options.stepping[B]||1},start:function(C,B){var D=this.options;if(D.disabled){return false}this.actualSize={width:this.element.outerWidth(),height:this.element.outerHeight()};if(!this.currentHandle){this.focus(this.previousHandle,true)}this.offset=this.element.offset();this.handleOffset=this.currentHandle.offset();this.clickOffset={top:C.pageY-this.handleOffset.top,left:C.pageX-this.handleOffset.left};this.firstValue=this.value();this.propagate("start",C);this.drag(C,B);return true},stop:function(B){this.propagate("stop",B);if(this.firstValue!=this.value()){this.propagate("change",B)}this.focus(this.currentHandle,true);return false},drag:function(E,D){var F=this.options;var B={top:E.pageY-this.offset.top-this.clickOffset.top,left:E.pageX-this.offset.left-this.clickOffset.left};if(!this.currentHandle){this.focus(this.previousHandle,true)}B.left=this.translateLimits(B.left,"x");B.top=this.translateLimits(B.top,"y");if(F.stepping.x){var C=this.convertValue(B.left,"x");C=Math.round(C/F.stepping.x)*F.stepping.x;B.left=this.translateValue(C,"x")}if(F.stepping.y){var C=this.convertValue(B.top,"y");C=Math.round(C/F.stepping.y)*F.stepping.y;B.top=this.translateValue(C,"y")}B.left=this.translateRange(B.left,"x");B.top=this.translateRange(B.top,"y");if(F.axis!="vertical"){this.currentHandle.css({left:B.left})}if(F.axis!="horizontal"){this.currentHandle.css({top:B.top})}this.currentHandle.data("mouse").sliderValue={x:Math.round(this.convertValue(B.left,"x"))||0,y:Math.round(this.convertValue(B.top,"y"))||0};if(this.rangeElement){this.updateRange()}this.propagate("slide",E);return false},moveTo:function(F,E,G){var H=this.options;this.actualSize={width:this.element.outerWidth(),height:this.element.outerHeight()};if(E==undefined&&!this.currentHandle&&this.handle.length!=1){return false}if(E==undefined&&!this.currentHandle){E=0}if(E!=undefined){this.currentHandle=this.previousHandle=A(this.handle[E]||E)}if(F.x!==undefined&&F.y!==undefined){var B=F.x,I=F.y}else{var B=F,I=F}if(B!==undefined&&B.constructor!=Number){var D=/^\-\=/.test(B),C=/^\+\=/.test(B);if(D||C){B=this.value(null,"x")+parseInt(B.replace(D?"=":"+=",""),10)}else{B=isNaN(parseInt(B,10))?undefined:parseInt(B,10)}}if(I!==undefined&&I.constructor!=Number){var D=/^\-\=/.test(I),C=/^\+\=/.test(I);if(D||C){I=this.value(null,"y")+parseInt(I.replace(D?"=":"+=",""),10)}else{I=isNaN(parseInt(I,10))?undefined:parseInt(I,10)}}if(H.axis!="vertical"&&B!==undefined){if(H.stepping.x){B=Math.round(B/H.stepping.x)*H.stepping.x}B=this.translateValue(B,"x");B=this.translateLimits(B,"x");B=this.translateRange(B,"x");H.animate?this.currentHandle.stop().animate({left:B},(Math.abs(parseInt(this.currentHandle.css("left"))-B))*(!isNaN(parseInt(H.animate))?H.animate:5)):this.currentHandle.css({left:B})}if(H.axis!="horizontal"&&I!==undefined){if(H.stepping.y){I=Math.round(I/H.stepping.y)*H.stepping.y}I=this.translateValue(I,"y");I=this.translateLimits(I,"y");I=this.translateRange(I,"y");H.animate?this.currentHandle.stop().animate({top:I},(Math.abs(parseInt(this.currentHandle.css("top"))-I))*(!isNaN(parseInt(H.animate))?H.animate:5)):this.currentHandle.css({top:I})}if(this.rangeElement){this.updateRange()}this.currentHandle.data("mouse").sliderValue={x:Math.round(this.convertValue(B,"x"))||0,y:Math.round(this.convertValue(I,"y"))||0};if(!G){this.propagate("start",null);this.propagate("stop",null);this.propagate("change",null);this.propagate("slide",null)}}});A.ui.slider.getter="value";A.ui.slider.defaults={handle:".ui-slider-handle",distance:1,animate:false}})(jQuery);(function(A){A.widget("ui.tabs",{init:function(){this.options.event+=".tabs";this.tabify(true)},setData:function(B,C){if((/^selected/).test(B)){this.select(C)}else{this.options[B]=C;this.tabify()}},length:function(){return this.$tabs.length},tabId:function(B){return B.title&&B.title.replace(/\s/g,"_").replace(/[^A-Za-z0-9\-_:\.]/g,"")||this.options.idPrefix+A.data(B)},ui:function(C,B){return{options:this.options,tab:C,panel:B,index:this.$tabs.index(C)}},tabify:function(O){this.$lis=A("li:has(a[href])",this.element);this.$tabs=this.$lis.map(function(){return A("a",this)[0]});this.$panels=A([]);var P=this,D=this.options;this.$tabs.each(function(R,Q){if(Q.hash&&Q.hash.replace("#","")){P.$panels=P.$panels.add(Q.hash)}else{if(A(Q).attr("href")!="#"){A.data(Q,"href.tabs",Q.href);A.data(Q,"load.tabs",Q.href);var T=P.tabId(Q);Q.href="#"+T;var S=A("#"+T);if(!S.length){S=A(D.panelTemplate).attr("id",T).addClass(D.panelClass).insertAfter(P.$panels[R-1]||P.element);S.data("destroy.tabs",true)}P.$panels=P.$panels.add(S)}else{D.disabled.push(R+1)}}});if(O){this.element.addClass(D.navClass);this.$panels.each(function(){var Q=A(this);Q.addClass(D.panelClass)});if(D.selected===undefined){if(location.hash){this.$tabs.each(function(S,Q){if(Q.hash==location.hash){D.selected=S;if(A.browser.msie||A.browser.opera){var R=A(location.hash),T=R.attr("id");R.attr("id","");setTimeout(function(){R.attr("id",T)},500)}scrollTo(0,0);return false}})}else{if(D.cookie){var J=parseInt(A.cookie("ui-tabs"+A.data(P.element)),10);if(J&&P.$tabs[J]){D.selected=J}}else{if(P.$lis.filter("."+D.selectedClass).length){D.selected=P.$lis.index(P.$lis.filter("."+D.selectedClass)[0])}}}}D.selected=D.selected===null||D.selected!==undefined?D.selected:0;D.disabled=A.unique(D.disabled.concat(A.map(this.$lis.filter("."+D.disabledClass),function(R,Q){return P.$lis.index(R)}))).sort();if(A.inArray(D.selected,D.disabled)!=-1){D.disabled.splice(A.inArray(D.selected,D.disabled),1)}this.$panels.addClass(D.hideClass);this.$lis.removeClass(D.selectedClass);if(D.selected!==null){this.$panels.eq(D.selected).show().removeClass(D.hideClass);this.$lis.eq(D.selected).addClass(D.selectedClass);var K=function(){A(P.element).triggerHandler("tabsshow",[P.fakeEvent("tabsshow"),P.ui(P.$tabs[D.selected],P.$panels[D.selected])],D.show)};if(A.data(this.$tabs[D.selected],"load.tabs")){this.load(D.selected,K)}else{K()}}A(window).bind("unload",function(){P.$tabs.unbind(".tabs");P.$lis=P.$tabs=P.$panels=null})}for(var G=0,N;N=this.$lis[G];G++){A(N)[A.inArray(G,D.disabled)!=-1&&!A(N).hasClass(D.selectedClass)?"addClass":"removeClass"](D.disabledClass)}if(D.cache===false){this.$tabs.removeData("cache.tabs")}var C,I,B={"min-width":0,duration:1},E="normal";if(D.fx&&D.fx.constructor==Array){C=D.fx[0]||B,I=D.fx[1]||B}else{C=I=D.fx||B}var H={display:"",overflow:"",height:""};if(!A.browser.msie){H.opacity=""}function M(R,Q,S){Q.animate(C,C.duration||E,function(){Q.addClass(D.hideClass).css(H);if(A.browser.msie&&C.opacity){Q[0].style.filter=""}if(S){L(R,S,Q)}})}function L(R,S,Q){if(I===B){S.css("display","block")}S.animate(I,I.duration||E,function(){S.removeClass(D.hideClass).css(H);if(A.browser.msie&&I.opacity){S[0].style.filter=""}A(P.element).triggerHandler("tabsshow",[P.fakeEvent("tabsshow"),P.ui(R,S[0])],D.show)})}function F(R,T,Q,S){T.addClass(D.selectedClass).siblings().removeClass(D.selectedClass);M(R,Q,S)}this.$tabs.unbind(".tabs").bind(D.event,function(){var T=A(this).parents("li:eq(0)"),Q=P.$panels.filter(":visible"),S=A(this.hash);if((T.hasClass(D.selectedClass)&&!D.unselect)||T.hasClass(D.disabledClass)||A(this).hasClass(D.loadingClass)||A(P.element).triggerHandler("tabsselect",[P.fakeEvent("tabsselect"),P.ui(this,S[0])],D.select)===false){this.blur();return false}P.options.selected=P.$tabs.index(this);if(D.unselect){if(T.hasClass(D.selectedClass)){P.options.selected=null;T.removeClass(D.selectedClass);P.$panels.stop();M(this,Q);this.blur();return false}else{if(!Q.length){P.$panels.stop();var R=this;P.load(P.$tabs.index(this),function(){T.addClass(D.selectedClass).addClass(D.unselectClass);L(R,S)});this.blur();return false}}}if(D.cookie){A.cookie("ui-tabs"+A.data(P.element),P.options.selected,D.cookie)}P.$panels.stop();if(S.length){var R=this;P.load(P.$tabs.index(this),Q.length?function(){F(R,T,Q,S)}:function(){T.addClass(D.selectedClass);L(R,S)})}else{throw"jQuery UI Tabs: Mismatching fragment identifier."}if(A.browser.msie){this.blur()}return false});if(!(/^click/).test(D.event)){this.$tabs.bind("click.tabs",function(){return false})}},add:function(E,D,C){if(C==undefined){C=this.$tabs.length}var G=this.options;var I=A(G.tabTemplate.replace(/#\{href\}/g,E).replace(/#\{label\}/g,D));I.data("destroy.tabs",true);var H=E.indexOf("#")==0?E.replace("#",""):this.tabId(A("a:first-child",I)[0]);var F=A("#"+H);if(!F.length){F=A(G.panelTemplate).attr("id",H).addClass(G.hideClass).data("destroy.tabs",true)}F.addClass(G.panelClass);if(C>=this.$lis.length){I.appendTo(this.element);F.appendTo(this.element[0].parentNode)}else{I.insertBefore(this.$lis[C]);F.insertBefore(this.$panels[C])}G.disabled=A.map(G.disabled,function(K,J){return K>=C?++K:K});this.tabify();if(this.$tabs.length==1){I.addClass(G.selectedClass);F.removeClass(G.hideClass);var B=A.data(this.$tabs[0],"load.tabs");if(B){this.load(C,B)}}this.element.triggerHandler("tabsadd",[this.fakeEvent("tabsadd"),this.ui(this.$tabs[C],this.$panels[C])],G.add)},remove:function(B){var D=this.options,E=this.$lis.eq(B).remove(),C=this.$panels.eq(B).remove();if(E.hasClass(D.selectedClass)&&this.$tabs.length>1){this.select(B+(B+1<this.$tabs.length?1:-1))}D.disabled=A.map(A.grep(D.disabled,function(G,F){return G!=B}),function(G,F){return G>=B?--G:G});this.tabify();this.element.triggerHandler("tabsremove",[this.fakeEvent("tabsremove"),this.ui(E.find("a")[0],C[0])],D.remove)},enable:function(B){var C=this.options;if(A.inArray(B,C.disabled)==-1){return }var D=this.$lis.eq(B).removeClass(C.disabledClass);if(A.browser.safari){D.css("display","inline-block");setTimeout(function(){D.css("display","block")},0)}C.disabled=A.grep(C.disabled,function(F,E){return F!=B});this.element.triggerHandler("tabsenable",[this.fakeEvent("tabsenable"),this.ui(this.$tabs[B],this.$panels[B])],C.enable)},disable:function(C){var B=this,D=this.options;if(C!=D.selected){this.$lis.eq(C).addClass(D.disabledClass);D.disabled.push(C);D.disabled.sort();this.element.triggerHandler("tabsdisable",[this.fakeEvent("tabsdisable"),this.ui(this.$tabs[C],this.$panels[C])],D.disable)}},select:function(B){if(typeof B=="string"){B=this.$tabs.index(this.$tabs.filter("[href$="+B+"]")[0])}this.$tabs.eq(B).trigger(this.options.event)},load:function(G,K){var L=this,D=this.options,E=this.$tabs.eq(G),J=E[0],H=K==undefined||K===false,B=E.data("load.tabs");K=K||function(){};if(!B||!H&&A.data(J,"cache.tabs")){K();return }var M=function(N){var O=A(N),P=O.find("*:last");return P.length&&P.is(":not(img)")&&P||O};var C=function(){L.$tabs.filter("."+D.loadingClass).removeClass(D.loadingClass).each(function(){if(D.spinner){M(this).parent().html(M(this).data("label.tabs"))}});L.xhr=null};if(D.spinner){var I=M(J).html();M(J).wrapInner("<em></em>").find("em").data("label.tabs",I).html(D.spinner)}var F=A.extend({},D.ajaxOptions,{url:B,success:function(O,N){A(J.hash).html(O);C();if(D.cache){A.data(J,"cache.tabs",true)}A(L.element).triggerHandler("tabsload",[L.fakeEvent("tabsload"),L.ui(L.$tabs[G],L.$panels[G])],D.load);D.ajaxOptions.success&&D.ajaxOptions.success(O,N);K()}});if(this.xhr){this.xhr.abort();C()}E.addClass(D.loadingClass);setTimeout(function(){L.xhr=A.ajax(F)},0)},url:function(C,B){this.$tabs.eq(C).removeData("cache.tabs").data("load.tabs",B)},destroy:function(){var B=this.options;this.element.unbind(".tabs").removeClass(B.navClass).removeData("tabs");this.$tabs.each(function(){var C=A.data(this,"href.tabs");if(C){this.href=C}var D=A(this).unbind(".tabs");A.each(["href","load","cache"],function(E,F){D.removeData(F+".tabs")})});this.$lis.add(this.$panels).each(function(){if(A.data(this,"destroy.tabs")){A(this).remove()}else{A(this).removeClass([B.selectedClass,B.unselectClass,B.disabledClass,B.panelClass,B.hideClass].join(" "))}})},fakeEvent:function(B){return A.event.fix({type:B,target:this.element[0]})}});A.ui.tabs.defaults={unselect:false,event:"click",disabled:[],cookie:null,spinner:"Loading&#8230;",cache:false,idPrefix:"ui-tabs-",ajaxOptions:{},fx:null,tabTemplate:'<li><a href="#{href}"><span>#{label}</span></a></li>',panelTemplate:"<div></div>",navClass:"ui-tabs-nav",selectedClass:"ui-tabs-selected",unselectClass:"ui-tabs-unselect",disabledClass:"ui-tabs-disabled",panelClass:"ui-tabs-panel",hideClass:"ui-tabs-hide",loadingClass:"ui-tabs-loading"};A.ui.tabs.getter="length";A.extend(A.ui.tabs.prototype,{rotation:null,rotate:function(C,F){F=F||false;var B=this,E=this.options.selected;function G(){B.rotation=setInterval(function(){E=++E<B.$tabs.length?E:0;B.select(E)},C)}function D(H){if(!H||H.clientX){clearInterval(B.rotation)}}if(C){G();if(!F){this.$tabs.bind(this.options.event,D)}else{this.$tabs.bind(this.options.event,function(){D();E=B.options.selected;G()})}}else{D();this.$tabs.unbind(this.options.event,D)}}})})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.core.min.js
===================================================================
--- js/ui/minified/ui.core.min.js	(revision 6370)
+++ js/ui/minified/ui.core.min.js	(working copy)
@@ -1 +0,0 @@
-(function(C){C.ui={plugin:{add:function(E,F,H){var G=C.ui[E].prototype;for(var D in H){G.plugins[D]=G.plugins[D]||[];G.plugins[D].push([F,H[D]])}},call:function(D,F,E){var H=D.plugins[F];if(!H){return }for(var G=0;G<H.length;G++){if(D.options[H[G][0]]){H[G][1].apply(D.element,E)}}}},cssCache:{},css:function(D){if(C.ui.cssCache[D]){return C.ui.cssCache[D]}var E=C('<div class="ui-gen">').addClass(D).css({position:"absolute",top:"-5000px",left:"-5000px",display:"block"}).appendTo("body");C.ui.cssCache[D]=!!((!(/auto|default/).test(E.css("cursor"))||(/^[1-9]/).test(E.css("height"))||(/^[1-9]/).test(E.css("width"))||!(/none/).test(E.css("backgroundImage"))||!(/transparent|rgba\(0, 0, 0, 0\)/).test(E.css("backgroundColor"))));try{C("body").get(0).removeChild(E.get(0))}catch(F){}return C.ui.cssCache[D]},disableSelection:function(D){C(D).attr("unselectable","on").css("MozUserSelect","none")},enableSelection:function(D){C(D).attr("unselectable","off").css("MozUserSelect","")},hasScroll:function(G,E){var D=/top/.test(E||"top")?"scrollTop":"scrollLeft",F=false;if(G[D]>0){return true}G[D]=1;F=G[D]>0?true:false;G[D]=0;return F}};var B=C.fn.remove;C.fn.remove=function(){C("*",this).add(this).triggerHandler("remove");return B.apply(this,arguments)};function A(E,F,G){var D=C[E][F].getter||[];D=(typeof D=="string"?D.split(/,?\s+/):D);return(C.inArray(G,D)!=-1)}C.widget=function(E,D){var F=E.split(".")[0];E=E.split(".")[1];C.fn[E]=function(J){var H=(typeof J=="string"),I=Array.prototype.slice.call(arguments,1);if(H&&A(F,E,J)){var G=C.data(this[0],E);return(G?G[J].apply(G,I):undefined)}return this.each(function(){var K=C.data(this,E);if(H&&K&&C.isFunction(K[J])){K[J].apply(K,I)}else{if(!H){C.data(this,E,new C[F][E](this,J))}}})};C[F][E]=function(I,H){var G=this;this.widgetName=E;this.widgetBaseClass=F+"-"+E;this.options=C.extend({},C.widget.defaults,C[F][E].defaults,H);this.element=C(I).bind("setData."+E,function(L,J,K){return G.setData(J,K)}).bind("getData."+E,function(K,J){return G.getData(J)}).bind("remove",function(){return G.destroy()});this.init()};C[F][E].prototype=C.extend({},C.widget.prototype,D)};C.widget.prototype={init:function(){},destroy:function(){this.element.removeData(this.widgetName)},getData:function(D){return this.options[D]},setData:function(D,E){this.options[D]=E;if(D=="disabled"){this.element[E?"addClass":"removeClass"](this.widgetBaseClass+"-disabled")}},enable:function(){this.setData("disabled",false)},disable:function(){this.setData("disabled",true)}};C.widget.defaults={disabled:false};C.ui.mouse={mouseInit:function(){var D=this;this.element.bind("mousedown."+this.widgetName,function(E){return D.mouseDown(E)});if(C.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},mouseDestroy:function(){this.element.unbind("."+this.widgetName);(C.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},mouseDown:function(F){(this._mouseStarted&&this.mouseUp(F));this._mouseDownEvent=F;var E=this,G=(F.which==1),D=(typeof this.options.cancel=="string"?C(F.target).parents().add(F.target).filter(this.options.cancel).length:false);if(!G||D||!this.mouseCapture(F)){return true}this._mouseDelayMet=!this.options.delay;if(!this._mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){E._mouseDelayMet=true},this.options.delay)}if(this.mouseDistanceMet(F)&&this.mouseDelayMet(F)){this._mouseStarted=(this.mouseStart(F)!==false);if(!this._mouseStarted){F.preventDefault();return true}}this._mouseMoveDelegate=function(H){return E.mouseMove(H)};this._mouseUpDelegate=function(H){return E.mouseUp(H)};C(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);return false},mouseMove:function(D){if(C.browser.msie&&!D.button){return this.mouseUp(D)}if(this._mouseStarted){this.mouseDrag(D);return false}if(this.mouseDistanceMet(D)&&this.mouseDelayMet(D)){this._mouseStarted=(this.mouseStart(this._mouseDownEvent,D)!==false);(this._mouseStarted?this.mouseDrag(D):this.mouseUp(D))}return !this._mouseStarted},mouseUp:function(D){C(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this.mouseStop(D)}return false},mouseDistanceMet:function(D){return(Math.max(Math.abs(this._mouseDownEvent.pageX-D.pageX),Math.abs(this._mouseDownEvent.pageY-D.pageY))>=this.options.distance)},mouseDelayMet:function(D){return this._mouseDelayMet},mouseStart:function(D){},mouseDrag:function(D){},mouseStop:function(D){},mouseCapture:function(D){return true}};C.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.scale.min.js
===================================================================
--- js/ui/minified/effects.scale.min.js	(revision 6370)
+++ js/ui/minified/effects.scale.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.puff=function(B){return this.queue(function(){var F=A(this);var C=A.extend(true,{},B.options);var H=A.effects.setMode(F,B.options.mode||"hide");var G=parseInt(B.options.percent)||150;C.fade=true;var E={height:F.height(),width:F.width()};var D=G/100;F.from=(H=="hide")?E:{height:E.height*D,width:E.width*D};C.from=F.from;C.percent=(H=="hide")?G:100;C.mode=H;F.effect("scale",C,B.duration,B.callback);F.dequeue()})};A.effects.scale=function(B){return this.queue(function(){var G=A(this);var D=A.extend(true,{},B.options);var J=A.effects.setMode(G,B.options.mode||"effect");var H=parseInt(B.options.percent)||(parseInt(B.options.percent)==0?0:(J=="hide"?0:100));var I=B.options.direction||"both";var C=B.options.origin;if(J!="effect"){D.origin=C||["middle","center"];D.restore=true}var F={height:G.height(),width:G.width()};G.from=B.options.from||(J=="show"?{height:0,width:0}:F);var E={y:I!="horizontal"?(H/100):1,x:I!="vertical"?(H/100):1};G.to={height:F.height*E.y,width:F.width*E.x};if(B.options.fade){if(J=="show"){G.from.opacity=0;G.to.opacity=1}if(J=="hide"){G.from.opacity=1;G.to.opacity=0}}D.from=G.from;D.to=G.to;D.mode=J;G.effect("size",D,B.duration,B.callback);G.dequeue()})};A.effects.size=function(B){return this.queue(function(){var C=A(this),N=["position","top","left","width","height","overflow","opacity"];var M=["position","top","left","overflow","opacity"];var J=["width","height","overflow"];var P=["fontSize"];var K=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"];var F=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"];var G=A.effects.setMode(C,B.options.mode||"effect");var I=B.options.restore||false;var E=B.options.scale||"both";var O=B.options.origin;var D={height:C.height(),width:C.width()};C.from=B.options.from||D;C.to=B.options.to||D;if(O){var H=A.effects.getBaseline(O,D);C.from.top=(D.height-C.from.height)*H.y;C.from.left=(D.width-C.from.width)*H.x;C.to.top=(D.height-C.to.height)*H.y;C.to.left=(D.width-C.to.width)*H.x}var L={from:{y:C.from.height/D.height,x:C.from.width/D.width},to:{y:C.to.height/D.height,x:C.to.width/D.width}};if(E=="box"||E=="both"){if(L.from.y!=L.to.y){N=N.concat(K);C.from=A.effects.setTransition(C,K,L.from.y,C.from);C.to=A.effects.setTransition(C,K,L.to.y,C.to)}if(L.from.x!=L.to.x){N=N.concat(F);C.from=A.effects.setTransition(C,F,L.from.x,C.from);C.to=A.effects.setTransition(C,F,L.to.x,C.to)}}if(E=="content"||E=="both"){if(L.from.y!=L.to.y){N=N.concat(P);C.from=A.effects.setTransition(C,P,L.from.y,C.from);C.to=A.effects.setTransition(C,P,L.to.y,C.to)}}A.effects.save(C,I?N:M);C.show();A.effects.createWrapper(C);C.css("overflow","hidden").css(C.from);if(E=="content"||E=="both"){K=K.concat(["marginTop","marginBottom"]).concat(P);F=F.concat(["marginLeft","marginRight"]);J=N.concat(K).concat(F);C.find("*[width]").each(function(){child=A(this);if(I){A.effects.save(child,J)}var Q={height:child.height(),width:child.width()};child.from={height:Q.height*L.from.y,width:Q.width*L.from.x};child.to={height:Q.height*L.to.y,width:Q.width*L.to.x};if(L.from.y!=L.to.y){child.from=A.effects.setTransition(child,K,L.from.y,child.from);child.to=A.effects.setTransition(child,K,L.to.y,child.to)}if(L.from.x!=L.to.x){child.from=A.effects.setTransition(child,F,L.from.x,child.from);child.to=A.effects.setTransition(child,F,L.to.x,child.to)}child.css(child.from);child.animate(child.to,B.duration,B.options.easing,function(){if(I){A.effects.restore(child,J)}})})}C.animate(C.to,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(G=="hide"){C.hide()}A.effects.restore(C,I?N:M);A.effects.removeWrapper(C);if(B.callback){B.callback.apply(this,arguments)}C.dequeue()}})})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.clip.min.js
===================================================================
--- js/ui/minified/effects.clip.min.js	(revision 6370)
+++ js/ui/minified/effects.clip.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.clip=function(B){return this.queue(function(){var F=A(this),J=["position","top","left","height","width"];var I=A.effects.setMode(F,B.options.mode||"hide");var K=B.options.direction||"vertical";A.effects.save(F,J);F.show();var C=A.effects.createWrapper(F).css({overflow:"hidden"});var E=F[0].tagName=="IMG"?C:F;var G={size:(K=="vertical")?"height":"width",position:(K=="vertical")?"top":"left"};var D=(K=="vertical")?E.height():E.width();if(I=="show"){E.css(G.size,0);E.css(G.position,D/2)}var H={};H[G.size]=I=="show"?D:0;H[G.position]=I=="show"?0:D/2;E.animate(H,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(I=="hide"){F.hide()}A.effects.restore(F,J);A.effects.removeWrapper(F);if(B.callback){B.callback.apply(F[0],arguments)}F.dequeue()}})})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.tabs.min.js
===================================================================
--- js/ui/minified/ui.tabs.min.js	(revision 6370)
+++ js/ui/minified/ui.tabs.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.widget("ui.tabs",{init:function(){this.options.event+=".tabs";this.tabify(true)},setData:function(B,C){if((/^selected/).test(B)){this.select(C)}else{this.options[B]=C;this.tabify()}},length:function(){return this.$tabs.length},tabId:function(B){return B.title&&B.title.replace(/\s/g,"_").replace(/[^A-Za-z0-9\-_:\.]/g,"")||this.options.idPrefix+A.data(B)},ui:function(C,B){return{options:this.options,tab:C,panel:B,index:this.$tabs.index(C)}},tabify:function(O){this.$lis=A("li:has(a[href])",this.element);this.$tabs=this.$lis.map(function(){return A("a",this)[0]});this.$panels=A([]);var P=this,D=this.options;this.$tabs.each(function(R,Q){if(Q.hash&&Q.hash.replace("#","")){P.$panels=P.$panels.add(Q.hash)}else{if(A(Q).attr("href")!="#"){A.data(Q,"href.tabs",Q.href);A.data(Q,"load.tabs",Q.href);var T=P.tabId(Q);Q.href="#"+T;var S=A("#"+T);if(!S.length){S=A(D.panelTemplate).attr("id",T).addClass(D.panelClass).insertAfter(P.$panels[R-1]||P.element);S.data("destroy.tabs",true)}P.$panels=P.$panels.add(S)}else{D.disabled.push(R+1)}}});if(O){this.element.addClass(D.navClass);this.$panels.each(function(){var Q=A(this);Q.addClass(D.panelClass)});if(D.selected===undefined){if(location.hash){this.$tabs.each(function(S,Q){if(Q.hash==location.hash){D.selected=S;if(A.browser.msie||A.browser.opera){var R=A(location.hash),T=R.attr("id");R.attr("id","");setTimeout(function(){R.attr("id",T)},500)}scrollTo(0,0);return false}})}else{if(D.cookie){var J=parseInt(A.cookie("ui-tabs"+A.data(P.element)),10);if(J&&P.$tabs[J]){D.selected=J}}else{if(P.$lis.filter("."+D.selectedClass).length){D.selected=P.$lis.index(P.$lis.filter("."+D.selectedClass)[0])}}}}D.selected=D.selected===null||D.selected!==undefined?D.selected:0;D.disabled=A.unique(D.disabled.concat(A.map(this.$lis.filter("."+D.disabledClass),function(R,Q){return P.$lis.index(R)}))).sort();if(A.inArray(D.selected,D.disabled)!=-1){D.disabled.splice(A.inArray(D.selected,D.disabled),1)}this.$panels.addClass(D.hideClass);this.$lis.removeClass(D.selectedClass);if(D.selected!==null){this.$panels.eq(D.selected).show().removeClass(D.hideClass);this.$lis.eq(D.selected).addClass(D.selectedClass);var K=function(){A(P.element).triggerHandler("tabsshow",[P.fakeEvent("tabsshow"),P.ui(P.$tabs[D.selected],P.$panels[D.selected])],D.show)};if(A.data(this.$tabs[D.selected],"load.tabs")){this.load(D.selected,K)}else{K()}}A(window).bind("unload",function(){P.$tabs.unbind(".tabs");P.$lis=P.$tabs=P.$panels=null})}for(var G=0,N;N=this.$lis[G];G++){A(N)[A.inArray(G,D.disabled)!=-1&&!A(N).hasClass(D.selectedClass)?"addClass":"removeClass"](D.disabledClass)}if(D.cache===false){this.$tabs.removeData("cache.tabs")}var C,I,B={"min-width":0,duration:1},E="normal";if(D.fx&&D.fx.constructor==Array){C=D.fx[0]||B,I=D.fx[1]||B}else{C=I=D.fx||B}var H={display:"",overflow:"",height:""};if(!A.browser.msie){H.opacity=""}function M(R,Q,S){Q.animate(C,C.duration||E,function(){Q.addClass(D.hideClass).css(H);if(A.browser.msie&&C.opacity){Q[0].style.filter=""}if(S){L(R,S,Q)}})}function L(R,S,Q){if(I===B){S.css("display","block")}S.animate(I,I.duration||E,function(){S.removeClass(D.hideClass).css(H);if(A.browser.msie&&I.opacity){S[0].style.filter=""}A(P.element).triggerHandler("tabsshow",[P.fakeEvent("tabsshow"),P.ui(R,S[0])],D.show)})}function F(R,T,Q,S){T.addClass(D.selectedClass).siblings().removeClass(D.selectedClass);M(R,Q,S)}this.$tabs.unbind(".tabs").bind(D.event,function(){var T=A(this).parents("li:eq(0)"),Q=P.$panels.filter(":visible"),S=A(this.hash);if((T.hasClass(D.selectedClass)&&!D.unselect)||T.hasClass(D.disabledClass)||A(this).hasClass(D.loadingClass)||A(P.element).triggerHandler("tabsselect",[P.fakeEvent("tabsselect"),P.ui(this,S[0])],D.select)===false){this.blur();return false}P.options.selected=P.$tabs.index(this);if(D.unselect){if(T.hasClass(D.selectedClass)){P.options.selected=null;T.removeClass(D.selectedClass);P.$panels.stop();M(this,Q);this.blur();return false}else{if(!Q.length){P.$panels.stop();var R=this;P.load(P.$tabs.index(this),function(){T.addClass(D.selectedClass).addClass(D.unselectClass);L(R,S)});this.blur();return false}}}if(D.cookie){A.cookie("ui-tabs"+A.data(P.element),P.options.selected,D.cookie)}P.$panels.stop();if(S.length){var R=this;P.load(P.$tabs.index(this),Q.length?function(){F(R,T,Q,S)}:function(){T.addClass(D.selectedClass);L(R,S)})}else{throw"jQuery UI Tabs: Mismatching fragment identifier."}if(A.browser.msie){this.blur()}return false});if(!(/^click/).test(D.event)){this.$tabs.bind("click.tabs",function(){return false})}},add:function(E,D,C){if(C==undefined){C=this.$tabs.length}var G=this.options;var I=A(G.tabTemplate.replace(/#\{href\}/g,E).replace(/#\{label\}/g,D));I.data("destroy.tabs",true);var H=E.indexOf("#")==0?E.replace("#",""):this.tabId(A("a:first-child",I)[0]);var F=A("#"+H);if(!F.length){F=A(G.panelTemplate).attr("id",H).addClass(G.hideClass).data("destroy.tabs",true)}F.addClass(G.panelClass);if(C>=this.$lis.length){I.appendTo(this.element);F.appendTo(this.element[0].parentNode)}else{I.insertBefore(this.$lis[C]);F.insertBefore(this.$panels[C])}G.disabled=A.map(G.disabled,function(K,J){return K>=C?++K:K});this.tabify();if(this.$tabs.length==1){I.addClass(G.selectedClass);F.removeClass(G.hideClass);var B=A.data(this.$tabs[0],"load.tabs");if(B){this.load(C,B)}}this.element.triggerHandler("tabsadd",[this.fakeEvent("tabsadd"),this.ui(this.$tabs[C],this.$panels[C])],G.add)},remove:function(B){var D=this.options,E=this.$lis.eq(B).remove(),C=this.$panels.eq(B).remove();if(E.hasClass(D.selectedClass)&&this.$tabs.length>1){this.select(B+(B+1<this.$tabs.length?1:-1))}D.disabled=A.map(A.grep(D.disabled,function(G,F){return G!=B}),function(G,F){return G>=B?--G:G});this.tabify();this.element.triggerHandler("tabsremove",[this.fakeEvent("tabsremove"),this.ui(E.find("a")[0],C[0])],D.remove)},enable:function(B){var C=this.options;if(A.inArray(B,C.disabled)==-1){return }var D=this.$lis.eq(B).removeClass(C.disabledClass);if(A.browser.safari){D.css("display","inline-block");setTimeout(function(){D.css("display","block")},0)}C.disabled=A.grep(C.disabled,function(F,E){return F!=B});this.element.triggerHandler("tabsenable",[this.fakeEvent("tabsenable"),this.ui(this.$tabs[B],this.$panels[B])],C.enable)},disable:function(C){var B=this,D=this.options;if(C!=D.selected){this.$lis.eq(C).addClass(D.disabledClass);D.disabled.push(C);D.disabled.sort();this.element.triggerHandler("tabsdisable",[this.fakeEvent("tabsdisable"),this.ui(this.$tabs[C],this.$panels[C])],D.disable)}},select:function(B){if(typeof B=="string"){B=this.$tabs.index(this.$tabs.filter("[href$="+B+"]")[0])}this.$tabs.eq(B).trigger(this.options.event)},load:function(G,K){var L=this,D=this.options,E=this.$tabs.eq(G),J=E[0],H=K==undefined||K===false,B=E.data("load.tabs");K=K||function(){};if(!B||!H&&A.data(J,"cache.tabs")){K();return }var M=function(N){var O=A(N),P=O.find("*:last");return P.length&&P.is(":not(img)")&&P||O};var C=function(){L.$tabs.filter("."+D.loadingClass).removeClass(D.loadingClass).each(function(){if(D.spinner){M(this).parent().html(M(this).data("label.tabs"))}});L.xhr=null};if(D.spinner){var I=M(J).html();M(J).wrapInner("<em></em>").find("em").data("label.tabs",I).html(D.spinner)}var F=A.extend({},D.ajaxOptions,{url:B,success:function(O,N){A(J.hash).html(O);C();if(D.cache){A.data(J,"cache.tabs",true)}A(L.element).triggerHandler("tabsload",[L.fakeEvent("tabsload"),L.ui(L.$tabs[G],L.$panels[G])],D.load);D.ajaxOptions.success&&D.ajaxOptions.success(O,N);K()}});if(this.xhr){this.xhr.abort();C()}E.addClass(D.loadingClass);setTimeout(function(){L.xhr=A.ajax(F)},0)},url:function(C,B){this.$tabs.eq(C).removeData("cache.tabs").data("load.tabs",B)},destroy:function(){var B=this.options;this.element.unbind(".tabs").removeClass(B.navClass).removeData("tabs");this.$tabs.each(function(){var C=A.data(this,"href.tabs");if(C){this.href=C}var D=A(this).unbind(".tabs");A.each(["href","load","cache"],function(E,F){D.removeData(F+".tabs")})});this.$lis.add(this.$panels).each(function(){if(A.data(this,"destroy.tabs")){A(this).remove()}else{A(this).removeClass([B.selectedClass,B.unselectClass,B.disabledClass,B.panelClass,B.hideClass].join(" "))}})},fakeEvent:function(B){return A.event.fix({type:B,target:this.element[0]})}});A.ui.tabs.defaults={unselect:false,event:"click",disabled:[],cookie:null,spinner:"Loading&#8230;",cache:false,idPrefix:"ui-tabs-",ajaxOptions:{},fx:null,tabTemplate:'<li><a href="#{href}"><span>#{label}</span></a></li>',panelTemplate:"<div></div>",navClass:"ui-tabs-nav",selectedClass:"ui-tabs-selected",unselectClass:"ui-tabs-unselect",disabledClass:"ui-tabs-disabled",panelClass:"ui-tabs-panel",hideClass:"ui-tabs-hide",loadingClass:"ui-tabs-loading"};A.ui.tabs.getter="length";A.extend(A.ui.tabs.prototype,{rotation:null,rotate:function(C,F){F=F||false;var B=this,E=this.options.selected;function G(){B.rotation=setInterval(function(){E=++E<B.$tabs.length?E:0;B.select(E)},C)}function D(H){if(!H||H.clientX){clearInterval(B.rotation)}}if(C){G();if(!F){this.$tabs.bind(this.options.event,D)}else{this.$tabs.bind(this.options.event,function(){D();E=B.options.selected;G()})}}else{D();this.$tabs.unbind(this.options.event,D)}}})})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.core.min.js
===================================================================
--- js/ui/minified/effects.core.min.js	(revision 6370)
+++ js/ui/minified/effects.core.min.js	(working copy)
@@ -1 +0,0 @@
-(function(C){C.effects=C.effects||{};C.extend(C.effects,{save:function(F,G){for(var E=0;E<G.length;E++){if(G[E]!==null){C.data(F[0],"ec.storage."+G[E],F[0].style[G[E]])}}},restore:function(F,G){for(var E=0;E<G.length;E++){if(G[E]!==null){F.css(G[E],C.data(F[0],"ec.storage."+G[E]))}}},setMode:function(E,F){if(F=="toggle"){F=E.is(":hidden")?"show":"hide"}return F},getBaseline:function(F,G){var H,E;switch(F[0]){case"top":H=0;break;case"middle":H=0.5;break;case"bottom":H=1;break;default:H=F[0]/G.height}switch(F[1]){case"left":E=0;break;case"center":E=0.5;break;case"right":E=1;break;default:E=F[1]/G.width}return{x:E,y:H}},createWrapper:function(F){if(F.parent().attr("id")=="fxWrapper"){return F}var E={width:F.outerWidth({margin:true}),height:F.outerHeight({margin:true}),"float":F.css("float")};F.wrap('<div id="fxWrapper" style="font-size:100%;background:transparent;border:none;margin:0;padding:0"></div>');var I=F.parent();if(F.css("position")=="static"){I.css({position:"relative"});F.css({position:"relative"})}else{var H=F.css("top");if(isNaN(parseInt(H))){H="auto"}var G=F.css("left");if(isNaN(parseInt(G))){G="auto"}I.css({position:F.css("position"),top:H,left:G,zIndex:F.css("z-index")}).show();F.css({position:"relative",top:0,left:0})}I.css(E);return I},removeWrapper:function(E){if(E.parent().attr("id")=="fxWrapper"){return E.parent().replaceWith(E)}return E},setTransition:function(F,G,E,H){H=H||{};C.each(G,function(J,I){unit=F.cssUnit(I);if(unit[0]>0){H[I]=unit[0]*E+unit[1]}});return H},animateClass:function(G,H,J,I){var E=(typeof J=="function"?J:(I?I:null));var F=(typeof J=="object"?J:null);return this.each(function(){var O={};var M=C(this);var N=M.attr("style")||"";if(typeof N=="object"){N=N["cssText"]}if(G.toggle){M.hasClass(G.toggle)?G.remove=G.toggle:G.add=G.toggle}var K=C.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(G.add){M.addClass(G.add)}if(G.remove){M.removeClass(G.remove)}var L=C.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(G.add){M.removeClass(G.add)}if(G.remove){M.addClass(G.remove)}for(var P in L){if(typeof L[P]!="function"&&L[P]&&P.indexOf("Moz")==-1&&P.indexOf("length")==-1&&L[P]!=K[P]&&(P.match(/color/i)||(!P.match(/color/i)&&!isNaN(parseInt(L[P],10))))&&(K.position!="static"||(K.position=="static"&&!P.match(/left|top|bottom|right/)))){O[P]=L[P]}}M.animate(O,H,F,function(){if(typeof C(this).attr("style")=="object"){C(this).attr("style")["cssText"]="";C(this).attr("style")["cssText"]=N}else{C(this).attr("style",N)}if(G.add){C(this).addClass(G.add)}if(G.remove){C(this).removeClass(G.remove)}if(E){E.apply(this,arguments)}})})}});C.fn.extend({_show:C.fn.show,_hide:C.fn.hide,__toggle:C.fn.toggle,_addClass:C.fn.addClass,_removeClass:C.fn.removeClass,_toggleClass:C.fn.toggleClass,effect:function(E,G,F,H){return C.effects[E]?C.effects[E].call(this,{method:E,options:G||{},duration:F,callback:H}):null},show:function(){if(!arguments[0]||(arguments[0].constructor==Number||/(slow|normal|fast)/.test(arguments[0]))){return this._show.apply(this,arguments)}else{var E=arguments[1]||{};E["mode"]="show";return this.effect.apply(this,[arguments[0],E,arguments[2]||E.duration,arguments[3]||E.callback])}},hide:function(){if(!arguments[0]||(arguments[0].constructor==Number||/(slow|normal|fast)/.test(arguments[0]))){return this._hide.apply(this,arguments)}else{var E=arguments[1]||{};E["mode"]="hide";return this.effect.apply(this,[arguments[0],E,arguments[2]||E.duration,arguments[3]||E.callback])}},toggle:function(){if(!arguments[0]||(arguments[0].constructor==Number||/(slow|normal|fast)/.test(arguments[0]))||(arguments[0].constructor==Function)){return this.__toggle.apply(this,arguments)}else{var E=arguments[1]||{};E["mode"]="toggle";return this.effect.apply(this,[arguments[0],E,arguments[2]||E.duration,arguments[3]||E.callback])}},addClass:function(F,E,H,G){return E?C.effects.animateClass.apply(this,[{add:F},E,H,G]):this._addClass(F)},removeClass:function(F,E,H,G){return E?C.effects.animateClass.apply(this,[{remove:F},E,H,G]):this._removeClass(F)},toggleClass:function(F,E,H,G){return E?C.effects.animateClass.apply(this,[{toggle:F},E,H,G]):this._toggleClass(F)},morph:function(E,G,F,I,H){return C.effects.animateClass.apply(this,[{add:G,remove:E},F,I,H])},switchClass:function(){return this.morph.apply(this,arguments)},cssUnit:function(E){var F=this.css(E),G=[];C.each(["em","px","%","pt"],function(H,I){if(F.indexOf(I)>0){G=[parseFloat(F),I]}});return G}});jQuery.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(F,E){jQuery.fx.step[E]=function(G){if(G.state==0){G.start=D(G.elem,E);G.end=B(G.end)}G.elem.style[E]="rgb("+[Math.max(Math.min(parseInt((G.pos*(G.end[0]-G.start[0]))+G.start[0]),255),0),Math.max(Math.min(parseInt((G.pos*(G.end[1]-G.start[1]))+G.start[1]),255),0),Math.max(Math.min(parseInt((G.pos*(G.end[2]-G.start[2]))+G.start[2]),255),0)].join(",")+")"}});function B(F){var E;if(F&&F.constructor==Array&&F.length==3){return F}if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(F)){return[parseInt(E[1]),parseInt(E[2]),parseInt(E[3])]}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return[parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55]}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return[parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16)]}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return[parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16)]}if(E=/rgba\(0, 0, 0, 0\)/.exec(F)){return A["transparent"]}return A[jQuery.trim(F).toLowerCase()]}function D(G,E){var F;do{F=jQuery.curCSS(G,E);if(F!=""&&F!="transparent"||jQuery.nodeName(G,"body")){break}E="backgroundColor"}while(G=G.parentNode);return B(F)}var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]};jQuery.easing["jswing"]=jQuery.easing["swing"];jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(F,G,E,I,H){return jQuery.easing[jQuery.easing.def](F,G,E,I,H)},easeInQuad:function(F,G,E,I,H){return I*(G/=H)*G+E},easeOutQuad:function(F,G,E,I,H){return -I*(G/=H)*(G-2)+E},easeInOutQuad:function(F,G,E,I,H){if((G/=H/2)<1){return I/2*G*G+E}return -I/2*((--G)*(G-2)-1)+E},easeInCubic:function(F,G,E,I,H){return I*(G/=H)*G*G+E},easeOutCubic:function(F,G,E,I,H){return I*((G=G/H-1)*G*G+1)+E},easeInOutCubic:function(F,G,E,I,H){if((G/=H/2)<1){return I/2*G*G*G+E}return I/2*((G-=2)*G*G+2)+E},easeInQuart:function(F,G,E,I,H){return I*(G/=H)*G*G*G+E},easeOutQuart:function(F,G,E,I,H){return -I*((G=G/H-1)*G*G*G-1)+E},easeInOutQuart:function(F,G,E,I,H){if((G/=H/2)<1){return I/2*G*G*G*G+E}return -I/2*((G-=2)*G*G*G-2)+E},easeInQuint:function(F,G,E,I,H){return I*(G/=H)*G*G*G*G+E},easeOutQuint:function(F,G,E,I,H){return I*((G=G/H-1)*G*G*G*G+1)+E},easeInOutQuint:function(F,G,E,I,H){if((G/=H/2)<1){return I/2*G*G*G*G*G+E}return I/2*((G-=2)*G*G*G*G+2)+E},easeInSine:function(F,G,E,I,H){return -I*Math.cos(G/H*(Math.PI/2))+I+E},easeOutSine:function(F,G,E,I,H){return I*Math.sin(G/H*(Math.PI/2))+E},easeInOutSine:function(F,G,E,I,H){return -I/2*(Math.cos(Math.PI*G/H)-1)+E},easeInExpo:function(F,G,E,I,H){return(G==0)?E:I*Math.pow(2,10*(G/H-1))+E},easeOutExpo:function(F,G,E,I,H){return(G==H)?E+I:I*(-Math.pow(2,-10*G/H)+1)+E},easeInOutExpo:function(F,G,E,I,H){if(G==0){return E}if(G==H){return E+I}if((G/=H/2)<1){return I/2*Math.pow(2,10*(G-1))+E}return I/2*(-Math.pow(2,-10*--G)+2)+E},easeInCirc:function(F,G,E,I,H){return -I*(Math.sqrt(1-(G/=H)*G)-1)+E},easeOutCirc:function(F,G,E,I,H){return I*Math.sqrt(1-(G=G/H-1)*G)+E},easeInOutCirc:function(F,G,E,I,H){if((G/=H/2)<1){return -I/2*(Math.sqrt(1-G*G)-1)+E}return I/2*(Math.sqrt(1-(G-=2)*G)+1)+E},easeInElastic:function(F,H,E,L,K){var I=1.70158;var J=0;var G=L;if(H==0){return E}if((H/=K)==1){return E+L}if(!J){J=K*0.3}if(G<Math.abs(L)){G=L;var I=J/4}else{var I=J/(2*Math.PI)*Math.asin(L/G)}return -(G*Math.pow(2,10*(H-=1))*Math.sin((H*K-I)*(2*Math.PI)/J))+E},easeOutElastic:function(F,H,E,L,K){var I=1.70158;var J=0;var G=L;if(H==0){return E}if((H/=K)==1){return E+L}if(!J){J=K*0.3}if(G<Math.abs(L)){G=L;var I=J/4}else{var I=J/(2*Math.PI)*Math.asin(L/G)}return G*Math.pow(2,-10*H)*Math.sin((H*K-I)*(2*Math.PI)/J)+L+E},easeInOutElastic:function(F,H,E,L,K){var I=1.70158;var J=0;var G=L;if(H==0){return E}if((H/=K/2)==2){return E+L}if(!J){J=K*(0.3*1.5)}if(G<Math.abs(L)){G=L;var I=J/4}else{var I=J/(2*Math.PI)*Math.asin(L/G)}if(H<1){return -0.5*(G*Math.pow(2,10*(H-=1))*Math.sin((H*K-I)*(2*Math.PI)/J))+E}return G*Math.pow(2,-10*(H-=1))*Math.sin((H*K-I)*(2*Math.PI)/J)*0.5+L+E},easeInBack:function(F,G,E,J,I,H){if(H==undefined){H=1.70158}return J*(G/=I)*G*((H+1)*G-H)+E},easeOutBack:function(F,G,E,J,I,H){if(H==undefined){H=1.70158}return J*((G=G/I-1)*G*((H+1)*G+H)+1)+E},easeInOutBack:function(F,G,E,J,I,H){if(H==undefined){H=1.70158}if((G/=I/2)<1){return J/2*(G*G*(((H*=(1.525))+1)*G-H))+E}return J/2*((G-=2)*G*(((H*=(1.525))+1)*G+H)+2)+E},easeInBounce:function(F,G,E,I,H){return I-jQuery.easing.easeOutBounce(F,H-G,0,I,H)+E},easeOutBounce:function(F,G,E,I,H){if((G/=H)<(1/2.75)){return I*(7.5625*G*G)+E}else{if(G<(2/2.75)){return I*(7.5625*(G-=(1.5/2.75))*G+0.75)+E}else{if(G<(2.5/2.75)){return I*(7.5625*(G-=(2.25/2.75))*G+0.9375)+E}else{return I*(7.5625*(G-=(2.625/2.75))*G+0.984375)+E}}}},easeInOutBounce:function(F,G,E,I,H){if(G<H/2){return jQuery.easing.easeInBounce(F,G*2,0,I,H)*0.5+E}return jQuery.easing.easeOutBounce(F,G*2-H,0,I,H)*0.5+I*0.5+E}})})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.blind.min.js
===================================================================
--- js/ui/minified/effects.blind.min.js	(revision 6370)
+++ js/ui/minified/effects.blind.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.blind=function(B){return this.queue(function(){var D=A(this),C=["position","top","left"];var H=A.effects.setMode(D,B.options.mode||"hide");var G=B.options.direction||"vertical";A.effects.save(D,C);D.show();var J=A.effects.createWrapper(D).css({overflow:"hidden"});var E=(G=="vertical")?"height":"width";var I=(G=="vertical")?J.height():J.width();if(H=="show"){J.css(E,0)}var F={};F[E]=H=="show"?I:0;J.animate(F,B.duration,B.options.easing,function(){if(H=="hide"){D.hide()}A.effects.restore(D,C);A.effects.removeWrapper(D);if(B.callback){B.callback.apply(D[0],arguments)}D.dequeue()})})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.shake.min.js
===================================================================
--- js/ui/minified/effects.shake.min.js	(revision 6370)
+++ js/ui/minified/effects.shake.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.shake=function(B){return this.queue(function(){var E=A(this),K=["position","top","left"];var J=A.effects.setMode(E,B.options.mode||"effect");var M=B.options.direction||"left";var C=B.options.distance||20;var D=B.options.times||3;var G=B.duration||B.options.duration||140;A.effects.save(E,K);E.show();A.effects.createWrapper(E);var F=(M=="up"||M=="down")?"top":"left";var O=(M=="up"||M=="left")?"pos":"neg";var H={},N={},L={};H[F]=(O=="pos"?"-=":"+=")+C;N[F]=(O=="pos"?"+=":"-=")+C*2;L[F]=(O=="pos"?"-=":"+=")+C*2;E.animate(H,G,B.options.easing);for(var I=1;I<D;I++){E.animate(N,G,B.options.easing).animate(L,G,B.options.easing)}E.animate(N,G,B.options.easing).animate(H,G/2,B.options.easing,function(){A.effects.restore(E,K);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}});E.queue("fx",function(){E.dequeue()});E.dequeue()})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.dialog.min.js
===================================================================
--- js/ui/minified/ui.dialog.min.js	(revision 6370)
+++ js/ui/minified/ui.dialog.min.js	(working copy)
@@ -1 +0,0 @@
-(function(B){var A={dragStart:"start.draggable",drag:"drag.draggable",dragStop:"stop.draggable",maxHeight:"maxHeight.resizable",minHeight:"minHeight.resizable",maxWidth:"maxWidth.resizable",minWidth:"minWidth.resizable",resizeStart:"start.resizable",resize:"drag.resizable",resizeStop:"stop.resizable"};B.widget("ui.dialog",{init:function(){var J=this,K=this.options,D=typeof K.resizable=="string"?K.resizable:"n,e,s,w,se,sw,ne,nw",E=this.element.addClass("ui-dialog-content").wrap("<div/>").wrap("<div/>"),G=(this.uiDialogContainer=E.parent().addClass("ui-dialog-container").css({position:"relative",width:"100%",height:"100%"})),H=K.title||E.attr("title")||"",C=(this.uiDialogTitlebar=B('<div class="ui-dialog-titlebar"/>')).append('<span class="ui-dialog-title">'+H+"</span>").append('<a href="#" class="ui-dialog-titlebar-close"><span>X</span></a>').prependTo(G),I=(this.uiDialog=G.parent()).appendTo(document.body).hide().addClass("ui-dialog").addClass(K.dialogClass).addClass(E.attr("className")).removeClass("ui-dialog-content").css({position:"absolute",width:K.width,height:K.height,overflow:"hidden",zIndex:K.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(L){if(K.closeOnEscape){var M=27;(L.keyCode&&L.keyCode==M&&J.close())}}).mousedown(function(){J.moveToTop()}),F=(this.uiDialogButtonPane=B("<div/>")).addClass("ui-dialog-buttonpane").css({position:"absolute",bottom:0}).appendTo(I);this.uiDialogTitlebarClose=B(".ui-dialog-titlebar-close",C).hover(function(){B(this).addClass("ui-dialog-titlebar-close-hover")},function(){B(this).removeClass("ui-dialog-titlebar-close-hover")}).mousedown(function(L){L.stopPropagation()}).click(function(){J.close();return false});this.uiDialogTitlebar.find("*").add(this.uiDialogTitlebar).each(function(){B.ui.disableSelection(this)});if(B.fn.draggable){I.draggable({cancel:".ui-dialog-content",helper:K.dragHelper,handle:".ui-dialog-titlebar",start:function(M,L){J.moveToTop();(K.dragStart&&K.dragStart.apply(J.element[0],arguments))},drag:function(M,L){(K.drag&&K.drag.apply(J.element[0],arguments))},stop:function(M,L){(K.dragStop&&K.dragStop.apply(J.element[0],arguments));B.ui.dialog.overlay.resize()}});(K.draggable||I.draggable("disable"))}if(B.fn.resizable){I.resizable({cancel:".ui-dialog-content",helper:K.resizeHelper,maxWidth:K.maxWidth,maxHeight:K.maxHeight,minWidth:K.minWidth,minHeight:K.minHeight,start:function(){(K.resizeStart&&K.resizeStart.apply(J.element[0],arguments))},resize:function(M,L){(K.autoResize&&J.size.apply(J));(K.resize&&K.resize.apply(J.element[0],arguments))},handles:D,stop:function(M,L){(K.autoResize&&J.size.apply(J));(K.resizeStop&&K.resizeStop.apply(J.element[0],arguments));B.ui.dialog.overlay.resize()}});(K.resizable||I.resizable("disable"))}this.createButtons(K.buttons);this.isOpen=false;(K.bgiframe&&B.fn.bgiframe&&I.bgiframe());(K.autoOpen&&this.open())},setData:function(C,D){(A[C]&&this.uiDialog.data(A[C],D));switch(C){case"buttons":this.createButtons(D);break;case"draggable":this.uiDialog.draggable(D?"enable":"disable");break;case"height":this.uiDialog.height(D);break;case"position":this.position(D);break;case"resizable":(typeof D=="string"&&this.uiDialog.data("handles.resizable",D));this.uiDialog.resizable(D?"enable":"disable");break;case"title":B(".ui-dialog-title",this.uiDialogTitlebar).text(D);break;case"width":this.uiDialog.width(D);break}B.widget.prototype.setData.apply(this,arguments)},position:function(H){var D=B(window),E=B(document),F=E.scrollTop(),C=E.scrollLeft(),G=F;if(B.inArray(H,["center","top","right","bottom","left"])>=0){H=[H=="right"||H=="left"?H:"center",H=="top"||H=="bottom"?H:"middle"]}if(H.constructor!=Array){H=["center","middle"]}if(H[0].constructor==Number){C+=H[0]}else{switch(H[0]){case"left":C+=0;break;case"right":C+=D.width()-this.uiDialog.width();break;default:case"center":C+=(D.width()-this.uiDialog.width())/2}}if(H[1].constructor==Number){F+=H[1]}else{switch(H[1]){case"top":F+=0;break;case"bottom":F+=D.height()-this.uiDialog.height();break;default:case"middle":F+=(D.height()-this.uiDialog.height())/2}}F=Math.max(F,G);this.uiDialog.css({top:F,left:C})},size:function(){var D=this.uiDialogContainer,G=this.uiDialogTitlebar,E=this.element,F=parseInt(E.css("margin-top"),10)+parseInt(E.css("margin-bottom"),10),C=parseInt(E.css("margin-left"),10)+parseInt(E.css("margin-right"),10);E.height(D.height()-G.outerHeight()-F);E.width(D.width()-C)},open:function(){if(this.isOpen){return }this.overlay=this.options.modal?new B.ui.dialog.overlay(this):null;(this.uiDialog.next().length>0)&&this.uiDialog.appendTo("body");this.position(this.options.position);this.uiDialog.show(this.options.show);this.options.autoResize&&this.size();this.moveToTop(true);var C=null;var D={options:this.options};this.uiDialogTitlebarClose.focus();this.element.triggerHandler("dialogopen",[C,D],this.options.open);this.isOpen=true},moveToTop:function(E){if((this.options.modal&&!E)||(!this.options.stack&&!this.options.modal)){return this.element.triggerHandler("dialogfocus",[null,{options:this.options}],this.options.focus)}var D=this.options.zIndex,C=this.options;B(".ui-dialog:visible").each(function(){D=Math.max(D,parseInt(B(this).css("z-index"),10)||C.zIndex)});(this.overlay&&this.overlay.$el.css("z-index",++D));this.uiDialog.css("z-index",++D);this.element.triggerHandler("dialogfocus",[null,{options:this.options}],this.options.focus)},close:function(){(this.overlay&&this.overlay.destroy());this.uiDialog.hide(this.options.hide);var D=null;var C={options:this.options};this.element.triggerHandler("dialogclose",[D,C],this.options.close);B.ui.dialog.overlay.resize();this.isOpen=false},destroy:function(){(this.overlay&&this.overlay.destroy());this.uiDialog.hide();this.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content").hide().appendTo("body");this.uiDialog.remove()},createButtons:function(F){var E=this,C=false,D=this.uiDialogButtonPane;D.empty().hide();B.each(F,function(){return !(C=true)});if(C){D.show();B.each(F,function(G,H){B("<button/>").text(G).click(function(){H.apply(E.element[0],arguments)}).appendTo(D)})}}});B.extend(B.ui.dialog,{defaults:{autoOpen:true,autoResize:true,bgiframe:false,buttons:{},closeOnEscape:true,draggable:true,height:200,minHeight:100,minWidth:150,modal:false,overlay:{},position:"center",resizable:true,stack:true,width:300,zIndex:1000},overlay:function(C){this.$el=B.ui.dialog.overlay.create(C)}});B.extend(B.ui.dialog.overlay,{instances:[],events:B.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(C){return C+".dialog-overlay"}).join(" "),create:function(D){if(this.instances.length===0){setTimeout(function(){B("a, :input").bind(B.ui.dialog.overlay.events,function(){var F=false;var H=B(this).parents(".ui-dialog");if(H.length){var E=B(".ui-dialog-overlay");if(E.length){var G=parseInt(E.css("z-index"),10);E.each(function(){G=Math.max(G,parseInt(B(this).css("z-index"),10))});F=parseInt(H.css("z-index"),10)>G}else{F=true}}return F})},1);B(document).bind("keydown.dialog-overlay",function(E){var F=27;(E.keyCode&&E.keyCode==F&&D.close())});B(window).bind("resize.dialog-overlay",B.ui.dialog.overlay.resize)}var C=B("<div/>").appendTo(document.body).addClass("ui-dialog-overlay").css(B.extend({borderWidth:0,margin:0,padding:0,position:"absolute",top:0,left:0,width:this.width(),height:this.height()},D.options.overlay));(D.options.bgiframe&&B.fn.bgiframe&&C.bgiframe());this.instances.push(C);return C},destroy:function(C){this.instances.splice(B.inArray(this.instances,C),1);if(this.instances.length===0){B("a, :input").add([document,window]).unbind(".dialog-overlay")}C.remove()},height:function(){if(B.browser.msie&&B.browser.version<7){var D=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);var C=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);if(D<C){return B(window).height()+"px"}else{return D+"px"}}else{return B(document).height()+"px"}},width:function(){if(B.browser.msie&&B.browser.version<7){var C=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);var D=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);if(C<D){return B(window).width()+"px"}else{return C+"px"}}else{return B(document).width()+"px"}},resize:function(){var C=B([]);B.each(B.ui.dialog.overlay.instances,function(){C=C.add(this)});C.css({width:0,height:0}).css({width:B.ui.dialog.overlay.width(),height:B.ui.dialog.overlay.height()})}});B.extend(B.ui.dialog.overlay.prototype,{destroy:function(){B.ui.dialog.overlay.destroy(this.$el)}})})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.accordion.min.js
===================================================================
--- js/ui/minified/ui.accordion.min.js	(revision 6370)
+++ js/ui/minified/ui.accordion.min.js	(working copy)
@@ -1 +0,0 @@
-(function(E){E.widget("ui.accordion",{init:function(){var G=this.options;if(G.navigation){var J=this.element.find("a").filter(G.navigationFilter);if(J.length){if(J.filter(G.header).length){G.active=J}else{G.active=J.parent().parent().prev();J.addClass("current")}}}G.headers=this.element.find(G.header);G.active=C(G.headers,G.active);if(E.browser.msie){this.element.find("a").css("zoom","1")}if(!this.element.hasClass("ui-accordion")){this.element.addClass("ui-accordion");E("<span class='ui-accordion-left'/>").insertBefore(G.headers);E("<span class='ui-accordion-right'/>").appendTo(G.headers);G.headers.addClass("ui-accordion-header").attr("tabindex","0")}var I;if(G.fillSpace){I=this.element.parent().height();G.headers.each(function(){I-=E(this).outerHeight()});var H=0;G.headers.next().each(function(){H=Math.max(H,E(this).innerHeight()-E(this).height())}).height(I-H)}else{if(G.autoHeight){I=0;G.headers.next().each(function(){I=Math.max(I,E(this).outerHeight())}).height(I)}}G.headers.not(G.active||"").next().hide();G.active.parent().andSelf().addClass(G.selectedClass);if(G.event){this.element.bind((G.event)+".accordion",F)}},activate:function(G){F.call(this.element[0],{target:C(this.options.headers,G)[0]})},destroy:function(){this.options.headers.next().css("display","");if(this.options.fillSpace||this.options.autoHeight){this.options.headers.next().css("height","")}E.removeData(this.element[0],"accordion");this.element.removeClass("ui-accordion").unbind(".accordion")}});function B(H,G){return function(){return H.apply(G,arguments)}}function D(I){if(!E.data(this,"accordion")){return }var G=E.data(this,"accordion");var H=G.options;H.running=I?0:--H.running;if(H.running){return }if(H.clearStyle){H.toShow.add(H.toHide).css({height:"",overflow:""})}E(this).triggerHandler("accordionchange",[E.event.fix({type:"accordionchange",target:G.element[0]}),H.data],H.change)}function A(G,K,L,J,M){var I=E.data(this,"accordion").options;I.toShow=G;I.toHide=K;I.data=L;var H=B(D,this);I.running=K.size()===0?G.size():K.size();if(I.animated){if(!I.alwaysOpen&&J){E.ui.accordion.animations[I.animated]({toShow:jQuery([]),toHide:K,complete:H,down:M,autoHeight:I.autoHeight})}else{E.ui.accordion.animations[I.animated]({toShow:G,toHide:K,complete:H,down:M,autoHeight:I.autoHeight})}}else{if(!I.alwaysOpen&&J){G.toggle()}else{K.hide();G.show()}H(true)}}function F(L){var J=E.data(this,"accordion").options;if(J.disabled){return false}if(!L.target&&!J.alwaysOpen){J.active.parent().andSelf().toggleClass(J.selectedClass);var I=J.active.next(),M={options:J,newHeader:jQuery([]),oldHeader:J.active,newContent:jQuery([]),oldContent:I},G=(J.active=E([]));A.call(this,G,I,M);return false}var K=E(L.target);K=E(K.parents(J.header)[0]||K);var H=K[0]==J.active[0];if(J.running||(J.alwaysOpen&&H)){return false}if(!K.is(J.header)){return }J.active.parent().andSelf().toggleClass(J.selectedClass);if(!H){K.parent().andSelf().addClass(J.selectedClass)}var G=K.next(),I=J.active.next(),M={options:J,newHeader:K,oldHeader:J.active,newContent:G,oldContent:I},N=J.headers.index(J.active[0])>J.headers.index(K[0]);J.active=H?E([]):K;A.call(this,G,I,M,H,N);return false}function C(H,G){return G!=undefined?typeof G=="number"?H.filter(":eq("+G+")"):H.not(H.not(G)):G===false?E([]):H.filter(":eq(0)")}E.extend(E.ui.accordion,{defaults:{selectedClass:"selected",alwaysOpen:true,animated:"slide",event:"click",header:"a",autoHeight:true,running:0,navigationFilter:function(){return this.href.toLowerCase()==location.href.toLowerCase()}},animations:{slide:function(G,I){G=E.extend({easing:"swing",duration:300},G,I);if(!G.toHide.size()){G.toShow.animate({height:"show"},G);return }var H=G.toHide.height(),J=G.toShow.height(),K=J/H;G.toShow.css({height:0,overflow:"hidden"}).show();G.toHide.filter(":hidden").each(G.complete).end().filter(":visible").animate({height:"hide"},{step:function(L){var M=(H-L)*K;if(E.browser.msie||E.browser.opera){M=Math.ceil(M)}G.toShow.height(M)},duration:G.duration,easing:G.easing,complete:function(){if(!G.autoHeight){G.toShow.css("height","auto")}G.complete()}})},bounceslide:function(G){this.slide(G,{easing:G.down?"bounceout":"swing",duration:G.down?1000:200})},easeslide:function(G){this.slide(G,{easing:"easeinout",duration:700})}}});E.fn.activate=function(G){return this.accordion("activate",G)}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.slide.min.js
===================================================================
--- js/ui/minified/effects.slide.min.js	(revision 6370)
+++ js/ui/minified/effects.slide.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.slide=function(B){return this.queue(function(){var E=A(this),D=["position","top","left"];var I=A.effects.setMode(E,B.options.mode||"show");var H=B.options.direction||"left";A.effects.save(E,D);E.show();A.effects.createWrapper(E).css({overflow:"hidden"});var F=(H=="up"||H=="down")?"top":"left";var C=(H=="up"||H=="left")?"pos":"neg";var J=B.options.distance||(F=="top"?E.outerHeight({margin:true}):E.outerWidth({margin:true}));if(I=="show"){E.css(F,C=="pos"?-J:J)}var G={};G[F]=(I=="show"?(C=="pos"?"+=":"-="):(C=="pos"?"-=":"+="))+J;E.animate(G,{queue:false,duration:B.duration,easing:B.options.easing,complete:function(){if(I=="hide"){E.hide()}A.effects.restore(E,D);A.effects.removeWrapper(E);if(B.callback){B.callback.apply(this,arguments)}E.dequeue()}})})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/effects.explode.min.js
===================================================================
--- js/ui/minified/effects.explode.min.js	(revision 6370)
+++ js/ui/minified/effects.explode.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.effects.explode=function(B){return this.queue(function(){var I=B.options.pieces?Math.round(Math.sqrt(B.options.pieces)):3;var E=B.options.pieces?Math.round(Math.sqrt(B.options.pieces)):3;B.options.mode=B.options.mode=="toggle"?(A(this).is(":visible")?"hide":"show"):B.options.mode;var H=A(this).show().css("visibility","hidden");var J=H.offset();J.top-=parseInt(H.css("marginTop"))||0;J.left-=parseInt(H.css("marginLeft"))||0;var G=H.outerWidth(true);var C=H.outerHeight(true);for(var F=0;F<I;F++){for(var D=0;D<E;D++){H.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-D*(G/E),top:-F*(C/I)}).parent().addClass("effects-explode").css({position:"absolute",overflow:"hidden",width:G/E,height:C/I,left:J.left+D*(G/E)+(B.options.mode=="show"?(D-Math.floor(E/2))*(G/E):0),top:J.top+F*(C/I)+(B.options.mode=="show"?(F-Math.floor(I/2))*(C/I):0),opacity:B.options.mode=="show"?0:1}).animate({left:J.left+D*(G/E)+(B.options.mode=="show"?0:(D-Math.floor(E/2))*(G/E)),top:J.top+F*(C/I)+(B.options.mode=="show"?0:(F-Math.floor(I/2))*(C/I)),opacity:B.options.mode=="show"?1:0},B.duration||500)}}setTimeout(function(){B.options.mode=="show"?H.css({visibility:"visible"}):H.css({visibility:"visible"}).hide();if(B.callback){B.callback.apply(H[0])}H.dequeue();A(".effects-explode").remove()},B.duration||500)})}})(jQuery)
\ No newline at end of file
Index: js/ui/minified/ui.selectable.min.js
===================================================================
--- js/ui/minified/ui.selectable.min.js	(revision 6370)
+++ js/ui/minified/ui.selectable.min.js	(working copy)
@@ -1 +0,0 @@
-(function(A){A.widget("ui.selectable",A.extend({},A.ui.mouse,{init:function(){var B=this;this.element.addClass("ui-selectable");this.dragged=false;var C;this.refresh=function(){C=A(B.options.filter,B.element[0]);C.each(function(){var D=A(this);var E=D.offset();A.data(this,"selectable-item",{element:this,$element:D,left:E.left,top:E.top,right:E.left+D.width(),bottom:E.top+D.height(),startselected:false,selected:D.hasClass("ui-selected"),selecting:D.hasClass("ui-selecting"),unselecting:D.hasClass("ui-unselecting")})})};this.refresh();this.selectees=C.addClass("ui-selectee");this.mouseInit();this.helper=A(document.createElement("div")).css({border:"1px dotted black"})},toggle:function(){if(this.options.disabled){this.enable()}else{this.disable()}},destroy:function(){this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this.mouseDestroy()},mouseStart:function(E){var C=this;this.opos=[E.pageX,E.pageY];if(this.options.disabled){return }var D=this.options;this.selectees=A(D.filter,this.element[0]);this.element.triggerHandler("selectablestart",[E,{"selectable":this.element[0],"options":D}],D.start);A("body").append(this.helper);this.helper.css({"z-index":100,"position":"absolute","left":E.clientX,"top":E.clientY,"width":0,"height":0});if(D.autoRefresh){this.refresh()}this.selectees.filter(".ui-selected").each(function(){var F=A.data(this,"selectable-item");F.startselected=true;if(!E.ctrlKey){F.$element.removeClass("ui-selected");F.selected=false;F.$element.addClass("ui-unselecting");F.unselecting=true;C.element.triggerHandler("selectableunselecting",[E,{selectable:C.element[0],unselecting:F.element,options:D}],D.unselecting)}});var B=false;A(E.target).parents().andSelf().each(function(){if(A.data(this,"selectable-item")){B=true}});return this.options.keyboard?!B:true},mouseDrag:function(I){var C=this;this.dragged=true;if(this.options.disabled){return }var E=this.options;var D=this.opos[0],H=this.opos[1],B=I.pageX,G=I.pageY;if(D>B){var F=B;B=D;D=F}if(H>G){var F=G;G=H;H=F}this.helper.css({left:D,top:H,width:B-D,height:G-H});this.selectees.each(function(){var J=A.data(this,"selectable-item");if(!J||J.element==C.element[0]){return }var K=false;if(E.tolerance=="touch"){K=(!(J.left>B||J.right<D||J.top>G||J.bottom<H))}else{if(E.tolerance=="fit"){K=(J.left>D&&J.right<B&&J.top>H&&J.bottom<G)}}if(K){if(J.selected){J.$element.removeClass("ui-selected");J.selected=false}if(J.unselecting){J.$element.removeClass("ui-unselecting");J.unselecting=false}if(!J.selecting){J.$element.addClass("ui-selecting");J.selecting=true;C.element.triggerHandler("selectableselecting",[I,{selectable:C.element[0],selecting:J.element,options:E}],E.selecting)}}else{if(J.selecting){if(I.ctrlKey&&J.startselected){J.$element.removeClass("ui-selecting");J.selecting=false;J.$element.addClass("ui-selected");J.selected=true}else{J.$element.removeClass("ui-selecting");J.selecting=false;if(J.startselected){J.$element.addClass("ui-unselecting");J.unselecting=true}C.element.triggerHandler("selectableunselecting",[I,{selectable:C.element[0],unselecting:J.element,options:E}],E.unselecting)}}if(J.selected){if(!I.ctrlKey&&!J.startselected){J.$element.removeClass("ui-selected");J.selected=false;J.$element.addClass("ui-unselecting");J.unselecting=true;C.element.triggerHandler("selectableunselecting",[I,{selectable:C.element[0],unselecting:J.element,options:E}],E.unselecting)}}}});return false},mouseStop:function(D){var B=this;this.dragged=false;var C=this.options;A(".ui-unselecting",this.element[0]).each(function(){var E=A.data(this,"selectable-item");E.$element.removeClass("ui-unselecting");E.unselecting=false;E.startselected=false;B.element.triggerHandler("selectableunselected",[D,{selectable:B.element[0],unselected:E.element,options:C}],C.unselected)});A(".ui-selecting",this.element[0]).each(function(){var E=A.data(this,"selectable-item");E.$element.removeClass("ui-selecting").addClass("ui-selected");E.selecting=false;E.selected=true;E.startselected=true;B.element.triggerHandler("selectableselected",[D,{selectable:B.element[0],selected:E.element,options:C}],C.selected)});this.element.triggerHandler("selectablestop",[D,{selectable:B.element[0],options:this.options}],this.options.stop);this.helper.remove();return false}}));A.extend(A.ui.selectable,{defaults:{distance:1,delay:0,cancel:":input",appendTo:"body",autoRefresh:true,filter:"*",tolerance:"touch"}})})(jQuery)
\ No newline at end of file
Index: js/ui/ui.dialog.js
===================================================================
--- js/ui/ui.dialog.js	(revision 6370)
+++ js/ui/ui.dialog.js	(working copy)
@@ -1,497 +0,0 @@
-/*
- * jQuery UI Dialog
- *
- * Copyright (c) 2008 Richard D. Worth (rdworth.org)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Dialog
- *
- * Depends:
- *	ui.core.js
- *	ui.draggable.js
- *	ui.resizable.js
- */
-(function($) {
-
-var setDataSwitch = {
-	dragStart: "start.draggable",
-	drag: "drag.draggable",
-	dragStop: "stop.draggable",
-	maxHeight: "maxHeight.resizable",
-	minHeight: "minHeight.resizable",
-	maxWidth: "maxWidth.resizable",
-	minWidth: "minWidth.resizable",
-	resizeStart: "start.resizable",
-	resize: "drag.resizable",
-	resizeStop: "stop.resizable"
-};
-
-$.widget("ui.dialog", {
-	init: function() {
-		var self = this,
-			options = this.options,
-			resizeHandles = typeof options.resizable == 'string'
-				? options.resizable
-				: 'n,e,s,w,se,sw,ne,nw',
-			
-			uiDialogContent = this.element
-				.addClass('ui-dialog-content')
-				.wrap('<div/>')
-				.wrap('<div/>'),
-			
-			uiDialogContainer = (this.uiDialogContainer = uiDialogContent.parent()
-				.addClass('ui-dialog-container')
-				.css({position: 'relative', width: '100%', height: '100%'})),
-			
-			title = options.title || uiDialogContent.attr('title') || '',
-			uiDialogTitlebar = (this.uiDialogTitlebar =
-				$('<div class="ui-dialog-titlebar"/>'))
-				.append('<span class="ui-dialog-title">' + title + '</span>')
-				.append('<a href="#" class="ui-dialog-titlebar-close"><span>X</span></a>')
-				.prependTo(uiDialogContainer),
-			
-			uiDialog = (this.uiDialog = uiDialogContainer.parent())
-				.appendTo(document.body)
-				.hide()
-				.addClass('ui-dialog')
-				.addClass(options.dialogClass)
-				// add content classes to dialog
-				// to inherit theme at top level of element
-				.addClass(uiDialogContent.attr('className'))
-					.removeClass('ui-dialog-content')
-				.css({
-					position: 'absolute',
-					width: options.width,
-					height: options.height,
-					overflow: 'hidden',
-					zIndex: options.zIndex
-				})
-				// setting tabIndex makes the div focusable
-				// setting outline to 0 prevents a border on focus in Mozilla
-				.attr('tabIndex', -1).css('outline', 0).keydown(function(ev) {
-					if (options.closeOnEscape) {
-						var ESC = 27;
-						(ev.keyCode && ev.keyCode == ESC && self.close());
-					}
-				})
-				.mousedown(function() {
-					self.moveToTop();
-				}),
-			
-			uiDialogButtonPane = (this.uiDialogButtonPane = $('<div/>'))
-				.addClass('ui-dialog-buttonpane').css({ position: 'absolute', bottom: 0 })
-				.appendTo(uiDialog);
-		
-		this.uiDialogTitlebarClose = $('.ui-dialog-titlebar-close', uiDialogTitlebar)
-			.hover(
-				function() {
-					$(this).addClass('ui-dialog-titlebar-close-hover');
-				},
-				function() {
-					$(this).removeClass('ui-dialog-titlebar-close-hover');
-				}
-			)
-			.mousedown(function(ev) {
-				ev.stopPropagation();
-			})
-			.click(function() {
-				self.close();
-				return false;
-			});
-
-		this.uiDialogTitlebar.find("*").add(this.uiDialogTitlebar).each(function() {
-			$.ui.disableSelection(this);
-		});
-
-		if ($.fn.draggable) {
-			uiDialog.draggable({
-				cancel: '.ui-dialog-content',
-				helper: options.dragHelper,
-				handle: '.ui-dialog-titlebar',
-				start: function(e, ui) {
-					self.moveToTop();
-					(options.dragStart && options.dragStart.apply(self.element[0], arguments));
-				},
-				drag: function(e, ui) {
-					(options.drag && options.drag.apply(self.element[0], arguments));
-				},
-				stop: function(e, ui) {
-					(options.dragStop && options.dragStop.apply(self.element[0], arguments));
-					$.ui.dialog.overlay.resize();
-				}
-			});
-			(options.draggable || uiDialog.draggable('disable'));
-		}
-		
-		if ($.fn.resizable) {
-			uiDialog.resizable({
-				cancel: '.ui-dialog-content',
-				helper: options.resizeHelper,
-				maxWidth: options.maxWidth,
-				maxHeight: options.maxHeight,
-				minWidth: options.minWidth,
-				minHeight: options.minHeight,
-				start: function() {
-					(options.resizeStart && options.resizeStart.apply(self.element[0], arguments));
-				},
-				resize: function(e, ui) {
-					(options.autoResize && self.size.apply(self));
-					(options.resize && options.resize.apply(self.element[0], arguments));
-				},
-				handles: resizeHandles,
-				stop: function(e, ui) {
-					(options.autoResize && self.size.apply(self));
-					(options.resizeStop && options.resizeStop.apply(self.element[0], arguments));
-					$.ui.dialog.overlay.resize();
-				}
-			});
-			(options.resizable || uiDialog.resizable('disable'));
-		}
-		
-		this.createButtons(options.buttons);
-		this.isOpen = false;
-		
-		(options.bgiframe && $.fn.bgiframe && uiDialog.bgiframe());
-		(options.autoOpen && this.open());
-	},
-	
-	setData: function(key, value){
-		(setDataSwitch[key] && this.uiDialog.data(setDataSwitch[key], value));
-		switch (key) {
-			case "buttons":
-				this.createButtons(value);
-				break;
-			case "draggable":
-				this.uiDialog.draggable(value ? 'enable' : 'disable');
-				break;
-			case "height":
-				this.uiDialog.height(value);
-				break;
-			case "position":
-				this.position(value);
-				break;
-			case "resizable":
-				(typeof value == 'string' && this.uiDialog.data('handles.resizable', value));
-				this.uiDialog.resizable(value ? 'enable' : 'disable');
-				break;
-			case "title":
-				$(".ui-dialog-title", this.uiDialogTitlebar).text(value);
-				break;
-			case "width":
-				this.uiDialog.width(value);
-				break;
-		}
-		
-		$.widget.prototype.setData.apply(this, arguments);
-	},
-	
-	position: function(pos) {
-		var wnd = $(window), doc = $(document),
-			pTop = doc.scrollTop(), pLeft = doc.scrollLeft(),
-			minTop = pTop;
-		
-		if ($.inArray(pos, ['center','top','right','bottom','left']) >= 0) {
-			pos = [
-				pos == 'right' || pos == 'left' ? pos : 'center',
-				pos == 'top' || pos == 'bottom' ? pos : 'middle'
-			];
-		}
-		if (pos.constructor != Array) {
-			pos = ['center', 'middle'];
-		}
-		if (pos[0].constructor == Number) {
-			pLeft += pos[0];
-		} else {
-			switch (pos[0]) {
-				case 'left':
-					pLeft += 0;
-					break;
-				case 'right':
-					pLeft += wnd.width() - this.uiDialog.width();
-					break;
-				default:
-				case 'center':
-					pLeft += (wnd.width() - this.uiDialog.width()) / 2;
-			}
-		}
-		if (pos[1].constructor == Number) {
-			pTop += pos[1];
-		} else {
-			switch (pos[1]) {
-				case 'top':
-					pTop += 0;
-					break;
-				case 'bottom':
-					pTop += wnd.height() - this.uiDialog.height();
-					break;
-				default:
-				case 'middle':
-					pTop += (wnd.height() - this.uiDialog.height()) / 2;
-			}
-		}
-		
-		// prevent the dialog from being too high (make sure the titlebar
-		// is accessible)
-		pTop = Math.max(pTop, minTop);
-		this.uiDialog.css({top: pTop, left: pLeft});
-	},
-
-	size: function() {
-		var container = this.uiDialogContainer,
-			titlebar = this.uiDialogTitlebar,
-			content = this.element,
-			tbMargin = parseInt(content.css('margin-top'),10) + parseInt(content.css('margin-bottom'),10),
-			lrMargin = parseInt(content.css('margin-left'),10) + parseInt(content.css('margin-right'),10);
-		content.height(container.height() - titlebar.outerHeight() - tbMargin);
-		content.width(container.width() - lrMargin);
-	},
-	
-	open: function() {
-		if (this.isOpen) { return; }
-		
-		this.overlay = this.options.modal ? new $.ui.dialog.overlay(this) : null;
-		(this.uiDialog.next().length > 0) && this.uiDialog.appendTo('body');
-		this.position(this.options.position);
-		this.uiDialog.show(this.options.show);
-		this.options.autoResize && this.size();
-		this.moveToTop(true);
-		
-		// CALLBACK: open
-		var openEV = null;
-		var openUI = {
-			options: this.options
-		};
-		this.uiDialogTitlebarClose.focus();
-		this.element.triggerHandler("dialogopen", [openEV, openUI], this.options.open);
-		
-		this.isOpen = true;
-	},
-	
-	// the force parameter allows us to move modal dialogs to their correct
-	// position on open
-	moveToTop: function(force) {
-		if ((this.options.modal && !force)
-			|| (!this.options.stack && !this.options.modal)) { return this.element.triggerHandler("dialogfocus", [null, { options: this.options }], this.options.focus); }
-		
-		var maxZ = this.options.zIndex, options = this.options;
-		$('.ui-dialog:visible').each(function() {
-			maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10) || options.zIndex);
-		});
-		(this.overlay && this.overlay.$el.css('z-index', ++maxZ));
-		this.uiDialog.css('z-index', ++maxZ);
-		
-		this.element.triggerHandler("dialogfocus", [null, { options: this.options }], this.options.focus);
-	},
-	
-	close: function() {
-		(this.overlay && this.overlay.destroy());
-		this.uiDialog.hide(this.options.hide);
-
-		// CALLBACK: close
-		var closeEV = null;
-		var closeUI = {
-			options: this.options
-		};
-		this.element.triggerHandler("dialogclose", [closeEV, closeUI], this.options.close);
-		$.ui.dialog.overlay.resize();
-		
-		this.isOpen = false;
-	},
-	
-	destroy: function() {
-		(this.overlay && this.overlay.destroy());
-		this.uiDialog.hide();
-		this.element
-			.unbind('.dialog')
-			.removeData('dialog')
-			.removeClass('ui-dialog-content')
-			.hide().appendTo('body');
-		this.uiDialog.remove();
-	},
-	
-	createButtons: function(buttons) {
-		var self = this,
-			hasButtons = false,
-			uiDialogButtonPane = this.uiDialogButtonPane;
-		
-		// remove any existing buttons
-		uiDialogButtonPane.empty().hide();
-		
-		$.each(buttons, function() { return !(hasButtons = true); });
-		if (hasButtons) {
-			uiDialogButtonPane.show();
-			$.each(buttons, function(name, fn) {
-				$('<button/>')
-					.text(name)
-					.click(function() { fn.apply(self.element[0], arguments); })
-					.appendTo(uiDialogButtonPane);
-			});
-		}
-	}
-});
-
-$.extend($.ui.dialog, {
-	defaults: {
-		autoOpen: true,
-		autoResize: true,
-		bgiframe: false,
-		buttons: {},
-		closeOnEscape: true,
-		draggable: true,
-		height: 200,
-		minHeight: 100,
-		minWidth: 150,
-		modal: false,
-		overlay: {},
-		position: 'center',
-		resizable: true,
-		stack: true,
-		width: 300,
-		zIndex: 1000
-	},
-	
-	overlay: function(dialog) {
-		this.$el = $.ui.dialog.overlay.create(dialog);
-	}
-});
-
-$.extend($.ui.dialog.overlay, {
-	instances: [],
-	events: $.map('focus,mousedown,mouseup,keydown,keypress,click'.split(','),
-		function(e) { return e + '.dialog-overlay'; }).join(' '),
-	create: function(dialog) {
-		if (this.instances.length === 0) {
-			// prevent use of anchors and inputs
-			// we use a setTimeout in case the overlay is created from an
-			// event that we're going to be cancelling (see #2804)
-			setTimeout(function() {
-				$('a, :input').bind($.ui.dialog.overlay.events, function() {
-					// allow use of the element if inside a dialog and
-					// - there are no modal dialogs
-					// - there are modal dialogs, but we are in front of the topmost modal
-					var allow = false;
-					var $dialog = $(this).parents('.ui-dialog');
-					if ($dialog.length) {
-						var $overlays = $('.ui-dialog-overlay');
-						if ($overlays.length) {
-							var maxZ = parseInt($overlays.css('z-index'), 10);
-							$overlays.each(function() {
-								maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10));
-							});
-							allow = parseInt($dialog.css('z-index'), 10) > maxZ;
-						} else {
-							allow = true;
-						}
-					}
-					return allow;
-				});
-			}, 1);
-			
-			// allow closing by pressing the escape key
-			$(document).bind('keydown.dialog-overlay', function(e) {
-				var ESC = 27;
-				(e.keyCode && e.keyCode == ESC && dialog.close()); 
-			});
-			
-			// handle window resize
-			$(window).bind('resize.dialog-overlay', $.ui.dialog.overlay.resize);
-		}
-		
-		var $el = $('<div/>').appendTo(document.body)
-			.addClass('ui-dialog-overlay').css($.extend({
-				borderWidth: 0, margin: 0, padding: 0,
-				position: 'absolute', top: 0, left: 0,
-				width: this.width(),
-				height: this.height()
-			}, dialog.options.overlay));
-		
-		(dialog.options.bgiframe && $.fn.bgiframe && $el.bgiframe());
-		
-		this.instances.push($el);
-		return $el;
-	},
-	
-	destroy: function($el) {
-		this.instances.splice($.inArray(this.instances, $el), 1);
-		
-		if (this.instances.length === 0) {
-			$('a, :input').add([document, window]).unbind('.dialog-overlay');
-		}
-		
-		$el.remove();
-	},
-	
-	height: function() {
-		if ($.browser.msie && $.browser.version < 7) {
-			var scrollHeight = Math.max(
-				document.documentElement.scrollHeight,
-				document.body.scrollHeight
-			);
-			var offsetHeight = Math.max(
-				document.documentElement.offsetHeight,
-				document.body.offsetHeight
-			);
-			
-			if (scrollHeight < offsetHeight) {
-				return $(window).height() + 'px';
-			} else {
-				return scrollHeight + 'px';
-			}
-		} else {
-			return $(document).height() + 'px';
-		}
-	},
-	
-	width: function() {
-		if ($.browser.msie && $.browser.version < 7) {
-			var scrollWidth = Math.max(
-				document.documentElement.scrollWidth,
-				document.body.scrollWidth
-			);
-			var offsetWidth = Math.max(
-				document.documentElement.offsetWidth,
-				document.body.offsetWidth
-			);
-			
-			if (scrollWidth < offsetWidth) {
-				return $(window).width() + 'px';
-			} else {
-				return scrollWidth + 'px';
-			}
-		} else {
-			return $(document).width() + 'px';
-		}
-	},
-	
-	resize: function() {
-		/* If the dialog is draggable and the user drags it past the
-		 * right edge of the window, the document becomes wider so we
-		 * need to stretch the overlay. If the user then drags the
-		 * dialog back to the left, the document will become narrower,
-		 * so we need to shrink the overlay to the appropriate size.
-		 * This is handled by shrinking the overlay before setting it
-		 * to the full document size.
-		 */
-		var $overlays = $([]);
-		$.each($.ui.dialog.overlay.instances, function() {
-			$overlays = $overlays.add(this);
-		});
-		
-		$overlays.css({
-			width: 0,
-			height: 0
-		}).css({
-			width: $.ui.dialog.overlay.width(),
-			height: $.ui.dialog.overlay.height()
-		});
-	}
-});
-
-$.extend($.ui.dialog.overlay.prototype, {
-	destroy: function() {
-		$.ui.dialog.overlay.destroy(this.$el);
-	}
-});
-
-})(jQuery);
Index: js/ui/packed/effects.explode.packed.js
===================================================================
--- js/ui/packed/effects.explode.packed.js	(revision 6370)
+++ js/ui/packed/effects.explode.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(e(A){A.i.h=e(B){16 j.15(e(){8 I=B.4.g?7.x(7.w(B.4.g)):3;8 E=B.4.g?7.x(7.w(B.4.g)):3;B.4.5=B.4.5=="14"?(A(j).13(":c")?"n":"6"):B.4.5;8 H=A(j).6().9("d","p");8 J=H.12();J.a-=v(H.9("11"))||0;J.b-=v(H.9("10"))||0;8 G=H.Z(u);8 C=H.Y(u);t(8 F=0;F<I;F++){t(8 D=0;D<E;D++){H.X().W("V").U("<s></s>").9({r:"q",d:"c",b:-D*(G/E),a:-F*(C/I)}).T().S("i-h").9({r:"q",R:"p",Q:G/E,P:C/I,b:J.b+D*(G/E)+(B.4.5=="6"?(D-7.f(E/2))*(G/E):0),a:J.a+F*(C/I)+(B.4.5=="6"?(F-7.f(I/2))*(C/I):0),o:B.4.5=="6"?0:1}).O({b:J.b+D*(G/E)+(B.4.5=="6"?0:(D-7.f(E/2))*(G/E)),a:J.a+F*(C/I)+(B.4.5=="6"?0:(F-7.f(I/2))*(C/I)),o:B.4.5=="6"?1:0},B.l||k)}}N(e(){B.4.5=="6"?H.9({d:"c"}):H.9({d:"c"}).n();M(B.m){B.m.L(H[0])}H.K();A(".i-h").z()},B.l||k)})}})(y)',62,69,'||||options|mode|show|Math|var|css|top|left|visible|visibility|function|floor|pieces|explode|effects|this|500|duration|callback|hide|opacity|hidden|absolute|position|div|for|true|parseInt|sqrt|round|jQuery|remove|||||||||||dequeue|apply|if|setTimeout|animate|height|width|overflow|addClass|parent|wrap|body|appendTo|clone|outerHeight|outerWidth|marginLeft|marginTop|offset|is|toggle|queue|return'.split('|'),0,{}))
-
Index: js/ui/packed/effects.slide.packed.js
===================================================================
--- js/ui/packed/effects.slide.packed.js	(revision 6370)
+++ js/ui/packed/effects.slide.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(2(A){A.1.Q=2(B){P 7.e(2(){0 E=A(7),D=["O","9","6"];0 I=A.1.N(E,B.3.M||"5");0 H=B.3.L||"6";A.1.K(E,D);E.5();A.1.z(E).f({y:"x"});0 F=(H=="i"||H=="w")?"9":"6";0 C=(H=="i"||H=="6")?"4":"v";0 J=B.3.u||(F=="9"?E.t({h:g}):E.s({h:g}));8(I=="5"){E.f(F,C=="4"?-J:J)}0 G={};G[F]=(I=="5"?(C=="4"?"+=":"-="):(C=="4"?"-=":"+="))+J;E.r(G,{e:q,d:B.d,c:B.3.c,p:2(){8(I=="b"){E.b()}A.1.o(E,D);A.1.n(E);8(B.a){B.a.m(7,l)}E.k()}})})}})(j)',53,53,'var|effects|function|options|pos|show|left|this|if|top|callback|hide|easing|duration|queue|css|true|margin|up|jQuery|dequeue|arguments|apply|removeWrapper|restore|complete|false|animate|outerWidth|outerHeight|distance|neg|down|hidden|overflow|createWrapper|||||||||||save|direction|mode|setMode|position|return|slide'.split('|'),0,{}))
-
Index: js/ui/packed/ui.selectable.packed.js
===================================================================
--- js/ui/packed/ui.selectable.packed.js	(revision 6370)
+++ js/ui/packed/ui.selectable.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(d(A){A.1M("4.5",A.V({},A.4.1L,{1K:d(){8 B=2;2.3.h("4-5");2.v=b;8 C;2.Q=d(){C=A(B.9.q,B.3[0]);C.o(d(){8 D=A(2);8 E=D.1J();A.n(2,"5-m",{3:2,$3:D,k:E.k,j:E.j,L:E.k+D.N(),y:E.j+D.M(),i:b,a:D.R("4-a"),c:D.R("4-c"),6:D.R("4-6")})})};2.Q();2.s=C.h("4-1I");2.1H();2.p=A(1G.1F("1E")).O({1D:"1C 1B 1A"})},1z:d(){7(2.9.t){2.1y()}r{2.1x()}},1w:d(){2.3.f("4-5 4-5-t").1v("5").1u(".5");2.1t()},1s:d(E){8 C=2;2.P=[E.Y,E.X];7(2.9.t){l}8 D=2.9;2.s=A(D.q,2.3[0]);2.3.g("1r",[E,{"5":2.3[0],"9":D}],D.1q);A("U").1p(2.p);2.p.O({"z-1o":1n,"1m":"1l","k":E.1k,"j":E.1j,"N":0,"M":0});7(D.T){2.Q()}2.s.q(".4-a").o(d(){8 F=A.n(2,"5-m");F.i=e;7(!E.x){F.$3.f("4-a");F.a=b;F.$3.h("4-6");F.6=e;C.3.g("w",[E,{5:C.3[0],6:F.3,9:D}],D.6)}});8 B=b;A(E.1i).1h().1g().o(d(){7(A.n(2,"5-m")){B=e}});l 2.9.1f?!B:e},1e:d(I){8 C=2;2.v=e;7(2.9.t){l}8 E=2.9;8 D=2.P[0],H=2.P[1],B=I.Y,G=I.X;7(D>B){8 F=B;B=D;D=F}7(H>G){8 F=G;G=H;H=F}2.p.O({k:D,j:H,N:B-D,M:G-H});2.s.o(d(){8 J=A.n(2,"5-m");7(!J||J.3==C.3[0]){l}8 K=b;7(E.u=="S"){K=(!(J.k>B||J.L<D||J.j>G||J.y<H))}r{7(E.u=="1d"){K=(J.k>D&&J.L<B&&J.j>H&&J.y<G)}}7(K){7(J.a){J.$3.f("4-a");J.a=b}7(J.6){J.$3.f("4-6");J.6=b}7(!J.c){J.$3.h("4-c");J.c=e;C.3.g("1c",[I,{5:C.3[0],c:J.3,9:E}],E.c)}}r{7(J.c){7(I.x&&J.i){J.$3.f("4-c");J.c=b;J.$3.h("4-a");J.a=e}r{J.$3.f("4-c");J.c=b;7(J.i){J.$3.h("4-6");J.6=e}C.3.g("w",[I,{5:C.3[0],6:J.3,9:E}],E.6)}}7(J.a){7(!I.x&&!J.i){J.$3.f("4-a");J.a=b;J.$3.h("4-6");J.6=e;C.3.g("w",[I,{5:C.3[0],6:J.3,9:E}],E.6)}}}});l b},1b:d(D){8 B=2;2.v=b;8 C=2.9;A(".4-6",2.3[0]).o(d(){8 E=A.n(2,"5-m");E.$3.f("4-6");E.6=b;E.i=b;B.3.g("1a",[D,{5:B.3[0],W:E.3,9:C}],C.W)});A(".4-c",2.3[0]).o(d(){8 E=A.n(2,"5-m");E.$3.f("4-c").h("4-a");E.c=b;E.a=e;E.i=e;B.3.g("19",[D,{5:B.3[0],a:E.3,9:C}],C.a)});2.3.g("18",[D,{5:B.3[0],9:2.9}],2.9.17);2.p.16();l b}}));A.V(A.4.5,{15:{14:1,13:0,12:":11",10:"U",T:e,q:"*",u:"S"}})})(Z)',62,111,'||this|element|ui|selectable|unselecting|if|var|options|selected|false|selecting|function|true|removeClass|triggerHandler|addClass|startselected|top|left|return|item|data|each|helper|filter|else|selectees|disabled|tolerance|dragged|selectableunselecting|ctrlKey|bottom|||||||||||||right|height|width|css|opos|refresh|hasClass|touch|autoRefresh|body|extend|unselected|pageY|pageX|jQuery|appendTo|input|cancel|delay|distance|defaults|remove|stop|selectablestop|selectableselected|selectableunselected|mouseStop|selectableselecting|fit|mouseDrag|keyboard|andSelf|parents|target|clientY|clientX|absolute|position|100|index|append|start|selectablestart|mouseStart|mouseDestroy|unbind|removeData|destroy|disable|enable|toggle|black|dotted|1px|border|div|createElement|document|mouseInit|selectee|offset|init|mouse|widget'.split('|'),0,{}))
-
Index: js/ui/packed/effects.drop.packed.js
===================================================================
--- js/ui/packed/effects.drop.packed.js	(revision 6370)
+++ js/ui/packed/effects.drop.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(5(A){A.4.S=5(B){R a.i(5(){3 E=A(a),D=["Q","e","9","d"];3 I=A.4.P(E,B.6.O||"c");3 H=B.6.N||"9";A.4.M(E,D);E.8();A.4.L(E);3 F=(H=="m"||H=="K")?"e":"9";3 C=(H=="m"||H=="9")?"7":"z";3 J=B.6.y||(F=="e"?E.x({l:k})/2:E.w({l:k})/2);b(I=="8"){E.j("d",0).j(F,C=="7"?-J:J)}3 G={d:I=="8"?1:0};G[F]=(I=="8"?(C=="7"?"+=":"-="):(C=="7"?"-=":"+="))+J;E.v(G,{i:u,h:B.h,g:B.6.g,t:5(){b(I=="c"){E.c()}A.4.s(E,D);A.4.r(E);b(B.f){B.f.q(a,p)}E.o()}})})}})(n)',55,55,'|||var|effects|function|options|pos|show|left|this|if|hide|opacity|top|callback|easing|duration|queue|css|true|margin|up|jQuery|dequeue|arguments|apply|removeWrapper|restore|complete|false|animate|outerWidth|outerHeight|distance|neg|||||||||||down|createWrapper|save|direction|mode|setMode|position|return|drop'.split('|'),0,{}))
-
Index: js/ui/packed/ui.droppable.packed.js
===================================================================
--- js/ui/packed/ui.droppable.packed.js	(revision 6370)
+++ js/ui/packed/ui.droppable.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(8(A){A.1P("4.c",{1O:8(){3.5.Z("4-c");3.e=0;3.k=1;9 C=3.6,B=C.g;C=A.13(C,{g:C.g&&C.g.1N==1M?C.g:8(D){a A(D).1L(B)}});3.V={u:3.5[0].1a,t:3.5[0].19};A.4.d.s.1K(3)},1J:{},4:8(B){a{1e:(B.h||B.5),1f:B.1f,l:B.l,1I:B.n,6:3.6,5:3.5}},1H:8(){9 B=A.4.d.s;1c(9 C=0;C<B.10;C++){7(B[C]==3){B.1G(C,1)}}3.5.M("4-c 4-c-r").1F("c").1E(".c")},p:8(C){9 B=A.4.d.v;7(!B||(B.h||B.5)[0]==3.5[0]){a}7(3.6.g.b(3.5,(B.h||B.5))){A.4.m.b(3,"p",[C,3.4(B)]);3.5.R("1D",[C,3.4(B)],3.6.p)}},o:8(C){9 B=A.4.d.v;7(!B||(B.h||B.5)[0]==3.5[0]){a}7(3.6.g.b(3.5,(B.h||B.5))){A.4.m.b(3,"o",[C,3.4(B)]);3.5.R("1C",[C,3.4(B)],3.6.o)}},j:8(D,C){9 B=C||A.4.d.v;7(!B||(B.h||B.5)[0]==3.5[0]){a i}9 E=i;3.5.1B(".4-c").1A(".4-1e-1z").12(8(){9 F=A.16(3,"c");7(F.6.17&&A.4.q(B,A.13(F,{f:F.5.f()}),F.6.U)){E=1d;a i}});7(E){a i}7(3.6.g.b(3.5,(B.h||B.5))){A.4.m.b(3,"j",[D,3.4(B)]);3.5.R("j",[D,3.4(B)],3.6.j);a 1d}a i},O:8(C){9 B=A.4.d.v;A.4.m.b(3,"O",[C,3.4(B)]);7(B){3.5.R("1y",[C,3.4(B)],3.6.O)}},N:8(C){9 B=A.4.d.v;A.4.m.b(3,"N",[C,3.4(B)]);7(B){3.5.R("1x",[C,3.4(B)],3.6.N)}}});A.13(A.4.c,{1w:{r:i,U:"q"}});A.4.q=8(L,F,J){7(!F.f){a i}9 D=(L.n||L.l.x).y,C=D+L.z.u,I=(L.n||L.l.x).w,H=I+L.z.t;9 E=F.f.y,B=E+F.V.u,K=F.f.w,G=K+F.V.t;1v(J){W"1u":a(E<D&&C<B&&K<I&&H<G);Q;W"q":a(E<D+(L.z.u/2)&&C-(L.z.u/2)<B&&K<I+(L.z.t/2)&&H-(L.z.t/2)<G);Q;W"1t":a(E<((L.n||L.l.x).y+(L.Y||L.f.X).y)&&((L.n||L.l.x).y+(L.Y||L.f.X).y)<B&&K<((L.n||L.l.x).w+(L.Y||L.f.X).w)&&((L.n||L.l.x).w+(L.Y||L.f.X).w)<G);Q;W"1s":a((I>=K&&I<=G)||(H>=K&&H<=G)||(I<K&&H>G))&&((D>=E&&D<=B)||(C>=E&&C<=B)||(D<E&&C>B));Q;1r:a i;Q}};A.4.d={v:11,s:[],18:8(D,F){9 B=A.4.d.s;9 E=F?F.1q:11;1c(9 C=0;C<B.10;C++){7(B[C].6.r||(D&&!B[C].6.g.b(B[C].5,(D.h||D.5)))){1b}B[C].P=B[C].5.1p("1o")!="1n";7(!B[C].P){1b}B[C].f=B[C].5.f();B[C].V={u:B[C].5[0].1a,t:B[C].5[0].19};7(E=="1m"||E=="1l"){B[C].O.b(B[C],F)}}},j:8(B,C){9 D=i;A.12(A.4.d.s,8(){7(!3.6){a}7(!3.6.r&&3.P&&A.4.q(B,3,3.6.U)){D=3.j.b(3,C)}7(!3.6.r&&3.P&&3.6.g.b(3.5,(B.h||B.5))){3.k=1;3.e=0;3.N.b(3,C)}});a D},1k:8(B,C){7(B.6.1j){A.4.d.18(B,C)}A.12(A.4.d.s,8(){7(3.6.r||3.15||!3.P){a}9 E=A.4.q(B,3,3.6.U);9 G=!E&&3.e==1?"k":(E&&3.e==0?"e":11);7(!G){a}9 F;7(3.6.17){9 D=3.5.1i(".4-c:1h(0)");7(D.10){F=A.16(D[0],"c");F.15=(G=="e"?1:0)}}7(F&&G=="e"){F["e"]=0;F["k"]=1;F.o.b(F,C)}3[G]=1;3[G=="k"?"e":"k"]=0;3[G=="e"?"p":"o"].b(3,C);7(F&&G=="k"){F["k"]=0;F["e"]=1;F.p.b(F,C)}})}};A.4.m.14("c","T",{O:8(C,B){A(3).Z(B.6.T)},N:8(C,B){A(3).M(B.6.T)},j:8(C,B){A(3).M(B.6.T)}});A.4.m.14("c","S",{p:8(C,B){A(3).Z(B.6.S)},o:8(C,B){A(3).M(B.6.S)},j:8(C,B){A(3).M(B.6.S)}})})(1g)',62,114,'|||this|ui|element|options|if|function|var|return|call|droppable|ddmanager|isover|offset|accept|currentItem|false|drop|isout|position|plugin|positionAbs|out|over|intersect|disabled|droppables|height|width|current|top|absolute|left|helperProportions|||||||||||||removeClass|deactivate|activate|visible|break|triggerHandler|hoverClass|activeClass|tolerance|proportions|case|click|clickOffset|addClass|length|null|each|extend|add|greedyChild|data|greedy|prepareOffsets|offsetHeight|offsetWidth|continue|for|true|draggable|helper|jQuery|eq|parents|refreshPositions|drag|sortactivate|dragstart|none|display|css|type|default|touch|pointer|fit|switch|defaults|dropdeactivate|dropactivate|dragging|not|find|dropout|dropover|unbind|removeData|splice|destroy|absolutePosition|plugins|push|is|Function|constructor|init|widget'.split('|'),0,{}))
-
Index: js/ui/packed/ui.draggable.packed.js
===================================================================
--- js/ui/packed/ui.draggable.packed.js	(revision 6370)
+++ js/ui/packed/ui.draggable.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(b(A){A.3y("g.i",A.1T({},A.g.3x,{3w:b(){a B=4.9;7(B.d=="27"&&!(/(l|Z|15)/).1k(4.j.e("m"))){4.j.e("m","l")}4.j.2b("g-i");(B.2e&&4.j.2b("g-i-2e"));4.3v()},2g:b(F){a H=4.9;7(4.d||H.2e||A(F.1Q).3u(".g-3t-1L")){n 11}a C=!4.9.1L||!A(4.9.1L,4.j).1A?t:11;A(4.9.1L,4.j).3s("*").3r().1b(b(){7(4==F.1Q){C=t}});7(!C){n 11}7(A.g.1f){A.g.1f.3q=4}4.d=A.3p(H.d)?A(H.d.3o(4.j[0],[F])):(H.d=="1S"?4.j.1S():4.j);7(!4.d.3n("14").1A){4.d.1p((H.1p=="k"?4.j[0].1t:H.1p))}7(4.d[0]!=4.j[0]&&!(/(15|Z)/).1k(4.d.e("m"))){4.d.e("m","Z")}4.S={6:(o(4.j.e("3m"),10)||0),5:(o(4.j.e("3l"),10)||0)};4.z=4.d.e("m");4.8=4.j.8();4.8={5:4.8.5-4.S.5,6:4.8.6-4.S.6};4.8.q={6:F.1q-4.8.6,5:F.1s-4.8.5};4.p=4.d.p();a B=4.p.8();7(4.p[0]==f.14&&A.3k.3j){B={5:0,6:0}}4.8.k={5:B.5+(o(4.p.e("2c"),10)||0),6:B.6+(o(4.p.e("2d"),10)||0)};a E=4.j.m();4.8.l=4.z=="l"?{5:E.5-(o(4.d.e("5"),10)||0)+4.p[0].s,6:E.6-(o(4.d.e("6"),10)||0)+4.p[0].r}:{5:0,6:0};4.1m=4.2a(F);4.w={v:4.d.1W(),u:4.d.1V()};7(H.1a){7(H.1a.6!=1K){4.8.q.6=H.1a.6+4.S.6}7(H.1a.2z!=1K){4.8.q.6=4.w.v-H.1a.2z+4.S.6}7(H.1a.5!=1K){4.8.q.5=H.1a.5+4.S.5}7(H.1a.2y!=1K){4.8.q.5=4.w.u-H.1a.2y+4.S.5}}7(H.h){7(H.h=="k"){H.h=4.d[0].1t}7(H.h=="f"||H.h=="1r"){4.h=[0-4.8.l.6-4.8.k.6,0-4.8.l.5-4.8.k.5,A(H.h=="f"?f:1r).v()-4.8.l.6-4.8.k.6-4.w.v-4.S.6-(o(4.j.e("2x"),10)||0),(A(H.h=="f"?f:1r).u()||f.14.1t.2v)-4.8.l.5-4.8.k.5-4.w.u-4.S.5-(o(4.j.e("2u"),10)||0)]}7(!(/^(f|1r|k)$/).1k(H.h)){a D=A(H.h)[0];a G=A(H.h).8();4.h=[G.6+(o(A(D).e("2d"),10)||0)-4.8.l.6-4.8.k.6,G.5+(o(A(D).e("2c"),10)||0)-4.8.l.5-4.8.k.5,G.6+T.2w(D.3i,D.1Z)-(o(A(D).e("2d"),10)||0)-4.8.l.6-4.8.k.6-4.w.v-4.S.6-(o(4.j.e("2x"),10)||0),G.5+T.2w(D.2v,D.22)-(o(A(D).e("2c"),10)||0)-4.8.l.5-4.8.k.5-4.w.u-4.S.5-(o(4.j.e("2u"),10)||0)]}}4.18("16",F);4.w={v:4.d.1W(),u:4.d.1V()};7(A.g.1f&&!H.2s){A.g.1f.3h(4,F)}4.d.2b("g-i-2r");4.1P(F);n t},W:b(C,D){7(!D){D=4.m}a B=C=="Z"?1:-1;n{5:(D.5+4.8.l.5*B+4.8.k.5*B-(4.z=="15"||(4.z=="Z"&&4.p[0]==f.14)?0:4.p[0].s)*B+(4.z=="15"?A(f).s():0)*B+4.S.5*B),6:(D.6+4.8.l.6*B+4.8.k.6*B-(4.z=="15"||(4.z=="Z"&&4.p[0]==f.14)?0:4.p[0].r)*B+(4.z=="15"?A(f).r():0)*B+4.S.6*B)}},2a:b(E){a F=4.9;a B={5:(E.1s-4.8.q.5-4.8.l.5-4.8.k.5+(4.z=="15"||(4.z=="Z"&&4.p[0]==f.14)?0:4.p[0].s)-(4.z=="15"?A(f).s():0)),6:(E.1q-4.8.q.6-4.8.l.6-4.8.k.6+(4.z=="15"||(4.z=="Z"&&4.p[0]==f.14)?0:4.p[0].r)-(4.z=="15"?A(f).r():0))};7(!4.1m){n B}7(4.h){7(B.6<4.h[0]){B.6=4.h[0]}7(B.5<4.h[1]){B.5=4.h[1]}7(B.6>4.h[2]){B.6=4.h[2]}7(B.5>4.h[3]){B.5=4.h[3]}}7(F.19){a D=4.1m.5+T.2t((B.5-4.1m.5)/F.19[1])*F.19[1];B.5=4.h?(!(D<4.h[1]||D>4.h[3])?D:(!(D<4.h[1])?D-F.19[1]:D+F.19[1])):D;a C=4.1m.6+T.2t((B.6-4.1m.6)/F.19[0])*F.19[0];B.6=4.h?(!(C<4.h[0]||C>4.h[2])?C:(!(C<4.h[0])?C-F.19[0]:C+F.19[0])):C}n B},1P:b(B){4.m=4.2a(B);4.1h=4.W("Z");4.m=4.18("1d",B)||4.m;7(!4.9.1z||4.9.1z!="y"){4.d[0].1v.6=4.m.6+"1I"}7(!4.9.1z||4.9.1z!="x"){4.d[0].1v.5=4.m.5+"1I"}7(A.g.1f){A.g.1f.1d(4,B)}n 11},1O:b(C){a D=11;7(A.g.1f&&!4.9.2s){a D=A.g.1f.3g(4,C)}7((4.9.1g=="3f"&&!D)||(4.9.1g=="3e"&&D)||4.9.1g===t){a B=4;A(4.d).3d(4.1m,o(4.9.1g,10)||3c,b(){B.18("1i",C);B.29()})}1x{4.18("1i",C);4.29()}n 11},29:b(){4.d.2q("g-i-2r");7(4.9.d!="27"&&!4.1w){4.d.1M()}4.d=3b;4.1w=11},3a:{},28:b(B){n{d:4.d,m:4.m,1U:4.1h,9:4.9}},18:b(C,B){A.g.17.2i(4,C,[B,4.28()]);7(C=="1d"){4.1h=4.W("Z")}n 4.j.2j(C=="1d"?C:"1d"+C,[B,4.28()],4.9[C])},39:b(){7(!4.j.V("i")){n}4.j.38("i").37(".i").2q("g-i");4.36()}}));A.1T(A.g.i,{35:{1p:"k",1z:11,34:":33",32:0,31:1,d:"27"}});A.g.17.1c("i","1u",{16:b(D,C){a B=A("14");7(B.e("1u")){C.9.26=B.e("1u")}B.e("1u",C.9.1u)},1i:b(C,B){7(B.9.26){A("14").e("1u",B.9.26)}}});A.g.17.1c("i","U",{16:b(D,C){a B=A(C.d);7(B.e("U")){C.9.25=B.e("U")}B.e("U",C.9.U)},1i:b(C,B){7(B.9.25){A(B.d).e("U",B.9.25)}}});A.g.17.1c("i","1l",{16:b(D,C){a B=A(C.d);7(B.e("1l")){C.9.24=B.e("1l")}B.e("1l",C.9.1l)},1i:b(C,B){7(B.9.24){A(B.d).e("1l",B.9.24)}}});A.g.17.1c("i","1J",{16:b(C,B){A(B.9.1J===t?"30":B.9.1J).1b(b(){A(\'<23 2Z="g-i-1J" 1v="2Y: #2X;"></23>\').e({v:4.1Z+"1I",u:4.22+"1I",m:"Z",1l:"0.2W",U:2V}).e(A(4).8()).1p("14")})},1i:b(C,B){A("23.2U").1b(b(){4.1t.2T(4)})}});A.g.17.1c("i","1y",{16:b(D,C){a E=C.9;a B=A(4).V("i");E.13=E.13||20;E.12=E.12||20;B.Y=b(F){2p{7(/1H|1y/.1k(F.e("1G"))||(/1H|1y/).1k(F.e("1G-y"))){n F}F=F.k()}2o(F[0].1t);n A(f)}(4);B.X=b(F){2p{7(/1H|1y/.1k(F.e("1G"))||(/1H|1y/).1k(F.e("1G-x"))){n F}F=F.k()}2o(F[0].1t);n A(f)}(4);7(B.Y[0]!=f&&B.Y[0].1F!="1E"){B.21=B.Y.8()}7(B.X[0]!=f&&B.X[0].1F!="1E"){B.1Y=B.X.8()}},1d:b(D,C){a E=C.9;a B=A(4).V("i");7(B.Y[0]!=f&&B.Y[0].1F!="1E"){7((B.21.5+B.Y[0].22)-D.1s<E.13){B.Y[0].s=B.Y[0].s+E.12}7(D.1s-B.21.5<E.13){B.Y[0].s=B.Y[0].s-E.12}}1x{7(D.1s-A(f).s()<E.13){A(f).s(A(f).s()-E.12)}7(A(1r).u()-(D.1s-A(f).s())<E.13){A(f).s(A(f).s()+E.12)}}7(B.X[0]!=f&&B.X[0].1F!="1E"){7((B.1Y.6+B.X[0].1Z)-D.1q<E.13){B.X[0].r=B.X[0].r+E.12}7(D.1q-B.1Y.6<E.13){B.X[0].r=B.X[0].r-E.12}}1x{7(D.1q-A(f).r()<E.13){A(f).r(A(f).r()-E.12)}7(A(1r).v()-(D.1q-A(f).r())<E.13){A(f).r(A(f).r()+E.12)}}}});A.g.17.1c("i","1X",{16:b(D,C){a B=A(4).V("i");B.1j=[];A(C.9.1X===t?".g-i":C.9.1X).1b(b(){a F=A(4);a E=F.8();7(4!=B.j[0]){B.1j.2l({2h:4,v:F.1W(),u:F.1V(),5:E.5,6:E.6})}})},1d:b(J,N){a I=A(4).V("i");a L=N.9.2S||20;a D=N.1U.6,C=D+I.w.v,P=N.1U.5,O=P+I.w.u;2R(a H=I.1j.1A-1;H>=0;H--){a E=I.1j[H].6,B=E+I.1j[H].v,R=I.1j[H].5,M=R+I.1j[H].u;7(!((E-L<D&&D<B+L&&R-L<P&&P<M+L)||(E-L<D&&D<B+L&&R-L<O&&O<M+L)||(E-L<C&&C<B+L&&R-L<P&&P<M+L)||(E-L<C&&C<B+L&&R-L<O&&O<M+L))){2Q}7(N.9.2n!="2P"){a K=T.1e(R-O)<=20;a Q=T.1e(M-P)<=20;a G=T.1e(E-C)<=20;a F=T.1e(B-D)<=20;7(K){N.m.5=I.W("l",{5:R-I.w.u,6:0}).5}7(Q){N.m.5=I.W("l",{5:M,6:0}).5}7(G){N.m.6=I.W("l",{5:0,6:E-I.w.v}).6}7(F){N.m.6=I.W("l",{5:0,6:B}).6}}7(N.9.2n!="2O"){a K=T.1e(R-P)<=20;a Q=T.1e(M-O)<=20;a G=T.1e(E-D)<=20;a F=T.1e(B-C)<=20;7(K){N.m.5=I.W("l",{5:R,6:0}).5}7(Q){N.m.5=I.W("l",{5:M-I.w.u,6:0}).5}7(G){N.m.6=I.W("l",{5:0,6:E}).6}7(F){N.m.6=I.W("l",{5:0,6:B-I.w.v}).6}}}}});A.g.17.1c("i","2m",{16:b(D,C){a B=A(4).V("i");B.1D=[];A(C.9.2m).1b(b(){7(A.V(4,"1R")){a E=A.V(4,"1R");B.1D.2l({c:E,2k:E.9.1g});E.2N();E.18("2M",D,B)}})},1i:b(D,C){a B=A(4).V("i");A.1b(B.1D,b(){7(4.c.1o){4.c.1o=0;B.1w=t;4.c.1w=11;7(4.2k){4.c.9.1g=t}4.c.1O(D);4.c.j.2j("2L",[D,A.1T(4.c.g(),{2K:B.j})],4.c.9["2J"]);4.c.9.d=4.c.9.1N}1x{4.c.18("2I",D,B)}})},1d:b(F,E){a D=A(4).V("i"),B=4;a C=b(K){a H=K.6,J=H+K.v,I=K.5,G=I+K.u;n(H<(4.1h.6+4.8.q.6)&&(4.1h.6+4.8.q.6)<J&&I<(4.1h.5+4.8.q.5)&&(4.1h.5+4.8.q.5)<G)};A.1b(D.1D,b(G){7(C.2i(D,4.c.2H)){7(!4.c.1o){4.c.1o=1;4.c.1C=A(B).1S().1p(4.c.j).V("1R-2h",t);4.c.9.1N=4.c.9.d;4.c.9.d=b(){n E.d[0]};F.1Q=4.c.1C[0];4.c.2G(F,t);4.c.2g(F,t,t);4.c.8.q.5=D.8.q.5;4.c.8.q.6=D.8.q.6;4.c.8.k.6-=D.8.k.6-4.c.8.k.6;4.c.8.k.5-=D.8.k.5-4.c.8.k.5;D.18("2F",F)}7(4.c.1C){4.c.1P(F)}}1x{7(4.c.1o){4.c.1o=0;4.c.1w=t;4.c.9.1g=11;4.c.1O(F,t);4.c.9.d=4.c.9.1N;4.c.1C.1M();7(4.c.2f){4.c.2f.1M()}D.18("2E",F)}}})}});A.g.17.1c("i","1n",{16:b(D,B){a C=A.2D(A(B.9.1n.2C)).2B(b(F,E){n(o(A(F).e("U"),10)||B.9.1n.1B)-(o(A(E).e("U"),10)||B.9.1n.1B)});A(C).1b(b(E){4.1v.U=B.9.1n.1B+E});4[0].1v.U=B.9.1n.1B+C.1A}})})(2A)',62,221,'||||this|top|left|if|offset|options|var|function|instance|helper|css|document|ui|containment|draggable|element|parent|relative|position|return|parseInt|offsetParent|click|scrollLeft|scrollTop|true|height|width|helperProportions|||cssPosition|||||||||||||||||||margins|Math|zIndex|data|convertPositionTo|overflowX|overflowY|absolute||false|scrollSpeed|scrollSensitivity|body|fixed|start|plugin|propagate|grid|cursorAt|each|add|drag|abs|ddmanager|revert|positionAbs|stop|snapElements|test|opacity|originalPosition|stack|isOver|appendTo|pageX|window|pageY|parentNode|cursor|style|cancelHelperRemoval|else|scroll|axis|length|min|currentItem|sortables|HTML|tagName|overflow|auto|px|iframeFix|undefined|handle|remove|_helper|mouseStop|mouseDrag|target|sortable|clone|extend|absolutePosition|outerHeight|outerWidth|snap|overflowXOffset|offsetWidth||overflowYOffset|offsetHeight|div|_opacity|_zIndex|_cursor|original|uiHash|clear|generatePosition|addClass|borderTopWidth|borderLeftWidth|disabled|placeholder|mouseStart|item|call|triggerHandler|shouldRevert|push|connectToSortable|snapMode|while|do|removeClass|dragging|dropBehaviour|round|marginBottom|scrollHeight|max|marginRight|bottom|right|jQuery|sort|group|makeArray|fromSortable|toSortable|mouseCapture|containerCache|deactivate|receive|sender|sortreceive|activate|refreshItems|outer|inner|continue|for|snapTolerance|removeChild|DragDropIframeFix|1000|001|fff|background|class|iframe|distance|delay|input|cancel|defaults|mouseDestroy|unbind|removeData|destroy|plugins|null|500|animate|valid|invalid|drop|prepareOffsets|scrollWidth|mozilla|browser|marginTop|marginLeft|parents|apply|isFunction|current|andSelf|find|resizable|is|mouseInit|init|mouse|widget'.split('|'),0,{}))
-
Index: js/ui/packed/effects.highlight.packed.js
===================================================================
--- js/ui/packed/effects.highlight.packed.js	(revision 6370)
+++ js/ui/packed/effects.highlight.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(5(A){A.4.J=5(B){I 2.e(5(){1 E=A(2),D=["g","6","f"];1 H=A.4.z(E,B.9.y||"7");1 C=B.9.x||"#w";1 G=E.h("6");A.4.v(E,D);E.7();E.h({g:"u",6:C});1 F={6:G};3(H=="8"){F["f"]=0}E.t(F,{e:s,d:B.d,c:B.9.c,r:5(){3(H=="8"){E.8()}A.4.q(E,D);3(H=="7"&&a.p.o){2.n.m("l")}3(B.b){B.b.k(2,j)}E.i()}})})}})(a)',46,46,'|var|this|if|effects|function|backgroundColor|show|hide|options|jQuery|callback|easing|duration|queue|opacity|backgroundImage|css|dequeue|arguments|apply|filter|removeAttribute|style|msie|browser|restore|complete|false|animate|none|save|ffff99|color|mode|setMode|||||||||return|highlight'.split('|'),0,{}))
-
Index: js/ui/packed/ui.sortable.packed.js
===================================================================
--- js/ui/packed/ui.sortable.packed.js	(revision 6370)
+++ js/ui/packed/ui.sortable.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(b(B){b A(E,D){9 C=B.2Y.3Z&&B.2Y.3Y<3X;5(E.2X&&!C){d E.2X(D)}5(E.2W){d!!(E.2W(D)&16)}1T(D=D.1d){5(D==E){d V}}d w}B.3W("j.p",B.2j({},B.j.3V,{3U:b(){9 C=4.8;4.Q={};4.g.2a("j-p");4.2P();4.14=4.c.z?(/6|28/).1e(4.c[0].t.f("3T")):w;5(!(/(2V|1m|3S)/).1e(4.g.f("O"))){4.g.f("O","2V")}4.a=4.g.a();4.3R()},3Q:{},j:b(C){d{l:(C||4)["l"],r:(C||4)["r"]||B([]),O:(C||4)["O"],3P:(C||4)["18"],8:4.8,g:4.g,t:(C||4)["i"],3O:C?C.g:P}},v:b(F,E,C,D){B.j.1b.Y(4,F,[E,4.j(C)]);5(!D){4.g.2t(F=="1a"?F:"1a"+F,[E,4.j(C)],4.8[F])}},2i:b(E){9 C=(B.1N(4.8.c)?4.8.c.Y(4.g):B(4.8.c,4.g)).21(".j-p-l");9 D=[];E=E||{};C.1x(b(){9 F=(B(4).2S(E.3N||"2R")||"").3M(E.2T||(/(.+)[-=3L](.+)/));5(F){D.1y((E.2U||F[1])+"[]="+(E.2U&&E.2T?F[1]:F[2]))}});d D.3K("&")},2h:b(C){9 D=(B.1N(4.8.c)?4.8.c.Y(4.g):B(4.8.c,4.g)).21(".j-p-l");9 E=[];D.1x(b(){E.1y(B(4).2S(C||"2R"))});d E},2J:b(J){9 E=4.18.6,D=E+4.s.n,I=4.18.7,H=I+4.s.o;9 F=J.6,C=F+J.n,K=J.7,G=K+J.o;5(4.8.1r=="2Q"||4.8.3J||(4.8.1r=="1X"&&4.s[4.14?"n":"o"]>J[4.14?"n":"o"])){d(I+4.a.q.7>K&&I+4.a.q.7<G&&E+4.a.q.6>F&&E+4.a.q.6<C)}X{d(F<E+(4.s.n/2)&&D-(4.s.n/2)<C&&K<I+(4.s.o/2)&&H-(4.s.o/2)<G)}},2w:b(J){9 E=4.18.6,D=E+4.s.n,I=4.18.7,H=I+4.s.o;9 F=J.6,C=F+J.n,K=J.7,G=K+J.o;5(4.8.1r=="2Q"||(4.8.1r=="1X"&&4.s[4.14?"n":"o"]>J[4.14?"n":"o"])){5(!(I+4.a.q.7>K&&I+4.a.q.7<G&&E+4.a.q.6>F&&E+4.a.q.6<C)){d w}5(4.14){5(E+4.a.q.6>F&&E+4.a.q.6<F+J.n/2){d 2}5(E+4.a.q.6>F+J.n/2&&E+4.a.q.6<C){d 1}}X{5(I+4.a.q.7>K&&I+4.a.q.7<K+J.o/2){d 2}5(I+4.a.q.7>K+J.o/2&&I+4.a.q.7<G){d 1}}}X{5(!(F<E+(4.s.n/2)&&D-(4.s.n/2)<C&&K<I+(4.s.o/2)&&H-(4.s.o/2)<G)){d w}5(4.14){5(D>F&&E<F){d 2}5(E<C&&D>C){d 1}}X{5(H>K&&I<K){d 1}5(I<G&&H>G){d 2}}}d w},2P:b(){4.2b();4.1G()},2b:b(){4.c=[];4.e=[4];9 D=4.c;9 C=4;9 F=[[B.1N(4.8.c)?4.8.c.Y(4.g,P,{8:4.8,t:4.i}):B(4.8.c,4.g),4]];5(4.8.2e){R(9 G=4.8.2e.z-1;G>=0;G--){9 I=B(4.8.2e[G]);R(9 E=I.z-1;E>=0;E--){9 H=B.19(I[E],"p");5(H&&!H.8.2c){F.1y([B.1N(H.8.c)?H.8.c.Y(H.g):B(H.8.c,H.g),H]);4.e.1y(H)}}}}R(9 G=F.z-1;G>=0;G--){F[G][0].1x(b(){B.19(4,"p-t",F[G][1]);D.1y({t:B(4),2O:F[G][1],n:0,o:0,6:0,7:0})})}},1G:b(D){5(4.u){9 C=4.u.a();4.a.m={7:C.7+4.1v.7,6:C.6+4.1v.6}}R(9 F=4.c.z-1;F>=0;F--){5(4.c[F].2O!=4.1w&&4.1w&&4.c[F].t[0]!=4.i[0]){1I}9 E=4.8.2N?B(4.8.2N,4.c[F].t):4.c[F].t;5(!D){4.c[F].n=E[0].1Q;4.c[F].o=E[0].1S}9 G=E.a();4.c[F].6=G.6;4.c[F].7=G.7}5(4.8.2d&&4.8.2d.2M){4.8.2d.2M.Y(4)}X{R(9 F=4.e.z-1;F>=0;F--){9 G=4.e[F].g.a();4.e[F].Q.6=G.6;4.e[F].Q.7=G.7;4.e[F].Q.n=4.e[F].g.1L();4.e[F].Q.o=4.e[F].g.1K()}}},3I:b(){4.g.3H("j-p j-p-2c").2L("p").3G(".p");4.3F();R(9 C=4.c.z-1;C>=0;C--){4.c[C].t.2L("p-t")}},29:b(E){9 C=E||4,F=C.8;5(F.r.3E==3D){9 D=F.r;F.r={g:b(){d B("<2K></2K>").2a(D)[0]},1s:b(G,H){H.f(G.a()).f({n:G.1L(),o:G.1K()})}}}C.r=B(F.r.g.Y(C.g,C.i)).1D("U").f({O:"1m"});F.r.1s.Y(C.g,C.i,C.r)},2u:b(F){R(9 D=4.e.z-1;D>=0;D--){5(4.2J(4.e[D].Q)){5(!4.e[D].Q.1h){5(4.1w!=4.e[D]){9 I=3C;9 H=P;9 E=4.18[4.e[D].14?"6":"7"];R(9 C=4.c.z-1;C>=0;C--){5(!A(4.e[D].g[0],4.c[C].t[0])){1I}9 G=4.c[C][4.e[D].14?"6":"7"];5(1n.2I(G-E)<I){I=1n.2I(G-E);H=4.c[C]}}5(!H&&!4.8.2g){1I}5(4.r){4.r.1E()}5(4.e[D].8.r){4.e[D].29(4)}X{4.r=P}4.1w=4.e[D];H?4.1H(F,H,P,V):4.1H(F,P,4.e[D].g,V);4.v("23",F);4.e[D].v("23",F,4)}4.e[D].v("1h",F,4);4.e[D].Q.1h=1}}X{5(4.e[D].Q.1h){4.e[D].v("2m",F,4);4.e[D].Q.1h=0}}}},3B:b(G,F){5(4.8.2c||4.8.2v=="3A"){d w}4.2b();9 E=P,D=4,C=B(G.1M).2G().1x(b(){5(B.19(4,"p-t")==D){E=B(4);d w}});5(B.19(G.1M,"p-t")==D){E=B(G.1M)}5(!E){d w}5(4.8.2H&&!F){9 H=w;B(4.8.2H,E).3z("*").3y().1x(b(){5(4==G.1M){H=V}});5(!H){d w}}4.i=E;d V},3x:b(H,F,C){9 J=4.8;4.1w=4;4.1G();4.l=3w J.l=="b"?B(J.l.3v(4.g[0],[H,4.i])):4.i.1Y();5(!4.l.2G("U").z){B(J.1D!="m"?J.1D:4.i[0].1d)[0].2s(4.l[0])}4.l.f({O:"1m",1F:"3u"}).2a("j-p-l");4.W={6:(L(4.i.f("3t"),10)||0),7:(L(4.i.f("3s"),10)||0)};4.a=4.i.a();4.a={7:4.a.7-4.W.7,6:4.a.6-4.W.6};4.a.q={6:H.1i-4.a.6,7:H.1j-4.a.7};4.u=4.l.u();9 D=4.u.a();4.1v={7:(L(4.u.f("26"),10)||0),6:(L(4.u.f("27"),10)||0)};4.a.m={7:D.7+4.1v.7,6:D.6+4.1v.6};4.15=4.25(H);4.1Z={1t:4.i.1t()[0],m:4.i.m()[0]};4.s={n:4.l.1L(),o:4.l.1K()};5(J.r){4.29()}4.v("1p",H);4.s={n:4.l.1L(),o:4.l.1K()};5(J.13){5(J.13.6!=1J){4.a.q.6=J.13.6}5(J.13.28!=1J){4.a.q.6=4.s.n-J.13.28}5(J.13.7!=1J){4.a.q.7=J.13.7}5(J.13.2F!=1J){4.a.q.7=4.s.o-J.13.2F}}5(J.k){5(J.k=="m"){J.k=4.l[0].1d}5(J.k=="h"||J.k=="1c"){4.k=[0-4.a.m.6,0-4.a.m.7,B(J.k=="h"?h:1c).n()-4.a.m.6-4.s.n-4.W.6-(L(4.g.f("2E"),10)||0),(B(J.k=="h"?h:1c).o()||h.U.1d.2C)-4.a.m.7-4.s.o-4.W.7-(L(4.g.f("2B"),10)||0)]}5(!(/^(h|1c|m)$/).1e(J.k)){9 G=B(J.k)[0];9 I=B(J.k).a();4.k=[I.6+(L(B(G).f("27"),10)||0)-4.a.m.6,I.7+(L(B(G).f("26"),10)||0)-4.a.m.7,I.6+1n.2D(G.3r,G.1Q)-(L(B(G).f("27"),10)||0)-4.a.m.6-4.s.n-4.W.6-(L(4.i.f("2E"),10)||0),I.7+1n.2D(G.2C,G.1S)-(L(B(G).f("26"),10)||0)-4.a.m.7-4.s.o-4.W.7-(L(4.i.f("2B"),10)||0)]}}5(4.8.r!="1Y"){4.i.f("2k","3q")}5(!C){R(9 E=4.e.z-1;E>=0;E--){4.e[E].v("3p",H,4)}}5(B.j.17){B.j.17.3o=4}5(B.j.17&&!J.2p){B.j.17.3n(4,H)}4.2l=V;4.2z(H);d V},24:b(D,E){5(!E){E=4.O}9 C=D=="1m"?1:-1;d{7:(E.7+4.a.m.7*C-(4.u[0]==h.U?0:4.u[0].N)*C+4.W.7*C),6:(E.6+4.a.m.6*C-(4.u[0]==h.U?0:4.u[0].M)*C+4.W.6*C)}},25:b(F){9 G=4.8;9 C={7:(F.1j-4.a.q.7-4.a.m.7+(4.u[0]==h.U?0:4.u[0].N)),6:(F.1i-4.a.q.6-4.a.m.6+(4.u[0]==h.U?0:4.u[0].M))};5(!4.15){d C}5(4.k){5(C.6<4.k[0]){C.6=4.k[0]}5(C.7<4.k[1]){C.7=4.k[1]}5(C.6>4.k[2]){C.6=4.k[2]}5(C.7>4.k[3]){C.7=4.k[3]}}5(G.12){9 E=4.15.7+1n.2A((C.7-4.15.7)/G.12[1])*G.12[1];C.7=4.k?(!(E<4.k[1]||E>4.k[3])?E:(!(E<4.k[1])?E-G.12[1]:E+G.12[1])):E;9 D=4.15.6+1n.2A((C.6-4.15.6)/G.12[0])*G.12[0];C.6=4.k?(!(D<4.k[0]||D>4.k[2])?D:(!(D<4.k[0])?D-G.12[0]:D+G.12[0])):D}d C},2z:b(D){4.O=4.25(D);4.18=4.24("1m");B.j.1b.Y(4,"1a",[D,4.j()]);4.18=4.24("1m");4.l[0].2y.6=4.O.6+"2x";4.l[0].2y.7=4.O.7+"2x";R(9 C=4.c.z-1;C>=0;C--){9 E=4.2w(4.c[C]);5(!E){1I}5(4.c[C].t[0]!=4.i[0]&&4.i[E==1?"3m":"1t"]()[0]!=4.c[C].t[0]&&!A(4.i[0],4.c[C].t[0])&&(4.8.2v=="3l-3k"?!A(4.g[0],4.c[C].t[0]):V)){4.2r=E==1?"2q":"3j";4.1H(D,4.c[C]);4.v("23",D);3i}}4.2u(D);5(B.j.17){B.j.17.3h(4,D)}4.g.2t("1a",[D,4.j()],4.8["1a"]);d w},1H:b(H,G,D,F){D?D[0].2s(4.i[0]):G.t[0].1d.3g(4.i[0],(4.2r=="2q"?G.t[0]:G.t[0].3f));4.1u=4.1u?++4.1u:1;9 E=4,C=4.1u;1c.3e(b(){5(C==E.1u){E.1G(!F)}},0);5(4.8.r){4.8.r.1s.Y(4.g,4.i,4.r)}},3d:b(E,D){5(B.j.17&&!4.8.2p){B.j.17.3c(4,E)}5(4.8.22){9 C=4;9 F=C.i.a();5(C.r){C.r.2o({1f:"3b"},(L(4.8.22,10)||2n)-3a)}B(4.l).2o({6:F.6-4.a.m.6-C.W.6+(4.u[0]==h.U?0:4.u[0].M),7:F.7-4.a.m.7-C.W.7+(4.u[0]==h.U?0:4.u[0].N)},L(4.8.22,10)||2n,b(){C.1F(E)})}X{4.1F(E,D)}d w},1F:b(E,D){5(4.1Z.1t!=4.i.1t().21(".j-p-l")[0]||4.1Z.m!=4.i.m()[0]){4.v("1s",E,P,D)}5(!A(4.g[0],4.i[0])){4.v("1E",E,P,D);R(9 C=4.e.z-1;C>=0;C--){5(A(4.e[C].g[0],4.i[0])){4.e[C].v("1s",E,4,D);4.e[C].v("39",E,4,D)}}}R(9 C=4.e.z-1;C>=0;C--){4.e[C].v("38",E,4,D);5(4.e[C].Q.1h){4.e[C].v("2m",E,4);4.e[C].Q.1h=0}}4.2l=w;5(4.37){4.v("1q",E,P,D);d w}B(4.i).f("2k","");5(4.r){4.r.1E()}4.l.1E();4.l=P;4.v("1q",E,P,D);d V}}));B.2j(B.j.p,{36:"2i 2h",35:{l:"1Y",1r:"1X",34:1,33:0,1k:V,11:20,Z:20,32:":31",c:"> *",1g:30,2g:V,1D:"m"}});B.j.1b.1o("p","1l",{1p:b(E,D){9 C=B("U");5(C.f("1l")){D.8.1W=C.f("1l")}C.f("1l",D.8.1l)},1q:b(D,C){5(C.8.1W){B("U").f("1l",C.8.1W)}}});B.j.1b.1o("p","1g",{1p:b(E,D){9 C=D.l;5(C.f("1g")){D.8.1V=C.f("1g")}C.f("1g",D.8.1g)},1q:b(D,C){5(C.8.1V){B(C.l).f("1g",C.8.1V)}}});B.j.1b.1o("p","1f",{1p:b(E,D){9 C=D.l;5(C.f("1f")){D.8.1U=C.f("1f")}C.f("1f",D.8.1f)},1q:b(D,C){5(C.8.1U){B(C.l).f("1f",C.8.1U)}}});B.j.1b.1o("p","1k",{1p:b(E,D){9 F=D.8;9 C=B(4).19("p");C.T=b(G){2f{5(/1C|1k/.1e(G.f("1B"))||(/1C|1k/).1e(G.f("1B-y"))){d G}G=G.m()}1T(G[0].1d);d B(h)}(C.i);C.S=b(G){2f{5(/1C|1k/.1e(G.f("1B"))||(/1C|1k/).1e(G.f("1B-x"))){d G}G=G.m()}1T(G[0].1d);d B(h)}(C.i);5(C.T[0]!=h&&C.T[0].1A!="1z"){C.1R=C.T.a()}5(C.S[0]!=h&&C.S[0].1A!="1z"){C.1P=C.S.a()}},1a:b(E,D){9 F=D.8;9 C=B(4).19("p");5(C.T[0]!=h&&C.T[0].1A!="1z"){5((C.1R.7+C.T[0].1S)-E.1j<F.11){C.T[0].N=C.T[0].N+F.Z}5(E.1j-C.1R.7<F.11){C.T[0].N=C.T[0].N-F.Z}}X{5(E.1j-B(h).N()<F.11){B(h).N(B(h).N()-F.Z)}5(B(1c).o()-(E.1j-B(h).N())<F.11){B(h).N(B(h).N()+F.Z)}}5(C.S[0]!=h&&C.S[0].1A!="1z"){5((C.1P.6+C.S[0].1Q)-E.1i<F.11){C.S[0].M=C.S[0].M+F.Z}5(E.1i-C.1P.6<F.11){C.S[0].M=C.S[0].M-F.Z}}X{5(E.1i-B(h).M()<F.11){B(h).M(B(h).M()-F.Z)}5(B(1c).n()-(E.1i-B(h).M())<F.11){B(h).M(B(h).M()+F.Z)}}}});B.j.1b.1o("p","1O",{1a:b(E,D){9 C=B(4).19("p");5(D.8.1O=="y"){C.O.6=C.15.6}5(D.8.1O=="x"){C.O.7=C.15.7}}})})(2Z)',62,248,'||||this|if|left|top|options|var|offset|function|items|return|containers|css|element|document|currentItem|ui|containment|helper|parent|width|height|sortable|click|placeholder|helperProportions|item|offsetParent|propagate|false|||length||||||||||||parseInt|scrollLeft|scrollTop|position|null|containerCache|for|overflowX|overflowY|body|true|margins|else|call|scrollSpeed||scrollSensitivity|grid|cursorAt|floating|originalPosition||ddmanager|positionAbs|data|sort|plugin|window|parentNode|test|opacity|zIndex|over|pageX|pageY|scroll|cursor|absolute|Math|add|start|stop|tolerance|update|prev|counter|offsetParentBorders|currentContainer|each|push|HTML|tagName|overflow|auto|appendTo|remove|clear|refreshPositions|rearrange|continue|undefined|outerHeight|outerWidth|target|isFunction|axis|overflowXOffset|offsetWidth|overflowYOffset|offsetHeight|while|_opacity|_zIndex|_cursor|guess|clone|domPosition||not|revert|change|convertPositionTo|generatePosition|borderTopWidth|borderLeftWidth|right|createPlaceholder|addClass|refreshItems|disabled|custom|connectWith|do|dropOnEmpty|toArray|serialize|extend|visibility|dragging|out|500|animate|dropBehaviour|down|direction|appendChild|triggerHandler|contactContainers|type|intersectsWithEdge|px|style|mouseDrag|round|marginBottom|scrollHeight|max|marginRight|bottom|parents|handle|abs|intersectsWith|div|removeData|refreshContainers|toleranceElement|instance|refresh|pointer|id|attr|expression|key|relative|compareDocumentPosition|contains|browser|jQuery|1000|input|cancel|delay|distance|defaults|getter|cancelHelperRemoval|deactivate|receive|50|hide|drop|mouseStop|setTimeout|nextSibling|insertBefore|drag|break|up|dynamic|semi|next|prepareOffsets|current|activate|hidden|scrollWidth|marginTop|marginLeft|both|apply|typeof|mouseStart|andSelf|find|static|mouseCapture|10000|String|constructor|mouseDestroy|unbind|removeClass|destroy|forcePointerForContainers|join|_|match|attribute|sender|absolutePosition|plugins|mouseInit|fixed|float|init|mouse|widget|522|version|safari'.split('|'),0,{}))
-
Index: js/ui/packed/ui.datepicker.packed.js
===================================================================
--- js/ui/packed/ui.datepicker.packed.js	(revision 6370)
+++ js/ui/packed/ui.datepicker.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(n($){c 19="f";n 3A(){b.7i=F;b.44=r;b.2s=[];b.2W=F;b.2G=F;b.5w="t-f-I";b.5O="t-f-3a";b.2p="t-f-41";b.5x="t-f-9D";b.5g="t-f-3l";b.5a="t-f-3H";b.4o="t-f-4u-G";b.5Q=[];b.5Q[""]={6C:"9C",6D:"9B 4a 4u h",6A:"7m",6B:"7m 9A 6P",2A:"&#9z;9y",6z:"4b 4a 9x C",2z:"9w&#9v;",6y:"4b 4a 3P C",2U:"9u",6x:"4b 4a 4u C",1g:["9t","9s","9r","9q","7l","9p","9o","9n","9m","9l","9k","9j"],1P:["9i","9h","9g","9f","7l","9e","9d","9c","9b","9a","99","98"],6g:"4b a 7k C",69:"4b a 7k A",6v:"97",96:"95 94 4a A",1o:["93","92","91","90","8Z","8Y","8X"],1t:["8W","8V","8U","8T","8S","8R","8Q"],4r:["8P","8O","8N","8M","8L","8K","8J"],4s:"8I 3N 8H 8G 2y G",2S:"7j 3N, M d",2L:"4z/3o/2V",1x:0,6k:"7j a h",1D:F};b.1z={31:"2E",1K:"5H",5A:{},2C:r,49:"",2K:"...",3y:"",7g:F,3G:1i,5i:F,3Q:F,3m:F,5f:F,6h:1i,6d:1i,6c:"-10:+10",3M:1i,3g:F,2w:F,3L:F,4q:b.3O,1C:"+10",1j:F,6w:b.2S,O:r,S:r,1c:"8F",3K:r,48:r,2F:r,68:r,46:r,67:1,2m:1,1E:F,3T:" - ",3Z:"",3q:""};$.4d(b.1z,b.5Q[""]);b.J=$(\'<I x="\'+b.5w+\'" 4l="5I: 6Y;"></I>\')}$.4d(3A.5V,{2H:"8E",5o:n(){k(b.7i){8D.5o.2b("",4T)}},8C:n(u){3D(b.1z,u||{});q b},5S:n(o,u){c 3z=r;1m(4R 61 b.1z){c 4Q=o.8B("h:"+4R);k(4Q){3z=3z||{};6J{3z[4R]=8A(4Q)}6I(8z){3z[4R]=4Q}}}c 1Y=o.1Y.5J();c 1v=(1Y=="I"||1Y=="3k");k(!o.x){o.x="78"+v z().1R()}c 8=b.5P($(o),1v);8.u=$.4d({},u||{},3z||{});k(1Y=="p"){b.7h(o,8)}N{k(1v){b.7b(o,8)}}},5P:n(o,1v){q{x:o[0].x,p:o,1s:0,1r:0,1B:0,H:0,K:0,1v:1v,J:(!1v?b.J:$(\'<I V="t-f-1v"></I>\'))}},7h:n(o,8){c p=$(o);k(p.42(b.2H)){q}c 49=b.l(8,"49");c 1D=b.l(8,"1D");k(49){p[1D?"7d":"7c"](\'<3k V="\'+b.5O+\'">\'+49+"</3k>")}c 31=b.l(8,"31");k(31=="2E"||31=="4k"){p.2E(b.3v)}k(31=="3x"||31=="4k"){c 2K=b.l(8,"2K");c 3y=b.l(8,"3y");c 41=$(b.l(8,"7g")?$("<4N/>").2j(b.2p).7f({56:3y,7e:2K,3J:2K}):$(\'<3x 47="3x"></3x>\').2j(b.2p).R(3y==""?2K:$("<4N/>").7f({56:3y,7e:2K,3J:2K})));p[1D?"7d":"7c"](41);41.8y(n(){k($.f.2W&&$.f.3r==o){$.f.2B()}N{$.f.3v(o)}q F})}p.2j(b.2H).5N(b.4M).75(b.5M).4P("7a.f",n(3s,2J,E){8.u[2J]=E}).4P("79.f",n(3s,2J){q b.l(8,2J)});$.1d(o,19,8)},7b:n(o,8){c p=$(o);k(p.42(b.2H)){q}p.2j(b.2H).3a(8.J).4P("7a.f",n(3s,2J,E){8.u[2J]=E}).4P("79.f",n(3s,2J){q b.l(8,2J)});$.1d(o,19,8);b.5k(8,b.5n(8));b.24(8)},8x:n(8){c 1b=b.3d(8);8.J.1M(1b[1]*$(".t-f",8.J[0]).1M())},8w:n(p,76,2F,u,2r){c 8=b.77;k(!8){c x="78"+v z().1R();b.26=$(\'<p 47="50" x="\'+x+\'" 23="1" 4l="1W: 4F; 1X: -6R;"/>\');b.26.5N(b.4M);$("29").3a(b.26);8=b.77=b.5P(b.26,F);8.u={};$.1d(b.26[0],19,8)}3D(8.u,u||{});b.26.3n(76);b.1H=(2r?(2r.1a?2r:[2r.8v,2r.8u]):r);k(!b.1H){c 4I=4J.6T||15.1L.5F||15.29.5F;c 4H=4J.6S||15.1L.5E||15.29.5E;c 30=15.1L.3u||15.29.3u;c 2Z=15.1L.3t||15.29.3t;b.1H=[(4I/2)-2O+30,(4H/2)-8t+2Z]}b.26.25("2q",b.1H[0]+"4K").25("1X",b.1H[1]+"4K");8.u.2F=2F;b.2G=1i;b.J.2j(b.5x);b.3v(b.26[0]);k($.43){$.43(b.J)}$.1d(b.26[0],19,8);q b},8s:n(o){c 1Y=o.1Y.5J();c $o=$(o);$.8r(o,19);k(1Y=="p"){$o.3w("."+b.5O).45().3i().3w("."+b.2p).45().3i().2Q(b.2H).4E("2E",b.3v).4E("5N",b.4M).4E("75",b.5M)}N{k(1Y=="I"||1Y=="3k"){$o.2Q(b.2H).6X()}}},8q:n(o){o.4O=F;$(o).3w("3x."+b.2p).3C(n(){b.4O=F}).3i().3w("4N."+b.2p).25({74:"1.0",73:""});b.2s=$.72(b.2s,n(E){q(E==o?r:E)})},8p:n(o){o.4O=1i;$(o).3w("3x."+b.2p).3C(n(){b.4O=1i}).3i().3w("4N."+b.2p).25({74:"0.5",73:"3V"});b.2s=$.72(b.2s,n(E){q(E==o?r:E)});b.2s[b.2s.1a]=o},70:n(o){k(!o){q F}1m(c i=0;i<b.2s.1a;i++){k(b.2s[i]==o){q 1i}}q F},8o:n(o,1e,E){c u=1e||{};k(1O 1e=="3B"){u={};u[1e]=E}k(8=$.1d(o,19)){3D(8.u,u);b.24(8)}},8n:n(o,h,1S){c 8=$.1d(o,19);k(8){b.5k(8,h,1S);b.24(8)}},8m:n(o){c 8=$.1d(o,19);k(8){b.5q(8)}q(8?b.4w(8):r)},4M:n(e){c 8=$.1d(e.o,19);c 4L=1i;k($.f.2W){3U(e.5L){B 9:$.f.2B(r,"");L;B 13:$.f.59(e.o,8.1r,8.1B,$("1w.t-f-3h-2R-2x",8.J)[0]);q F;L;B 27:$.f.2B(r,$.f.l(8,"1c"));L;B 33:$.f.1U(e.o,(e.1N?-1:-$.f.l(8,"2m")),(e.1N?"Y":"M"));L;B 34:$.f.1U(e.o,(e.1N?+1:+$.f.l(8,"2m")),(e.1N?"Y":"M"));L;B 35:k(e.1N){$.f.5h(e.o)}L;B 36:k(e.1N){$.f.5e(e.o)}L;B 37:k(e.1N){$.f.1U(e.o,-1,"D")}L;B 38:k(e.1N){$.f.1U(e.o,-7,"D")}L;B 39:k(e.1N){$.f.1U(e.o,+1,"D")}L;B 40:k(e.1N){$.f.1U(e.o,+7,"D")}L;3V:4L=F}}N{k(e.5L==36&&e.1N){$.f.3v(b)}N{4L=F}}k(4L){e.8l();e.8k()}},5M:n(e){c 8=$.1d(e.o,19);c 2n=$.f.6K($.f.l(8,"2L"));c 5K=8j.8i(e.71==4U?e.5L:e.71);q e.1N||(5K<" "||!2n||2n.6u(5K)>-1)},3v:n(p){p=p.o||p;k(p.1Y.5J()!="p"){p=$("p",p.8h)[0]}k($.f.70(p)||$.f.3r==p){q}c 8=$.1d(p,19);c 48=$.f.l(8,"48");3D(8.u,(48?48.2b(p,[p,8]):{}));$.f.2B(r,"");$.f.3r=p;$.f.5q(8);k($.f.2G){p.E=""}k(!$.f.1H){$.f.1H=$.f.5C(p);$.f.1H[1]+=p.8g}c 1p=F;$(p).6Q().3C(n(){1p|=$(b).25("1W")=="6Z";q!1p});k(1p&&$.2c.5D){$.f.1H[0]-=15.1L.3u;$.f.1H[1]-=15.1L.3t}c P={2q:$.f.1H[0],1X:$.f.1H[1]};$.f.1H=r;8.1h=r;8.J.25({1W:"4F",5I:"8f",1X:"-8e"});$.f.24(8);8.J.1M($.f.3d(8)[1]*$(".t-f",8.J[0])[0].8d);P=$.f.6U(8,P,1p);8.J.25({1W:($.f.2G&&$.43?"8c":(1p?"6Z":"4F")),5I:"6Y",2q:P.2q+"4K",1X:P.1X+"4K"});k(!8.1v){c 1K=$.f.l(8,"1K")||"5H";c 1c=$.f.l(8,"1c");c 2X=n(){$.f.2W=1i;k($.2c.57&&2N($.2c.6j)<7){$("4j.t-f-55").25({1M:8.J.1M()+4,2I:8.J.2I()+4})}};k($.4G&&$.4G[1K]){8.J.5H(1K,$.f.l(8,"5A"),1c,2X)}N{8.J[1K](1c,2X)}k(1c==""){2X()}k(8.p[0].47!="5B"){8.p[0].2E()}$.f.44=8}},24:n(8){c 5G={1M:8.J.1M()+4,2I:8.J.2I()+4};8.J.6X().3a(b.6E(8)).8b("4j.t-f-55").25({1M:5G.1M,2I:5G.2I});c 1b=b.3d(8);8.J[(1b[0]!=1||1b[1]!=1?"6W":"45")+"6V"]("t-f-8a");8.J[(b.l(8,"1D")?"6W":"45")+"6V"]("t-f-89");k(8.p&&8.p[0].47!="5B"){$(8.p[0]).2E()}},6U:n(8,P,1p){c 2r=8.p?b.5C(8.p[0]):r;c 4I=4J.6T||15.1L.5F;c 4H=4J.6S||15.1L.5E;c 30=15.1L.3u||15.29.3u;c 2Z=15.1L.3t||15.29.3t;k(b.l(8,"1D")||(P.2q+8.J.1M()-30)>4I){P.2q=1Q.2t((1p?0:30),2r[0]+(8.p?8.p.1M():0)-(1p?30:0)-8.J.1M()-(1p&&$.2c.5D?15.1L.3u:0))}N{P.2q-=(1p?30:0)}k((P.1X+8.J.2I()-2Z)>4H){P.1X=1Q.2t((1p?0:2Z),2r[1]-(1p?2Z:0)-(b.2G?0:8.J.2I())-(1p&&$.2c.5D?15.1L.3t:0))}N{P.1X-=(1p?2Z:0)}q P},5C:n(2Y){3S(2Y&&(2Y.47=="5B"||2Y.88!=1)){2Y=2Y.87}c 1W=$(2Y).P();q[1W.2q,1W.1X]},2B:n(p,1c){c 8=b.44;k(!8){q}c 1E=b.l(8,"1E");k(1E&&b.2o){b.4C("#"+8.x,b.2M(8,8.1f,8.1q,8.1n))}b.2o=F;k(b.2W){1c=(1c!=r?1c:b.l(8,"1c"));c 1K=b.l(8,"1K");c 2X=n(){$.f.5y(8)};k(1c!=""&&$.4G&&$.4G[1K]){8.J.5z(1K,$.f.l(8,"5A"),1c,2X)}N{8.J[(1c==""?"5z":(1K=="86"?"85":(1K=="84"?"83":"5z")))](1c,2X)}k(1c==""){b.5y(8)}c 46=b.l(8,"46");k(46){46.2b((8.p?8.p[0]:r),[b.4w(8),8])}b.2W=F;b.3r=r;8.u.3l=r;k(b.2G){b.26.25({1W:"4F",2q:"0",1X:"-6R"});k($.43){$.82();$("29").3a(b.J)}}b.2G=F}b.44=r},5y:n(8){8.J.2Q(b.5x).4E(".t-f");$("."+b.5g,8.J).45()},5R:n(3s){k(!$.f.44){q}c $o=$(3s.o);k(($o.6Q("#"+$.f.5w).1a==0)&&!$o.42($.f.2H)&&!$o.42($.f.2p)&&$.f.2W&&!($.f.2G&&$.43)){$.f.2B(r,"")}},1U:n(x,P,20){c o=$(x);c 8=$.1d(o[0],19);b.4g(8,P,20);b.24(8)},5e:n(x){c o=$(x);c 8=$.1d(o[0],19);k(b.l(8,"5f")&&8.1f){8.1s=8.1f;8.H=8.1r=8.1q;8.K=8.1B=8.1n}N{c h=v z();8.1s=h.U();8.H=8.1r=h.16();8.K=8.1B=h.Q()}b.1U(o);b.4f(8)},53:n(x,2P,20){c o=$(x);c 8=$.1d(o[0],19);8.4D=F;8[20=="M"?"H":"K"]=2P.2a[2P.81].E-0;b.1U(o);b.4f(8)},52:n(x){c o=$(x);c 8=$.1d(o[0],19);k(8.p&&8.4D&&!$.2c.57){8.p[0].2E()}8.4D=!8.4D},6s:n(x,G){c o=$(x);c 8=$.1d(o[0],19);8.u.1x=G;b.24(8)},59:n(x,C,A,1w){k($(1w).42(b.5a)){q}c o=$(x);c 8=$.1d(o[0],19);c 1E=b.l(8,"1E");k(1E){b.2o=!b.2o;k(b.2o){$(".t-f 1w").2Q(b.4o);$(1w).2j(b.4o)}}8.1s=8.1f=$("a",1w).R();8.1r=8.1q=C;8.1B=8.1n=A;k(b.2o){8.1T=8.22=8.17=r}N{k(1E){8.1T=8.1f;8.22=8.1q;8.17=8.1n}}b.4C(x,b.2M(8,8.1f,8.1q,8.1n));k(b.2o){8.1h=v z(8.1n,8.1q,8.1f);b.24(8)}N{k(1E){8.1s=8.1f=8.1h.U();8.1r=8.1q=8.1h.16();8.1B=8.1n=8.1h.Q();8.1h=r;k(8.1v){b.24(8)}}}},5h:n(x){c o=$(x);c 8=$.1d(o[0],19);k(b.l(8,"5i")){q}b.2o=F;8.1T=8.22=8.17=8.1h=r;b.4C(o,"")},4C:n(x,1J){c o=$(x);c 8=$.1d(o[0],19);1J=(1J!=r?1J:b.2M(8));k(b.l(8,"1E")&&1J){1J=(8.1h?b.2M(8,8.1h):1J)+b.l(8,"3T")+1J}k(8.p){8.p.3n(1J)}b.6O(8);c 2F=b.l(8,"2F");k(2F){2F.2b((8.p?8.p[0]:r),[1J,8])}N{k(8.p){8.p.41("6P")}}k(8.1v){b.24(8)}N{k(!b.2o){b.2B(r,b.l(8,"1c"));b.3r=8.p[0];k(1O(8.p[0])!="4c"){8.p[0].2E()}b.3r=r}}},6O:n(8){c 3Z=b.l(8,"3Z");k(3Z){c 3q=b.l(8,"3q");c h=b.4w(8);1J=(5Z(h)?(!h[0]&&!h[1]?"":b.2d(3q,h[0],b.1Z(8))+b.l(8,"3T")+b.2d(3q,h[1]||h[0],b.1Z(8))):b.2d(3q,h,b.1Z(8)));$(3Z).3C(n(){$(b).3n(1J)})}},80:n(h){c G=h.3e();q[(G>0&&G<6),""]},3O:n(h){c 1A=v z(h.Q(),h.16(),h.U(),(h.7Z()/-60));c 3p=v z(1A.Q(),1-1,4);c 1x=3p.3e()||7;3p.4e(3p.U()+1-1x);k(1x<4&&1A<3p){1A.4e(1A.U()-3);q $.f.3O(1A)}N{k(1A>v z(1A.Q(),12-1,28)){1x=v z(1A.Q()+1,1-1,4).3e()||7;k(1x>4&&(1A.3e()||7)<1x-3){1A.4e(1A.U()+3);q $.f.3O(1A)}}}q 1Q.7Y(((1A-3p)/7X)/7)+1},2S:n(h,8){q $.f.2d($.f.l(8,"2S"),h,$.f.1Z(8))},5p:n(X,E,u){k(X==r||E==r){3W"6M 4T"}E=(1O E=="4c"?E.5X():E+"");k(E==""){q r}c 1C=(u?u.1C:r)||b.1z.1C;c 1t=(u?u.1t:r)||b.1z.1t;c 1o=(u?u.1o:r)||b.1z.1o;c 1P=(u?u.1P:r)||b.1z.1P;c 1g=(u?u.1g:r)||b.1z.1g;c A=-1;c C=-1;c G=-1;c 1F=F;c 1G=n(1l){c 1y=(T+1<X.1a&&X.18(T+1)==1l);k(1y){T++}q 1y};c 3X=n(1l){1G(1l);c 5v=(1l=="@"?14:(1l=="y"?4:2));c 23=5v;c 4B=0;3S(23>0&&1I<E.1a&&E.18(1I)>="0"&&E.18(1I)<="9"){4B=4B*10+(E.18(1I++)-0);23--}k(23==5v){3W"7W 4X 5u 1W "+1I}q 4B};c 5t=n(1l,4x,4y){c 3Y=(1G(1l)?4y:4x);c 23=0;1m(c j=0;j<3Y.1a;j++){23=1Q.2t(23,3Y[j].1a)}c 1e="";c 6N=1I;3S(23>0&&1I<E.1a){1e+=E.18(1I++);1m(c i=0;i<3Y.1a;i++){k(1e==3Y[i]){q i+1}}23--}3W"7V 1e 5u 1W "+6N};c 4A=n(){k(E.18(1I)!=X.18(T)){3W"7U 1F 5u 1W "+1I}1I++};c 1I=0;1m(c T=0;T<X.1a;T++){k(1F){k(X.18(T)=="\'"&&!1G("\'")){1F=F}N{4A()}}N{3U(X.18(T)){B"d":G=3X("d");L;B"D":5t("D",1t,1o);L;B"m":C=3X("m");L;B"M":C=5t("M",1P,1g);L;B"y":A=3X("y");L;B"@":c h=v z(3X("@"));A=h.Q();C=h.16()+1;G=h.U();L;B"\'":k(1G("\'")){4A()}N{1F=1i}L;3V:4A()}}}k(A<2O){A+=v z().Q()-v z().Q()%2O+(A<=1C?0:-2O)}c h=v z(A,C-1,G);k(h.Q()!=A||h.16()+1!=C||h.U()!=G){3W"6M h"}q h},7T:"2V-4z-3o",7S:"D, 3o M 2V",7R:"2V-4z-3o",7Q:"D, d M y",7P:"3N, 3o-M-y",7O:"D, d M y",7N:"D, d M 2V",7M:"D, d M 2V",7L:"D, d M y",7K:"@",7J:"2V-4z-3o",2d:n(X,h,u){k(!h){q""}c 1t=(u?u.1t:r)||b.1z.1t;c 1o=(u?u.1o:r)||b.1z.1o;c 1P=(u?u.1P:r)||b.1z.1P;c 1g=(u?u.1g:r)||b.1z.1g;c 1G=n(1l){c 1y=(T+1<X.1a&&X.18(T+1)==1l);k(1y){T++}q 1y};c 5s=n(1l,E){q(1G(1l)&&E<10?"0":"")+E};c 5r=n(1l,E,4x,4y){q(1G(1l)?4y[E]:4x[E])};c 1V="";c 1F=F;k(h){1m(c T=0;T<X.1a;T++){k(1F){k(X.18(T)=="\'"&&!1G("\'")){1F=F}N{1V+=X.18(T)}}N{3U(X.18(T)){B"d":1V+=5s("d",h.U());L;B"D":1V+=5r("D",h.3e(),1t,1o);L;B"m":1V+=5s("m",h.16()+1);L;B"M":1V+=5r("M",h.16(),1P,1g);L;B"y":1V+=(1G("y")?h.Q():(h.6L()%2O<10?"0":"")+h.6L()%2O);L;B"@":1V+=h.1R();L;B"\'":k(1G("\'")){1V+="\'"}N{1F=1i}L;3V:1V+=X.18(T)}}}}q 1V},6K:n(X){c 2n="";c 1F=F;1m(c T=0;T<X.1a;T++){k(1F){k(X.18(T)=="\'"&&!1G("\'")){1F=F}N{2n+=X.18(T)}}N{3U(X.18(T)){B"d":B"m":B"y":B"@":2n+="7I";L;B"D":B"M":q r;B"\'":k(1G("\'")){2n+="\'"}N{1F=1i}L;3V:2n+=X.18(T)}}}q 2n},l:n(8,1e){q 8.u[1e]!==4U?8.u[1e]:b.1z[1e]},5q:n(8){c 2L=b.l(8,"2L");c 2D=8.p?8.p.3n().6b(b.l(8,"3T")):r;8.1T=8.22=8.17=r;c h=2C=b.5n(8);k(2D.1a>0){c u=b.1Z(8);k(2D.1a>1){h=b.5p(2L,2D[1],u)||2C;8.1T=h.U();8.22=h.16();8.17=h.Q()}6J{h=b.5p(2L,2D[0],u)||2C}6I(e){b.5o(e);h=2C}}8.1s=h.U();8.H=8.1r=h.16();8.K=8.1B=h.Q();8.1f=(2D[0]?h.U():0);8.1q=(2D[0]?h.16():0);8.1n=(2D[0]?h.Q():0);b.4g(8)},5n:n(8){c h=b.3F(b.l(8,"2C"),v z());c O=b.2e(8,"2f",1i);c S=b.2e(8,"2t");h=(O&&h<O?O:h);h=(S&&h>S?S:h);q h},3F:n(h,2C){c 6F=n(P){c h=v z();h.6o(h.6n()+P);q h};c 6G=n(P,5m){c h=v z();c A=h.Q();c C=h.16();c G=h.U();c 5l=/([+-]?[0-9]+)\\s*(d|D|w|W|m|M|y|Y)?/g;c 1y=5l.6H(P);3S(1y){3U(1y[2]||"d"){B"d":B"D":G+=(1y[1]-0);L;B"w":B"W":G+=(1y[1]*7);L;B"m":B"M":C+=(1y[1]-0);G=1Q.2f(G,5m(A,C));L;B"y":B"Y":A+=(1y[1]-0);G=1Q.2f(G,5m(A,C));L}1y=5l.6H(P)}q v z(A,C,G)};q(h==r?2C:(1O h=="3B"?6G(h,b.3E):(1O h=="4X"?6F(h):h)))},5k:n(8,h,1S){c 2v=!(h);h=b.3F(h,v z());8.1s=8.1f=h.U();8.H=8.1r=8.1q=h.16();8.K=8.1B=8.1n=h.Q();k(b.l(8,"1E")){k(1S){1S=b.3F(1S,r);8.1T=1S.U();8.22=1S.16();8.17=1S.Q()}N{8.1T=8.1f;8.22=8.1q;8.17=8.1n}}b.4g(8);k(8.p){8.p.3n(2v?"":b.2M(8)+(!b.l(8,"1E")?"":b.l(8,"3T")+b.2M(8,8.1T,8.22,8.17)))}},4w:n(8){c 5j=(!8.1n||(8.p&&8.p.3n()=="")?r:v z(8.1n,8.1q,8.1f));k(b.l(8,"1E")){q[8.1h||5j,(!8.17?r:v z(8.17,8.22,8.1T))]}N{q 5j}},6E:n(8){c 2k=v z();2k=v z(2k.Q(),2k.16(),2k.U());c 1j=b.l(8,"1j");c 1D=b.l(8,"1D");c 2v=(b.l(8,"5i")?"":\'<I V="t-f-2v"><a 2h="Z.f.5h(\\\'#\'+8.x+"\');\\""+(1j?b.2g(8,b.l(8,"6D")||"&#1u;"):"")+">"+b.l(8,"6C")+"</a></I>");c 58=\'<I V="t-f-7H">\'+(1D?"":2v)+\'<I V="t-f-7G"><a 2h="Z.f.2B();"\'+(1j?b.2g(8,b.l(8,"6B")||"&#1u;"):"")+">"+b.l(8,"6A")+"</a></I>"+(1D?2v:"")+"</I>";c 3l=b.l(8,"3l");c 3G=b.l(8,"3G");c 3Q=b.l(8,"3Q");c 3m=b.l(8,"3m");c 1b=b.3d(8);c 2m=b.l(8,"2m");c 6q=(1b[0]!=1||1b[1]!=1);c 4p=(!8.1f?v z(7F,9,9):v z(8.1n,8.1q,8.1f));c O=b.2e(8,"2f",1i);c S=b.2e(8,"2t");c H=8.H;c K=8.K;k(S){c 3R=v z(S.Q(),S.16()-1b[1]+1,S.U());3R=(O&&3R<O?O:3R);3S(v z(K,H,1)>3R){H--;k(H<0){H=11;K--}}}c 2A=b.l(8,"2A");2A=(!3m?2A:b.2d(2A,v z(K,H-2m,1),b.1Z(8)));c 4t=\'<I V="t-f-4t">\'+(b.4W(8,-1,K,H)?"<a 2h=\\"Z.f.1U(\'#"+8.x+"\', -"+2m+", \'M\');\\""+(1j?b.2g(8,b.l(8,"6z")||"&#1u;"):"")+">"+2A+"</a>":(3Q?"":"<4v>"+2A+"</4v>"))+"</I>";c 2z=b.l(8,"2z");2z=(!3m?2z:b.2d(2z,v z(K,H+2m,1),b.1Z(8)));c 3P=\'<I V="t-f-3P">\'+(b.4W(8,+1,K,H)?"<a 2h=\\"Z.f.1U(\'#"+8.x+"\', +"+2m+", \'M\');\\""+(1j?b.2g(8,b.l(8,"6y")||"&#1u;"):"")+">"+2z+"</a>":(3Q?"":"<4v>"+2z+"</4v>"))+"</I>";c 2U=b.l(8,"2U");2U=(!3m?2U:b.2d(2U,2k,b.1Z(8)));c R=(3l?\'<I V="\'+b.5g+\'">\'+3l+"</I>":"")+(3G&&!8.1v?58:"")+\'<I V="t-f-7E">\'+(1D?3P:4t)+(b.4V(8,(b.l(8,"5f")&&8.1f?4p:2k))?\'<I V="t-f-4u"><a 2h="Z.f.5e(\\\'#\'+8.x+"\');\\""+(1j?b.2g(8,b.l(8,"6x")||"&#1u;"):"")+">"+2U+"</a></I>":"")+(1D?4t:3P)+"</I>";c 1x=b.l(8,"1x");c 3M=b.l(8,"3M");c 1o=b.l(8,"1o");c 1t=b.l(8,"1t");c 4r=b.l(8,"4r");c 1g=b.l(8,"1g");c 3K=b.l(8,"3K");c 3g=b.l(8,"3g");c 2w=b.l(8,"2w");c 3L=b.l(8,"3L");c 4q=b.l(8,"4q")||b.3O;c 21=(1j?b.l(8,"4s")||"&#1u;":"");c 2S=b.l(8,"6w")||b.2S;c 1S=8.1T?v z(8.17,8.22,8.1T):4p;1m(c 2T=0;2T<1b[0];2T++){1m(c 3j=0;3j<1b[1];3j++){c 3f=v z(K,H,8.1s);R+=\'<I V="t-f-7D-C\'+(3j==0?" t-f-v-2T":"")+\'">\'+b.6i(8,H,K,O,S,3f,2T>0||3j>0,1j,1g)+\'<6l V="t-f" 7C="0" 7B="0"><6r><4m V="t-f-3J-2T">\'+(3L?"<1w>"+b.l(8,"6v")+"</1w>":"");1m(c 2l=0;2l<7;2l++){c G=(2l+1x)%7;c 4s=(21.6u("3N")>-1?21.6t(/3N/,1o[G]):21.6t(/D/,1t[G]));R+="<1w"+((2l+1x+6)%7>=5?\' V="t-f-2y-3i-2R"\':"")+">"+(!3M?"<3k":"<a 2h=\\"Z.f.6s(\'#"+8.x+"\', "+G+\');"\')+(1j?b.2g(8,4s):"")+\' 3J="\'+1o[G]+\'">\'+4r[G]+(3M?"</a>":"</3k>")+"</1w>"}R+="</4m></6r><6m>";c 5c=b.3E(K,H);k(K==8.1B&&H==8.1r){8.1s=1Q.2f(8.1s,5c)}c 5d=(b.64(K,H)-1x+7)%7;c 1k=v z(K,H,1-5d);c 6p=(6q?6:1Q.7A((5d+5c)/7));1m(c 5b=0;5b<6p;5b++){R+=\'<4m V="t-f-3h-2T">\'+(3L?\'<1w V="t-f-2y-3j">\'+4q(1k)+"</1w>":"");1m(c 2l=0;2l<7;2l++){c 3I=(3K?3K.2b((8.p?8.p[0]:r),[1k]):[1i,""]);c 2i=(1k.16()!=H);c 3H=2i||!3I[0]||(O&&1k<O)||(S&&1k>S);R+=\'<1w V="t-f-3h-2R\'+((2l+1x+6)%7>=5?" t-f-2y-3i-2R":"")+(2i?" t-f-2i":"")+(1k.1R()==3f.1R()&&H==8.1r?" t-f-3h-2R-2x":"")+(3H?" "+b.5a:"")+(2i&&!2w?"":" "+3I[1]+(1k.1R()>=4p.1R()&&1k.1R()<=1S.1R()?" "+b.4o:"")+(1k.1R()==2k.1R()?" t-f-2k":""))+\'"\'+((!2i||2w)&&3I[2]?\' 3J="\'+3I[2]+\'"\':"")+(3H?(3g?" 51=\\"Z(b).4n().2j(\'t-f-2y-2x\');\\" 4Z=\\"Z(b).4n().2Q(\'t-f-2y-2x\');\\"":""):" 51=\\"Z(b).2j(\'t-f-3h-2R-2x\')"+(3g?".4n().2j(\'t-f-2y-2x\')":"")+";"+(!1j||(2i&&!2w)?"":"Z(\'#t-f-21-"+8.x+"\').R(\'"+(2S.2b((8.p?8.p[0]:r),[1k,8])||"&#1u;")+"\');")+"\\" 4Z=\\"Z(b).2Q(\'t-f-3h-2R-2x\')"+(3g?".4n().2Q(\'t-f-2y-2x\')":"")+";"+(!1j||(2i&&!2w)?"":"Z(\'#t-f-21-"+8.x+"\').R(\'&#1u;\');")+\'" 2h="Z.f.59(\\\'#\'+8.x+"\',"+H+","+K+\', b);"\')+">"+(2i?(2w?1k.U():"&#1u;"):(3H?1k.U():"<a>"+1k.U()+"</a>"))+"</1w>";1k.6o(1k.6n()+1)}R+="</4m>"}H++;k(H>11){H=0;K++}R+="</6m></6l></I>"}}R+=(1j?\'<I 4l="2v: 4k;"></I><I x="t-f-21-\'+8.x+\'" V="t-f-21">\'+(b.l(8,"6k")||"&#1u;")+"</I>":"")+(!3G&&!8.1v?58:"")+\'<I 4l="2v: 4k;"></I>\'+($.2c.57&&2N($.2c.6j)<7&&!8.1v?\'<4j 56="7z:F;" V="t-f-55"></4j>\':"");q R},6i:n(8,H,K,O,S,3f,54,1j,1g){O=(8.1h&&O&&3f<O?3f:O);c R=\'<I V="t-f-7y">\';k(54||!b.l(8,"6h")){R+=1g[H]+"&#1u;"}N{c 6f=(O&&O.Q()==K);c 6e=(S&&S.Q()==K);R+=\'<2P V="t-f-v-C" 6a="Z.f.53(\\\'#\'+8.x+"\', b, \'M\');\\" 2h=\\"Z.f.52(\'#"+8.x+"\');\\""+(1j?b.2g(8,b.l(8,"6g")||"&#1u;"):"")+">";1m(c C=0;C<12;C++){k((!6f||C>=O.16())&&(!6e||C<=S.16())){R+=\'<4h E="\'+C+\'"\'+(C==H?\' 4i="4i"\':"")+">"+1g[C]+"</4h>"}}R+="</2P>"}k(54||!b.l(8,"6d")){R+=K}N{c 2u=b.l(8,"6c").6b(":");c A=0;c 17=0;k(2u.1a!=2){A=K-10;17=K+10}N{k(2u[0].18(0)=="+"||2u[0].18(0)=="-"){A=17=v z().Q();A+=2N(2u[0],10);17+=2N(2u[1],10)}N{A=2N(2u[0],10);17=2N(2u[1],10)}}A=(O?1Q.2t(A,O.Q()):A);17=(S?1Q.2f(17,S.Q()):17);R+=\'<2P V="t-f-v-A" 6a="Z.f.53(\\\'#\'+8.x+"\', b, \'Y\');\\" 2h=\\"Z.f.52(\'#"+8.x+"\');\\""+(1j?b.2g(8,b.l(8,"69")||"&#1u;"):"")+">";1m(;A<=17;A++){R+=\'<4h E="\'+A+\'"\'+(A==K?\' 4i="4i"\':"")+">"+A+"</4h>"}R+="</2P>"}R+="</I>";q R},2g:n(8,50){q" 51=\\"Z(\'#t-f-21-"+8.x+"\').R(\'"+50+"\');\\" 4Z=\\"Z(\'#t-f-21-"+8.x+"\').R(\'&#1u;\');\\""},4g:n(8,P,20){c A=8.K+(20=="Y"?P:0);c C=8.H+(20=="M"?P:0);c G=1Q.2f(8.1s,b.3E(A,C))+(20=="D"?P:0);c h=v z(A,C,G);c O=b.2e(8,"2f",1i);c S=b.2e(8,"2t");h=(O&&h<O?O:h);h=(S&&h>S?S:h);8.1s=h.U();8.H=8.1r=h.16();8.K=8.1B=h.Q();k(20=="M"||20=="Y"){b.4f(8)}},4f:n(8){c 4Y=b.l(8,"68");k(4Y){4Y.2b((8.p?8.p[0]:r),[v z(8.1B,8.1r,1),8])}},3d:n(8){c 1b=b.l(8,"67");q(1b==r?[1,1]:(1O 1b=="4X"?[1,1b]:1b))},2e:n(8,66,65){c h=b.3F(b.l(8,66+"z"),r);k(h){h.7x(0);h.7w(0);h.7v(0);h.7u(0)}q(!65||!8.1h?h:(!h||8.1h>h?8.1h:h))},3E:n(A,C){q 32-v z(A,C,32).U()},64:n(A,C){q v z(A,C,1).3e()},4W:n(8,P,63,62){c 1b=b.3d(8);c h=v z(63,62+(P<0?P:1b[1]),1);k(P<0){h.4e(b.3E(h.Q(),h.16()))}q b.4V(8,h)},4V:n(8,h){c 3c=(!8.1h?r:v z(8.1B,8.1r,8.1s));3c=(3c&&8.1h<3c?8.1h:3c);c O=3c||b.2e(8,"2f");c S=b.2e(8,"2t");q((!O||h>=O)&&(!S||h<=S))},1Z:n(8){c 1C=b.l(8,"1C");1C=(1O 1C!="3B"?1C:v z().Q()%2O+2N(1C,10));q{1C:1C,1t:b.l(8,"1t"),1o:b.l(8,"1o"),1P:b.l(8,"1P"),1g:b.l(8,"1g")}},2M:n(8,G,C,A){k(!G){8.1f=8.1s;8.1q=8.1r;8.1n=8.1B}c h=(G?(1O G=="4c"?G:v z(A,C,G)):v z(8.1n,8.1q,8.1f));q b.2d(b.l(8,"2L"),h,b.1Z(8))}});n 3D(o,3b){$.4d(o,3b);1m(c 1e 61 3b){k(3b[1e]==r||3b[1e]==4U){o[1e]=3b[1e]}}q o}n 5Z(a){q(a&&(($.2c.7t&&1O a=="4c"&&a.1a)||(a.5Y&&a.5Y.5X().1l(/\\5W\\(\\)/))))}$.7s.f=n(2a){c 4S=5W.5V.7r.7q(4T,1);k(1O 2a=="3B"&&(2a=="7p"||2a=="U")){q $.f["5U"+2a+"3A"].2b($.f,[b[0]].5T(4S))}q b.3C(n(){1O 2a=="3B"?$.f["5U"+2a+"3A"].2b($.f,[b].5T(4S)):$.f.5S(b,2a)})};$.f=v 3A();$(15).7o(n(){$(15.29).3a($.f.J).7n($.f.5R)})})(Z)',62,598,'||||||||inst|||this|var|||datepicker||date|||if|_get||function|target|input|return|null||ui|settings|new||id||Date|year|case|month||value|false|day|drawMonth|div|dpDiv|drawYear|break||else|minDate|offset|getFullYear|html|maxDate|iFormat|getDate|class||format||jQuery||||||document|getMonth|endYear|charAt|PROP_NAME|length|numMonths|duration|data|name|currentDay|monthNames|rangeStart|true|showStatus|printDate|match|for|currentYear|dayNames|isFixed|currentMonth|selectedMonth|selectedDay|dayNamesShort|xa0|inline|td|firstDay|matches|_defaults|checkDate|selectedYear|shortYearCutoff|isRTL|rangeSelect|literal|lookAhead|_pos|iValue|dateStr|showAnim|documentElement|width|ctrlKey|typeof|monthNamesShort|Math|getTime|endDate|endDay|_adjustDate|output|position|top|nodeName|_getFormatConfig|period|status|endMonth|size|_updateDatepicker|css|_dialogInput|||body|options|apply|browser|formatDate|_getMinMaxDate|min|_addStatus|onclick|otherMonth|addClass|today|dow|stepMonths|chars|_stayOpen|_triggerClass|left|pos|_disabledInputs|max|years|clear|showOtherMonths|over|week|nextText|prevText|_hideDatepicker|defaultDate|dates|focus|onSelect|_inDialog|markerClassName|height|key|buttonText|dateFormat|_formatDate|parseInt|100|select|removeClass|cell|dateStatus|row|currentText|yy|_datepickerShowing|postProcess|obj|scrollY|scrollX|showOn|||||||||append|props|newMinDate|_getNumberOfMonths|getDay|selectedDate|highlightWeek|days|end|col|span|prompt|navigationAsDateFormat|val|dd|firstMon|altFormat|_lastInput|event|scrollTop|scrollLeft|_showDatepicker|siblings|button|buttonImage|inlineSettings|Datepicker|string|each|extendRemove|_getDaysInMonth|_determineDate|closeAtTop|unselectable|daySettings|title|beforeShowDay|showWeeks|changeFirstDay|DD|iso8601Week|next|hideIfNoPrevNext|maxDraw|while|rangeSeparator|switch|default|throw|getNumber|names|altField||trigger|hasClass|blockUI|_curInst|remove|onClose|type|beforeShow|appendText|the|Show|object|extend|setDate|_notifyChange|_adjustInstDate|option|selected|iframe|both|style|tr|parent|_currentClass|currentDate|calculateWeek|dayNamesMin|dayStatus|prev|current|label|_getDate|shortNames|longNames|mm|checkLiteral|num|_selectDate|_selectingMonthYear|unbind|absolute|effects|browserHeight|browserWidth|window|px|handled|_doKeyDown|img|disabled|bind|attrValue|attrName|otherArgs|arguments|undefined|_isInRange|_canAdjustMonth|number|onChange|onmouseout|text|onmouseover|_clickMonthYear|_selectMonthYear|secondary|cover|src|msie|controls|_selectDay|_unselectableClass|dRow|daysInMonth|leadDays|_gotoToday|gotoCurrent|_promptClass|_clearDate|mandatory|startDate|_setDate|pattern|getDaysInMonth|_getDefaultDate|log|parseDate|_setDateFromField|formatName|formatNumber|getName|at|origSize|_mainDivId|_dialogClass|_tidyDialog|hide|showOptions|hidden|_findPos|opera|clientHeight|clientWidth|dims|show|display|toLowerCase|chr|keyCode|_doKeyPress|keydown|_appendClass|_newInst|regional|_checkExternalClick|_attachDatepicker|concat|_|prototype|Array|toString|constructor|isArray||in|curMonth|curYear|_getFirstDayOfMonth|checkRange|minMax|numberOfMonths|onChangeMonthYear|yearStatus|onchange|split|yearRange|changeYear|inMaxYear|inMinYear|monthStatus|changeMonth|_generateMonthYearHeader|version|initStatus|table|tbody|getUTCDate|setUTCDate|numRows|isMultiMonth|thead|_changeFirstDay|replace|indexOf|weekHeader|statusForDate|currentStatus|nextStatus|prevStatus|closeText|closeStatus|clearText|clearStatus|_generateDatepicker|offsetNumeric|offsetString|exec|catch|try|_possibleChars|getYear|Invalid|iInit|_updateAlternate|change|parents|100px|innerHeight|innerWidth|_checkOffset|Class|add|empty|none|fixed|_isDisabledDatepicker|charCode|map|cursor|opacity|keypress|dateText|_dialogInst|dp|getData|setData|_inlineDatepicker|after|before|alt|attr|buttonImageOnly|_connectDatepicker|debug|Select|different|May|Close|mousedown|ready|isDisabled|call|slice|fn|safari|setMilliseconds|setSeconds|setMinutes|setHours|header|javascript|ceil|cellspacing|cellpadding|one|links|9999|close|control|0123456789|W3C|TIMESTAMP|RSS|RFC_2822|RFC_1123|RFC_1036|RFC_850|RFC_822|ISO_8601|COOKIE|ATOM|Unexpected|Unknown|Missing|86400000|floor|getTimezoneOffset|noWeekends|selectedIndex|unblockUI|fadeOut|fadeIn|slideUp|slideDown|nextSibling|nodeType|rtl|multi|find|static|offsetWidth|1000px|block|offsetHeight|parentNode|fromCharCode|String|stopPropagation|preventDefault|_getDateDatepicker|_setDateDatepicker|_changeDatepicker|_disableDatepicker|_enableDatepicker|removeData|_destroyDatepicker|150|pageY|pageX|_dialogDatepicker|_inlineShow|click|err|eval|getAttribute|setDefaults|console|hasDatepicker|normal|first|as|Set|Sa|Fr|Th|We|Tu|Mo|Su|Sat|Fri|Thu|Wed|Tue|Mon|Sun|Saturday|Friday|Thursday|Wednesday|Tuesday|Monday|Sunday|of|Week|weekStatus|Wk|Dec|Nov|Oct|Sep|Aug|Jul|Jun|Apr|Mar|Feb|Jan|December|November|October|September|August|July|June|April|March|February|January|Today|x3e|Next|previous|Prev|x3c|without|Erase|Clear|dialog'.split('|'),0,{}))
-
Index: js/ui/packed/effects.bounce.packed.js
===================================================================
--- js/ui/packed/effects.bounce.packed.js	(revision 6370)
+++ js/ui/packed/effects.bounce.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(a(A){A.8.16=a(B){15 e.m(a(){4 E=A(e),K=["14","i","j"];4 J=A.8.13(E,B.6.12||"11");4 M=B.6.10||"k";4 C=B.6.u||Z;4 D=B.6.Y||5;4 G=B.X||W;7(/h|d/.V(J)){K.U("g")}A.8.T(E,K);E.h();A.8.S(E);4 F=(M=="k"||M=="R")?"i":"j";4 O=(M=="k"||M=="j")?"9":"Q";4 C=B.6.u||(F=="i"?E.P({t:s})/3:E.z({t:s})/3);7(J=="h"){E.r("g",0).r(F,O=="9"?-C:C)}7(J=="d"){C=C/(D*2)}7(J!="d"){D--}7(J=="h"){4 H={g:1};H[F]=(O=="9"?"+=":"-=")+C;E.c(H,G/2,B.6.b);C=C/2;D--}y(4 I=0;I<D;I++){4 N={},L={};N[F]=(O=="9"?"-=":"+=")+C;L[F]=(O=="9"?"+=":"-=")+C;E.c(N,G/2,B.6.b).c(L,G/2,B.6.b);C=(J=="d")?C*2:C/2}7(J=="d"){4 H={g:0};H[F]=(O=="9"?"-=":"+=")+C;E.c(H,G/2,B.6.b,a(){E.d();A.8.q(E,K);A.8.p(E);7(B.f){B.f.o(e,n)}})}x{4 N={},L={};N[F]=(O=="9"?"-=":"+=")+C;L[F]=(O=="9"?"+=":"-=")+C;E.c(N,G/2,B.6.b).c(L,G/2,B.6.b,a(){A.8.q(E,K);A.8.p(E);7(B.f){B.f.o(e,n)}})}E.m("w",a(){E.l()});E.l()})}})(v)',62,69,'||||var||options|if|effects|pos|function|easing|animate|hide|this|callback|opacity|show|top|left|up|dequeue|queue|arguments|apply|removeWrapper|restore|css|true|margin|distance|jQuery|fx|else|for|outerWidth||||||||||||||||outerHeight|neg|down|createWrapper|save|push|test|250|duration|times|20|direction|effect|mode|setMode|position|return|bounce'.split('|'),0,{}))
-
Index: js/ui/packed/effects.pulsate.packed.js
===================================================================
--- js/ui/packed/effects.pulsate.packed.js	(revision 6370)
+++ js/ui/packed/effects.pulsate.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(7(A){A.n.z=7(B){y d.j(7(){f 3=A(d);f h=A.n.x(3,B.4.w||"m");f c=B.4.v||5;b(h=="g"){c--}b(3.u(":t")){3.s("6",0);3.m();3.a({6:1},B.9/2,B.4.8);c=c-2}r(f C=0;C<c;C++){3.a({6:0},B.9/2,B.4.8).a({6:1},B.9/2,B.4.8)}b(h=="g"){3.a({6:0},B.9/2,B.4.8,7(){3.g();b(B.e){B.e.l(d,k)}})}q{3.a({6:0},B.9/2,B.4.8).a({6:1},B.9/2,B.4.8,7(){b(B.e){B.e.l(d,k)}})}3.j("p",7(){3.i()});3.i()})}})(o)',39,39,'|||D|options||opacity|function|easing|duration|animate|if|E|this|callback|var|hide|F|dequeue|queue|arguments|apply|show|effects|jQuery|fx|else|for|css|hidden|is|times|mode|setMode|return|pulsate|||'.split('|'),0,{}))
-
Index: js/ui/packed/ui.resizable.packed.js
===================================================================
--- js/ui/packed/ui.resizable.packed.js	(revision 6370)
+++ js/ui/packed/ui.resizable.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(h(A){A.4s("b.c",A.19({},A.b.4r,{4q:h(){f M=4,N=4.m;f Q=4.k.d("g");4.2v=4.k;4.k.1j("b-c").d({g:/20/.q(Q)?"1i":Q});A.19(N,{1N:!!(N.1a),l:N.l||N.12||N.1o?N.l||"4p":1g,1m:N.1m===1v?"b-c-1V-13":N.1m});f H="2E 3m #4o";N.3j={"b-c":{1W:"2d"},"b-c-13":{g:"1D",3o:"#3n",4n:"0.2E"},"b-c-n":{t:"n-o",8:"16",5:"p",1s:"p",2F:H},"b-c-s":{t:"s-o",8:"16",5:"p",1s:"p",2I:H},"b-c-e":{t:"e-o",6:"16",9:"p",1t:"p",2H:H},"b-c-w":{t:"w-o",6:"16",9:"p",1t:"p",2G:H},"b-c-y":{t:"y-o",6:"16",8:"16",2H:H,2I:H},"b-c-x":{t:"x-o",6:"16",8:"16",2I:H,2G:H},"b-c-Z":{t:"Z-o",6:"16",8:"16",2H:H,2F:H},"b-c-z":{t:"z-o",6:"16",8:"16",2G:H,2F:H}};N.2z={"b-c-13":{3o:"#3n",4m:"2E 3m #4l",8:"3l",6:"3l"},"b-c-n":{t:"n-o",9:"p",5:"45%"},"b-c-s":{t:"s-o",1t:"p",5:"45%"},"b-c-e":{t:"e-o",1s:"p",9:"45%"},"b-c-w":{t:"w-o",5:"p",9:"45%"},"b-c-y":{t:"y-o",1s:"p",1t:"p"},"b-c-x":{t:"x-o",5:"p",1t:"p"},"b-c-z":{t:"z-o",5:"p",9:"p"},"b-c-Z":{t:"Z-o",1s:"p",9:"p"}};N.2y=4.k[0].2f;a(N.2y.2x(/4k|1Y|2j|3f|3e|4j/i)){f B=4.k;a(/1i/.q(B.d("g"))&&A.1f.35){B.d({g:"1i",9:"1U",5:"1U"})}B.4i(A(\'<1E 3i="b-2t"	2o="2n: 2m;"></1E>\').d({g:B.d("g"),6:B.1x(),8:B.1w(),9:B.d("9"),5:B.d("5")}));f J=4.k;4.k=4.k.1P();4.k.11("c",4);4.k.d({2D:J.d("2D"),2C:J.d("2C"),2B:J.d("2B"),2A:J.d("2A")});J.d({2D:0,2C:0,2B:0,2A:0});a(A.1f.4h&&N.2V){J.d("o","3k")}N.1h=J.d({g:"20",4g:1,1W:"2d"});4.k.d({2c:J.d("2c")});4.1T()}a(!N.u){N.u=!A(".b-c-13",4.k).1K?"e,s,y":{n:".b-c-n",e:".b-c-e",s:".b-c-s",w:".b-c-w",y:".b-c-y",x:".b-c-x",Z:".b-c-Z",z:".b-c-z"}}a(N.u.3h==3g){N.1C=N.1C||4f;a(N.u=="4e"){N.u="n,e,s,w,y,x,Z,z"}f O=N.u.4d(",");N.u={};f G={13:"g: 1D; 1W: 3k; 2n:2m;",n:"9: 1r; 6:2a%;",e:"1s: 1r; 8:2a%;",s:"1t: 1r; 6:2a%;",w:"5: 1r; 8:2a%;",y:"1t: 1r; 1s: p;",x:"1t: 1r; 5: p;",Z:"9: 1r; 1s: p;",z:"9: 1r; 5: p;"};2s(f R=0;R<O.1K;R++){f S=A.4c(O[R]),L=N.3j,F="b-c-"+S,C=!A.b.d(F)&&!N.1m,P=A.b.d("b-c-1V-13"),T=A.19(L[F],L["b-c-13"]),D=A.19(N.2z[F],!P?N.2z["b-c-13"]:{});f K=/x|y|Z|z/.q(S)?{1C:++N.1C}:{};f I=(C?G[S]:""),E=A([\'<1E 3i="b-c-13 \',F,\'" 2o="\',I,G.13,\'"></1E>\'].2u("")).d(K);N.u[S]=".b-c-"+S;4.k.38(E.d(C?T:{}).d(N.1m?D:{}).1j(N.1m?"b-c-1V-13":"").1j(N.1m))}a(N.1m){4.k.1j("b-c-1V").d(!A.b.d("b-c-1V")?{}:{})}}4.3d=h(Y){Y=Y||4.k;2s(f V 36 N.u){a(N.u[V].3h==3g){N.u[V]=A(N.u[V],4.k).3b()}a(N.2i){N.u[V].d({2M:0})}a(4.k.2r(".b-2t")&&N.2y.2x(/1Y|2j|3f|3e/i)){f W=A(N.u[V],4.k),X=0;X=/x|Z|z|y|n|s/.q(V)?W.1w():W.1x();f U=["4b",/Z|z|n/.q(V)?"4a":/y|x|s/.q(V)?"49":/^e$/.q(V)?"48":"47"].2u("");a(!N.2i){Y.d(U,X)}4.1T()}a(!A(N.u[V]).1K){46}}};4.3d(4.k);N.1G=A(".b-c-13",M.k);a(N.1Q){N.1G.1y(h(U,V){A.b.1Q(V)})}N.1G.44(h(){a(!N.29){a(4.3c){f U=4.3c.2x(/b-c-(y|x|Z|z|n|e|s|w)/i)}M.1u=N.1u=U&&U[1]?U[1]:"y"}});a(N.2U){N.1G.3a();A(M.k).1j("b-c-2w").43(h(){A(4).39("b-c-2w");N.1G.3b()},h(){a(!N.29){A(4).1j("b-c-2w");N.1G.3a()}})}4.42()},41:{},b:h(){r{2v:4.2v,k:4.k,l:4.l,g:4.g,j:4.j,m:4.m,15:4.15,14:4.14}},1M:h(C,B){A.b.1z.40(4,C,[B,4.b()]);a(C!="o"){4.k.2Z(["o",C].2u(""),[B,4.b()],4.m[C])}},3Z:h(){f D=4.k,C=D.3Y(".b-c").1c(0);4.3X();f B=h(E){A(E).39("b-c b-c-37").2J("c").3W(".c").3V(".b-c-13").2p()};B(D);a(D.2r(".b-2t")&&C){D.1P().38(A(C).d({g:D.d("g"),6:D.1x(),8:D.1w(),9:D.d("9"),5:D.d("5")})).3U().2p();B(C)}},3T:h(K){a(4.m.37){r 1b}f J=1b;2s(f H 36 4.m.u){a(A(4.m.u[H])[0]==K.3S){J=1v}}a(!J){r 1b}f C=4.m,B=4.k.g(),D=4.k,I=h(O){r v(O,10)||0},G=A.1f.26&&A.1f.2l<7;C.29=1v;C.2q={9:A(1l).33(),5:A(1l).34()};a(D.2r(".b-3R")||(/1D/).q(D.d("g"))){f M=A.1f.26&&!C.1B&&(/1D/).q(D.d("g"))&&!(/1i/).q(D.1P().d("g"));f L=M?C.2q.9:0,F=M?C.2q.5:0;D.d({g:"1D",9:(B.9+L),5:(B.5+F)})}a(A.1f.35&&/1i/.q(D.d("g"))){D.d({g:"1i",9:"1U",5:"1U"})}4.2W();f N=I(4.l.d("5")),E=I(4.l.d("9"));a(C.1B){N+=A(C.1B).34()||0;E+=A(C.1B).33()||0}4.1k=4.l.1k();4.g={5:N,9:E};4.j=C.l||G?{6:D.1x(),8:D.1w()}:{6:D.6(),8:D.8()};4.15=C.l||G?{6:D.1x(),8:D.1w()}:{6:D.6(),8:D.8()};4.14={5:N,9:E};4.1p={6:D.1x()-D.6(),8:D.1w()-D.8()};4.32={5:K.31,9:K.30};C.1a=(1J C.1a=="2Q")?C.1a:((4.15.8/4.15.6)||1);a(C.2h){A("23").d("t",4.1u+"-o")}4.1M("1H",K);r 1v},3Q:h(I){f D=4.l,C=4.m,J={},M=4,F=4.32,K=4.1u;f N=(I.31-F.5)||0,L=(I.30-F.9)||0;f E=4.1e[K];a(!E){r 1b}f H=E.1n(4,[I,N,L]),G=A.1f.26&&A.1f.2l<7,B=4.1p;a(C.1N||I.1Z){H=4.2Y(H,I)}H=4.2X(H,I);4.1M("o",I);D.d({9:4.g.9+"1q",5:4.g.5+"1q",6:4.j.6+"1q",8:4.j.8+"1q"});a(!C.l&&C.1h){4.1T()}4.2e(H);4.k.2Z("o",[I,4.b()],4.m["o"]);r 1b},3P:h(I){4.m.29=1b;f E=4.m,H=h(M){r v(M,10)||0},K=4;a(E.l){f D=E.1h,B=D&&(/1Y/i).q(D.1c(0).2f),C=B&&A.b.1X(D.1c(0),"5")?0:K.1p.8,G=B?0:K.1p.6;f L={6:(K.j.6-G),8:(K.j.8-C)},F=(v(K.k.d("5"),10)+(K.g.5-K.14.5))||1g,J=(v(K.k.d("9"),10)+(K.g.9-K.14.9))||1g;a(!E.1o){4.k.d(A.19(L,{9:J,5:F}))}a(E.l&&!E.1o){4.1T()}}a(E.2h){A("23").d("t","1U")}4.1M("1I",I);a(E.l){4.l.2p()}r 1b},2e:h(B){f C=4.m;4.1k=4.l.1k();a(B.5){4.g.5=B.5}a(B.9){4.g.9=B.9}a(B.8){4.j.8=B.8}a(B.6){4.j.6=B.6}},2Y:h(D,E){f F=4.m,G=4.g,C=4.j,B=4.1u;a(D.8){D.6=(C.8/F.1a)}18{a(D.6){D.8=(C.6*F.1a)}}a(B=="x"){D.5=G.5+(C.6-D.6);D.9=1g}a(B=="z"){D.9=G.9+(C.8-D.8);D.5=G.5+(C.6-D.6)}r D},2X:h(H,I){f F=4.l,E=4.m,N=E.1N||I.1Z,M=4.1u,P=H.6&&E.28&&E.28<H.6,J=H.8&&E.27&&E.27<H.8,D=H.6&&E.1S&&E.1S>H.6,O=H.8&&E.1R&&E.1R>H.8;a(D){H.6=E.1S}a(O){H.8=E.1R}a(P){H.6=E.28}a(J){H.8=E.27}f C=4.14.5+4.15.6,L=4.g.9+4.j.8;f G=/x|z|w/.q(M),B=/z|Z|n/.q(M);a(D&&G){H.5=C-E.1S}a(P&&G){H.5=C-E.28}a(O&&B){H.9=L-E.1R}a(J&&B){H.9=L-E.27}f K=!H.6&&!H.8;a(K&&!H.5&&H.9){H.9=1g}18{a(K&&!H.9&&H.5){H.5=1g}}r H},1T:h(){f F=4.m;a(!F.1h){r}f D=F.1h,C=4.l||4.k;a(!F.1F){f B=[D.d("3O"),D.d("3N"),D.d("3M"),D.d("3L")],E=[D.d("3K"),D.d("3J"),D.d("3I"),D.d("3H")];F.1F=A.3G(B,h(G,I){f H=v(G,10)||0,J=v(E[I],10)||0;r H+J})}D.d({8:(C.8()-F.1F[0]-F.1F[2])+"1q",6:(C.6()-F.1F[1]-F.1F[3])+"1q"})},2W:h(){f C=4.k,F=4.m;4.2k=C.1k();a(F.l){4.l=4.l||A(\'<1E 2o="2n:2m;"></1E>\');f B=A.1f.26&&A.1f.2l<7,D=(B?1:0),E=(B?2:-1);4.l.1j(F.l).d({6:C.1x()+E,8:C.1w()+E,g:"1D",5:4.2k.5-D+"1q",9:4.2k.9-D+"1q",1C:++F.1C});4.l.2L("23");a(F.1Q){A.b.1Q(4.l.1c(0))}}18{4.l=C}},1e:{e:h(D,C,B){r{6:4.15.6+C}},w:h(F,C,B){f G=4.m,D=4.15,E=4.14;r{5:E.5+C,6:D.6-C}},n:h(F,C,B){f G=4.m,D=4.15,E=4.14;r{9:E.9+B,8:D.8-B}},s:h(D,C,B){r{8:4.15.8+B}},y:h(D,C,B){r A.19(4.1e.s.1n(4,24),4.1e.e.1n(4,[D,C,B]))},x:h(D,C,B){r A.19(4.1e.s.1n(4,24),4.1e.w.1n(4,[D,C,B]))},Z:h(D,C,B){r A.19(4.1e.n.1n(4,24),4.1e.e.1n(4,[D,C,B]))},z:h(D,C,B){r A.19(4.1e.n.1n(4,24),4.1e.w.1n(4,[D,C,B]))}}}));A.19(A.b.c,{3F:{3E:":2j",3D:1,3C:0,2V:1v,2i:1b,1S:10,1R:10,1a:1b,1Q:1v,2h:1v,2U:1b,1m:1b}});A.b.1z.1L("c","1B",{1H:h(I,K){f E=K.m,M=A(4).11("c"),G=M.k;f C=E.1B,F=(C 3B A)?C.1c(0):(/1P/.q(C))?G.1P().1c(0):C;a(!F){r}M.2g=A(F);a(/1l/.q(C)||C==1l){M.1O={5:0,9:0};M.21={5:0,9:0};M.1A={k:A(1l),5:0,9:0,6:A(1l).6(),8:A(1l).8()||1l.23.3A.2T}}18{M.1O=A(F).1k();M.21=A(F).g();M.22={8:A(F).2R(),6:A(F).2S()};f J=M.1O,B=M.22.8,H=M.22.6,D=(A.b.1X(F,"5")?F.3z:H),L=(A.b.1X(F)?F.2T:B);M.1A={k:F,5:J.5,9:J.9,6:D,8:L}}},o:h(H,K){f E=K.m,N=A(4).11("c"),C=N.22,J=N.1O,G=N.j,I=N.g,L=E.1N||H.1Z,B={9:0,5:0},D=N.2g;a(D[0]!=1l&&/20/.q(D.d("g"))){B=N.21}a(I.5<(E.l?J.5:B.5)){N.j.6=N.j.6+(E.l?(N.g.5-J.5):(N.g.5-B.5));a(L){N.j.8=N.j.6*E.1a}N.g.5=E.l?J.5:B.5}a(I.9<(E.l?J.9:0)){N.j.8=N.j.8+(E.l?(N.g.9-J.9):N.g.9);a(L){N.j.6=N.j.8/E.1a}N.g.9=E.l?J.9:0}f F=(E.l?N.1k.5-J.5:(N.g.5-B.5))+N.1p.6,M=(E.l?N.1k.9-J.9:N.g.9)+N.1p.8;a(F+N.j.6>=N.1A.6){N.j.6=N.1A.6-F;a(L){N.j.8=N.j.6*E.1a}}a(M+N.j.8>=N.1A.8){N.j.8=N.1A.8-M;a(L){N.j.6=N.j.8/E.1a}}},1I:h(G,J){f C=J.m,L=A(4).11("c"),H=L.g,I=L.1O,B=L.21,D=L.2g;f E=A(L.l),M=E.1k(),K=E.2S(),F=E.2R();a(C.l&&!C.1o&&/1i/.q(D.d("g"))){A(4).d({5:(M.5-I.5),9:(M.9-I.9),6:K,8:F})}a(C.l&&!C.1o&&/20/.q(D.d("g"))){A(4).d({5:B.5+(M.5-I.5),9:B.9+(M.9-I.9),6:K,8:F})}}});A.b.1z.1L("c","1d",{o:h(H,J){f D=J.m,L=A(4).11("c"),G=L.j,E=L.15,F=L.14,K=L.1u,I=D.1N||H.1Z;D.1d=1J D.1d=="2Q"?[D.1d,D.1d]:D.1d;f C=2P.2O((G.6-E.6)/(D.1d[0]||1))*(D.1d[0]||1),B=2P.2O((G.8-E.8)/(D.1d[1]||1))*(D.1d[1]||1);a(/^(y|s|e)$/.q(K)){L.j.6=E.6+C;L.j.8=E.8+B}18{a(/^(Z)$/.q(K)){L.j.6=E.6+C;L.j.8=E.8+B;L.g.9=F.9-B}18{a(/^(x)$/.q(K)){L.j.6=E.6+C;L.j.8=E.8+B;L.g.5=F.5-C}18{L.j.6=E.6+C;L.j.8=E.8+B;L.g.9=F.9-B;L.g.5=F.5-C}}}}});A.b.1z.1L("c","1o",{1I:h(I,K){f F=K.m,L=A(4).11("c");f E=F.1h,B=E&&(/1Y/i).q(E.1c(0).2f),C=B&&A.b.1X(E.1c(0),"5")?0:L.1p.8,H=B?0:L.1p.6;f D={6:(L.j.6-H),8:(L.j.8-C)},G=(v(L.k.d("5"),10)+(L.g.5-L.14.5))||1g,J=(v(L.k.d("9"),10)+(L.g.9-L.14.9))||1g;L.k.1o(A.19(D,J&&G?{9:J,5:G}:{}),{3y:F.3x||"3w",3v:F.3u||"3t",3s:h(){f M={6:v(L.k.d("6"),10),8:v(L.k.d("8"),10),9:v(L.k.d("9"),10),5:v(L.k.d("5"),10)};a(E){E.d({6:M.6,8:M.8})}L.2e(M);L.1M("1o",I)}})}});A.b.1z.1L("c","12",{1H:h(E,D){f F=D.m,B=A(4).11("c"),G=F.1h,C=B.j;a(!G){B.12=B.k.2N()}18{B.12=G.2N()}B.12.d({2M:0.25,1W:"2d",g:"1i",8:C.8,6:C.6,2c:0,5:0,9:0}).1j("b-c-12").1j(1J F.12=="3r"?F.12:"");B.12.2L(B.l)},o:h(D,C){f E=C.m,B=A(4).11("c"),F=E.1h;a(B.12){B.12.d({g:"1i",8:B.j.8,6:B.j.6})}},1I:h(D,C){f E=C.m,B=A(4).11("c"),F=E.1h;a(B.12&&B.l){B.l.1c(0).3q(B.12.1c(0))}}});A.b.1z.1L("c","17",{1H:h(E,C){f F=C.m,B=A(4).11("c"),D=h(G){A(G).1y(h(){A(4).11("c-2b",{6:v(A(4).6(),10),8:v(A(4).8(),10),5:v(A(4).d("5"),10),9:v(A(4).d("9"),10)})})};a(1J(F.17)=="2K"){a(F.17.1K){F.17=F.17[0];D(F.17)}18{A.1y(F.17,h(G,H){D(G)})}}18{D(F.17)}},o:h(F,E){f G=E.m,C=A(4).11("c"),D=C.15,I=C.14;f H={8:(C.j.8-D.8)||0,6:(C.j.6-D.6)||0,9:(C.g.9-I.9)||0,5:(C.g.5-I.5)||0},B=h(J,K){A(J).1y(h(){f N=A(4).11("c-2b"),M={},L=K&&K.1K?K:["6","8","9","5"];A.1y(L||["6","8","9","5"],h(O,Q){f P=(N[Q]||0)+(H[Q]||0);a(P&&P>=0){M[Q]=P||1g}});A(4).d(M)})};a(1J(G.17)=="2K"){A.1y(G.17,h(J,K){B(J,K)})}18{B(G.17)}},1I:h(C,B){A(4).2J("c-2b-1H")}})})(3p)',62,277,'||||this|left|width||height|top|if|ui|resizable|css||var|position|function||size|element|helper|options||resize|0px|test|return||cursor|handles|parseInt||sw|se|nw||||||||||||||||||||||||||ne||data|ghost|handle|originalPosition|originalSize|4px|alsoResize|else|extend|aspectRatio|false|get|grid|_change|browser|null|proportionallyResize|relative|addClass|offset|document|knobHandles|apply|animate|sizeDiff|px|0pt|right|bottom|axis|true|outerHeight|outerWidth|each|plugin|parentData|containment|zIndex|absolute|div|borderDif|_handles|start|stop|typeof|length|add|propagate|_aspectRatio|containerOffset|parent|disableSelection|minHeight|minWidth|_proportionallyResize|auto|knob|display|hasScroll|textarea|shiftKey|static|containerPosition|containerSize|body|arguments||msie|maxHeight|maxWidth|resizing|100|alsoresize|margin|block|_updateCache|nodeName|containerElement|preserveCursor|transparent|input|elementOffset|version|hidden|overflow|style|remove|documentScroll|is|for|wrapper|join|originalElement|autohide|match|_nodeName|knobTheme|marginBottom|marginRight|marginTop|marginLeft|1px|borderTop|borderLeft|borderRight|borderBottom|removeData|object|appendTo|opacity|clone|round|Math|number|innerHeight|innerWidth|scrollHeight|autoHide|preventDefault|_renderProxy|_respectSize|_updateRatio|triggerHandler|pageY|pageX|originalMousePosition|scrollTop|scrollLeft|opera|in|disabled|append|removeClass|hide|show|className|_renderAxis|button|select|String|constructor|class|defaultTheme|none|8px|solid|F2F2F2|background|jQuery|removeChild|string|step|swing|animateEasing|easing|slow|animateDuration|duration|scrollWidth|parentNode|instanceof|delay|distance|cancel|defaults|map|paddingLeft|paddingBottom|paddingRight|paddingTop|borderLeftWidth|borderBottomWidth|borderRightWidth|borderTopWidth|mouseStop|mouseDrag|draggable|target|mouseStart|end|find|unbind|mouseDestroy|children|destroy|call|plugins|mouseInit|hover|mouseover||continue|Left|Right|Bottom|Top|padding|trim|split|all|1000|zoom|safari|wrap|img|canvas|808080|border|fontSize|DEDEDE|proxy|init|mouse|widget'.split('|'),0,{}))
-
Index: js/ui/packed/ui.slider.packed.js
===================================================================
--- js/ui/packed/ui.slider.packed.js	(revision 6370)
+++ js/ui/packed/ui.slider.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(6(A){A.25.1C=A.25.1C||6(B){c 3.18(6(){A(3).2J(B).2I(0).2H(3).1s()})};A.24("j.m",{2G:{},j:6(B){c{8:3.8,9:3.7,n:3.8.l!="2F"||!3.8.l?p.t(3.n(i,3.8.l=="w"?"y":"x")):{x:p.t(3.n(i,"x")),y:p.t(3.n(i,"y"))},1h:3.1K()}},M:6(C,B){A.j.2E.1k(3,C,[B,3.j()]);3.d.2D(C=="1a"?C:"1a"+C,[B,3.j()],3.8[C])},2C:6(){3.d.1R("j-m j-m-1r").2B("m").2A(".m");4(3.9&&3.9.11){3.9.1C("a");3.9.18(6(){A(3).U("P").2z()})}3.1B&&3.1B.1s()},23:6(B,C){A.24.22.23.1Z(3,2y);4(/k|s|X/.Q(B)){3.1y()}4(B=="1h"){C?3.9.11==2&&3.1u():3.1L()}},2x:6(){h B=3;3.d.1i("j-m");3.1y();3.9=A(3.8.9,3.d);4(!3.9.11){B.9=B.1B=A(B.8.1g||[0]).2w(6(){h D=A("<1t/>").1i("j-m-9").1M(B.d);4(3.1A){D.2v("1A",3.1A)}c D[0]})}h C=6(D){3.d=A(D);3.d.U("P",3);3.8=B.8;3.d.19("20",6(){4(B.7){3.1j(B.7)}B.O(3,1)});3.2u()};A.1W(C.22,A.j.P,{2t:6(D){c B.12.1k(B,D,3.d[0])},2s:6(D){c B.Z.1k(B,D,3.d[0])},2r:6(D){c B.1p.1k(B,D,3.d[0])},2q:6(){c N},1Y:6(D){3.2p(D)}});A(3.9).18(6(){2o C(3)}).2n(\'<a 2m="2l:2k(0)" 2j="2i:21;2h:21;"></a>\').1S().19("O",6(D){B.O(3.1z)}).19("1j",6(D){B.1j(3.1z)}).19("1x",6(D){4(!B.8.2g){B.1x(D.2f,3.1z)}});3.d.19("20.m",6(D){B.1P.1Z(B,[D]);B.7.U("P").1Y(D);B.1f=B.1f+1});A.18(3.8.1g||[],6(D,E){B.16(E.12,D,N)});4(!V(3.8.1X)){3.16(3.8.1X,0,N)}3.R=A(3.9[0]);4(3.9.11==2&&3.8.1h){3.1u()}},1y:6(){h B=3.d[0],C=3.8;3.S={J:3.d.1n(),z:3.d.1m()};A.1W(C,{l:C.l||(B.1N<B.1O?"w":"1l"),s:!V(b(C.s,10))?{x:b(C.s,10),y:b(C.s,10)}:({x:C.s&&C.s.x||1V,y:C.s&&C.s.y||1V}),k:!V(b(C.k,10))?{x:b(C.k,10),y:b(C.k,10)}:({x:C.k&&C.k.x||0,y:C.k&&C.k.y||0})});C.T={x:C.s.x-C.k.x,y:C.s.y-C.k.y};C.f={x:C.f&&C.f.x||b(C.f,10)||(C.X?C.T.x/(C.X.x||b(C.X,10)||C.T.x):0),y:C.f&&C.f.y||b(C.f,10)||(C.X?C.T.y/(C.X.y||b(C.X,10)||C.T.y):0)}},1x:6(C,B){4(/(1w|1v|1U|1T)/.Q(C)){3.16({x:/(1w|1U)/.Q(C)?(C==1w?"-":"+")+"="+3.17("x"):0,y:/(1v|1T)/.Q(C)?(C==1v?"-":"+")+"="+3.17("y"):0},B)}},O:6(B,C){3.7=A(B).1i("j-m-9-1Q");4(C){3.7.1S()[0].O()}},1j:6(B){A(B).1R("j-m-9-1Q");4(3.7&&3.7[0]==B){3.R=3.7;3.7=i}},1P:6(C){h D=[C.1d,C.1e];h B=Y;3.9.18(6(){4(3==C.2e){B=N}});4(B||3.8.1r||!(3.7||3.R)){c}4(!3.7&&3.R){3.O(3.R,N)}3.K=3.d.K();3.16({y:3.v(C.1e-3.K.e-3.7[0].1O/2,"y"),x:3.v(C.1d-3.K.g-3.7[0].1N/2,"x")},i,!3.8.1D)},1u:6(){4(3.u){c}3.u=A("<1t></1t>").1i("j-m-1h").o({2d:"2c"}).1M(3.d);3.1c()},1L:6(){3.u.1s();3.u=i},1c:6(){h C=3.8.l=="w"?"e":"g";h B=3.8.l=="w"?"z":"J";3.u.o(C,(b(A(3.9[0]).o(C),10)||0)+3.W(0,3.8.l=="w"?"y":"x")/2);3.u.o(B,(b(A(3.9[1]).o(C),10)||0)-(b(A(3.9[0]).o(C),10)||0))},1K:6(){c 3.u?3.v(b(3.u.o(3.8.l=="w"?"z":"J"),10),3.8.l=="w"?"y":"x"):i},1J:6(){c 3.9.2b(3.7[0])},n:6(D,B){4(3.9.11==1){3.7=3.9}4(!B){B=3.8.l=="w"?"y":"x"}h C=A(D!=r&&D!==i?3.9[D]||D:3.7);4(C.U("P").1b){c b(C.U("P").1b[B],10)}15{c b(((b(C.o(B=="x"?"g":"e"),10)/(3.S[B=="x"?"J":"z"]-3.W(D,B)))*3.8.T[B])+3.8.k[B],10)}},v:6(C,B){c 3.8.k[B]+(C/(3.S[B=="x"?"J":"z"]-3.W(i,B)))*3.8.T[B]},q:6(C,B){c((C-3.8.k[B])/3.8.T[B])*(3.S[B=="x"?"J":"z"]-3.W(i,B))},13:6(D,B){4(3.u){4(3.7[0]==3.9[0]&&D>=3.q(3.n(1),B)){D=3.q(3.n(1,B)-3.17(B),B)}4(3.7[0]==3.9[1]&&D<=3.q(3.n(0),B)){D=3.q(3.n(0,B)+3.17(B),B)}}4(3.8.1g){h C=3.8.1g[3.1J()];4(D<3.q(C.k,B)){D=3.q(C.k,B)}15{4(D>3.q(C.s,B)){D=3.q(C.s,B)}}}c D},14:6(C,B){4(C>=3.S[B=="x"?"J":"z"]-3.W(i,B)){C=3.S[B=="x"?"J":"z"]-3.W(i,B)}4(C<=0){C=0}c C},W:6(C,B){c A(C!=r&&C!==i?3.9[C]:3.7)[0]["K"+(B=="x"?"2a":"29")]},17:6(B){c 3.8.f[B]||1},12:6(C,B){h D=3.8;4(D.1r){c Y}3.S={J:3.d.1n(),z:3.d.1m()};4(!3.7){3.O(3.R,N)}3.K=3.d.K();3.1q=3.7.K();3.1o={e:C.1e-3.1q.e,g:C.1d-3.1q.g};3.1f=3.n();3.M("12",C);3.1p(C,B);c N},Z:6(B){3.M("Z",B);4(3.1f!=3.n()){3.M("1E",B)}3.O(3.7,N);c Y},1p:6(E,D){h F=3.8;h B={e:E.1e-3.K.e-3.1o.e,g:E.1d-3.K.g-3.1o.g};4(!3.7){3.O(3.R,N)}B.g=3.14(B.g,"x");B.e=3.14(B.e,"y");4(F.f.x){h C=3.v(B.g,"x");C=p.t(C/F.f.x)*F.f.x;B.g=3.q(C,"x")}4(F.f.y){h C=3.v(B.e,"y");C=p.t(C/F.f.y)*F.f.y;B.e=3.q(C,"y")}B.g=3.13(B.g,"x");B.e=3.13(B.e,"y");4(F.l!="w"){3.7.o({g:B.g})}4(F.l!="1l"){3.7.o({e:B.e})}3.7.U("P").1b={x:p.t(3.v(B.g,"x"))||0,y:p.t(3.v(B.e,"y"))||0};4(3.u){3.1c()}3.M("1a",E);c Y},16:6(F,E,G){h H=3.8;3.S={J:3.d.1n(),z:3.d.1m()};4(E==r&&!3.7&&3.9.11!=1){c Y}4(E==r&&!3.7){E=0}4(E!=r){3.7=3.R=A(3.9[E]||E)}4(F.x!==r&&F.y!==r){h B=F.x,I=F.y}15{h B=F,I=F}4(B!==r&&B.1I!=1H){h D=/^\\-\\=/.Q(B),C=/^\\+\\=/.Q(B);4(D||C){B=3.n(i,"x")+b(B.1G(D?"=":"+=",""),10)}15{B=V(b(B,10))?r:b(B,10)}}4(I!==r&&I.1I!=1H){h D=/^\\-\\=/.Q(I),C=/^\\+\\=/.Q(I);4(D||C){I=3.n(i,"y")+b(I.1G(D?"=":"+=",""),10)}15{I=V(b(I,10))?r:b(I,10)}}4(H.l!="w"&&B!==r){4(H.f.x){B=p.t(B/H.f.x)*H.f.x}B=3.q(B,"x");B=3.14(B,"x");B=3.13(B,"x");H.L?3.7.Z().L({g:B},(p.1F(b(3.7.o("g"))-B))*(!V(b(H.L))?H.L:5)):3.7.o({g:B})}4(H.l!="1l"&&I!==r){4(H.f.y){I=p.t(I/H.f.y)*H.f.y}I=3.q(I,"y");I=3.14(I,"y");I=3.13(I,"y");H.L?3.7.Z().L({e:I},(p.1F(b(3.7.o("e"))-I))*(!V(b(H.L))?H.L:5)):3.7.o({e:I})}4(3.u){3.1c()}3.7.U("P").1b={x:p.t(3.v(B,"x"))||0,y:p.t(3.v(I,"y"))||0};4(!G){3.M("12",i);3.M("Z",i);3.M("1E",i);3.M("1a",i)}}});A.j.m.28="n";A.j.m.27={9:".j-m-9",1D:1,L:Y}})(26)',62,170,'|||this|if||function|currentHandle|options|handle||parseInt|return|element|top|stepping|left|var|null|ui|min|axis|slider|value|css|Math|translateValue|undefined|max|round|rangeElement|convertValue|vertical|||height||||||||||width|offset|animate|propagate|true|focus|mouse|test|previousHandle|actualSize|realMax|data|isNaN|handleSize|steps|false|stop||length|start|translateRange|translateLimits|else|moveTo|oneStep|each|bind|slide|sliderValue|updateRange|pageX|pageY|firstValue|handles|range|addClass|blur|call|horizontal|outerHeight|outerWidth|clickOffset|drag|handleOffset|disabled|remove|div|createRange|38|37|keydown|initBoundaries|firstChild|id|generated|unwrap|distance|change|abs|replace|Number|constructor|handleIndex|getRange|removeRange|appendTo|offsetWidth|offsetHeight|click|active|removeClass|parent|40|39|100|extend|startValue|trigger|apply|mousedown|none|prototype|setData|widget|fn|jQuery|defaults|getter|Height|Width|index|absolute|position|target|keyCode|noKeyboard|border|outline|style|void|javascript|href|wrap|new|mouseDown|mouseCapture|mouseDrag|mouseStop|mouseStart|mouseInit|attr|map|init|arguments|mouseDestroy|unbind|removeData|destroy|triggerHandler|plugin|both|plugins|after|eq|parents'.split('|'),0,{}))
-
Index: js/ui/packed/effects.transfer.packed.js
===================================================================
--- js/ui/packed/effects.transfer.packed.js	(revision 6370)
+++ js/ui/packed/effects.transfer.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(5(A){A.9.o=5(B){R p.Q(5(){4 E=A(p);4 G=A.9.P(E,B.3.O||"N");4 F=A(B.3.M);4 C=E.l();4 D=A(\'<n L="K-9-o"></n>\').J(I.H);b(B.3.8){D.m(B.3.8)}D.m(B.3.8);D.1({7:C.7,6:C.6,k:E.j()-2(D.1("i"))-2(D.1("h")),g:E.f()-2(D.1("e"))-2(D.1("d")),z:"y"});C=F.l();c={7:C.7,6:C.6,k:F.j()-2(D.1("i"))-2(D.1("h")),g:F.f()-2(D.1("e"))-2(D.1("d"))};D.x(c,B.w,B.3.v,5(){D.u();b(B.a){B.a.t(E[0],s)}E.r()})})}})(q)',54,54,'|css|parseInt|options|var|function|left|top|className|effects|callback|if|animation|borderRightWidth|borderLeftWidth|outerWidth|width|borderBottomWidth|borderTopWidth|outerHeight|height|offset|addClass|div|transfer|this|jQuery|dequeue|arguments|apply|remove|easing|duration|animate|absolute|position||||||||body|document|appendTo|ui|class|to|effect|mode|setMode|queue|return'.split('|'),0,{}))
-
Index: js/ui/packed/jquery.ui.all.packed.js
===================================================================
--- js/ui/packed/jquery.ui.all.packed.js	(revision 6370)
+++ js/ui/packed/jquery.ui.all.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(c(C){C.l={2z:{1T:c(E,F,H){b G=C.l[E].53;1R(b D in H){G.6i[D]=G.6i[D]||[];G.6i[D].4K([F,H[D]])}},23:c(D,F,E){b H=D.6i[F];if(!H){k}1R(b G=0;G<H.1m;G++){if(D.h[H[G][0]]){H[G][1].1t(D.r,E)}}}},9T:{},q:c(D){if(C.l.9T[D]){k C.l.9T[D]}b E=C(\'<1w 2u="l-lK">\').1n(D).q({17:"1W",p:"-gl",o:"-gl",4q:"6O"}).2K("1K");C.l.9T[D]=!!((!(/46|5q/).1B(E.q("2s"))||(/^[1-9]/).1B(E.q("t"))||(/^[1-9]/).1B(E.q("u"))||!(/5n/).1B(E.q("cz"))||!(/7i|ft\\(0, 0, 0, 0\\)/).1B(E.q("7Z"))));ca{C("1K").5i(0).cU(E.5i(0))}c8(F){}k C.l.9T[D]},7G:c(D){C(D).2L("5T","gi").q("gk","5n")},lJ:c(D){C(D).2L("5T","lI").q("gk","")},9N:c(G,E){b D=/p/.1B(E||"p")?"2f":"2e",F=Z;if(G[D]>0){k 1e}G[D]=1;F=G[D]>0?1e:Z;G[D]=0;k F}};b B=C.fn.1Z;C.fn.1Z=c(){C("*",8).1T(8).2m("1Z");k B.1t(8,1A)};c A(E,F,G){b D=C[E][F].9U||[];D=(2D D=="56"?D.7D(/,?\\s+/):D);k(C.7t(G,D)!=-1)}C.4b=c(E,D){b F=E.7D(".")[0];E=E.7D(".")[1];C.fn[E]=c(J){b H=(2D J=="56"),I=8a.53.dR.23(1A,1);if(H&&A(F,E,J)){b G=C.1i(8[0],E);k(G?G[J].1t(G,I):2p)}k 8.1x(c(){b K=C.1i(8,E);if(H&&K&&C.8N(K[J])){K[J].1t(K,I)}1g{if(!H){C.1i(8,E,1M C[F][E](8,J))}}})};C[F][E]=c(I,H){b G=8;8.7p=E;8.gj=F+"-"+E;8.h=C.1Q({},C.4b.4I,C[F][E].4I,H);8.r=C(I).2V("5a."+E,c(L,J,K){k G.5a(J,K)}).2V("9x."+E,c(K,J){k G.9x(J)}).2V("1Z",c(){k G.3t()});8.5l()};C[F][E].53=C.1Q({},C.4b.53,D)};C.4b.53={5l:c(){},3t:c(){8.r.49(8.7p)},9x:c(D){k 8.h[D]},5a:c(D,E){8.h[D]=E;if(D=="1I"){8.r[E?"1n":"1J"](8.gj+"-1I")}},87:c(){8.5a("1I",Z)},6N:c(){8.5a("1I",1e)}};C.4b.4I={1I:Z};C.l.4s={8d:c(){b D=8;8.r.2V("7A."+8.7p,c(E){k D.br(E)});if(C.22.3v){8.gh=8.r.2L("5T");8.r.2L("5T","gi")}8.lH=Z},8e:c(){8.r.3o("."+8.7p);(C.22.3v&&8.r.2L("5T",8.gh))},br:c(F){(8.6H&&8.9S(F));8.bf=F;b E=8,G=(F.lG==1),D=(2D 8.h.6j=="56"?C(F.1h).58().1T(F.1h).3u(8.h.6j).1m:Z);if(!G||D||!8.93(F)){k 1e}8.be=!8.h.80;if(!8.be){8.lF=7s(c(){E.be=1e},8.h.80)}if(8.df(F)&&8.de(F)){8.6H=(8.6h(F)!==Z);if(!8.6H){F.aD();k 1e}}8.dh=c(H){k E.gg(H)};8.dg=c(H){k E.9S(H)};C(1d).2V("gf."+8.7p,8.dh).2V("bx."+8.7p,8.dg);k Z},gg:c(D){if(C.22.3v&&!D.5P){k 8.9S(D)}if(8.6H){8.5o(D);k Z}if(8.df(D)&&8.de(D)){8.6H=(8.6h(8.bf,D)!==Z);(8.6H?8.5o(D):8.9S(D))}k!8.6H},9S:c(D){C(1d).3o("gf."+8.7p,8.dh).3o("bx."+8.7p,8.dg);if(8.6H){8.6H=Z;8.6g(D)}k Z},df:c(D){k(1f.2d(1f.3T(8.bf.3b-D.3b),1f.3T(8.bf.3c-D.3c))>=8.h.4L)},de:c(D){k 8.be},6h:c(D){},5o:c(D){},6g:c(D){},93:c(D){k 1e}};C.l.4s.4I={6j:19,4L:1,80:0}})(1v);(c(A){A.4b("l.24",A.1Q({},A.l.4s,{5l:c(){b B=8.h;if(B.1c=="db"&&!(/(2b|1W|4X)/).1B(8.r.q("17"))){8.r.q("17","2b")}8.r.1n("l-24");(B.1I&&8.r.1n("l-24-1I"));8.8d()},6h:c(F){b H=8.h;if(8.1c||H.1I||A(F.1h).is(".l-1k-1G")){k Z}b C=!8.h.1G||!A(8.h.1G,8.r).1m?1e:Z;A(8.h.1G,8.r).4J("*").7W().1x(c(){if(8==F.1h){C=1e}});if(!C){k Z}if(A.l.2H){A.l.2H.4T=8}8.1c=A.8N(H.1c)?A(H.1c.1t(8.r[0],[F])):(H.1c=="6B"?8.r.6B():8.r);if(!8.1c.58("1K").1m){8.1c.2K((H.2K=="1o"?8.r[0].3R:H.2K))}if(8.1c[0]!=8.r[0]&&!(/(4X|1W)/).1B(8.1c.q("17"))){8.1c.q("17","1W")}8.30={o:(1b(8.r.q("7X"),10)||0),p:(1b(8.r.q("7Y"),10)||0)};8.4H=8.1c.q("17");8.v=8.r.v();8.v={p:8.v.p-8.30.p,o:8.v.o-8.30.o};8.v.1F={o:F.3b-8.v.o,p:F.3c-8.v.p};8.2l=8.1c.2l();b B=8.2l.v();if(8.2l[0]==1d.1K&&A.22.lE){B={p:0,o:0}}8.v.1o={p:B.p+(1b(8.2l.q("64"),10)||0),o:B.o+(1b(8.2l.q("63"),10)||0)};b E=8.r.17();8.v.2b=8.4H=="2b"?{p:E.p-(1b(8.1c.q("p"),10)||0)+8.2l[0].2f,o:E.o-(1b(8.1c.q("o"),10)||0)+8.2l[0].2e}:{p:0,o:0};8.2O=8.8M(F);8.1Y={u:8.1c.2Y(),t:8.1c.2M()};if(H.3O){if(H.3O.o!=2p){8.v.1F.o=H.3O.o+8.30.o}if(H.3O.3e!=2p){8.v.1F.o=8.1Y.u-H.3O.3e+8.30.o}if(H.3O.p!=2p){8.v.1F.p=H.3O.p+8.30.p}if(H.3O.3h!=2p){8.v.1F.p=8.1Y.t-H.3O.3h+8.30.p}}if(H.1s){if(H.1s=="1o"){H.1s=8.1c[0].3R}if(H.1s=="1d"||H.1s=="3a"){8.1s=[0-8.v.2b.o-8.v.1o.o,0-8.v.2b.p-8.v.1o.p,A(H.1s=="1d"?1d:3a).u()-8.v.2b.o-8.v.1o.o-8.1Y.u-8.30.o-(1b(8.r.q("7f"),10)||0),(A(H.1s=="1d"?1d:3a).t()||1d.1K.3R.6W)-8.v.2b.p-8.v.1o.p-8.1Y.t-8.30.p-(1b(8.r.q("7g"),10)||0)]}if(!(/^(1d|3a|1o)$/).1B(H.1s)){b D=A(H.1s)[0];b G=A(H.1s).v();8.1s=[G.o+(1b(A(D).q("63"),10)||0)-8.v.2b.o-8.v.1o.o,G.p+(1b(A(D).q("64"),10)||0)-8.v.2b.p-8.v.1o.p,G.o+1f.2d(D.94,D.4N)-(1b(A(D).q("63"),10)||0)-8.v.2b.o-8.v.1o.o-8.1Y.u-8.30.o-(1b(8.r.q("7f"),10)||0),G.p+1f.2d(D.6W,D.4O)-(1b(A(D).q("64"),10)||0)-8.v.2b.p-8.v.1o.p-8.1Y.t-8.30.p-(1b(8.r.q("7g"),10)||0)]}}8.2a("2j",F);8.1Y={u:8.1c.2Y(),t:8.1c.2M()};if(A.l.2H&&!H.aY){A.l.2H.b0(8,F)}8.1c.1n("l-24-9F");8.5o(F);k 1e},4G:c(C,D){if(!D){D=8.17}b B=C=="1W"?1:-1;k{p:(D.p+8.v.2b.p*B+8.v.1o.p*B-(8.4H=="4X"||(8.4H=="1W"&&8.2l[0]==1d.1K)?0:8.2l[0].2f)*B+(8.4H=="4X"?A(1d).2f():0)*B+8.30.p*B),o:(D.o+8.v.2b.o*B+8.v.1o.o*B-(8.4H=="4X"||(8.4H=="1W"&&8.2l[0]==1d.1K)?0:8.2l[0].2e)*B+(8.4H=="4X"?A(1d).2e():0)*B+8.30.o*B)}},8M:c(E){b F=8.h;b B={p:(E.3c-8.v.1F.p-8.v.2b.p-8.v.1o.p+(8.4H=="4X"||(8.4H=="1W"&&8.2l[0]==1d.1K)?0:8.2l[0].2f)-(8.4H=="4X"?A(1d).2f():0)),o:(E.3b-8.v.1F.o-8.v.2b.o-8.v.1o.o+(8.4H=="4X"||(8.4H=="1W"&&8.2l[0]==1d.1K)?0:8.2l[0].2e)-(8.4H=="4X"?A(1d).2e():0))};if(!8.2O){k B}if(8.1s){if(B.o<8.1s[0]){B.o=8.1s[0]}if(B.p<8.1s[1]){B.p=8.1s[1]}if(B.o>8.1s[2]){B.o=8.1s[2]}if(B.p>8.1s[3]){B.p=8.1s[3]}}if(F.2J){b D=8.2O.p+1f.3E((B.p-8.2O.p)/F.2J[1])*F.2J[1];B.p=8.1s?(!(D<8.1s[1]||D>8.1s[3])?D:(!(D<8.1s[1])?D-F.2J[1]:D+F.2J[1])):D;b C=8.2O.o+1f.3E((B.o-8.2O.o)/F.2J[0])*F.2J[0];B.o=8.1s?(!(C<8.1s[0]||C>8.1s[2])?C:(!(C<8.1s[0])?C-F.2J[0]:C+F.2J[0])):C}k B},5o:c(B){8.17=8.8M(B);8.3n=8.4G("1W");8.17=8.2a("3F",B)||8.17;if(!8.h.2B||8.h.2B!="y"){8.1c[0].2Q.o=8.17.o+"2U"}if(!8.h.2B||8.h.2B!="x"){8.1c[0].2Q.p=8.17.p+"2U"}if(A.l.2H){A.l.2H.3F(8,B)}k Z},6g:c(C){b D=Z;if(A.l.2H&&!8.h.aY){b D=A.l.2H.5C(8,C)}if((8.h.68=="lD"&&!D)||(8.h.68=="lC"&&D)||8.h.68===1e){b B=8;A(8.1c).1E(8.2O,1b(8.h.68,10)||8b,c(){B.2a("2y",C);B.4j()})}1g{8.2a("2y",C);8.4j()}k Z},4j:c(){8.1c.1J("l-24-9F");if(8.h.1c!="db"&&!8.8L){8.1c.1Z()}8.1c=19;8.8L=Z},6i:{},dc:c(B){k{1c:8.1c,17:8.17,9M:8.3n,h:8.h}},2a:c(C,B){A.l.2z.23(8,C,[B,8.dc()]);if(C=="3F"){8.3n=8.4G("1W")}k 8.r.2m(C=="3F"?C:"3F"+C,[B,8.dc()],8.h[C])},3t:c(){if(!8.r.1i("24")){k}8.r.49("24").3o(".24").1J("l-24");8.8e()}}));A.1Q(A.l.24,{4I:{2K:"1o",2B:Z,6j:":1p",80:0,4L:1,1c:"db"}});A.l.2z.1T("24","2s",{2j:c(D,C){b B=A("1K");if(B.q("2s")){C.h.8K=B.q("2s")}B.q("2s",C.h.2s)},2y:c(C,B){if(B.h.8K){A("1K").q("2s",B.h.8K)}}});A.l.2z.1T("24","2C",{2j:c(D,C){b B=A(C.1c);if(B.q("2C")){C.h.8J=B.q("2C")}B.q("2C",C.h.2C)},2y:c(C,B){if(B.h.8J){A(B.1c).q("2C",B.h.8J)}}});A.l.2z.1T("24","1O",{2j:c(D,C){b B=A(C.1c);if(B.q("1O")){C.h.8I=B.q("1O")}B.q("1O",C.h.1O)},2y:c(C,B){if(B.h.8I){A(B.1c).q("1O",B.h.8I)}}});A.l.2z.1T("24","bd",{2j:c(C,B){A(B.h.bd===1e?"9d":B.h.bd).1x(c(){A(\'<1w 2u="l-24-bd" 2Q="aX: #lB;"></1w>\').q({u:8.4N+"2U",t:8.4O+"2U",17:"1W",1O:"0.lA",2C:95}).q(A(8).v()).2K("1K")})},2y:c(C,B){A("1w.lz").1x(c(){8.3R.cU(8)})}});A.l.2z.1T("24","5D",{2j:c(D,C){b E=C.h;b B=A(8).1i("24");E.3J=E.3J||20;E.3I=E.3I||20;B.3m=c(F){do{if(/46|5D/.1B(F.q("2X"))||(/46|5D/).1B(F.q("2X-y"))){k F}F=F.1o()}5y(F[0].3R);k A(1d)}(8);B.3l=c(F){do{if(/46|5D/.1B(F.q("2X"))||(/46|5D/).1B(F.q("2X-x"))){k F}F=F.1o()}5y(F[0].3R);k A(1d)}(8);if(B.3m[0]!=1d&&B.3m[0].6C!="7j"){B.8H=B.3m.v()}if(B.3l[0]!=1d&&B.3l[0].6C!="7j"){B.8G=B.3l.v()}},3F:c(D,C){b E=C.h;b B=A(8).1i("24");if(B.3m[0]!=1d&&B.3m[0].6C!="7j"){if((B.8H.p+B.3m[0].4O)-D.3c<E.3J){B.3m[0].2f=B.3m[0].2f+E.3I}if(D.3c-B.8H.p<E.3J){B.3m[0].2f=B.3m[0].2f-E.3I}}1g{if(D.3c-A(1d).2f()<E.3J){A(1d).2f(A(1d).2f()-E.3I)}if(A(3a).t()-(D.3c-A(1d).2f())<E.3J){A(1d).2f(A(1d).2f()+E.3I)}}if(B.3l[0]!=1d&&B.3l[0].6C!="7j"){if((B.8G.o+B.3l[0].4N)-D.3b<E.3J){B.3l[0].2e=B.3l[0].2e+E.3I}if(D.3b-B.8G.o<E.3J){B.3l[0].2e=B.3l[0].2e-E.3I}}1g{if(D.3b-A(1d).2e()<E.3J){A(1d).2e(A(1d).2e()-E.3I)}if(A(3a).u()-(D.3b-A(1d).2e())<E.3J){A(1d).2e(A(1d).2e()+E.3I)}}}});A.l.2z.1T("24","da",{2j:c(D,C){b B=A(8).1i("24");B.83=[];A(C.h.da===1e?".l-24":C.h.da).1x(c(){b F=A(8);b E=F.v();if(8!=B.r[0]){B.83.4K({2I:8,u:F.2Y(),t:F.2M(),p:E.p,o:E.o})}})},3F:c(J,N){b I=A(8).1i("24");b L=N.h.ly||20;b D=N.9M.o,C=D+I.1Y.u,P=N.9M.p,O=P+I.1Y.t;1R(b H=I.83.1m-1;H>=0;H--){b E=I.83[H].o,B=E+I.83[H].u,R=I.83[H].p,M=R+I.83[H].t;if(!((E-L<D&&D<B+L&&R-L<P&&P<M+L)||(E-L<D&&D<B+L&&R-L<O&&O<M+L)||(E-L<C&&C<B+L&&R-L<P&&P<M+L)||(E-L<C&&C<B+L&&R-L<O&&O<M+L))){7l}if(N.h.ge!="lx"){b K=1f.3T(R-O)<=20;b Q=1f.3T(M-P)<=20;b G=1f.3T(E-C)<=20;b F=1f.3T(B-D)<=20;if(K){N.17.p=I.4G("2b",{p:R-I.1Y.t,o:0}).p}if(Q){N.17.p=I.4G("2b",{p:M,o:0}).p}if(G){N.17.o=I.4G("2b",{p:0,o:E-I.1Y.u}).o}if(F){N.17.o=I.4G("2b",{p:0,o:B}).o}}if(N.h.ge!="lw"){b K=1f.3T(R-P)<=20;b Q=1f.3T(M-O)<=20;b G=1f.3T(E-D)<=20;b F=1f.3T(B-C)<=20;if(K){N.17.p=I.4G("2b",{p:R,o:0}).p}if(Q){N.17.p=I.4G("2b",{p:M-I.1Y.t,o:0}).p}if(G){N.17.o=I.4G("2b",{p:0,o:E}).o}if(F){N.17.o=I.4G("2b",{p:0,o:B-I.1Y.u}).o}}}}});A.l.2z.1T("24","gd",{2j:c(D,C){b B=A(8).1i("24");B.bc=[];A(C.h.gd).1x(c(){if(A.1i(8,"2P")){b E=A.1i(8,"2P");B.bc.4K({1V:E,gc:E.h.68});E.b1();E.2a("5Z",D,B)}})},2y:c(D,C){b B=A(8).1i("24");A.1x(B.bc,c(){if(8.1V.8T){8.1V.8T=0;B.8L=1e;8.1V.8L=Z;if(8.gc){8.1V.h.68=1e}8.1V.6g(D);8.1V.r.2m("lv",[D,A.1Q(8.1V.l(),{fU:B.r})],8.1V.h["fM"]);8.1V.h.1c=8.1V.h.d9}1g{8.1V.2a("81",D,B)}})},3F:c(F,E){b D=A(8).1i("24"),B=8;b C=c(K){b H=K.o,J=H+K.u,I=K.p,G=I+K.t;k(H<(8.3n.o+8.v.1F.o)&&(8.3n.o+8.v.1F.o)<J&&I<(8.3n.p+8.v.1F.p)&&(8.3n.p+8.v.1F.p)<G)};A.1x(D.bc,c(G){if(C.23(D,8.1V.4Z)){if(!8.1V.8T){8.1V.8T=1;8.1V.1S=A(B).6B().2K(8.1V.r).1i("2P-2I",1e);8.1V.h.d9=8.1V.h.1c;8.1V.h.1c=c(){k E.1c[0]};F.1h=8.1V.1S[0];8.1V.93(F,1e);8.1V.6h(F,1e,1e);8.1V.v.1F.p=D.v.1F.p;8.1V.v.1F.o=D.v.1F.o;8.1V.v.1o.o-=D.v.1o.o-8.1V.v.1o.o;8.1V.v.1o.p-=D.v.1o.p-8.1V.v.1o.p;D.2a("lu",F)}if(8.1V.1S){8.1V.5o(F)}}1g{if(8.1V.8T){8.1V.8T=0;8.1V.8L=1e;8.1V.h.68=Z;8.1V.6g(F,1e);8.1V.h.1c=8.1V.h.d9;8.1V.1S.1Z();if(8.1V.2Z){8.1V.2Z.1Z()}D.2a("lt",F)}}})}});A.l.2z.1T("24","6X",{2j:c(D,B){b C=A.ls(A(B.h.6X.lr)).5I(c(F,E){k(1b(A(F).q("2C"),10)||B.h.6X.2q)-(1b(A(E).q("2C"),10)||B.h.6X.2q)});A(C).1x(c(E){8.2Q.2C=B.h.6X.2q+E});8[0].2Q.2C=B.h.6X.2q+C.1m}})})(1v);(c(A){A.4b("l.52",{5l:c(){8.r.1n("l-52");8.5G=0;8.7o=1;b C=8.h,B=C.6a;C=A.1Q(C,{6a:C.6a&&C.6a.3S==fD?C.6a:c(D){k A(D).is(B)}});8.bb={u:8.r[0].4N,t:8.r[0].4O};A.l.2H.8S.4K(8)},6i:{},l:c(B){k{24:(B.1S||B.r),1c:B.1c,17:B.17,9M:B.3n,h:8.h,r:8.r}},3t:c(){b B=A.l.2H.8S;1R(b C=0;C<B.1m;C++){if(B[C]==8){B.bm(C,1)}}8.r.1J("l-52 l-52-1I").49("52").3o(".52")},3r:c(C){b B=A.l.2H.4T;if(!B||(B.1S||B.r)[0]==8.r[0]){k}if(8.h.6a.23(8.r,(B.1S||B.r))){A.l.2z.23(8,"3r",[C,8.l(B)]);8.r.2m("lq",[C,8.l(B)],8.h.3r)}},7k:c(C){b B=A.l.2H.4T;if(!B||(B.1S||B.r)[0]==8.r[0]){k}if(8.h.6a.23(8.r,(B.1S||B.r))){A.l.2z.23(8,"7k",[C,8.l(B)]);8.r.2m("lp",[C,8.l(B)],8.h.7k)}},5C:c(D,C){b B=C||A.l.2H.4T;if(!B||(B.1S||B.r)[0]==8.r[0]){k Z}b E=Z;8.r.4J(".l-52").6L(".l-24-9F").1x(c(){b F=A.1i(8,"52");if(F.h.gb&&A.l.8R(B,A.1Q(F,{v:F.r.v()}),F.h.5g)){E=1e;k Z}});if(E){k Z}if(8.h.6a.23(8.r,(B.1S||B.r))){A.l.2z.23(8,"5C",[D,8.l(B)]);8.r.2m("5C",[D,8.l(B)],8.h.5C);k 1e}k Z},5Z:c(C){b B=A.l.2H.4T;A.l.2z.23(8,"5Z",[C,8.l(B)]);if(B){8.r.2m("lo",[C,8.l(B)],8.h.5Z)}},81:c(C){b B=A.l.2H.4T;A.l.2z.23(8,"81",[C,8.l(B)]);if(B){8.r.2m("ln",[C,8.l(B)],8.h.81)}}});A.1Q(A.l.52,{4I:{1I:Z,5g:"8R"}});A.l.8R=c(L,F,J){if(!F.v){k Z}b D=(L.3n||L.17.1W).o,C=D+L.1Y.u,I=(L.3n||L.17.1W).p,H=I+L.1Y.t;b E=F.v.o,B=E+F.bb.u,K=F.v.p,G=K+F.bb.t;5r(J){1u"fZ":k(E<D&&C<B&&K<I&&H<G);1D;1u"8R":k(E<D+(L.1Y.u/2)&&C-(L.1Y.u/2)<B&&K<I+(L.1Y.t/2)&&H-(L.1Y.t/2)<G);1D;1u"cO":k(E<((L.3n||L.17.1W).o+(L.7x||L.v.1F).o)&&((L.3n||L.17.1W).o+(L.7x||L.v.1F).o)<B&&K<((L.3n||L.17.1W).p+(L.7x||L.v.1F).p)&&((L.3n||L.17.1W).p+(L.7x||L.v.1F).p)<G);1D;1u"cP":k((I>=K&&I<=G)||(H>=K&&H<=G)||(I<K&&H>G))&&((D>=E&&D<=B)||(C>=E&&C<=B)||(D<E&&C>B));1D;5q:k Z;1D}};A.l.2H={4T:19,8S:[],b0:c(D,F){b B=A.l.2H.8S;b E=F?F.5H:19;1R(b C=0;C<B.1m;C++){if(B[C].h.1I||(D&&!B[C].h.6a.23(B[C].r,(D.1S||D.r)))){7l}B[C].57=B[C].r.q("4q")!="5n";if(!B[C].57){7l}B[C].v=B[C].r.v();B[C].bb={u:B[C].r[0].4N,t:B[C].r[0].4O};if(E=="lm"||E=="ll"){B[C].5Z.23(B[C],F)}}},5C:c(B,C){b D=Z;A.1x(A.l.2H.8S,c(){if(!8.h){k}if(!8.h.1I&&8.57&&A.l.8R(B,8,8.h.5g)){D=8.5C.23(8,C)}if(!8.h.1I&&8.57&&8.h.6a.23(8.r,(B.1S||B.r))){8.7o=1;8.5G=0;8.81.23(8,C)}});k D},3F:c(B,C){if(B.h.9H){A.l.2H.b0(B,C)}A.1x(A.l.2H.8S,c(){if(8.h.1I||8.ga||!8.57){k}b E=A.l.8R(B,8,8.h.5g);b G=!E&&8.5G==1?"7o":(E&&8.5G==0?"5G":19);if(!G){k}b F;if(8.h.gb){b D=8.r.58(".l-52:eq(0)");if(D.1m){F=A.1i(D[0],"52");F.ga=(G=="5G"?1:0)}}if(F&&G=="5G"){F["5G"]=0;F["7o"]=1;F.7k.23(F,C)}8[G]=1;8[G=="7o"?"5G":"7o"]=0;8[G=="5G"?"3r":"7k"].23(8,C);if(F&&G=="7o"){F["7o"]=0;F["5G"]=1;F.3r.23(F,C)}})}};A.l.2z.1T("52","ba",{5Z:c(C,B){A(8).1n(B.h.ba)},81:c(C,B){A(8).1J(B.h.ba)},5C:c(C,B){A(8).1J(B.h.ba)}});A.l.2z.1T("52","b9",{3r:c(C,B){A(8).1n(B.h.b9)},7k:c(C,B){A(8).1J(B.h.b9)},5C:c(C,B){A(8).1J(B.h.b9)}})})(1v);(c(A){A.4b("l.1k",A.1Q({},A.l.4s,{5l:c(){b M=8,N=8.h;b Q=8.r.q("17");8.d1=8.r;8.r.1n("l-1k").q({17:/6w/.1B(Q)?"2b":Q});A.1Q(N,{9O:!!(N.5F),1c:N.1c||N.51||N.1E?N.1c||"lk":19,6G:N.6G===1e?"l-1k-9R-1G":N.6G});b H="b3 g8 #lj";N.g6={"l-1k":{4q:"6O"},"l-1k-1G":{17:"1W",aX:"#g9",fc:"0.b3"},"l-1k-n":{2s:"n-2i",t:"5j",o:"31",3e:"31",d5:H},"l-1k-s":{2s:"s-2i",t:"5j",o:"31",3e:"31",d8:H},"l-1k-e":{2s:"e-2i",u:"5j",p:"31",3h:"31",d7:H},"l-1k-w":{2s:"w-2i",u:"5j",p:"31",3h:"31",d6:H},"l-1k-3X":{2s:"3X-2i",u:"5j",t:"5j",d7:H,d8:H},"l-1k-3W":{2s:"3W-2i",u:"5j",t:"5j",d8:H,d6:H},"l-1k-4d":{2s:"4d-2i",u:"5j",t:"5j",d7:H,d5:H},"l-1k-3V":{2s:"3V-2i",u:"5j",t:"5j",d6:H,d5:H}};N.d4={"l-1k-1G":{aX:"#g9",a8:"b3 g8 #lh",t:"g7",u:"g7"},"l-1k-n":{2s:"n-2i",p:"31",o:"45%"},"l-1k-s":{2s:"s-2i",3h:"31",o:"45%"},"l-1k-e":{2s:"e-2i",3e:"31",p:"45%"},"l-1k-w":{2s:"w-2i",o:"31",p:"45%"},"l-1k-3X":{2s:"3X-2i",3e:"31",3h:"31"},"l-1k-3W":{2s:"3W-2i",o:"31",3h:"31"},"l-1k-3V":{2s:"3V-2i",o:"31",p:"31"},"l-1k-4d":{2s:"4d-2i",3e:"31",p:"31"}};N.d3=8.r[0].4l;if(N.d3.3i(/lg|b4|1p|4o|5P|86/i)){b B=8.r;if(/2b/.1B(B.q("17"))&&A.22.7v){B.q({17:"2b",p:"46",o:"46"})}B.8c(A(\'<1w 2u="l-d0"	2Q="2X: 3H;"></1w>\').q({17:B.q("17"),u:B.2Y(),t:B.2M(),p:B.q("p"),o:B.q("o")}));b J=8.r;8.r=8.r.1o();8.r.1i("1k",8);8.r.q({7X:J.q("7X"),7Y:J.q("7Y"),7f:J.q("7f"),7g:J.q("7g")});J.q({7X:0,7Y:0,7f:0,7g:0});if(A.22.9Z&&N.aD){J.q("2i","5n")}N.6F=J.q({17:"6w",f4:1,4q:"6O"});8.r.q({3U:J.q("3U")});8.9Q()}if(!N.3d){N.3d=!A(".l-1k-1G",8.r).1m?"e,s,3X":{n:".l-1k-n",e:".l-1k-e",s:".l-1k-s",w:".l-1k-w",3X:".l-1k-3X",3W:".l-1k-3W",4d:".l-1k-4d",3V:".l-1k-3V"}}if(N.3d.3S==aC){N.2C=N.2C||95;if(N.3d=="lf"){N.3d="n,e,s,w,3X,3W,4d,3V"}b O=N.3d.7D(",");N.3d={};b G={1G:"17: 1W; 4q: 5n; 2X:3H;",n:"p: 7n; u:2T%;",e:"3e: 7n; t:2T%;",s:"3h: 7n; u:2T%;",w:"o: 7n; t:2T%;",3X:"3h: 7n; 3e: 31;",3W:"3h: 7n; o: 31;",4d:"p: 7n; 3e: 31;",3V:"p: 7n; o: 31;"};1R(b R=0;R<O.1m;R++){b S=A.fs(O[R]),L=N.g6,F="l-1k-"+S,C=!A.l.q(F)&&!N.6G,P=A.l.q("l-1k-9R-1G"),T=A.1Q(L[F],L["l-1k-1G"]),D=A.1Q(N.d4[F],!P?N.d4["l-1k-1G"]:{});b K=/3W|3X|4d|3V/.1B(S)?{2C:++N.2C}:{};b I=(C?G[S]:""),E=A([\'<1w 2u="l-1k-1G \',F,\'" 2Q="\',I,G.1G,\'"></1w>\'].7r("")).q(K);N.3d[S]=".l-1k-"+S;8.r.5s(E.q(C?T:{}).q(N.6G?D:{}).1n(N.6G?"l-1k-9R-1G":"").1n(N.6G))}if(N.6G){8.r.1n("l-1k-9R").q(!A.l.q("l-1k-9R")?{}:{})}}8.g5=c(Y){Y=Y||8.r;1R(b V in N.3d){if(N.3d[V].3S==aC){N.3d[V]=A(N.3d[V],8.r).1y()}if(N.7i){N.3d[V].q({1O:0})}if(8.r.is(".l-d0")&&N.d3.3i(/b4|1p|4o|5P/i)){b W=A(N.3d[V],8.r),X=0;X=/3W|4d|3V|3X|n|s/.1B(V)?W.2M():W.2Y();b U=["bv",/4d|3V|n/.1B(V)?"le":/3X|3W|s/.1B(V)?"ld":/^e$/.1B(V)?"lc":"lb"].7r("");if(!N.7i){Y.q(U,X)}8.9Q()}if(!A(N.3d[V]).1m){7l}}};8.g5(8.r);N.8Q=A(".l-1k-1G",M.r);if(N.7G){N.8Q.1x(c(U,V){A.l.7G(V)})}N.8Q.la(c(){if(!N.b8){if(8.8g){b U=8.8g.3i(/l-1k-(3X|3W|4d|3V|n|e|s|w)/i)}M.2B=N.2B=U&&U[1]?U[1]:"3X"}});if(N.g0){N.8Q.1C();A(M.r).1n("l-1k-d2").ae(c(){A(8).1J("l-1k-d2");N.8Q.1y()},c(){if(!N.b8){A(8).1n("l-1k-d2");N.8Q.1C()}})}8.8d()},6i:{},l:c(){k{d1:8.d1,r:8.r,1c:8.1c,17:8.17,1r:8.1r,h:8.h,5h:8.5h,2O:8.2O}},2a:c(C,B){A.l.2z.23(8,C,[B,8.l()]);if(C!="2i"){8.r.2m(["2i",C].7r(""),[B,8.l()],8.h[C])}},3t:c(){b D=8.r,C=D.l9(".l-1k").5i(0);8.8e();b B=c(E){A(E).1J("l-1k l-1k-1I").49("1k").3o(".1k").4J(".l-1k-1G").1Z()};B(D);if(D.is(".l-d0")&&C){D.1o().5s(A(C).q({17:D.q("17"),u:D.2Y(),t:D.2M(),p:D.q("p"),o:D.q("o")})).4R().1Z();B(C)}},6h:c(K){if(8.h.1I){k Z}b J=Z;1R(b H in 8.h.3d){if(A(8.h.3d[H])[0]==K.1h){J=1e}}if(!J){k Z}b C=8.h,B=8.r.17(),D=8.r,I=c(O){k 1b(O,10)||0},G=A.22.3v&&A.22.6V<7;C.b8=1e;C.cZ={p:A(1d).2f(),o:A(1d).2e()};if(D.is(".l-24")||(/1W/).1B(D.q("17"))){b M=A.22.3v&&!C.1s&&(/1W/).1B(D.q("17"))&&!(/2b/).1B(D.1o().q("17"));b L=M?C.cZ.p:0,F=M?C.cZ.o:0;D.q({17:"1W",p:(B.p+L),o:(B.o+F)})}if(A.22.7v&&/2b/.1B(D.q("17"))){D.q({17:"2b",p:"46",o:"46"})}8.g1();b N=I(8.1c.q("o")),E=I(8.1c.q("p"));if(C.1s){N+=A(C.1s).2e()||0;E+=A(C.1s).2f()||0}8.v=8.1c.v();8.17={o:N,p:E};8.1r=C.1c||G?{u:D.2Y(),t:D.2M()}:{u:D.u(),t:D.t()};8.5h=C.1c||G?{u:D.2Y(),t:D.2M()}:{u:D.u(),t:D.t()};8.2O={o:N,p:E};8.7m={u:D.2Y()-D.u(),t:D.2M()-D.t()};8.g4={o:K.3b,p:K.3c};C.5F=(2D C.5F=="8l")?C.5F:((8.5h.t/8.5h.u)||1);if(C.cX){A("1K").q("2s",8.2B+"-2i")}8.2a("2j",K);k 1e},5o:c(I){b D=8.1c,C=8.h,J={},M=8,F=8.g4,K=8.2B;b N=(I.3b-F.o)||0,L=(I.3c-F.p)||0;b E=8.69[K];if(!E){k Z}b H=E.1t(8,[I,N,L]),G=A.22.3v&&A.22.6V<7,B=8.7m;if(C.9O||I.b5){H=8.g3(H,I)}H=8.g2(H,I);8.2a("2i",I);D.q({p:8.17.p+"2U",o:8.17.o+"2U",u:8.1r.u+"2U",t:8.1r.t+"2U"});if(!C.1c&&C.6F){8.9Q()}8.cV(H);8.r.2m("2i",[I,8.l()],8.h["2i"]);k Z},6g:c(I){8.h.b8=Z;b E=8.h,H=c(M){k 1b(M,10)||0},K=8;if(E.1c){b D=E.6F,B=D&&(/b4/i).1B(D.5i(0).4l),C=B&&A.l.9N(D.5i(0),"o")?0:K.7m.t,G=B?0:K.7m.u;b L={u:(K.1r.u-G),t:(K.1r.t-C)},F=(1b(K.r.q("o"),10)+(K.17.o-K.2O.o))||19,J=(1b(K.r.q("p"),10)+(K.17.p-K.2O.p))||19;if(!E.1E){8.r.q(A.1Q(L,{p:J,o:F}))}if(E.1c&&!E.1E){8.9Q()}}if(E.cX){A("1K").q("2s","46")}8.2a("2y",I);if(E.1c){8.1c.1Z()}k Z},cV:c(B){b C=8.h;8.v=8.1c.v();if(B.o){8.17.o=B.o}if(B.p){8.17.p=B.p}if(B.t){8.1r.t=B.t}if(B.u){8.1r.u=B.u}},g3:c(D,E){b F=8.h,G=8.17,C=8.1r,B=8.2B;if(D.t){D.u=(C.t/F.5F)}1g{if(D.u){D.t=(C.u*F.5F)}}if(B=="3W"){D.o=G.o+(C.u-D.u);D.p=19}if(B=="3V"){D.p=G.p+(C.t-D.t);D.o=G.o+(C.u-D.u)}k D},g2:c(H,I){b F=8.1c,E=8.h,N=E.9O||I.b5,M=8.2B,P=H.u&&E.6Z&&E.6Z<H.u,J=H.t&&E.6Y&&E.6Y<H.t,D=H.u&&E.5N&&E.5N>H.u,O=H.t&&E.5O&&E.5O>H.t;if(D){H.u=E.5N}if(O){H.t=E.5O}if(P){H.u=E.6Z}if(J){H.t=E.6Y}b C=8.2O.o+8.5h.u,L=8.17.p+8.1r.t;b G=/3W|3V|w/.1B(M),B=/3V|4d|n/.1B(M);if(D&&G){H.o=C-E.5N}if(P&&G){H.o=C-E.6Z}if(O&&B){H.p=L-E.5O}if(J&&B){H.p=L-E.6Y}b K=!H.u&&!H.t;if(K&&!H.o&&H.p){H.p=19}1g{if(K&&!H.p&&H.o){H.o=19}}k H},9Q:c(){b F=8.h;if(!F.6F){k}b D=F.6F,C=8.1c||8.r;if(!F.8P){b B=[D.q("64"),D.q("aK"),D.q("aL"),D.q("63")],E=[D.q("fb"),D.q("f8"),D.q("fa"),D.q("f9")];F.8P=A.6d(B,c(G,I){b H=1b(G,10)||0,J=1b(E[I],10)||0;k H+J})}D.q({t:(C.t()-F.8P[0]-F.8P[2])+"2U",u:(C.u()-F.8P[1]-F.8P[3])+"2U"})},g1:c(){b C=8.r,F=8.h;8.cY=C.v();if(F.1c){8.1c=8.1c||A(\'<1w 2Q="2X:3H;"></1w>\');b B=A.22.3v&&A.22.6V<7,D=(B?1:0),E=(B?2:-1);8.1c.1n(F.1c).q({u:C.2Y()+E,t:C.2M()+E,17:"1W",o:8.cY.o-D+"2U",p:8.cY.p-D+"2U",2C:++F.2C});8.1c.2K("1K");if(F.7G){A.l.7G(8.1c.5i(0))}}1g{8.1c=C}},69:{e:c(D,C,B){k{u:8.5h.u+C}},w:c(F,C,B){b G=8.h,D=8.5h,E=8.2O;k{o:E.o+C,u:D.u-C}},n:c(F,C,B){b G=8.h,D=8.5h,E=8.2O;k{p:E.p+B,t:D.t-B}},s:c(D,C,B){k{t:8.5h.t+B}},3X:c(D,C,B){k A.1Q(8.69.s.1t(8,1A),8.69.e.1t(8,[D,C,B]))},3W:c(D,C,B){k A.1Q(8.69.s.1t(8,1A),8.69.w.1t(8,[D,C,B]))},4d:c(D,C,B){k A.1Q(8.69.n.1t(8,1A),8.69.e.1t(8,[D,C,B]))},3V:c(D,C,B){k A.1Q(8.69.n.1t(8,1A),8.69.w.1t(8,[D,C,B]))}}}));A.1Q(A.l.1k,{4I:{6j:":1p",4L:1,80:0,aD:1e,7i:Z,5N:10,5O:10,5F:Z,7G:1e,cX:1e,g0:Z,6G:Z}});A.l.2z.1T("1k","1s",{2j:c(I,K){b E=K.h,M=A(8).1i("1k"),G=M.r;b C=E.1s,F=(C l8 A)?C.5i(0):(/1o/.1B(C))?G.1o().5i(0):C;if(!F){k}M.cW=A(F);if(/1d/.1B(C)||C==1d){M.9P={o:0,p:0};M.b6={o:0,p:0};M.8O={r:A(1d),o:0,p:0,u:A(1d).u(),t:A(1d).t()||1d.1K.3R.6W}}1g{M.9P=A(F).v();M.b6=A(F).17();M.b7={t:A(F).9v(),u:A(F).aB()};b J=M.9P,B=M.b7.t,H=M.b7.u,D=(A.l.9N(F,"o")?F.94:H),L=(A.l.9N(F)?F.6W:B);M.8O={r:F,o:J.o,p:J.p,u:D,t:L}}},2i:c(H,K){b E=K.h,N=A(8).1i("1k"),C=N.b7,J=N.9P,G=N.1r,I=N.17,L=E.9O||H.b5,B={p:0,o:0},D=N.cW;if(D[0]!=1d&&/6w/.1B(D.q("17"))){B=N.b6}if(I.o<(E.1c?J.o:B.o)){N.1r.u=N.1r.u+(E.1c?(N.17.o-J.o):(N.17.o-B.o));if(L){N.1r.t=N.1r.u*E.5F}N.17.o=E.1c?J.o:B.o}if(I.p<(E.1c?J.p:0)){N.1r.t=N.1r.t+(E.1c?(N.17.p-J.p):N.17.p);if(L){N.1r.u=N.1r.t/E.5F}N.17.p=E.1c?J.p:0}b F=(E.1c?N.v.o-J.o:(N.17.o-B.o))+N.7m.u,M=(E.1c?N.v.p-J.p:N.17.p)+N.7m.t;if(F+N.1r.u>=N.8O.u){N.1r.u=N.8O.u-F;if(L){N.1r.t=N.1r.u*E.5F}}if(M+N.1r.t>=N.8O.t){N.1r.t=N.8O.t-M;if(L){N.1r.u=N.1r.t/E.5F}}},2y:c(G,J){b C=J.h,L=A(8).1i("1k"),H=L.17,I=L.9P,B=L.b6,D=L.cW;b E=A(L.1c),M=E.v(),K=E.aB(),F=E.9v();if(C.1c&&!C.1E&&/2b/.1B(D.q("17"))){A(8).q({o:(M.o-I.o),p:(M.p-I.p),u:K,t:F})}if(C.1c&&!C.1E&&/6w/.1B(D.q("17"))){A(8).q({o:B.o+(M.o-I.o),p:B.p+(M.p-I.p),u:K,t:F})}}});A.l.2z.1T("1k","2J",{2i:c(H,J){b D=J.h,L=A(8).1i("1k"),G=L.1r,E=L.5h,F=L.2O,K=L.2B,I=D.9O||H.b5;D.2J=2D D.2J=="8l"?[D.2J,D.2J]:D.2J;b C=1f.3E((G.u-E.u)/(D.2J[0]||1))*(D.2J[0]||1),B=1f.3E((G.t-E.t)/(D.2J[1]||1))*(D.2J[1]||1);if(/^(3X|s|e)$/.1B(K)){L.1r.u=E.u+C;L.1r.t=E.t+B}1g{if(/^(4d)$/.1B(K)){L.1r.u=E.u+C;L.1r.t=E.t+B;L.17.p=F.p-B}1g{if(/^(3W)$/.1B(K)){L.1r.u=E.u+C;L.1r.t=E.t+B;L.17.o=F.o-C}1g{L.1r.u=E.u+C;L.1r.t=E.t+B;L.17.p=F.p-B;L.17.o=F.o-C}}}}});A.l.2z.1T("1k","1E",{2y:c(I,K){b F=K.h,L=A(8).1i("1k");b E=F.6F,B=E&&(/b4/i).1B(E.5i(0).4l),C=B&&A.l.9N(E.5i(0),"o")?0:L.7m.t,H=B?0:L.7m.u;b D={u:(L.1r.u-H),t:(L.1r.t-C)},G=(1b(L.r.q("o"),10)+(L.17.o-L.2O.o))||19,J=(1b(L.r.q("p"),10)+(L.17.p-L.2O.p))||19;L.r.1E(A.1Q(D,J&&G?{p:J,o:G}:{}),{1z:F.l7||"aU",1N:F.l6||"9B",ct:c(){b M={u:1b(L.r.q("u"),10),t:1b(L.r.q("t"),10),p:1b(L.r.q("p"),10),o:1b(L.r.q("o"),10)};if(E){E.q({u:M.u,t:M.t})}L.cV(M);L.2a("1E",I)}})}});A.l.2z.1T("1k","51",{2j:c(E,D){b F=D.h,B=A(8).1i("1k"),G=F.6F,C=B.1r;if(!G){B.51=B.r.6B()}1g{B.51=G.6B()}B.51.q({1O:0.25,4q:"6O",17:"2b",t:C.t,u:C.u,3U:0,o:0,p:0}).1n("l-1k-51").1n(2D F.51=="56"?F.51:"");B.51.2K(B.1c)},2i:c(D,C){b E=C.h,B=A(8).1i("1k"),F=E.6F;if(B.51){B.51.q({17:"2b",t:B.1r.t,u:B.1r.u})}},2y:c(D,C){b E=C.h,B=A(8).1i("1k"),F=E.6F;if(B.51&&B.1c){B.1c.5i(0).cU(B.51.5i(0))}}});A.l.2z.1T("1k","5E",{2j:c(E,C){b F=C.h,B=A(8).1i("1k"),D=c(G){A(G).1x(c(){A(8).1i("1k-cT",{u:1b(A(8).u(),10),t:1b(A(8).t(),10),o:1b(A(8).q("o"),10),p:1b(A(8).q("p"),10)})})};if(2D(F.5E)=="6k"){if(F.5E.1m){F.5E=F.5E[0];D(F.5E)}1g{A.1x(F.5E,c(G,H){D(G)})}}1g{D(F.5E)}},2i:c(F,E){b G=E.h,C=A(8).1i("1k"),D=C.5h,I=C.2O;b H={t:(C.1r.t-D.t)||0,u:(C.1r.u-D.u)||0,p:(C.17.p-I.p)||0,o:(C.17.o-I.o)||0},B=c(J,K){A(J).1x(c(){b N=A(8).1i("1k-cT"),M={},L=K&&K.1m?K:["u","t","p","o"];A.1x(L||["u","t","p","o"],c(O,Q){b P=(N[Q]||0)+(H[Q]||0);if(P&&P>=0){M[Q]=P||19}});A(8).q(M)})};if(2D(G.5E)=="6k"){A.1x(G.5E,c(J,K){B(J,K)})}1g{B(G.5E)}},2y:c(C,B){A(8).49("1k-cT-2j")}})})(1v);(c(A){A.4b("l.3s",A.1Q({},A.l.4s,{5l:c(){b B=8;8.r.1n("l-3s");8.cQ=Z;b C;8.9L=c(){C=A(B.h.3u,B.r[0]);C.1x(c(){b D=A(8);b E=D.v();A.1i(8,"3s-2I",{r:8,$r:D,o:E.o,p:E.p,3e:E.o+D.u(),3h:E.p+D.t(),82:Z,1L:D.4a("l-1L"),4n:D.4a("l-4n"),3B:D.4a("l-3B")})})};8.9L();8.b2=C.1n("l-l5");8.8d();8.1c=A(1d.l4("1w")).q({a8:"b3 l3 fq"})},5e:c(){if(8.h.1I){8.87()}1g{8.6N()}},3t:c(){8.r.1J("l-3s l-3s-1I").49("3s").3o(".3s");8.8e()},6h:c(E){b C=8;8.cS=[E.3b,E.3c];if(8.h.1I){k}b D=8.h;8.b2=A(D.3u,8.r[0]);8.r.2m("l2",[E,{"3s":8.r[0],"h":D}],D.2j);A("1K").5s(8.1c);8.1c.q({"z-3D":2T,"17":"1W","o":E.di,"p":E.l1,"u":0,"t":0});if(D.fX){8.9L()}8.b2.3u(".l-1L").1x(c(){b F=A.1i(8,"3s-2I");F.82=1e;if(!E.4m){F.$r.1J("l-1L");F.1L=Z;F.$r.1n("l-3B");F.3B=1e;C.r.2m("cR",[E,{3s:C.r[0],3B:F.r,h:D}],D.3B)}});b B=Z;A(E.1h).58().7W().1x(c(){if(A.1i(8,"3s-2I")){B=1e}});k 8.h.l0?!B:1e},5o:c(I){b C=8;8.cQ=1e;if(8.h.1I){k}b E=8.h;b D=8.cS[0],H=8.cS[1],B=I.3b,G=I.3c;if(D>B){b F=B;B=D;D=F}if(H>G){b F=G;G=H;H=F}8.1c.q({o:D,p:H,u:B-D,t:G-H});8.b2.1x(c(){b J=A.1i(8,"3s-2I");if(!J||J.r==C.r[0]){k}b K=Z;if(E.5g=="cP"){K=(!(J.o>B||J.3e<D||J.p>G||J.3h<H))}1g{if(E.5g=="fZ"){K=(J.o>D&&J.3e<B&&J.p>H&&J.3h<G)}}if(K){if(J.1L){J.$r.1J("l-1L");J.1L=Z}if(J.3B){J.$r.1J("l-3B");J.3B=Z}if(!J.4n){J.$r.1n("l-4n");J.4n=1e;C.r.2m("kZ",[I,{3s:C.r[0],4n:J.r,h:E}],E.4n)}}1g{if(J.4n){if(I.4m&&J.82){J.$r.1J("l-4n");J.4n=Z;J.$r.1n("l-1L");J.1L=1e}1g{J.$r.1J("l-4n");J.4n=Z;if(J.82){J.$r.1n("l-3B");J.3B=1e}C.r.2m("cR",[I,{3s:C.r[0],3B:J.r,h:E}],E.3B)}}if(J.1L){if(!I.4m&&!J.82){J.$r.1J("l-1L");J.1L=Z;J.$r.1n("l-3B");J.3B=1e;C.r.2m("cR",[I,{3s:C.r[0],3B:J.r,h:E}],E.3B)}}}});k Z},6g:c(D){b B=8;8.cQ=Z;b C=8.h;A(".l-3B",8.r[0]).1x(c(){b E=A.1i(8,"3s-2I");E.$r.1J("l-3B");E.3B=Z;E.82=Z;B.r.2m("kY",[D,{3s:B.r[0],fY:E.r,h:C}],C.fY)});A(".l-4n",8.r[0]).1x(c(){b E=A.1i(8,"3s-2I");E.$r.1J("l-4n").1n("l-1L");E.4n=Z;E.1L=1e;E.82=1e;B.r.2m("kX",[D,{3s:B.r[0],1L:E.r,h:C}],C.1L)});8.r.2m("kW",[D,{3s:B.r[0],h:8.h}],8.h.2y);8.1c.1Z();k Z}}));A.1Q(A.l.3s,{4I:{4L:1,80:0,6j:":1p",2K:"1K",fX:1e,3u:"*",5g:"cP"}})})(1v);(c(B){c A(E,D){b C=B.22.9Z&&B.22.6V<kV;if(E.fW&&!C){k E.fW(D)}if(E.fV){k!!(E.fV(D)&16)}5y(D=D.3R){if(D==E){k 1e}}k Z}B.4b("l.2P",B.1Q({},B.l.4s,{5l:c(){b C=8.h;8.4Z={};8.r.1n("l-2P");8.9L();8.6E=8.2c.1m?(/o|3e/).1B(8.2c[0].2I.q("cI")):Z;if(!(/(2b|1W|4X)/).1B(8.r.q("17"))){8.r.q("17","2b")}8.v=8.r.v();8.8d()},6i:{},l:c(C){k{1c:(C||8)["1c"],2Z:(C||8)["2Z"]||B([]),17:(C||8)["17"],9M:(C||8)["3n"],h:8.h,r:8.r,2I:(C||8)["1S"],fU:C?C.r:19}},2a:c(F,E,C,D){B.l.2z.23(8,F,[E,8.l(C)]);if(!D){8.r.2m(F=="5I"?F:"5I"+F,[E,8.l(C)],8.h[F])}},fL:c(E){b C=(B.8N(8.h.2c)?8.h.2c.23(8.r):B(8.h.2c,8.r)).6L(".l-2P-1c");b D=[];E=E||{};C.1x(c(){b F=(B(8).2L(E.kU||"id")||"").3i(E.fT||(/(.+)[-=8Y](.+)/));if(F){D.4K((E.5Y||F[1])+"[]="+(E.5Y&&E.fT?F[1]:F[2]))}});k D.7r("&")},fK:c(C){b D=(B.8N(8.h.2c)?8.h.2c.23(8.r):B(8.h.2c,8.r)).6L(".l-2P-1c");b E=[];D.1x(c(){E.4K(B(8).2L(C||"id"))});k E},fQ:c(J){b E=8.3n.o,D=E+8.1Y.u,I=8.3n.p,H=I+8.1Y.t;b F=J.o,C=F+J.u,K=J.p,G=K+J.t;if(8.h.5g=="cO"||8.h.kT||(8.h.5g=="cJ"&&8.1Y[8.6E?"u":"t"]>J[8.6E?"u":"t"])){k(I+8.v.1F.p>K&&I+8.v.1F.p<G&&E+8.v.1F.o>F&&E+8.v.1F.o<C)}1g{k(F<E+(8.1Y.u/2)&&D-(8.1Y.u/2)<C&&K<I+(8.1Y.t/2)&&H-(8.1Y.t/2)<G)}},fP:c(J){b E=8.3n.o,D=E+8.1Y.u,I=8.3n.p,H=I+8.1Y.t;b F=J.o,C=F+J.u,K=J.p,G=K+J.t;if(8.h.5g=="cO"||(8.h.5g=="cJ"&&8.1Y[8.6E?"u":"t"]>J[8.6E?"u":"t"])){if(!(I+8.v.1F.p>K&&I+8.v.1F.p<G&&E+8.v.1F.o>F&&E+8.v.1F.o<C)){k Z}if(8.6E){if(E+8.v.1F.o>F&&E+8.v.1F.o<F+J.u/2){k 2}if(E+8.v.1F.o>F+J.u/2&&E+8.v.1F.o<C){k 1}}1g{if(I+8.v.1F.p>K&&I+8.v.1F.p<K+J.t/2){k 2}if(I+8.v.1F.p>K+J.t/2&&I+8.v.1F.p<G){k 1}}}1g{if(!(F<E+(8.1Y.u/2)&&D-(8.1Y.u/2)<C&&K<I+(8.1Y.t/2)&&H-(8.1Y.t/2)<G)){k Z}if(8.6E){if(D>F&&E<F){k 2}if(E<C&&D>C){k 1}}1g{if(H>K&&I<K){k 1}if(I<G&&H>G){k 2}}}k Z},9L:c(){8.b1();8.9H()},b1:c(){8.2c=[];8.2g=[8];b D=8.2c;b C=8;b F=[[B.8N(8.h.2c)?8.h.2c.23(8.r,19,{h:8.h,2I:8.1S}):B(8.h.2c,8.r),8]];if(8.h.cN){1R(b G=8.h.cN.1m-1;G>=0;G--){b I=B(8.h.cN[G]);1R(b E=I.1m-1;E>=0;E--){b H=B.1i(I[E],"2P");if(H&&!H.h.1I){F.4K([B.8N(H.h.2c)?H.h.2c.23(H.r):B(H.h.2c,H.r),H]);8.2g.4K(H)}}}}1R(b G=F.1m-1;G>=0;G--){F[G][0].1x(c(){B.1i(8,"2P-2I",F[G][1]);D.4K({2I:B(8),1V:F[G][1],u:0,t:0,o:0,p:0})})}},9H:c(D){if(8.2l){b C=8.2l.v();8.v.1o={p:C.p+8.9J.p,o:C.o+8.9J.o}}1R(b F=8.2c.1m-1;F>=0;F--){if(8.2c[F].1V!=8.9K&&8.9K&&8.2c[F].2I[0]!=8.1S[0]){7l}b E=8.h.fS?B(8.h.fS,8.2c[F].2I):8.2c[F].2I;if(!D){8.2c[F].u=E[0].4N;8.2c[F].t=E[0].4O}b G=E.v();8.2c[F].o=G.o;8.2c[F].p=G.p}if(8.h.cM&&8.h.cM.fR){8.h.cM.fR.23(8)}1g{1R(b F=8.2g.1m-1;F>=0;F--){b G=8.2g[F].r.v();8.2g[F].4Z.o=G.o;8.2g[F].4Z.p=G.p;8.2g[F].4Z.u=8.2g[F].r.2Y();8.2g[F].4Z.t=8.2g[F].r.2M()}}},3t:c(){8.r.1J("l-2P l-2P-1I").49("2P").3o(".2P");8.8e();1R(b C=8.2c.1m-1;C>=0;C--){8.2c[C].2I.49("2P-2I")}},cL:c(E){b C=E||8,F=C.h;if(F.2Z.3S==aC){b D=F.2Z;F.2Z={r:c(){k B("<1w></1w>").1n(D)[0]},9G:c(G,H){H.q(G.v()).q({u:G.2Y(),t:G.2M()})}}}C.2Z=B(F.2Z.r.23(C.r,C.1S)).2K("1K").q({17:"1W"});F.2Z.9G.23(C.r,C.1S,C.2Z)},fO:c(F){1R(b D=8.2g.1m-1;D>=0;D--){if(8.fQ(8.2g[D].4Z)){if(!8.2g[D].4Z.3r){if(8.9K!=8.2g[D]){b I=kS;b H=19;b E=8.3n[8.2g[D].6E?"o":"p"];1R(b C=8.2c.1m-1;C>=0;C--){if(!A(8.2g[D].r[0],8.2c[C].2I[0])){7l}b G=8.2c[C][8.2g[D].6E?"o":"p"];if(1f.3T(G-E)<I){I=1f.3T(G-E);H=8.2c[C]}}if(!H&&!8.h.fJ){7l}if(8.2Z){8.2Z.1Z()}if(8.2g[D].h.2Z){8.2g[D].cL(8)}1g{8.2Z=19}8.9K=8.2g[D];H?8.aZ(F,H,19,1e):8.aZ(F,19,8.2g[D].r,1e);8.2a("6Q",F);8.2g[D].2a("6Q",F,8)}8.2g[D].2a("3r",F,8);8.2g[D].4Z.3r=1}}1g{if(8.2g[D].4Z.3r){8.2g[D].2a("7k",F,8);8.2g[D].4Z.3r=0}}}},93:c(G,F){if(8.h.1I||8.h.5H=="6w"){k Z}8.b1();b E=19,D=8,C=B(G.1h).58().1x(c(){if(B.1i(8,"2P-2I")==D){E=B(8);k Z}});if(B.1i(G.1h,"2P-2I")==D){E=B(G.1h)}if(!E){k Z}if(8.h.1G&&!F){b H=Z;B(8.h.1G,E).4J("*").7W().1x(c(){if(8==G.1h){H=1e}});if(!H){k Z}}8.1S=E;k 1e},6h:c(H,F,C){b J=8.h;8.9K=8;8.9H();8.1c=2D J.1c=="c"?B(J.1c.1t(8.r[0],[H,8.1S])):8.1S.6B();if(!8.1c.58("1K").1m){B(J.2K!="1o"?J.2K:8.1S[0].3R)[0].fN(8.1c[0])}8.1c.q({17:"1W",4j:"5p"}).1n("l-2P-1c");8.30={o:(1b(8.1S.q("7X"),10)||0),p:(1b(8.1S.q("7Y"),10)||0)};8.v=8.1S.v();8.v={p:8.v.p-8.30.p,o:8.v.o-8.30.o};8.v.1F={o:H.3b-8.v.o,p:H.3c-8.v.p};8.2l=8.1c.2l();b D=8.2l.v();8.9J={p:(1b(8.2l.q("64"),10)||0),o:(1b(8.2l.q("63"),10)||0)};8.v.1o={p:D.p+8.9J.p,o:D.o+8.9J.o};8.2O=8.8M(H);8.cK={5V:8.1S.5V()[0],1o:8.1S.1o()[0]};8.1Y={u:8.1c.2Y(),t:8.1c.2M()};if(J.2Z){8.cL()}8.2a("2j",H);8.1Y={u:8.1c.2Y(),t:8.1c.2M()};if(J.3O){if(J.3O.o!=2p){8.v.1F.o=J.3O.o}if(J.3O.3e!=2p){8.v.1F.o=8.1Y.u-J.3O.3e}if(J.3O.p!=2p){8.v.1F.p=J.3O.p}if(J.3O.3h!=2p){8.v.1F.p=8.1Y.t-J.3O.3h}}if(J.1s){if(J.1s=="1o"){J.1s=8.1c[0].3R}if(J.1s=="1d"||J.1s=="3a"){8.1s=[0-8.v.1o.o,0-8.v.1o.p,B(J.1s=="1d"?1d:3a).u()-8.v.1o.o-8.1Y.u-8.30.o-(1b(8.r.q("7f"),10)||0),(B(J.1s=="1d"?1d:3a).t()||1d.1K.3R.6W)-8.v.1o.p-8.1Y.t-8.30.p-(1b(8.r.q("7g"),10)||0)]}if(!(/^(1d|3a|1o)$/).1B(J.1s)){b G=B(J.1s)[0];b I=B(J.1s).v();8.1s=[I.o+(1b(B(G).q("63"),10)||0)-8.v.1o.o,I.p+(1b(B(G).q("64"),10)||0)-8.v.1o.p,I.o+1f.2d(G.94,G.4N)-(1b(B(G).q("63"),10)||0)-8.v.1o.o-8.1Y.u-8.30.o-(1b(8.1S.q("7f"),10)||0),I.p+1f.2d(G.6W,G.4O)-(1b(B(G).q("64"),10)||0)-8.v.1o.p-8.1Y.t-8.30.p-(1b(8.1S.q("7g"),10)||0)]}}if(8.h.2Z!="6B"){8.1S.q("8B","3H")}if(!C){1R(b E=8.2g.1m-1;E>=0;E--){8.2g[E].2a("5Z",H,8)}}if(B.l.2H){B.l.2H.4T=8}if(B.l.2H&&!J.aY){B.l.2H.b0(8,H)}8.9F=1e;8.5o(H);k 1e},4G:c(D,E){if(!E){E=8.17}b C=D=="1W"?1:-1;k{p:(E.p+8.v.1o.p*C-(8.2l[0]==1d.1K?0:8.2l[0].2f)*C+8.30.p*C),o:(E.o+8.v.1o.o*C-(8.2l[0]==1d.1K?0:8.2l[0].2e)*C+8.30.o*C)}},8M:c(F){b G=8.h;b C={p:(F.3c-8.v.1F.p-8.v.1o.p+(8.2l[0]==1d.1K?0:8.2l[0].2f)),o:(F.3b-8.v.1F.o-8.v.1o.o+(8.2l[0]==1d.1K?0:8.2l[0].2e))};if(!8.2O){k C}if(8.1s){if(C.o<8.1s[0]){C.o=8.1s[0]}if(C.p<8.1s[1]){C.p=8.1s[1]}if(C.o>8.1s[2]){C.o=8.1s[2]}if(C.p>8.1s[3]){C.p=8.1s[3]}}if(G.2J){b E=8.2O.p+1f.3E((C.p-8.2O.p)/G.2J[1])*G.2J[1];C.p=8.1s?(!(E<8.1s[1]||E>8.1s[3])?E:(!(E<8.1s[1])?E-G.2J[1]:E+G.2J[1])):E;b D=8.2O.o+1f.3E((C.o-8.2O.o)/G.2J[0])*G.2J[0];C.o=8.1s?(!(D<8.1s[0]||D>8.1s[2])?D:(!(D<8.1s[0])?D-G.2J[0]:D+G.2J[0])):D}k C},5o:c(D){8.17=8.8M(D);8.3n=8.4G("1W");B.l.2z.23(8,"5I",[D,8.l()]);8.3n=8.4G("1W");8.1c[0].2Q.o=8.17.o+"2U";8.1c[0].2Q.p=8.17.p+"2U";1R(b C=8.2c.1m-1;C>=0;C--){b E=8.fP(8.2c[C]);if(!E){7l}if(8.2c[C].2I[0]!=8.1S[0]&&8.1S[E==1?"4g":"5V"]()[0]!=8.2c[C].2I[0]&&!A(8.1S[0],8.2c[C].2I[0])&&(8.h.5H=="kR-kQ"?!A(8.r[0],8.2c[C].2I[0]):1e)){8.6A=E==1?"61":"66";8.aZ(D,8.2c[C]);8.2a("6Q",D);1D}}8.fO(D);if(B.l.2H){B.l.2H.3F(8,D)}8.r.2m("5I",[D,8.l()],8.h["5I"]);k Z},aZ:c(H,G,D,F){D?D[0].fN(8.1S[0]):G.2I[0].3R.a0(8.1S[0],(8.6A=="61"?G.2I[0]:G.2I[0].eG));8.9I=8.9I?++8.9I:1;b E=8,C=8.9I;3a.7s(c(){if(C==E.9I){E.9H(!F)}},0);if(8.h.2Z){8.h.2Z.9G.23(8.r,8.1S,8.2Z)}},6g:c(E,D){if(B.l.2H&&!8.h.aY){B.l.2H.5C(8,E)}if(8.h.68){b C=8;b F=C.1S.v();if(C.2Z){C.2Z.1E({1O:"1C"},(1b(8.h.68,10)||8b)-50)}B(8.1c).1E({o:F.o-8.v.1o.o-C.30.o+(8.2l[0]==1d.1K?0:8.2l[0].2e),p:F.p-8.v.1o.p-C.30.p+(8.2l[0]==1d.1K?0:8.2l[0].2f)},1b(8.h.68,10)||8b,c(){C.4j(E)})}1g{8.4j(E,D)}k Z},4j:c(E,D){if(8.cK.5V!=8.1S.5V().6L(".l-2P-1c")[0]||8.cK.1o!=8.1S.1o()[0]){8.2a("9G",E,19,D)}if(!A(8.r[0],8.1S[0])){8.2a("1Z",E,19,D);1R(b C=8.2g.1m-1;C>=0;C--){if(A(8.2g[C].r[0],8.1S[0])){8.2g[C].2a("9G",E,8,D);8.2g[C].2a("fM",E,8,D)}}}1R(b C=8.2g.1m-1;C>=0;C--){8.2g[C].2a("81",E,8,D);if(8.2g[C].4Z.3r){8.2g[C].2a("7k",E,8);8.2g[C].4Z.3r=0}}8.9F=Z;if(8.8L){8.2a("2y",E,19,D);k Z}B(8.1S).q("8B","");if(8.2Z){8.2Z.1Z()}8.1c.1Z();8.1c=19;8.2a("2y",E,19,D);k 1e}}));B.1Q(B.l.2P,{9U:"fL fK",4I:{1c:"6B",5g:"cJ",4L:1,80:0,5D:1e,3J:20,3I:20,6j:":1p",2c:"> *",2C:95,fJ:1e,2K:"1o"}});B.l.2z.1T("2P","2s",{2j:c(E,D){b C=B("1K");if(C.q("2s")){D.h.8K=C.q("2s")}C.q("2s",D.h.2s)},2y:c(D,C){if(C.h.8K){B("1K").q("2s",C.h.8K)}}});B.l.2z.1T("2P","2C",{2j:c(E,D){b C=D.1c;if(C.q("2C")){D.h.8J=C.q("2C")}C.q("2C",D.h.2C)},2y:c(D,C){if(C.h.8J){B(C.1c).q("2C",C.h.8J)}}});B.l.2z.1T("2P","1O",{2j:c(E,D){b C=D.1c;if(C.q("1O")){D.h.8I=C.q("1O")}C.q("1O",D.h.1O)},2y:c(D,C){if(C.h.8I){B(C.1c).q("1O",C.h.8I)}}});B.l.2z.1T("2P","5D",{2j:c(E,D){b F=D.h;b C=B(8).1i("2P");C.3m=c(G){do{if(/46|5D/.1B(G.q("2X"))||(/46|5D/).1B(G.q("2X-y"))){k G}G=G.1o()}5y(G[0].3R);k B(1d)}(C.1S);C.3l=c(G){do{if(/46|5D/.1B(G.q("2X"))||(/46|5D/).1B(G.q("2X-x"))){k G}G=G.1o()}5y(G[0].3R);k B(1d)}(C.1S);if(C.3m[0]!=1d&&C.3m[0].6C!="7j"){C.8H=C.3m.v()}if(C.3l[0]!=1d&&C.3l[0].6C!="7j"){C.8G=C.3l.v()}},5I:c(E,D){b F=D.h;b C=B(8).1i("2P");if(C.3m[0]!=1d&&C.3m[0].6C!="7j"){if((C.8H.p+C.3m[0].4O)-E.3c<F.3J){C.3m[0].2f=C.3m[0].2f+F.3I}if(E.3c-C.8H.p<F.3J){C.3m[0].2f=C.3m[0].2f-F.3I}}1g{if(E.3c-B(1d).2f()<F.3J){B(1d).2f(B(1d).2f()-F.3I)}if(B(3a).t()-(E.3c-B(1d).2f())<F.3J){B(1d).2f(B(1d).2f()+F.3I)}}if(C.3l[0]!=1d&&C.3l[0].6C!="7j"){if((C.8G.o+C.3l[0].4N)-E.3b<F.3J){C.3l[0].2e=C.3l[0].2e+F.3I}if(E.3b-C.8G.o<F.3J){C.3l[0].2e=C.3l[0].2e-F.3I}}1g{if(E.3b-B(1d).2e()<F.3J){B(1d).2e(B(1d).2e()-F.3I)}if(B(3a).u()-(E.3b-B(1d).2e())<F.3J){B(1d).2e(B(1d).2e()+F.3I)}}}});B.l.2z.1T("2P","2B",{5I:c(E,D){b C=B(8).1i("2P");if(D.h.2B=="y"){C.17.o=C.2O.o}if(D.h.2B=="x"){C.17.p=C.2O.p}}})})(1v);(c(C){C.1j=C.1j||{};C.1Q(C.1j,{5A:c(F,G){1R(b E=0;E<G.1m;E++){if(G[E]!==19){C.1i(F[0],"ec.fI."+G[E],F[0].2Q[G[E]])}}},4F:c(F,G){1R(b E=0;E<G.1m;E++){if(G[E]!==19){F.q(G[E],C.1i(F[0],"ec.fI."+G[E]))}}},4E:c(E,F){if(F=="5e"){F=E.is(":3H")?"1y":"1C"}k F},f7:c(F,G){b H,E;5r(F[0]){1u"p":H=0;1D;1u"98":H=0.5;1D;1u"3h":H=1;1D;5q:H=F[0]/G.t}5r(F[1]){1u"o":E=0;1D;1u"7E":E=0.5;1D;1u"3e":E=1;1D;5q:E=F[1]/G.u}k{x:E,y:H}},6z:c(F){if(F.1o().2L("id")=="cH"){k F}b E={u:F.2Y({3U:1e}),t:F.2M({3U:1e}),"cI":F.q("cI")};F.8c(\'<1w id="cH" 2Q="kP-1r:2T%;aX:7i;a8:5n;3U:0;bv:0"></1w>\');b I=F.1o();if(F.q("17")=="6w"){I.q({17:"2b"});F.q({17:"2b"})}1g{b H=F.q("p");if(5L(1b(H))){H="46"}b G=F.q("o");if(5L(1b(G))){G="46"}I.q({17:F.q("17"),p:H,o:G,2C:F.q("z-3D")}).1y();F.q({17:"2b",p:0,o:0})}I.q(E);k I},65:c(E){if(E.1o().2L("id")=="cH"){k E.1o().kO(E)}k E},5B:c(F,G,E,H){H=H||{};C.1x(G,c(J,I){aW=F.fv(I);if(aW[0]>0){H[I]=aW[0]*E+aW[1]}});k H},9E:c(G,H,J,I){b E=(2D J=="c"?J:(I?I:19));b F=(2D J=="6k"?J:19);k 8.1x(c(){b O={};b M=C(8);b N=M.2L("2Q")||"";if(2D N=="6k"){N=N["cG"]}if(G.5e){M.4a(G.5e)?G.1Z=G.5e:G.1T=G.5e}b K=C.1Q({},(1d.aV?1d.aV.fH(8,19):8.fG));if(G.1T){M.1n(G.1T)}if(G.1Z){M.1J(G.1Z)}b L=C.1Q({},(1d.aV?1d.aV.fH(8,19):8.fG));if(G.1T){M.1J(G.1T)}if(G.1Z){M.1n(G.1Z)}1R(b P in L){if(2D L[P]!="c"&&L[P]&&P.88("kN")==-1&&P.88("1m")==-1&&L[P]!=K[P]&&(P.3i(/aO/i)||(!P.3i(/aO/i)&&!5L(1b(L[P],10))))&&(K.17!="6w"||(K.17=="6w"&&!P.3i(/o|p|3h|3e/)))){O[P]=L[P]}}M.1E(O,H,F,c(){if(2D C(8).2L("2Q")=="6k"){C(8).2L("2Q")["cG"]="";C(8).2L("2Q")["cG"]=N}1g{C(8).2L("2Q",N)}if(G.1T){C(8).1n(G.1T)}if(G.1Z){C(8).1J(G.1Z)}if(E){E.1t(8,1A)}})})}});C.fn.1Q({fF:C.fn.1y,fE:C.fn.1C,fC:C.fn.5e,fB:C.fn.1n,fz:C.fn.1J,fy:C.fn.aJ,5f:c(E,G,F,H){k C.1j[E]?C.1j[E].23(8,{kM:E,h:G||{},1z:F,2o:H}):19},1y:c(){if(!1A[0]||(1A[0].3S==7w||/(aU|8X|cF)/.1B(1A[0]))){k 8.fF.1t(8,1A)}1g{b E=1A[1]||{};E["2G"]="1y";k 8.5f.1t(8,[1A[0],E,1A[2]||E.1z,1A[3]||E.2o])}},1C:c(){if(!1A[0]||(1A[0].3S==7w||/(aU|8X|cF)/.1B(1A[0]))){k 8.fE.1t(8,1A)}1g{b E=1A[1]||{};E["2G"]="1C";k 8.5f.1t(8,[1A[0],E,1A[2]||E.1z,1A[3]||E.2o])}},5e:c(){if(!1A[0]||(1A[0].3S==7w||/(aU|8X|cF)/.1B(1A[0]))||(1A[0].3S==fD)){k 8.fC.1t(8,1A)}1g{b E=1A[1]||{};E["2G"]="5e";k 8.5f.1t(8,[1A[0],E,1A[2]||E.1z,1A[3]||E.2o])}},1n:c(F,E,H,G){k E?C.1j.9E.1t(8,[{1T:F},E,H,G]):8.fB(F)},1J:c(F,E,H,G){k E?C.1j.9E.1t(8,[{1Z:F},E,H,G]):8.fz(F)},aJ:c(F,E,H,G){k E?C.1j.9E.1t(8,[{5e:F},E,H,G]):8.fy(F)},fw:c(E,G,F,I,H){k C.1j.9E.1t(8,[{1T:G,1Z:E},F,I,H])},kL:c(){k 8.fw.1t(8,1A)},fv:c(E){b F=8.q(E),G=[];C.1x(["em","2U","%","kK"],c(H,I){if(F.88(I)>0){G=[aT(F),I]}});k G}});1v.1x(["7Z","kJ","kI","kH","kG","aO","kF"],c(F,E){1v.fx.ct[E]=c(G){if(G.kE==0){G.2j=D(G.fu,E);G.4R=B(G.4R)}G.fu.2Q[E]="cE("+[1f.2d(1f.2q(1b((G.2w*(G.4R[0]-G.2j[0]))+G.2j[0]),2t),0),1f.2d(1f.2q(1b((G.2w*(G.4R[1]-G.2j[1]))+G.2j[1]),2t),0),1f.2d(1f.2q(1b((G.2w*(G.4R[2]-G.2j[2]))+G.2j[2]),2t),0)].7r(",")+")"}});c B(F){b E;if(F&&F.3S==8a&&F.1m==3){k F}if(E=/cE\\(\\s*([0-9]{1,3})\\s*,\\s*([0-9]{1,3})\\s*,\\s*([0-9]{1,3})\\s*\\)/.78(F)){k[1b(E[1]),1b(E[2]),1b(E[3])]}if(E=/cE\\(\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*,\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*,\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*\\)/.78(F)){k[aT(E[1])*2.55,aT(E[2])*2.55,aT(E[3])*2.55]}if(E=/#([a-fA-8F-9]{2})([a-fA-8F-9]{2})([a-fA-8F-9]{2})/.78(F)){k[1b(E[1],16),1b(E[2],16),1b(E[3],16)]}if(E=/#([a-fA-8F-9])([a-fA-8F-9])([a-fA-8F-9])/.78(F)){k[1b(E[1]+E[1],16),1b(E[2]+E[2],16),1b(E[3]+E[3],16)]}if(E=/ft\\(0, 0, 0, 0\\)/.78(F)){k A["7i"]}k A[1v.fs(F).8w()]}c D(G,E){b F;do{F=1v.kD(G,E);if(F!=""&&F!="7i"||1v.4l(G,"1K")){1D}E="7Z"}5y(G=G.3R);k B(F)}b A={kC:[0,2t,2t],kB:[fo,2t,2t],kA:[fr,fr,kz],fq:[0,0,0],ky:[0,0,2t],kx:[fj,42,42],kw:[0,2t,2t],kv:[0,0,8E],ku:[0,8E,8E],kt:[cD,cD,cD],ks:[0,2T,0],kr:[kq,kp,fp],ko:[8E,0,8E],kn:[85,fp,47],km:[2t,cv,0],kl:[kk,50,kj],ki:[8E,0,0],kh:[kg,aa,kf],ke:[kd,0,aS],kc:[2t,0,2t],kb:[2t,ka,0],k9:[0,6D,0],k8:[75,0,k7],k6:[fo,fm,cv],k5:[k4,k3,fm],k2:[fk,2t,2t],k1:[fl,k0,fl],jZ:[aS,aS,aS],jY:[2t,jX,jW],jV:[2t,2t,fk],jU:[0,2t,0],jT:[2t,0,2t],jS:[6D,0,0],jR:[0,0,6D],jQ:[6D,6D,0],jP:[2t,fj,0],jO:[2t,aR,jN],jM:[6D,0,6D],jL:[6D,0,6D],jK:[2t,0,0],jJ:[aR,aR,aR],jI:[2t,2t,2t],jH:[2t,2t,0],7i:[2t,2t,2t]};1v.1N["jG"]=1v.1N["9B"];1v.1Q(1v.1N,{fi:"fh",9B:c(F,G,E,I,H){k 1v.1N[1v.1N.fi](F,G,E,I,H)},jF:c(F,G,E,I,H){k I*(G/=H)*G+E},fh:c(F,G,E,I,H){k-I*(G/=H)*(G-2)+E},jE:c(F,G,E,I,H){if((G/=H/2)<1){k I/2*G*G+E}k-I/2*((--G)*(G-2)-1)+E},jD:c(F,G,E,I,H){k I*(G/=H)*G*G+E},jC:c(F,G,E,I,H){k I*((G=G/H-1)*G*G+1)+E},jB:c(F,G,E,I,H){if((G/=H/2)<1){k I/2*G*G*G+E}k I/2*((G-=2)*G*G+2)+E},jA:c(F,G,E,I,H){k I*(G/=H)*G*G*G+E},jz:c(F,G,E,I,H){k-I*((G=G/H-1)*G*G*G-1)+E},jy:c(F,G,E,I,H){if((G/=H/2)<1){k I/2*G*G*G*G+E}k-I/2*((G-=2)*G*G*G-2)+E},jx:c(F,G,E,I,H){k I*(G/=H)*G*G*G*G+E},jw:c(F,G,E,I,H){k I*((G=G/H-1)*G*G*G*G+1)+E},jv:c(F,G,E,I,H){if((G/=H/2)<1){k I/2*G*G*G*G*G+E}k I/2*((G-=2)*G*G*G*G+2)+E},ju:c(F,G,E,I,H){k-I*1f.fg(G/H*(1f.67/2))+I+E},jt:c(F,G,E,I,H){k I*1f.9D(G/H*(1f.67/2))+E},js:c(F,G,E,I,H){k-I/2*(1f.fg(1f.67*G/H)-1)+E},jr:c(F,G,E,I,H){k(G==0)?E:I*1f.7h(2,10*(G/H-1))+E},jq:c(F,G,E,I,H){k(G==H)?E+I:I*(-1f.7h(2,-10*G/H)+1)+E},jp:c(F,G,E,I,H){if(G==0){k E}if(G==H){k E+I}if((G/=H/2)<1){k I/2*1f.7h(2,10*(G-1))+E}k I/2*(-1f.7h(2,-10*--G)+2)+E},jo:c(F,G,E,I,H){k-I*(1f.8C(1-(G/=H)*G)-1)+E},jn:c(F,G,E,I,H){k I*1f.8C(1-(G=G/H-1)*G)+E},jm:c(F,G,E,I,H){if((G/=H/2)<1){k-I/2*(1f.8C(1-G*G)-1)+E}k I/2*(1f.8C(1-(G-=2)*G)+1)+E},jl:c(F,H,E,L,K){b I=1.8D;b J=0;b G=L;if(H==0){k E}if((H/=K)==1){k E+L}if(!J){J=K*0.3}if(G<1f.3T(L)){G=L;b I=J/4}1g{b I=J/(2*1f.67)*1f.cC(L/G)}k-(G*1f.7h(2,10*(H-=1))*1f.9D((H*K-I)*(2*1f.67)/J))+E},jk:c(F,H,E,L,K){b I=1.8D;b J=0;b G=L;if(H==0){k E}if((H/=K)==1){k E+L}if(!J){J=K*0.3}if(G<1f.3T(L)){G=L;b I=J/4}1g{b I=J/(2*1f.67)*1f.cC(L/G)}k G*1f.7h(2,-10*H)*1f.9D((H*K-I)*(2*1f.67)/J)+L+E},jj:c(F,H,E,L,K){b I=1.8D;b J=0;b G=L;if(H==0){k E}if((H/=K/2)==2){k E+L}if(!J){J=K*(0.3*1.5)}if(G<1f.3T(L)){G=L;b I=J/4}1g{b I=J/(2*1f.67)*1f.cC(L/G)}if(H<1){k-0.5*(G*1f.7h(2,10*(H-=1))*1f.9D((H*K-I)*(2*1f.67)/J))+E}k G*1f.7h(2,-10*(H-=1))*1f.9D((H*K-I)*(2*1f.67)/J)*0.5+L+E},ji:c(F,G,E,J,I,H){if(H==2p){H=1.8D}k J*(G/=I)*G*((H+1)*G-H)+E},jh:c(F,G,E,J,I,H){if(H==2p){H=1.8D}k J*((G=G/I-1)*G*((H+1)*G+H)+1)+E},jg:c(F,G,E,J,I,H){if(H==2p){H=1.8D}if((G/=I/2)<1){k J/2*(G*G*(((H*=(1.ff))+1)*G-H))+E}k J/2*((G-=2)*G*(((H*=(1.ff))+1)*G+H)+2)+E},fe:c(F,G,E,I,H){k I-1v.1N.cB(F,H-G,0,I,H)+E},cB:c(F,G,E,I,H){if((G/=H)<(1/2.75)){k I*(7.aQ*G*G)+E}1g{if(G<(2/2.75)){k I*(7.aQ*(G-=(1.5/2.75))*G+0.75)+E}1g{if(G<(2.5/2.75)){k I*(7.aQ*(G-=(2.25/2.75))*G+0.jf)+E}1g{k I*(7.aQ*(G-=(2.je/2.75))*G+0.jd)+E}}}},jc:c(F,G,E,I,H){if(G<H/2){k 1v.1N.fe(F,G*2,0,I,H)*0.5+E}k 1v.1N.cB(F,G*2-H,0,I,H)*0.5+I*0.5+E}})})(1v);(c(A){A.1j.jb=c(B){k 8.3k(c(){b D=A(8),C=["17","p","o"];b H=A.1j.4E(D,B.h.2G||"1C");b G=B.h.6A||"3K";A.1j.5A(D,C);D.1y();b J=A.1j.6z(D).q({2X:"3H"});b E=(G=="3K")?"t":"u";b I=(G=="3K")?J.t():J.u();if(H=="1y"){J.q(E,0)}b F={};F[E]=H=="1y"?I:0;J.1E(F,B.1z,B.h.1N,c(){if(H=="1C"){D.1C()}A.1j.4F(D,C);A.1j.65(D);if(B.2o){B.2o.1t(D[0],1A)}D.48()})})}})(1v);(c(A){A.1j.ja=c(B){k 8.3k(c(){b E=A(8),K=["17","p","o"];b J=A.1j.4E(E,B.h.2G||"5f");b M=B.h.6A||"66";b C=B.h.4L||20;b D=B.h.cw||5;b G=B.1z||j9;if(/1y|1C/.1B(J)){K.4K("1O")}A.1j.5A(E,K);E.1y();A.1j.6z(E);b F=(M=="66"||M=="61")?"p":"o";b O=(M=="66"||M=="o")?"2w":"aM";b C=B.h.4L||(F=="p"?E.2M({3U:1e})/3:E.2Y({3U:1e})/3);if(J=="1y"){E.q("1O",0).q(F,O=="2w"?-C:C)}if(J=="1C"){C=C/(D*2)}if(J!="1C"){D--}if(J=="1y"){b H={1O:1};H[F]=(O=="2w"?"+=":"-=")+C;E.1E(H,G/2,B.h.1N);C=C/2;D--}1R(b I=0;I<D;I++){b N={},L={};N[F]=(O=="2w"?"-=":"+=")+C;L[F]=(O=="2w"?"+=":"-=")+C;E.1E(N,G/2,B.h.1N).1E(L,G/2,B.h.1N);C=(J=="1C")?C*2:C/2}if(J=="1C"){b H={1O:0};H[F]=(O=="2w"?"-=":"+=")+C;E.1E(H,G/2,B.h.1N,c(){E.1C();A.1j.4F(E,K);A.1j.65(E);if(B.2o){B.2o.1t(8,1A)}})}1g{b N={},L={};N[F]=(O=="2w"?"-=":"+=")+C;L[F]=(O=="2w"?"+=":"-=")+C;E.1E(N,G/2,B.h.1N).1E(L,G/2,B.h.1N,c(){A.1j.4F(E,K);A.1j.65(E);if(B.2o){B.2o.1t(8,1A)}})}E.3k("fx",c(){E.48()});E.48()})}})(1v);(c(A){A.1j.j8=c(B){k 8.3k(c(){b F=A(8),J=["17","p","o","t","u"];b I=A.1j.4E(F,B.h.2G||"1C");b K=B.h.6A||"3K";A.1j.5A(F,J);F.1y();b C=A.1j.6z(F).q({2X:"3H"});b E=F[0].6C=="j7"?C:F;b G={1r:(K=="3K")?"t":"u",17:(K=="3K")?"p":"o"};b D=(K=="3K")?E.t():E.u();if(I=="1y"){E.q(G.1r,0);E.q(G.17,D/2)}b H={};H[G.1r]=I=="1y"?D:0;H[G.17]=I=="1y"?0:D/2;E.1E(H,{3k:Z,1z:B.1z,1N:B.h.1N,62:c(){if(I=="1C"){F.1C()}A.1j.4F(F,J);A.1j.65(F);if(B.2o){B.2o.1t(F[0],1A)}F.48()}})})}})(1v);(c(A){A.1j.5C=c(B){k 8.3k(c(){b E=A(8),D=["17","p","o","1O"];b I=A.1j.4E(E,B.h.2G||"1C");b H=B.h.6A||"o";A.1j.5A(E,D);E.1y();A.1j.6z(E);b F=(H=="66"||H=="61")?"p":"o";b C=(H=="66"||H=="o")?"2w":"aM";b J=B.h.4L||(F=="p"?E.2M({3U:1e})/2:E.2Y({3U:1e})/2);if(I=="1y"){E.q("1O",0).q(F,C=="2w"?-J:J)}b G={1O:I=="1y"?1:0};G[F]=(I=="1y"?(C=="2w"?"+=":"-="):(C=="2w"?"-=":"+="))+J;E.1E(G,{3k:Z,1z:B.1z,1N:B.h.1N,62:c(){if(I=="1C"){E.1C()}A.1j.4F(E,D);A.1j.65(E);if(B.2o){B.2o.1t(8,1A)}E.48()}})})}})(1v);(c(A){A.1j.cA=c(B){k 8.3k(c(){b I=B.h.aP?1f.3E(1f.8C(B.h.aP)):3;b E=B.h.aP?1f.3E(1f.8C(B.h.aP)):3;B.h.2G=B.h.2G=="5e"?(A(8).is(":57")?"1C":"1y"):B.h.2G;b H=A(8).1y().q("8B","3H");b J=H.v();J.p-=1b(H.q("7Y"))||0;J.o-=1b(H.q("7X"))||0;b G=H.2Y(1e);b C=H.2M(1e);1R(b F=0;F<I;F++){1R(b D=0;D<E;D++){H.6B().2K("1K").8c("<1w></1w>").q({17:"1W",8B:"57",o:-D*(G/E),p:-F*(C/I)}).1o().1n("1j-cA").q({17:"1W",2X:"3H",u:G/E,t:C/I,o:J.o+D*(G/E)+(B.h.2G=="1y"?(D-1f.9q(E/2))*(G/E):0),p:J.p+F*(C/I)+(B.h.2G=="1y"?(F-1f.9q(I/2))*(C/I):0),1O:B.h.2G=="1y"?0:1}).1E({o:J.o+D*(G/E)+(B.h.2G=="1y"?0:(D-1f.9q(E/2))*(G/E)),p:J.p+F*(C/I)+(B.h.2G=="1y"?0:(F-1f.9q(I/2))*(C/I)),1O:B.h.2G=="1y"?1:0},B.1z||8b)}}7s(c(){B.h.2G=="1y"?H.q({8B:"57"}):H.q({8B:"57"}).1C();if(B.2o){B.2o.1t(H[0])}H.48();A(".1j-cA").1Z()},B.1z||8b)})}})(1v);(c(A){A.1j.j6=c(B){k 8.3k(c(){b E=A(8),J=["17","p","o"];b G=A.1j.4E(E,B.h.2G||"1C");b N=B.h.1r||15;b M=!(!B.h.j5);A.1j.5A(E,J);E.1y();b D=A.1j.6z(E).q({2X:"3H"});b H=((G=="1y")!=M);b F=H?["u","t"]:["t","u"];b C=H?[D.u(),D.t()]:[D.t(),D.u()];b I=/([0-9]+)%/.78(N);if(I){N=1b(I[1])/2T*C[G=="1C"?0:1]}if(G=="1y"){D.q(M?{t:0,u:N}:{t:N,u:0})}b L={},K={};L[F[0]]=G=="1y"?C[0]:N;K[F[1]]=G=="1y"?C[1]:0;D.1E(L,B.1z/2,B.h.1N).1E(K,B.1z/2,B.h.1N,c(){if(G=="1C"){E.1C()}A.1j.4F(E,J);A.1j.65(E);if(B.2o){B.2o.1t(E[0],1A)}E.48()})})}})(1v);(c(A){A.1j.j4=c(B){k 8.3k(c(){b E=A(8),D=["cz","7Z","1O"];b H=A.1j.4E(E,B.h.2G||"1y");b C=B.h.aO||"#j3";b G=E.q("7Z");A.1j.5A(E,D);E.1y();E.q({cz:"5n",7Z:C});b F={7Z:G};if(H=="1C"){F["1O"]=0}E.1E(F,{3k:Z,1z:B.1z,1N:B.h.1N,62:c(){if(H=="1C"){E.1C()}A.1j.4F(E,D);if(H=="1y"&&1v.22.3v){8.2Q.j2("3u")}if(B.2o){B.2o.1t(8,1A)}E.48()}})})}})(1v);(c(A){A.1j.j1=c(B){k 8.3k(c(){b D=A(8);b F=A.1j.4E(D,B.h.2G||"1y");b E=B.h.cw||5;if(F=="1C"){E--}if(D.is(":3H")){D.q("1O",0);D.1y();D.1E({1O:1},B.1z/2,B.h.1N);E=E-2}1R(b C=0;C<E;C++){D.1E({1O:0},B.1z/2,B.h.1N).1E({1O:1},B.1z/2,B.h.1N)}if(F=="1C"){D.1E({1O:0},B.1z/2,B.h.1N,c(){D.1C();if(B.2o){B.2o.1t(8,1A)}})}1g{D.1E({1O:0},B.1z/2,B.h.1N).1E({1O:1},B.1z/2,B.h.1N,c(){if(B.2o){B.2o.1t(8,1A)}})}D.3k("fx",c(){D.48()});D.48()})}})(1v);(c(A){A.1j.j0=c(B){k 8.3k(c(){b F=A(8);b C=A.1Q(1e,{},B.h);b H=A.1j.4E(F,B.h.2G||"1C");b G=1b(B.h.aN)||aa;C.fd=1e;b E={t:F.t(),u:F.u()};b D=G/2T;F.1U=(H=="1C")?E:{t:E.t*D,u:E.u*D};C.1U=F.1U;C.aN=(H=="1C")?G:2T;C.2G=H;F.5f("cy",C,B.1z,B.2o);F.48()})};A.1j.cy=c(B){k 8.3k(c(){b G=A(8);b D=A.1Q(1e,{},B.h);b J=A.1j.4E(G,B.h.2G||"5f");b H=1b(B.h.aN)||(1b(B.h.aN)==0?0:(J=="1C"?0:2T));b I=B.h.6A||"5p";b C=B.h.cx;if(J!="5f"){D.cx=C||["98","7E"];D.4F=1e}b F={t:G.t(),u:G.u()};G.1U=B.h.1U||(J=="1y"?{t:0,u:0}:F);b E={y:I!="a5"?(H/2T):1,x:I!="3K"?(H/2T):1};G.29={t:F.t*E.y,u:F.u*E.x};if(B.h.fd){if(J=="1y"){G.1U.1O=0;G.29.1O=1}if(J=="1C"){G.1U.1O=1;G.29.1O=0}}D.1U=G.1U;D.29=G.29;D.2G=J;G.5f("1r",D,B.1z,B.2o);G.48()})};A.1j.1r=c(B){k 8.3k(c(){b C=A(8),N=["17","p","o","u","t","2X","1O"];b M=["17","p","o","2X","1O"];b J=["u","t","2X"];b P=["fc"];b K=["64","aL","fb","fa"];b F=["63","aK","f9","f8"];b G=A.1j.4E(C,B.h.2G||"5f");b I=B.h.4F||Z;b E=B.h.cy||"5p";b O=B.h.cx;b D={t:C.t(),u:C.u()};C.1U=B.h.1U||D;C.29=B.h.29||D;if(O){b H=A.1j.f7(O,D);C.1U.p=(D.t-C.1U.t)*H.y;C.1U.o=(D.u-C.1U.u)*H.x;C.29.p=(D.t-C.29.t)*H.y;C.29.o=(D.u-C.29.u)*H.x}b L={1U:{y:C.1U.t/D.t,x:C.1U.u/D.u},29:{y:C.29.t/D.t,x:C.29.u/D.u}};if(E=="iZ"||E=="5p"){if(L.1U.y!=L.29.y){N=N.5k(K);C.1U=A.1j.5B(C,K,L.1U.y,C.1U);C.29=A.1j.5B(C,K,L.29.y,C.29)}if(L.1U.x!=L.29.x){N=N.5k(F);C.1U=A.1j.5B(C,F,L.1U.x,C.1U);C.29=A.1j.5B(C,F,L.29.x,C.29)}}if(E=="7F"||E=="5p"){if(L.1U.y!=L.29.y){N=N.5k(P);C.1U=A.1j.5B(C,P,L.1U.y,C.1U);C.29=A.1j.5B(C,P,L.29.y,C.29)}}A.1j.5A(C,I?N:M);C.1y();A.1j.6z(C);C.q("2X","3H").q(C.1U);if(E=="7F"||E=="5p"){K=K.5k(["7Y","7g"]).5k(P);F=F.5k(["7X","7f"]);J=N.5k(K).5k(F);C.4J("*[u]").1x(c(){2W=A(8);if(I){A.1j.5A(2W,J)}b Q={t:2W.t(),u:2W.u()};2W.1U={t:Q.t*L.1U.y,u:Q.u*L.1U.x};2W.29={t:Q.t*L.29.y,u:Q.u*L.29.x};if(L.1U.y!=L.29.y){2W.1U=A.1j.5B(2W,K,L.1U.y,2W.1U);2W.29=A.1j.5B(2W,K,L.29.y,2W.29)}if(L.1U.x!=L.29.x){2W.1U=A.1j.5B(2W,F,L.1U.x,2W.1U);2W.29=A.1j.5B(2W,F,L.29.x,2W.29)}2W.q(2W.1U);2W.1E(2W.29,B.1z,B.h.1N,c(){if(I){A.1j.4F(2W,J)}})})}C.1E(C.29,{3k:Z,1z:B.1z,1N:B.h.1N,62:c(){if(G=="1C"){C.1C()}A.1j.4F(C,I?N:M);A.1j.65(C);if(B.2o){B.2o.1t(8,1A)}C.48()}})})}})(1v);(c(A){A.1j.iY=c(B){k 8.3k(c(){b E=A(8),K=["17","p","o"];b J=A.1j.4E(E,B.h.2G||"5f");b M=B.h.6A||"o";b C=B.h.4L||20;b D=B.h.cw||3;b G=B.1z||B.h.1z||cv;A.1j.5A(E,K);E.1y();A.1j.6z(E);b F=(M=="66"||M=="61")?"p":"o";b O=(M=="66"||M=="o")?"2w":"aM";b H={},N={},L={};H[F]=(O=="2w"?"-=":"+=")+C;N[F]=(O=="2w"?"+=":"-=")+C*2;L[F]=(O=="2w"?"-=":"+=")+C*2;E.1E(H,G,B.h.1N);1R(b I=1;I<D;I++){E.1E(N,G,B.h.1N).1E(L,G,B.h.1N)}E.1E(N,G,B.h.1N).1E(H,G/2,B.h.1N,c(){A.1j.4F(E,K);A.1j.65(E);if(B.2o){B.2o.1t(8,1A)}});E.3k("fx",c(){E.48()});E.48()})}})(1v);(c(A){A.1j.6e=c(B){k 8.3k(c(){b E=A(8),D=["17","p","o"];b I=A.1j.4E(E,B.h.2G||"1y");b H=B.h.6A||"o";A.1j.5A(E,D);E.1y();A.1j.6z(E).q({2X:"3H"});b F=(H=="66"||H=="61")?"p":"o";b C=(H=="66"||H=="o")?"2w":"aM";b J=B.h.4L||(F=="p"?E.2M({3U:1e}):E.2Y({3U:1e}));if(I=="1y"){E.q(F,C=="2w"?-J:J)}b G={};G[F]=(I=="1y"?(C=="2w"?"+=":"-="):(C=="2w"?"-=":"+="))+J;E.1E(G,{3k:Z,1z:B.1z,1N:B.h.1N,62:c(){if(I=="1C"){E.1C()}A.1j.4F(E,D);A.1j.65(E);if(B.2o){B.2o.1t(8,1A)}E.48()}})})}})(1v);(c(A){A.1j.f6=c(B){k 8.3k(c(){b E=A(8);b G=A.1j.4E(E,B.h.2G||"5f");b F=A(B.h.29);b C=E.v();b D=A(\'<1w 2u="l-1j-f6"></1w>\').2K(1d.1K);if(B.h.8g){D.1n(B.h.8g)}D.1n(B.h.8g);D.q({p:C.p,o:C.o,t:E.2M()-1b(D.q("64"))-1b(D.q("aL")),u:E.2Y()-1b(D.q("63"))-1b(D.q("aK")),17:"1W"});C=F.v();f5={p:C.p,o:C.o,t:F.2M()-1b(D.q("64"))-1b(D.q("aL")),u:F.2Y()-1b(D.q("63"))-1b(D.q("aK"))};D.1E(f5,B.1z,B.h.1N,c(){D.1Z();if(B.2o){B.2o.1t(E[0],1A)}E.48()})})}})(1v);(c(E){E.4b("l.3N",{5l:c(){b G=8.h;if(G.iX){b J=8.r.4J("a").3u(G.eX);if(J.1m){if(J.3u(G.7J).1m){G.3L=J}1g{G.3L=J.1o().1o().5V();J.1n("4T")}}}G.4D=8.r.4J(G.7J);G.3L=C(G.4D,G.3L);if(E.22.3v){8.r.4J("a").q("f4","1")}if(!8.r.4a("l-3N")){8.r.1n("l-3N");E("<4p 2u=\'l-3N-o\'/>").a0(G.4D);E("<4p 2u=\'l-3N-3e\'/>").2K(G.4D);G.4D.1n("l-3N-7J").2L("iW","0")}b I;if(G.f3){I=8.r.1o().t();G.4D.1x(c(){I-=E(8).2M()});b H=0;G.4D.4g().1x(c(){H=1f.2d(H,E(8).9v()-E(8).t())}).t(I-H)}1g{if(G.7e){I=0;G.4D.4g().1x(c(){I=1f.2d(I,E(8).2M())}).t(I)}}G.4D.6L(G.3L||"").4g().1C();G.3L.1o().7W().1n(G.3p);if(G.3C){8.r.2V((G.3C)+".3N",F)}},5Z:c(G){F.23(8.r[0],{1h:C(8.h.4D,G)[0]})},3t:c(){8.h.4D.4g().q("4q","");if(8.h.f3||8.h.7e){8.h.4D.4g().q("t","")}E.49(8.r[0],"3N");8.r.1J("l-3N").3o(".3N")}});c B(H,G){k c(){k H.1t(G,1A)}}c D(I){if(!E.1i(8,"3N")){k}b G=E.1i(8,"3N");b H=G.h;H.8A=I?0:--H.8A;if(H.8A){k}if(H.iV){H.6y.1T(H.7V).q({t:"",2X:""})}E(8).2m("f2",[E.3C.dm({5H:"f2",1h:G.r[0]}),H.1i],H.6Q)}c A(G,K,L,J,M){b I=E.1i(8,"3N").h;I.6y=G;I.7V=K;I.1i=L;b H=B(D,8);I.8A=K.1r()===0?G.1r():K.1r();if(I.aI){if(!I.9C&&J){E.l.3N.cu[I.aI]({6y:1v([]),7V:K,62:H,61:M,7e:I.7e})}1g{E.l.3N.cu[I.aI]({6y:G,7V:K,62:H,61:M,7e:I.7e})}}1g{if(!I.9C&&J){G.5e()}1g{K.1C();G.1y()}H(1e)}}c F(L){b J=E.1i(8,"3N").h;if(J.1I){k Z}if(!L.1h&&!J.9C){J.3L.1o().7W().aJ(J.3p);b I=J.3L.4g(),M={h:J,f1:1v([]),f0:J.3L,eZ:1v([]),eY:I},G=(J.3L=E([]));A.23(8,G,I,M);k Z}b K=E(L.1h);K=E(K.58(J.7J)[0]||K);b H=K[0]==J.3L[0];if(J.8A||(J.9C&&H)){k Z}if(!K.is(J.7J)){k}J.3L.1o().7W().aJ(J.3p);if(!H){K.1o().7W().1n(J.3p)}b G=K.4g(),I=J.3L.4g(),M={h:J,f1:K,f0:J.3L,eZ:G,eY:I},N=J.4D.3D(J.3L[0])>J.4D.3D(K[0]);J.3L=H?E([]):K;A.23(8,G,I,M,H,N);k Z}c C(H,G){k G!=2p?2D G=="8l"?H.3u(":eq("+G+")"):H.6L(H.6L(G)):G===Z?E([]):H.3u(":eq(0)")}E.1Q(E.l.3N,{4I:{3p:"1L",9C:1e,aI:"6e",3C:"1F",7J:"a",7e:1e,8A:0,eX:c(){k 8.3P.8w()==a2.3P.8w()}},cu:{6e:c(G,I){G=E.1Q({1N:"9B",1z:dG},G,I);if(!G.7V.1r()){G.6y.1E({t:"1y"},G);k}b H=G.7V.t(),J=G.6y.t(),K=J/H;G.6y.q({t:0,2X:"3H"}).1y();G.7V.3u(":3H").1x(G.62).4R().3u(":57").1E({t:"1C"},{ct:c(L){b M=(H-L)*K;if(E.22.3v||E.22.7v){M=1f.eh(M)}G.6y.t(M)},1z:G.1z,1N:G.1N,62:c(){if(!G.7e){G.6y.q("t","46")}G.62()}})},iU:c(G){8.6e(G,{1N:G.61?"iT":"9B",1z:G.61?95:dH})},iS:c(G){8.6e(G,{1N:"iR",1z:iQ})}}});E.fn.5Z=c(G){k 8.3N("5Z",G)}})(1v);(c($){b 3A="18";c 99(){8.eS=Z;8.9t=19;8.6x=[];8.7P=Z;8.7b=Z;8.cg="l-18-1w";8.cq="l-18-5s";8.6v="l-18-6M";8.ch="l-18-1X";8.bZ="l-18-8q";8.bT="l-18-5T";8.ak="l-18-4T-2n";8.cs=[];8.cs[""]={ev:"iP",ew:"iO 9z 4T 1a",et:"eW",eu:"eW iN 6Q",74:"&#iM;iL",es:"9A 9z iK 2k",73:"iJ&#iI;",er:"9A 9z 4g 2k",7N:"iH",ep:"9A 9z 4T 2k",41:["iG","iF","iE","iD","eV","iC","iB","iA","iz","iy","ix","iw"],5t:["iv","iu","it","ir","eV","iq","ip","io","im","il","ik","ij"],e7:"9A a eU 2k",e1:"9A a eU 26",en:"ii",ih:"ig ie 9z 26",4i:["ic","ib","ia","i9","i8","i7","i6"],4w:["i5","i4","i3","i2","i1","i0","hZ"],an:["hY","hX","hW","hV","hU","hT","hS"],ao:"hR 9j as dw 72 2n",7L:"eT 9j, M d",7H:"au/dd/7O",4z:0,ea:"eT a 1a",4S:Z};8.4B={7U:"3q",5d:"1y",cj:{},77:19,9y:"",7d:"...",8y:"",eQ:Z,9e:1e,c1:Z,9l:Z,8r:Z,bY:Z,e8:1e,e4:1e,e3:"-10:+10",9i:1e,8n:Z,71:Z,9h:Z,am:8.9k,4Q:"+10",44:Z,eo:8.7L,2F:19,2R:19,1z:"8X",9g:19,9w:19,7a:19,e0:19,9u:19,dZ:1,6s:1,4U:Z,9n:" - ",9r:"",8u:""};$.1Q(8.4B,8.cs[""]);8.2v=$(\'<1w id="\'+8.cg+\'" 2Q="4q: 5n;"></1w>\')}$.1Q(99.53,{7c:"hQ",c7:c(){if(8.eS){hP.c7.1t("",1A)}},hO:c(1P){9a(8.4B,1P||{});k 8},dQ:c(1h,1P){b 8z=19;1R(aH in 8.4B){b aG=1h.hN("1a:"+aH);if(aG){8z=8z||{};ca{8z[aH]=hM(aG)}c8(hL){8z[aH]=aG}}}b 4l=1h.4l.8w();b 4f=(4l=="1w"||4l=="4p");if(!1h.id){1h.id="dp"+1M 21().5u()}b f=8.cr($(1h),4f);f.1P=$.1Q({},1P||{},8z||{});if(4l=="1p"){8.eR(1h,f)}1g{if(4f){8.eN(1h,f)}}},cr:c(1h,4f){k{id:1h[0].id,1p:1h,4v:0,4u:0,4P:0,2r:0,2A:0,4f:4f,2v:(!4f?8.2v:$(\'<1w 2u="l-18-4f"></1w>\'))}},eR:c(1h,f){b 1p=$(1h);if(1p.4a(8.7c)){k}b 9y=8.1l(f,"9y");b 4S=8.1l(f,"4S");if(9y){1p[4S?"eO":"bu"](\'<4p 2u="\'+8.cq+\'">\'+9y+"</4p>")}b 7U=8.1l(f,"7U");if(7U=="3q"||7U=="5p"){1p.3q(8.8x)}if(7U=="5P"||7U=="5p"){b 7d=8.1l(f,"7d");b 8y=8.1l(f,"8y");b 6M=$(8.1l(f,"eQ")?$("<86/>").1n(8.6v).2L({bQ:8y,eP:7d,59:7d}):$(\'<5P 5H="5P"></5P>\').1n(8.6v).2x(8y==""?7d:$("<86/>").2L({bQ:8y,eP:7d,59:7d})));1p[4S?"eO":"bu"](6M);6M.1F(c(){if($.18.7P&&$.18.8v==1h){$.18.76()}1g{$.18.8x(1h)}k Z})}1p.1n(8.7c).6f(8.aF).bw(8.cp).2V("5a.18",c(3C,5Y,1H){f.1P[5Y]=1H}).2V("9x.18",c(3C,5Y){k 8.1l(f,5Y)});$.1i(1h,3A,f)},eN:c(1h,f){b 1p=$(1h);if(1p.4a(8.7c)){k}1p.1n(8.7c).5s(f.2v).2V("5a.18",c(3C,5Y,1H){f.1P[5Y]=1H}).2V("9x.18",c(3C,5Y){k 8.1l(f,5Y)});$.1i(1h,3A,f);8.c3(f,8.c6(f));8.5W(f)},hK:c(f){b 3M=8.8j(f);f.2v.u(3M[1]*$(".l-18",f.2v[0]).u())},hJ:c(1p,eL,7a,1P,2w){b f=8.eM;if(!f){b id="dp"+1M 21().5u();8.5X=$(\'<1p 5H="96" id="\'+id+\'" 1r="1" 2Q="17: 1W; p: -eF;"/>\');8.5X.6f(8.aF);$("1K").5s(8.5X);f=8.eM=8.cr(8.5X,Z);f.1P={};$.1i(8.5X[0],3A,f)}9a(f.1P,1P||{});8.5X.8s(eL);8.4Y=(2w?(2w.1m?2w:[2w.3b,2w.3c]):19);if(!8.4Y){b aA=3a.aB||1d.4c.cm||1d.1K.cm;b az=3a.9v||1d.4c.cl||1d.1K.cl;b 7T=1d.4c.2e||1d.1K.2e;b 7S=1d.4c.2f||1d.1K.2f;8.4Y=[(aA/2)-2T+7T,(az/2)-aa+7S]}8.5X.q("o",8.4Y[0]+"2U").q("p",8.4Y[1]+"2U");f.1P.7a=7a;8.7b=1e;8.2v.1n(8.ch);8.8x(8.5X[0]);if($.9s){$.9s(8.2v)}$.1i(8.5X[0],3A,f);k 8},hI:c(1h){b 4l=1h.4l.8w();b $1h=$(1h);$.49(1h,3A);if(4l=="1p"){$1h.7u("."+8.cq).1Z().4R().7u("."+8.6v).1Z().4R().1J(8.7c).3o("3q",8.8x).3o("6f",8.aF).3o("bw",8.cp)}1g{if(4l=="1w"||4l=="4p"){$1h.1J(8.7c).bz()}}},hH:c(1h){1h.1I=Z;$(1h).7u("5P."+8.6v).1x(c(){8.1I=Z}).4R().7u("86."+8.6v).q({1O:"1.0",2s:""});8.6x=$.6d(8.6x,c(1H){k(1H==1h?19:1H)})},hG:c(1h){1h.1I=1e;$(1h).7u("5P."+8.6v).1x(c(){8.1I=1e}).4R().7u("86."+8.6v).q({1O:"0.5",2s:"5q"});8.6x=$.6d(8.6x,c(1H){k(1H==1h?19:1H)});8.6x[8.6x.1m]=1h},eJ:c(1h){if(!1h){k Z}1R(b i=0;i<8.6x.1m;i++){if(8.6x[i]==1h){k 1e}}k Z},hF:c(1h,3Y,1H){b 1P=3Y||{};if(2D 3Y=="56"){1P={};1P[3Y]=1H}if(f=$.1i(1h,3A)){9a(f.1P,1P);8.5W(f)}},hE:c(1h,1a,5v){b f=$.1i(1h,3A);if(f){8.c3(f,1a,5v);8.5W(f)}},hD:c(1h){b f=$.1i(1h,3A);if(f){8.cb(f)}k(f?8.ap(f):19)},aF:c(e){b f=$.1i(e.1h,3A);b aE=1e;if($.18.7P){5r(e.6U){1u 9:$.18.76(19,"");1D;1u 13:$.18.bS(e.1h,f.4u,f.4P,$("4y.l-18-8o-7K-3r",f.2v)[0]);k Z;1D;1u 27:$.18.76(19,$.18.1l(f,"1z"));1D;1u 33:$.18.5x(e.1h,(e.4m?-1:-$.18.1l(f,"6s")),(e.4m?"Y":"M"));1D;1u 34:$.18.5x(e.1h,(e.4m?+1:+$.18.1l(f,"6s")),(e.4m?"Y":"M"));1D;1u 35:if(e.4m){$.18.c0(e.1h)}1D;1u 36:if(e.4m){$.18.bX(e.1h)}1D;1u 37:if(e.4m){$.18.5x(e.1h,-1,"D")}1D;1u 38:if(e.4m){$.18.5x(e.1h,-7,"D")}1D;1u 39:if(e.4m){$.18.5x(e.1h,+1,"D")}1D;1u 40:if(e.4m){$.18.5x(e.1h,+7,"D")}1D;5q:aE=Z}}1g{if(e.6U==36&&e.4m){$.18.8x(8)}1g{aE=Z}}if(aE){e.aD();e.dO()}},cp:c(e){b f=$.1i(e.1h,3A);b 6t=$.18.eA($.18.1l(f,"7H"));b co=aC.hC(e.eK==2p?e.6U:e.eK);k e.4m||(co<" "||!6t||6t.88(co)>-1)},8x:c(1p){1p=1p.1h||1p;if(1p.4l.8w()!="1p"){1p=$("1p",1p.3R)[0]}if($.18.eJ(1p)||$.18.8v==1p){k}b f=$.1i(1p,3A);b 9w=$.18.1l(f,"9w");9a(f.1P,(9w?9w.1t(1p,[1p,f]):{}));$.18.76(19,"");$.18.8v=1p;$.18.cb(f);if($.18.7b){1p.1H=""}if(!$.18.4Y){$.18.4Y=$.18.ck(1p);$.18.4Y[1]+=1p.4O}b 4k=Z;$(1p).58().1x(c(){4k|=$(8).q("17")=="4X";k!4k});if(4k&&$.22.7v){$.18.4Y[0]-=1d.4c.2e;$.18.4Y[1]-=1d.4c.2f}b v={o:$.18.4Y[0],p:$.18.4Y[1]};$.18.4Y=19;f.43=19;f.2v.q({17:"1W",4q:"6O",p:"-hB"});$.18.5W(f);f.2v.u($.18.8j(f)[1]*$(".l-18",f.2v[0])[0].4N);v=$.18.eH(f,v,4k);f.2v.q({17:($.18.7b&&$.9s?"6w":(4k?"4X":"1W")),4q:"5n",o:v.o+"2U",p:v.p+"2U"});if(!f.4f){b 5d=$.18.1l(f,"5d")||"1y";b 1z=$.18.1l(f,"1z");b 7Q=c(){$.18.7P=1e;if($.22.3v&&1b($.22.6V)<7){$("9d.l-18-bP").q({u:f.2v.u()+4,t:f.2v.t()+4})}};if($.1j&&$.1j[5d]){f.2v.1y(5d,$.18.1l(f,"cj"),1z,7Q)}1g{f.2v[5d](1z,7Q)}if(1z==""){7Q()}if(f.1p[0].5H!="3H"){f.1p[0].3q()}$.18.9t=f}},5W:c(f){b cn={u:f.2v.u()+4,t:f.2v.t()+4};f.2v.bz().5s(8.ex(f)).4J("9d.l-18-bP").q({u:cn.u,t:cn.t});b 3M=8.8j(f);f.2v[(3M[0]!=1||3M[1]!=1?"1T":"1Z")+"eI"]("l-18-hA");f.2v[(8.1l(f,"4S")?"1T":"1Z")+"eI"]("l-18-hz");if(f.1p&&f.1p[0].5H!="3H"){$(f.1p[0]).3q()}},eH:c(f,v,4k){b 2w=f.1p?8.ck(f.1p[0]):19;b aA=3a.aB||1d.4c.cm;b az=3a.9v||1d.4c.cl;b 7T=1d.4c.2e||1d.1K.2e;b 7S=1d.4c.2f||1d.1K.2f;if(8.1l(f,"4S")||(v.o+f.2v.u()-7T)>aA){v.o=1f.2d((4k?0:7T),2w[0]+(f.1p?f.1p.u():0)-(4k?7T:0)-f.2v.u()-(4k&&$.22.7v?1d.4c.2e:0))}1g{v.o-=(4k?7T:0)}if((v.p+f.2v.t()-7S)>az){v.p=1f.2d((4k?0:7S),2w[1]-(4k?7S:0)-(8.7b?0:f.2v.t())-(4k&&$.22.7v?1d.4c.2f:0))}1g{v.p-=(4k?7S:0)}k v},ck:c(7R){5y(7R&&(7R.5H=="3H"||7R.hy!=1)){7R=7R.eG}b 17=$(7R).v();k[17.o,17.p]},76:c(1p,1z){b f=8.9t;if(!f){k}b 4U=8.1l(f,"4U");if(4U&&8.6u){8.ax("#"+f.id,8.7I(f,f.3Z,f.4t,f.4h))}8.6u=Z;if(8.7P){1z=(1z!=19?1z:8.1l(f,"1z"));b 5d=8.1l(f,"5d");b 7Q=c(){$.18.ci(f)};if(1z!=""&&$.1j&&$.1j[5d]){f.2v.1C(5d,$.18.1l(f,"cj"),1z,7Q)}1g{f.2v[(1z==""?"1C":(5d=="hx"?"hw":(5d=="hv"?"hu":"1C")))](1z,7Q)}if(1z==""){8.ci(f)}b 9u=8.1l(f,"9u");if(9u){9u.1t((f.1p?f.1p[0]:19),[8.ap(f),f])}8.7P=Z;8.8v=19;f.1P.8q=19;if(8.7b){8.5X.q({17:"1W",o:"0",p:"-eF"});if($.9s){$.ht();$("1K").5s(8.2v)}}8.7b=Z}8.9t=19},ci:c(f){f.2v.1J(8.ch).3o(".l-18");$("."+8.bZ,f.2v).1Z()},dP:c(3C){if(!$.18.9t){k}b $1h=$(3C.1h);if(($1h.58("#"+$.18.cg).1m==0)&&!$1h.4a($.18.7c)&&!$1h.4a($.18.6v)&&$.18.7P&&!($.18.7b&&$.9s)){$.18.76(19,"")}},5x:c(id,v,5R){b 1h=$(id);b f=$.1i(1h[0],3A);8.ah(f,v,5R);8.5W(f)},bX:c(id){b 1h=$(id);b f=$.1i(1h[0],3A);if(8.1l(f,"bY")&&f.3Z){f.4v=f.3Z;f.2r=f.4u=f.4t;f.2A=f.4P=f.4h}1g{b 1a=1M 21();f.4v=1a.3f();f.2r=f.4u=1a.3x();f.2A=f.4P=1a.2N()}8.5x(1h);8.ag(f)},bN:c(id,4o,5R){b 1h=$(id);b f=$.1i(1h[0],3A);f.ay=Z;f[5R=="M"?"2r":"2A"]=4o.h[4o.hs].1H-0;8.5x(1h);8.ag(f)},bM:c(id){b 1h=$(id);b f=$.1i(1h[0],3A);if(f.1p&&f.ay&&!$.22.3v){f.1p[0].3q()}f.ay=!f.ay},ek:c(id,2n){b 1h=$(id);b f=$.1i(1h[0],3A);f.1P.4z=2n;8.5W(f)},bS:c(id,2k,26,4y){if($(4y).4a(8.bT)){k}b 1h=$(id);b f=$.1i(1h[0],3A);b 4U=8.1l(f,"4U");if(4U){8.6u=!8.6u;if(8.6u){$(".l-18 4y").1J(8.ak);$(4y).1n(8.ak)}}f.4v=f.3Z=$("a",4y).2x();f.4u=f.4t=2k;f.4P=f.4h=26;if(8.6u){f.5w=f.5U=f.3y=19}1g{if(4U){f.5w=f.3Z;f.5U=f.4t;f.3y=f.4h}}8.ax(id,8.7I(f,f.3Z,f.4t,f.4h));if(8.6u){f.43=1M 21(f.4h,f.4t,f.3Z);8.5W(f)}1g{if(4U){f.4v=f.3Z=f.43.3f();f.4u=f.4t=f.43.3x();f.4P=f.4h=f.43.2N();f.43=19;if(f.4f){8.5W(f)}}}},c0:c(id){b 1h=$(id);b f=$.1i(1h[0],3A);if(8.1l(f,"c1")){k}8.6u=Z;f.5w=f.5U=f.3y=f.43=19;8.ax(1h,"")},ax:c(id,5c){b 1h=$(id);b f=$.1i(1h[0],3A);5c=(5c!=19?5c:8.7I(f));if(8.1l(f,"4U")&&5c){5c=(f.43?8.7I(f,f.43):5c)+8.1l(f,"9n")+5c}if(f.1p){f.1p.8s(5c)}8.eE(f);b 7a=8.1l(f,"7a");if(7a){7a.1t((f.1p?f.1p[0]:19),[5c,f])}1g{if(f.1p){f.1p.6M("6Q")}}if(f.4f){8.5W(f)}1g{if(!8.6u){8.76(19,8.1l(f,"1z"));8.8v=f.1p[0];if(2D(f.1p[0])!="6k"){f.1p[0].3q()}8.8v=19}}},eE:c(f){b 9r=8.1l(f,"9r");if(9r){b 8u=8.1l(f,"8u");b 1a=8.ap(f);5c=(dT(1a)?(!1a[0]&&!1a[1]?"":8.6l(8u,1a[0],8.5Q(f))+8.1l(f,"9n")+8.6l(8u,1a[1]||1a[0],8.5Q(f))):8.6l(8u,1a,8.5Q(f)));$(9r).1x(c(){$(8).8s(5c)})}},hr:c(1a){b 2n=1a.8k();k[(2n>0&&2n<6),""]},9k:c(1a){b 4C=1M 21(1a.2N(),1a.3x(),1a.3f(),(1a.hq()/-60));b 8t=1M 21(4C.2N(),1-1,4);b 4z=8t.8k()||7;8t.af(8t.3f()+1-4z);if(4z<4&&4C<8t){4C.af(4C.3f()-3);k $.18.9k(4C)}1g{if(4C>1M 21(4C.2N(),12-1,28)){4z=1M 21(4C.2N()+1,1-1,4).8k()||7;if(4z>4&&(4C.8k()||7)<4z-3){4C.af(4C.3f()+3);k $.18.9k(4C)}}}k 1f.9q(((4C-8t)/hp)/7)+1},7L:c(1a,f){k $.18.6l($.18.1l(f,"7L"),1a,$.18.5Q(f))},c9:c(3j,1H,1P){if(3j==19||1H==19){89"eC 1A"}1H=(2D 1H=="6k"?1H.dS():1H+"");if(1H==""){k 19}b 4Q=(1P?1P.4Q:19)||8.4B.4Q;b 4w=(1P?1P.4w:19)||8.4B.4w;b 4i=(1P?1P.4i:19)||8.4B.4i;b 5t=(1P?1P.5t:19)||8.4B.5t;b 41=(1P?1P.41:19)||8.4B.41;b 26=-1;b 2k=-1;b 2n=-1;b 4V=Z;b 4W=c(3i){b 4A=(2S+1<3j.1m&&3j.3z(2S+1)==3i);if(4A){2S++}k 4A};b 9o=c(3i){4W(3i);b cf=(3i=="@"?14:(3i=="y"?4:2));b 1r=cf;b aw=0;5y(1r>0&&5b<1H.1m&&1H.3z(5b)>="0"&&1H.3z(5b)<="9"){aw=aw*10+(1H.3z(5b++)-0);1r--}if(1r==cf){89"ho 8l at 17 "+5b}k aw};b ce=c(3i,aq,ar){b 9p=(4W(3i)?ar:aq);b 1r=0;1R(b j=0;j<9p.1m;j++){1r=1f.2d(1r,9p[j].1m)}b 3Y="";b eD=5b;5y(1r>0&&5b<1H.1m){3Y+=1H.3z(5b++);1R(b i=0;i<9p.1m;i++){if(3Y==9p[i]){k i+1}}1r--}89"hn 3Y at 17 "+eD};b av=c(){if(1H.3z(5b)!=3j.3z(2S)){89"hm 4V at 17 "+5b}5b++};b 5b=0;1R(b 2S=0;2S<3j.1m;2S++){if(4V){if(3j.3z(2S)=="\'"&&!4W("\'")){4V=Z}1g{av()}}1g{5r(3j.3z(2S)){1u"d":2n=9o("d");1D;1u"D":ce("D",4w,4i);1D;1u"m":2k=9o("m");1D;1u"M":2k=ce("M",5t,41);1D;1u"y":26=9o("y");1D;1u"@":b 1a=1M 21(9o("@"));26=1a.2N();2k=1a.3x()+1;2n=1a.3f();1D;1u"\'":if(4W("\'")){av()}1g{4V=1e}1D;5q:av()}}}if(26<2T){26+=1M 21().2N()-1M 21().2N()%2T+(26<=4Q?0:-2T)}b 1a=1M 21(26,2k-1,2n);if(1a.2N()!=26||1a.3x()+1!=2k||1a.3f()!=2n){89"eC 1a"}k 1a},hl:"7O-au-dd",hk:"D, dd M 7O",hj:"7O-au-dd",hi:"D, d M y",hh:"9j, dd-M-y",hg:"D, d M y",hf:"D, d M 7O",he:"D, d M 7O",hd:"D, d M y",hc:"@",hb:"7O-au-dd",6l:c(3j,1a,1P){if(!1a){k""}b 4w=(1P?1P.4w:19)||8.4B.4w;b 4i=(1P?1P.4i:19)||8.4B.4i;b 5t=(1P?1P.5t:19)||8.4B.5t;b 41=(1P?1P.41:19)||8.4B.41;b 4W=c(3i){b 4A=(2S+1<3j.1m&&3j.3z(2S+1)==3i);if(4A){2S++}k 4A};b cd=c(3i,1H){k(4W(3i)&&1H<10?"0":"")+1H};b cc=c(3i,1H,aq,ar){k(4W(3i)?ar[1H]:aq[1H])};b 5z="";b 4V=Z;if(1a){1R(b 2S=0;2S<3j.1m;2S++){if(4V){if(3j.3z(2S)=="\'"&&!4W("\'")){4V=Z}1g{5z+=3j.3z(2S)}}1g{5r(3j.3z(2S)){1u"d":5z+=cd("d",1a.3f());1D;1u"D":5z+=cc("D",1a.8k(),4w,4i);1D;1u"m":5z+=cd("m",1a.3x()+1);1D;1u"M":5z+=cc("M",1a.3x(),5t,41);1D;1u"y":5z+=(4W("y")?1a.2N():(1a.eB()%2T<10?"0":"")+1a.eB()%2T);1D;1u"@":5z+=1a.5u();1D;1u"\'":if(4W("\'")){5z+="\'"}1g{4V=1e}1D;5q:5z+=3j.3z(2S)}}}}k 5z},eA:c(3j){b 6t="";b 4V=Z;1R(b 2S=0;2S<3j.1m;2S++){if(4V){if(3j.3z(2S)=="\'"&&!4W("\'")){4V=Z}1g{6t+=3j.3z(2S)}}1g{5r(3j.3z(2S)){1u"d":1u"m":1u"y":1u"@":6t+="ha";1D;1u"D":1u"M":k 19;1u"\'":if(4W("\'")){6t+="\'"}1g{4V=1e}1D;5q:6t+=3j.3z(2S)}}}k 6t},1l:c(f,3Y){k f.1P[3Y]!==2p?f.1P[3Y]:8.4B[3Y]},cb:c(f){b 7H=8.1l(f,"7H");b 79=f.1p?f.1p.8s().7D(8.1l(f,"9n")):19;f.5w=f.5U=f.3y=19;b 1a=77=8.c6(f);if(79.1m>0){b 1P=8.5Q(f);if(79.1m>1){1a=8.c9(7H,79[1],1P)||77;f.5w=1a.3f();f.5U=1a.3x();f.3y=1a.2N()}ca{1a=8.c9(7H,79[0],1P)||77}c8(e){8.c7(e);1a=77}}f.4v=1a.3f();f.2r=f.4u=1a.3x();f.2A=f.4P=1a.2N();f.3Z=(79[0]?1a.3f():0);f.4t=(79[0]?1a.3x():0);f.4h=(79[0]?1a.2N():0);8.ah(f)},c6:c(f){b 1a=8.9c(8.1l(f,"77"),1M 21());b 2F=8.6m(f,"2q",1e);b 2R=8.6m(f,"2d");1a=(2F&&1a<2F?2F:1a);1a=(2R&&1a>2R?2R:1a);k 1a},9c:c(1a,77){b ey=c(v){b 1a=1M 21();1a.ef(1a.ee()+v);k 1a};b ez=c(v,c5){b 1a=1M 21();b 26=1a.2N();b 2k=1a.3x();b 2n=1a.3f();b c4=/([+-]?[0-9]+)\\s*(d|D|w|W|m|M|y|Y)?/g;b 4A=c4.78(v);5y(4A){5r(4A[2]||"d"){1u"d":1u"D":2n+=(4A[1]-0);1D;1u"w":1u"W":2n+=(4A[1]*7);1D;1u"m":1u"M":2k+=(4A[1]-0);2n=1f.2q(2n,c5(26,2k));1D;1u"y":1u"Y":26+=(4A[1]-0);2n=1f.2q(2n,c5(26,2k));1D}4A=c4.78(v)}k 1M 21(26,2k,2n)};k(1a==19?77:(2D 1a=="56"?ez(1a,8.9b):(2D 1a=="8l"?ey(1a):1a)))},c3:c(f,1a,5v){b 4j=!(1a);1a=8.9c(1a,1M 21());f.4v=f.3Z=1a.3f();f.2r=f.4u=f.4t=1a.3x();f.2A=f.4P=f.4h=1a.2N();if(8.1l(f,"4U")){if(5v){5v=8.9c(5v,19);f.5w=5v.3f();f.5U=5v.3x();f.3y=5v.2N()}1g{f.5w=f.3Z;f.5U=f.4t;f.3y=f.4h}}8.ah(f);if(f.1p){f.1p.8s(4j?"":8.7I(f)+(!8.1l(f,"4U")?"":8.1l(f,"9n")+8.7I(f,f.5w,f.5U,f.3y)))}},ap:c(f){b c2=(!f.4h||(f.1p&&f.1p.8s()=="")?19:1M 21(f.4h,f.4t,f.3Z));if(8.1l(f,"4U")){k[f.43||c2,(!f.3y?19:1M 21(f.3y,f.5U,f.5w))]}1g{k c2}},ex:c(f){b 6q=1M 21();6q=1M 21(6q.2N(),6q.3x(),6q.3f());b 44=8.1l(f,"44");b 4S=8.1l(f,"4S");b 4j=(8.1l(f,"c1")?"":\'<1w 2u="l-18-4j"><a 6o="1v.18.c0(\\\'#\'+f.id+"\');\\""+(44?8.6n(f,8.1l(f,"ew")||"&#4x;"):"")+">"+8.1l(f,"ev")+"</a></1w>");b bR=\'<1w 2u="l-18-h9">\'+(4S?"":4j)+\'<1w 2u="l-18-5M"><a 6o="1v.18.76();"\'+(44?8.6n(f,8.1l(f,"eu")||"&#4x;"):"")+">"+8.1l(f,"et")+"</a></1w>"+(4S?4j:"")+"</1w>";b 8q=8.1l(f,"8q");b 9e=8.1l(f,"9e");b 9l=8.1l(f,"9l");b 8r=8.1l(f,"8r");b 3M=8.8j(f);b 6s=8.1l(f,"6s");b ei=(3M[0]!=1||3M[1]!=1);b al=(!f.3Z?1M 21(h8,9,9):1M 21(f.4h,f.4t,f.3Z));b 2F=8.6m(f,"2q",1e);b 2R=8.6m(f,"2d");b 2r=f.2r;b 2A=f.2A;if(2R){b 9m=1M 21(2R.2N(),2R.3x()-3M[1]+1,2R.3f());9m=(2F&&9m<2F?2F:9m);5y(1M 21(2A,2r,1)>9m){2r--;if(2r<0){2r=11;2A--}}}b 74=8.1l(f,"74");74=(!8r?74:8.6l(74,1M 21(2A,2r-6s,1),8.5Q(f)));b 5V=\'<1w 2u="l-18-5V">\'+(8.bI(f,-1,2A,2r)?"<a 6o=\\"1v.18.5x(\'#"+f.id+"\', -"+6s+", \'M\');\\""+(44?8.6n(f,8.1l(f,"es")||"&#4x;"):"")+">"+74+"</a>":(9l?"":"<6J>"+74+"</6J>"))+"</1w>";b 73=8.1l(f,"73");73=(!8r?73:8.6l(73,1M 21(2A,2r+6s,1),8.5Q(f)));b 4g=\'<1w 2u="l-18-4g">\'+(8.bI(f,+1,2A,2r)?"<a 6o=\\"1v.18.5x(\'#"+f.id+"\', +"+6s+", \'M\');\\""+(44?8.6n(f,8.1l(f,"er")||"&#4x;"):"")+">"+73+"</a>":(9l?"":"<6J>"+73+"</6J>"))+"</1w>";b 7N=8.1l(f,"7N");7N=(!8r?7N:8.6l(7N,6q,8.5Q(f)));b 2x=(8q?\'<1w 2u="\'+8.bZ+\'">\'+8q+"</1w>":"")+(9e&&!f.4f?bR:"")+\'<1w 2u="l-18-h7">\'+(4S?4g:5V)+(8.bH(f,(8.1l(f,"bY")&&f.3Z?al:6q))?\'<1w 2u="l-18-4T"><a 6o="1v.18.bX(\\\'#\'+f.id+"\');\\""+(44?8.6n(f,8.1l(f,"ep")||"&#4x;"):"")+">"+7N+"</a></1w>":"")+(4S?5V:4g)+"</1w>";b 4z=8.1l(f,"4z");b 9i=8.1l(f,"9i");b 4i=8.1l(f,"4i");b 4w=8.1l(f,"4w");b an=8.1l(f,"an");b 41=8.1l(f,"41");b 9g=8.1l(f,"9g");b 8n=8.1l(f,"8n");b 71=8.1l(f,"71");b 9h=8.1l(f,"9h");b am=8.1l(f,"am")||8.9k;b 5S=(44?8.1l(f,"ao")||"&#4x;":"");b 7L=8.1l(f,"eo")||8.7L;b 5v=f.5w?1M 21(f.3y,f.5U,f.5w):al;1R(b 7M=0;7M<3M[0];7M++){1R(b 8p=0;8p<3M[1];8p++){b 8m=1M 21(2A,2r,f.4v);2x+=\'<1w 2u="l-18-h6-2k\'+(8p==0?" l-18-1M-7M":"")+\'">\'+8.e9(f,2r,2A,2F,2R,8m,7M>0||8p>0,44,41)+\'<eb 2u="l-18" h5="0" h4="0"><ej><aj 2u="l-18-59-7M">\'+(9h?"<4y>"+8.1l(f,"en")+"</4y>":"");1R(b 6r=0;6r<7;6r++){b 2n=(6r+4z)%7;b ao=(5S.88("9j")>-1?5S.5J(/9j/,4i[2n]):5S.5J(/D/,4w[2n]));2x+="<4y"+((6r+4z+6)%7>=5?\' 2u="l-18-72-4R-7K"\':"")+">"+(!9i?"<4p":"<a 6o=\\"1v.18.ek(\'#"+f.id+"\', "+2n+\');"\')+(44?8.6n(f,ao):"")+\' 59="\'+4i[2n]+\'">\'+an[2n]+(9i?"</a>":"</4p>")+"</4y>"}2x+="</aj></ej><ed>";b bV=8.9b(2A,2r);if(2A==f.4P&&2r==f.4u){f.4v=1f.2q(f.4v,bV)}b bW=(8.dW(2A,2r)-4z+7)%7;b 4e=1M 21(2A,2r,1-bW);b eg=(ei?6:1f.eh((bW+bV)/7));1R(b bU=0;bU<eg;bU++){2x+=\'<aj 2u="l-18-8o-7M">\'+(9h?\'<4y 2u="l-18-72-8p">\'+am(4e)+"</4y>":"");1R(b 6r=0;6r<7;6r++){b 9f=(9g?9g.1t((f.1p?f.1p[0]:19),[4e]):[1e,""]);b 6p=(4e.3x()!=2r);b 5T=6p||!9f[0]||(2F&&4e<2F)||(2R&&4e>2R);2x+=\'<4y 2u="l-18-8o-7K\'+((6r+4z+6)%7>=5?" l-18-72-4R-7K":"")+(6p?" l-18-6p":"")+(4e.5u()==8m.5u()&&2r==f.4u?" l-18-8o-7K-3r":"")+(5T?" "+8.bT:"")+(6p&&!71?"":" "+9f[1]+(4e.5u()>=al.5u()&&4e.5u()<=5v.5u()?" "+8.ak:"")+(4e.5u()==6q.5u()?" l-18-6q":""))+\'"\'+((!6p||71)&&9f[2]?\' 59="\'+9f[2]+\'"\':"")+(5T?(8n?" bL=\\"1v(8).1o().1n(\'l-18-72-3r\');\\" bK=\\"1v(8).1o().1J(\'l-18-72-3r\');\\"":""):" bL=\\"1v(8).1n(\'l-18-8o-7K-3r\')"+(8n?".1o().1n(\'l-18-72-3r\')":"")+";"+(!44||(6p&&!71)?"":"1v(\'#l-18-5S-"+f.id+"\').2x(\'"+(7L.1t((f.1p?f.1p[0]:19),[4e,f])||"&#4x;")+"\');")+"\\" bK=\\"1v(8).1J(\'l-18-8o-7K-3r\')"+(8n?".1o().1J(\'l-18-72-3r\')":"")+";"+(!44||(6p&&!71)?"":"1v(\'#l-18-5S-"+f.id+"\').2x(\'&#4x;\');")+\'" 6o="1v.18.bS(\\\'#\'+f.id+"\',"+2r+","+2A+\', 8);"\')+">"+(6p?(71?4e.3f():"&#4x;"):(5T?4e.3f():"<a>"+4e.3f()+"</a>"))+"</4y>";4e.ef(4e.ee()+1)}2x+="</aj>"}2r++;if(2r>11){2r=0;2A++}2x+="</ed></eb></1w>"}}2x+=(44?\'<1w 2Q="4j: 5p;"></1w><1w id="l-18-5S-\'+f.id+\'" 2u="l-18-5S">\'+(8.1l(f,"ea")||"&#4x;")+"</1w>":"")+(!9e&&!f.4f?bR:"")+\'<1w 2Q="4j: 5p;"></1w>\'+($.22.3v&&1b($.22.6V)<7&&!f.4f?\'<9d bQ="dD:Z;" 2u="l-18-bP"></9d>\':"");k 2x},e9:c(f,2r,2A,2F,2R,8m,bO,44,41){2F=(f.43&&2F&&8m<2F?8m:2F);b 2x=\'<1w 2u="l-18-7J">\';if(bO||!8.1l(f,"e8")){2x+=41[2r]+"&#4x;"}1g{b e6=(2F&&2F.2N()==2A);b e5=(2R&&2R.2N()==2A);2x+=\'<4o 2u="l-18-1M-2k" e2="1v.18.bN(\\\'#\'+f.id+"\', 8, \'M\');\\" 6o=\\"1v.18.bM(\'#"+f.id+"\');\\""+(44?8.6n(f,8.1l(f,"e7")||"&#4x;"):"")+">";1R(b 2k=0;2k<12;2k++){if((!e6||2k>=2F.3x())&&(!e5||2k<=2R.3x())){2x+=\'<ai 1H="\'+2k+\'"\'+(2k==2r?\' 1L="1L"\':"")+">"+41[2k]+"</ai>"}}2x+="</4o>"}if(bO||!8.1l(f,"e4")){2x+=2A}1g{b 70=8.1l(f,"e3").7D(":");b 26=0;b 3y=0;if(70.1m!=2){26=2A-10;3y=2A+10}1g{if(70[0].3z(0)=="+"||70[0].3z(0)=="-"){26=3y=1M 21().2N();26+=1b(70[0],10);3y+=1b(70[1],10)}1g{26=1b(70[0],10);3y=1b(70[1],10)}}26=(2F?1f.2d(26,2F.2N()):26);3y=(2R?1f.2q(3y,2R.2N()):3y);2x+=\'<4o 2u="l-18-1M-26" e2="1v.18.bN(\\\'#\'+f.id+"\', 8, \'Y\');\\" 6o=\\"1v.18.bM(\'#"+f.id+"\');\\""+(44?8.6n(f,8.1l(f,"e1")||"&#4x;"):"")+">";1R(;26<=3y;26++){2x+=\'<ai 1H="\'+26+\'"\'+(26==2A?\' 1L="1L"\':"")+">"+26+"</ai>"}2x+="</4o>"}2x+="</1w>";k 2x},6n:c(f,96){k" bL=\\"1v(\'#l-18-5S-"+f.id+"\').2x(\'"+96+"\');\\" bK=\\"1v(\'#l-18-5S-"+f.id+"\').2x(\'&#4x;\');\\""},ah:c(f,v,5R){b 26=f.2A+(5R=="Y"?v:0);b 2k=f.2r+(5R=="M"?v:0);b 2n=1f.2q(f.4v,8.9b(26,2k))+(5R=="D"?v:0);b 1a=1M 21(26,2k,2n);b 2F=8.6m(f,"2q",1e);b 2R=8.6m(f,"2d");1a=(2F&&1a<2F?2F:1a);1a=(2R&&1a>2R?2R:1a);f.4v=1a.3f();f.2r=f.4u=1a.3x();f.2A=f.4P=1a.2N();if(5R=="M"||5R=="Y"){8.ag(f)}},ag:c(f){b bJ=8.1l(f,"e0");if(bJ){bJ.1t((f.1p?f.1p[0]:19),[1M 21(f.4P,f.4u,1),f])}},8j:c(f){b 3M=8.1l(f,"dZ");k(3M==19?[1,1]:(2D 3M=="8l"?[1,3M]:3M))},6m:c(f,dY,dX){b 1a=8.9c(8.1l(f,dY+"21"),19);if(1a){1a.h3(0);1a.h2(0);1a.h1(0);1a.h0(0)}k(!dX||!f.43?1a:(!1a||f.43>1a?f.43:1a))},9b:c(26,2k){k 32-1M 21(26,2k,32).3f()},dW:c(26,2k){k 1M 21(26,2k,1).8k()},bI:c(f,v,dV,dU){b 3M=8.8j(f);b 1a=1M 21(dV,dU+(v<0?v:3M[1]),1);if(v<0){1a.af(8.9b(1a.2N(),1a.3x()))}k 8.bH(f,1a)},bH:c(f,1a){b 8i=(!f.43?19:1M 21(f.4P,f.4u,f.4v));8i=(8i&&f.43<8i?f.43:8i);b 2F=8i||8.6m(f,"2q");b 2R=8.6m(f,"2d");k((!2F||1a>=2F)&&(!2R||1a<=2R))},5Q:c(f){b 4Q=8.1l(f,"4Q");4Q=(2D 4Q!="56"?4Q:1M 21().2N()%2T+1b(4Q,10));k{4Q:4Q,4w:8.1l(f,"4w"),4i:8.1l(f,"4i"),5t:8.1l(f,"5t"),41:8.1l(f,"41")}},7I:c(f,2n,2k,26){if(!2n){f.3Z=f.4v;f.4t=f.4u;f.4h=f.4P}b 1a=(2n?(2D 2n=="6k"?2n:1M 21(26,2k,2n)):1M 21(f.4h,f.4t,f.3Z));k 8.6l(8.1l(f,"7H"),1a,8.5Q(f))}});c 9a(1h,8h){$.1Q(1h,8h);1R(b 3Y in 8h){if(8h[3Y]==19||8h[3Y]==2p){1h[3Y]=8h[3Y]}}k 1h}c dT(a){k(a&&(($.22.9Z&&2D a=="6k"&&a.1m)||(a.3S&&a.3S.dS().3i(/\\8a\\(\\)/))))}$.fn.18=c(h){b bG=8a.53.dR.23(1A,1);if(2D h=="56"&&(h=="gZ"||h=="3f")){k $.18["8Y"+h+"99"].1t($.18,[8[0]].5k(bG))}k 8.1x(c(){2D h=="56"?$.18["8Y"+h+"99"].1t($.18,[8].5k(bG)):$.18.dQ(8,h)})};$.18=1M 99();$(1d).gY(c(){$(1d.1K).5s($.18.2v).7A($.18.dP)})})(1v);(c(B){b A={bF:"2j.24",3F:"3F.24",bE:"2y.24",6Y:"6Y.1k",5O:"5O.1k",6Z:"6Z.1k",5N:"5N.1k",bD:"2j.1k",2i:"3F.1k",bC:"2y.1k"};B.4b("l.1X",{5l:c(){b J=8,K=8.h,D=2D K.1k=="56"?K.1k:"n,e,s,w,3X,3W,4d,3V",E=8.r.1n("l-1X-7F").8c("<1w/>").8c("<1w/>"),G=(8.dN=E.1o().1n("l-1X-gX").q({17:"2b",u:"2T%",t:"2T%"})),H=K.59||E.2L("59")||"",C=(8.97=B(\'<1w 2u="l-1X-8f"/>\')).5s(\'<4p 2u="l-1X-59">\'+H+"</4p>").5s(\'<a 3P="#" 2u="l-1X-8f-5M"><4p>X</4p></a>\').gW(G),I=(8.3G=G.1o()).2K(1d.1K).1C().1n("l-1X").1n(K.gV).1n(E.2L("8g")).1J("l-1X-7F").q({17:"1W",u:K.u,t:K.t,2X:"3H",2C:K.2C}).2L("gU",-1).q("dC",0).6f(c(L){if(K.dI){b M=27;(L.6U&&L.6U==M&&J.5M())}}).7A(c(){J.ad()}),F=(8.dK=B("<1w/>")).1n("l-1X-gT").q({17:"1W",3h:0}).2K(I);8.dM=B(".l-1X-8f-5M",C).ae(c(){B(8).1n("l-1X-8f-5M-ae")},c(){B(8).1J("l-1X-8f-5M-ae")}).7A(c(L){L.dO()}).1F(c(){J.5M();k Z});8.97.4J("*").1T(8.97).1x(c(){B.l.7G(8)});if(B.fn.24){I.24({6j:".l-1X-7F",1c:K.gS,1G:".l-1X-8f",2j:c(M,L){J.ad();(K.bF&&K.bF.1t(J.r[0],1A))},3F:c(M,L){(K.3F&&K.3F.1t(J.r[0],1A))},2y:c(M,L){(K.bE&&K.bE.1t(J.r[0],1A));B.l.1X.2E.2i()}});(K.24||I.24("6N"))}if(B.fn.1k){I.1k({6j:".l-1X-7F",1c:K.gR,6Z:K.6Z,6Y:K.6Y,5N:K.5N,5O:K.5O,2j:c(){(K.bD&&K.bD.1t(J.r[0],1A))},2i:c(M,L){(K.ab&&J.1r.1t(J));(K.2i&&K.2i.1t(J.r[0],1A))},3d:D,2y:c(M,L){(K.ab&&J.1r.1t(J));(K.bC&&K.bC.1t(J.r[0],1A));B.l.1X.2E.2i()}});(K.1k||I.1k("6N"))}8.bA(K.by);8.ac=Z;(K.7C&&B.fn.7C&&I.7C());(K.dJ&&8.bB())},5a:c(C,D){(A[C]&&8.3G.1i(A[C],D));5r(C){1u"by":8.bA(D);1D;1u"24":8.3G.24(D?"87":"6N");1D;1u"t":8.3G.t(D);1D;1u"17":8.17(D);1D;1u"1k":(2D D=="56"&&8.3G.1i("3d.1k",D));8.3G.1k(D?"87":"6N");1D;1u"59":B(".l-1X-59",8.97).96(D);1D;1u"u":8.3G.u(D);1D}B.4b.53.5a.1t(8,1A)},17:c(H){b D=B(3a),E=B(1d),F=E.2f(),C=E.2e(),G=F;if(B.7t(H,["7E","p","3e","3h","o"])>=0){H=[H=="3e"||H=="o"?H:"7E",H=="p"||H=="3h"?H:"98"]}if(H.3S!=8a){H=["7E","98"]}if(H[0].3S==7w){C+=H[0]}1g{5r(H[0]){1u"o":C+=0;1D;1u"3e":C+=D.u()-8.3G.u();1D;5q:1u"7E":C+=(D.u()-8.3G.u())/2}}if(H[1].3S==7w){F+=H[1]}1g{5r(H[1]){1u"p":F+=0;1D;1u"3h":F+=D.t()-8.3G.t();1D;5q:1u"98":F+=(D.t()-8.3G.t())/2}}F=1f.2d(F,G);8.3G.q({p:F,o:C})},1r:c(){b D=8.dN,G=8.97,E=8.r,F=1b(E.q("3U-p"),10)+1b(E.q("3U-3h"),10),C=1b(E.q("3U-o"),10)+1b(E.q("3U-3e"),10);E.t(D.t()-G.2M()-F);E.u(D.u()-C)},bB:c(){if(8.ac){k}8.2E=8.h.a9?1M B.l.1X.2E(8):19;(8.3G.4g().1m>0)&&8.3G.2K("1K");8.17(8.h.17);8.3G.1y(8.h.1y);8.h.ab&&8.1r();8.ad(1e);b C=19;b D={h:8.h};8.dM.3q();8.r.2m("gQ",[C,D],8.h.bB);8.ac=1e},ad:c(E){if((8.h.a9&&!E)||(!8.h.6X&&!8.h.a9)){k 8.r.2m("dL",[19,{h:8.h}],8.h.3q)}b D=8.h.2C,C=8.h;B(".l-1X:57").1x(c(){D=1f.2d(D,1b(B(8).q("z-3D"),10)||C.2C)});(8.2E&&8.2E.$el.q("z-3D",++D));8.3G.q("z-3D",++D);8.r.2m("dL",[19,{h:8.h}],8.h.3q)},5M:c(){(8.2E&&8.2E.3t());8.3G.1C(8.h.1C);b D=19;b C={h:8.h};8.r.2m("gP",[D,C],8.h.5M);B.l.1X.2E.2i();8.ac=Z},3t:c(){(8.2E&&8.2E.3t());8.3G.1C();8.r.3o(".1X").49("1X").1J("l-1X-7F").1C().2K("1K");8.3G.1Z()},bA:c(F){b E=8,C=Z,D=8.dK;D.bz().1C();B.1x(F,c(){k!(C=1e)});if(C){D.1y();B.1x(F,c(G,H){B("<5P/>").96(G).1F(c(){H.1t(E.r[0],1A)}).2K(D)})}}});B.1Q(B.l.1X,{4I:{dJ:1e,ab:1e,7C:Z,by:{},dI:1e,24:1e,t:dH,5O:2T,5N:aa,a9:Z,2E:{},17:"7E",1k:1e,6X:1e,u:dG,2C:95},2E:c(C){8.$el=B.l.1X.2E.dF(C)}});B.1Q(B.l.1X.2E,{7B:[],dE:B.6d("3q,7A,bx,6f,bw,1F".7D(","),c(C){k C+".1X-2E"}).7r(" "),dF:c(D){if(8.7B.1m===0){7s(c(){B("a, :1p").2V(B.l.1X.2E.dE,c(){b F=Z;b H=B(8).58(".l-1X");if(H.1m){b E=B(".l-1X-2E");if(E.1m){b G=1b(E.q("z-3D"),10);E.1x(c(){G=1f.2d(G,1b(B(8).q("z-3D"),10))});F=1b(H.q("z-3D"),10)>G}1g{F=1e}}k F})},1);B(1d).2V("6f.1X-2E",c(E){b F=27;(E.6U&&E.6U==F&&D.5M())});B(3a).2V("2i.1X-2E",B.l.1X.2E.2i)}b C=B("<1w/>").2K(1d.1K).1n("l-1X-2E").q(B.1Q({gO:0,3U:0,bv:0,17:"1W",p:0,o:0,u:8.u(),t:8.t()},D.h.2E));(D.h.7C&&B.fn.7C&&C.7C());8.7B.4K(C);k C},3t:c(C){8.7B.bm(B.7t(8.7B,C),1);if(8.7B.1m===0){B("a, :1p").1T([1d,3a]).3o(".1X-2E")}C.1Z()},t:c(){if(B.22.3v&&B.22.6V<7){b D=1f.2d(1d.4c.6W,1d.1K.6W);b C=1f.2d(1d.4c.4O,1d.1K.4O);if(D<C){k B(3a).t()+"2U"}1g{k D+"2U"}}1g{k B(1d).t()+"2U"}},u:c(){if(B.22.3v&&B.22.6V<7){b C=1f.2d(1d.4c.94,1d.1K.94);b D=1f.2d(1d.4c.4N,1d.1K.4N);if(C<D){k B(3a).u()+"2U"}1g{k C+"2U"}}1g{k B(1d).u()+"2U"}},2i:c(){b C=B([]);B.1x(B.l.1X.2E.7B,c(){C=C.1T(8)});C.q({u:0,t:0}).q({u:B.l.1X.2E.u(),t:B.l.1X.2E.t()})}});B.1Q(B.l.1X.2E.53,{3t:c(){B.l.1X.2E.3t(8.$el)}})})(1v);(c(A){A.fn.bt=A.fn.bt||c(B){k 8.1x(c(){A(8).58(B).eq(0).bu(8).1Z()})};A.4b("l.4r",{6i:{},l:c(B){k{h:8.h,1G:8.2h,1H:8.h.2B!="5p"||!8.h.2B?1f.3E(8.1H(19,8.h.2B=="3K"?"y":"x")):{x:1f.3E(8.1H(19,"x")),y:1f.3E(8.1H(19,"y"))},a7:8.dz()}},2a:c(C,B){A.l.2z.23(8,C,[B,8.l()]);8.r.2m(C=="6e"?C:"6e"+C,[B,8.l()],8.h[C])},3t:c(){8.r.1J("l-4r l-4r-1I").49("4r").3o(".4r");if(8.1G&&8.1G.1m){8.1G.bt("a");8.1G.1x(c(){A(8).1i("4s").8e()})}8.bs&&8.bs.1Z()},5a:c(B,C){A.4b.53.5a.1t(8,1A);if(/2q|2d|7z/.1B(B)){8.bp()}if(B=="a7"){C?8.1G.1m==2&&8.bo():8.dA()}},5l:c(){b B=8;8.r.1n("l-4r");8.bp();8.1G=A(8.h.1G,8.r);if(!8.1G.1m){B.1G=B.bs=A(B.h.3d||[0]).6d(c(){b D=A("<1w/>").1n("l-4r-1G").2K(B.r);if(8.id){D.2L("id",8.id)}k D[0]})}b C=c(D){8.r=A(D);8.r.1i("4s",8);8.h=B.h;8.r.2V("7A",c(){if(B.2h){8.6P(B.2h)}B.3q(8,1)});8.8d()};A.1Q(C.53,A.l.4s,{6h:c(D){k B.2j.23(B,D,8.r[0])},6g:c(D){k B.2y.23(B,D,8.r[0])},5o:c(D){k B.3F.23(B,D,8.r[0])},93:c(){k 1e},6M:c(D){8.br(D)}});A(8.1G).1x(c(){1M C(8)}).8c(\'<a 3P="dD:gN(0)" 2Q="dC:5n;a8:5n;"></a>\').1o().2V("3q",c(D){B.3q(8.bq)}).2V("6P",c(D){B.6P(8.bq)}).2V("6f",c(D){if(!B.h.gM){B.6f(D.6U,8.bq)}});8.r.2V("7A.4r",c(D){B.1F.1t(B,[D]);B.2h.1i("4s").6M(D);B.a6=B.a6+1});A.1x(8.h.3d||[],c(D,E){B.91(E.2j,D,1e)});if(!5L(8.h.dB)){8.91(8.h.dB,0,1e)}8.6R=A(8.1G[0]);if(8.1G.1m==2&&8.h.a7){8.bo()}},bp:c(){b B=8.r[0],C=8.h;8.6S={u:8.r.2Y(),t:8.r.2M()};A.1Q(C,{2B:C.2B||(B.4N<B.4O?"3K":"a5"),2d:!5L(1b(C.2d,10))?{x:1b(C.2d,10),y:1b(C.2d,10)}:({x:C.2d&&C.2d.x||2T,y:C.2d&&C.2d.y||2T}),2q:!5L(1b(C.2q,10))?{x:1b(C.2q,10),y:1b(C.2q,10)}:({x:C.2q&&C.2q.x||0,y:C.2q&&C.2q.y||0})});C.6T={x:C.2d.x-C.2q.x,y:C.2d.y-C.2q.y};C.3w={x:C.3w&&C.3w.x||1b(C.3w,10)||(C.7z?C.6T.x/(C.7z.x||1b(C.7z,10)||C.6T.x):0),y:C.3w&&C.3w.y||1b(C.3w,10)||(C.7z?C.6T.y/(C.7z.y||1b(C.7z,10)||C.6T.y):0)}},6f:c(C,B){if(/(37|38|39|40)/.1B(C)){8.91({x:/(37|39)/.1B(C)?(C==37?"-":"+")+"="+8.92("x"):0,y:/(38|40)/.1B(C)?(C==38?"-":"+")+"="+8.92("y"):0},B)}},3q:c(B,C){8.2h=A(B).1n("l-4r-1G-3L");if(C){8.2h.1o()[0].3q()}},6P:c(B){A(B).1J("l-4r-1G-3L");if(8.2h&&8.2h[0]==B){8.6R=8.2h;8.2h=19}},1F:c(C){b D=[C.3b,C.3c];b B=Z;8.1G.1x(c(){if(8==C.1h){B=1e}});if(B||8.h.1I||!(8.2h||8.6R)){k}if(!8.2h&&8.6R){8.3q(8.6R,1e)}8.v=8.r.v();8.91({y:8.5K(C.3c-8.v.p-8.2h[0].4O/2,"y"),x:8.5K(C.3b-8.v.o-8.2h[0].4N/2,"x")},19,!8.h.4L)},bo:c(){if(8.5m){k}8.5m=A("<1w></1w>").1n("l-4r-a7").q({17:"1W"}).2K(8.r);8.a4()},dA:c(){8.5m.1Z();8.5m=19},a4:c(){b C=8.h.2B=="3K"?"p":"o";b B=8.h.2B=="3K"?"t":"u";8.5m.q(C,(1b(A(8.1G[0]).q(C),10)||0)+8.7y(0,8.h.2B=="3K"?"y":"x")/2);8.5m.q(B,(1b(A(8.1G[1]).q(C),10)||0)-(1b(A(8.1G[0]).q(C),10)||0))},dz:c(){k 8.5m?8.5K(1b(8.5m.q(8.h.2B=="3K"?"t":"u"),10),8.h.2B=="3K"?"y":"x"):19},dy:c(){k 8.1G.3D(8.2h[0])},1H:c(D,B){if(8.1G.1m==1){8.2h=8.1G}if(!B){B=8.h.2B=="3K"?"y":"x"}b C=A(D!=2p&&D!==19?8.1G[D]||D:8.2h);if(C.1i("4s").a3){k 1b(C.1i("4s").a3[B],10)}1g{k 1b(((1b(C.q(B=="x"?"o":"p"),10)/(8.6S[B=="x"?"u":"t"]-8.7y(D,B)))*8.h.6T[B])+8.h.2q[B],10)}},5K:c(C,B){k 8.h.2q[B]+(C/(8.6S[B=="x"?"u":"t"]-8.7y(19,B)))*8.h.6T[B]},4M:c(C,B){k((C-8.h.2q[B])/8.h.6T[B])*(8.6S[B=="x"?"u":"t"]-8.7y(19,B))},8Z:c(D,B){if(8.5m){if(8.2h[0]==8.1G[0]&&D>=8.4M(8.1H(1),B)){D=8.4M(8.1H(1,B)-8.92(B),B)}if(8.2h[0]==8.1G[1]&&D<=8.4M(8.1H(0),B)){D=8.4M(8.1H(0,B)+8.92(B),B)}}if(8.h.3d){b C=8.h.3d[8.dy()];if(D<8.4M(C.2q,B)){D=8.4M(C.2q,B)}1g{if(D>8.4M(C.2d,B)){D=8.4M(C.2d,B)}}}k D},90:c(C,B){if(C>=8.6S[B=="x"?"u":"t"]-8.7y(19,B)){C=8.6S[B=="x"?"u":"t"]-8.7y(19,B)}if(C<=0){C=0}k C},7y:c(C,B){k A(C!=2p&&C!==19?8.1G[C]:8.2h)[0]["v"+(B=="x"?"gL":"gK")]},92:c(B){k 8.h.3w[B]||1},2j:c(C,B){b D=8.h;if(D.1I){k Z}8.6S={u:8.r.2Y(),t:8.r.2M()};if(!8.2h){8.3q(8.6R,1e)}8.v=8.r.v();8.bn=8.2h.v();8.7x={p:C.3c-8.bn.p,o:C.3b-8.bn.o};8.a6=8.1H();8.2a("2j",C);8.3F(C,B);k 1e},2y:c(B){8.2a("2y",B);if(8.a6!=8.1H()){8.2a("6Q",B)}8.3q(8.2h,1e);k Z},3F:c(E,D){b F=8.h;b B={p:E.3c-8.v.p-8.7x.p,o:E.3b-8.v.o-8.7x.o};if(!8.2h){8.3q(8.6R,1e)}B.o=8.90(B.o,"x");B.p=8.90(B.p,"y");if(F.3w.x){b C=8.5K(B.o,"x");C=1f.3E(C/F.3w.x)*F.3w.x;B.o=8.4M(C,"x")}if(F.3w.y){b C=8.5K(B.p,"y");C=1f.3E(C/F.3w.y)*F.3w.y;B.p=8.4M(C,"y")}B.o=8.8Z(B.o,"x");B.p=8.8Z(B.p,"y");if(F.2B!="3K"){8.2h.q({o:B.o})}if(F.2B!="a5"){8.2h.q({p:B.p})}8.2h.1i("4s").a3={x:1f.3E(8.5K(B.o,"x"))||0,y:1f.3E(8.5K(B.p,"y"))||0};if(8.5m){8.a4()}8.2a("6e",E);k Z},91:c(F,E,G){b H=8.h;8.6S={u:8.r.2Y(),t:8.r.2M()};if(E==2p&&!8.2h&&8.1G.1m!=1){k Z}if(E==2p&&!8.2h){E=0}if(E!=2p){8.2h=8.6R=A(8.1G[E]||E)}if(F.x!==2p&&F.y!==2p){b B=F.x,I=F.y}1g{b B=F,I=F}if(B!==2p&&B.3S!=7w){b D=/^\\-\\=/.1B(B),C=/^\\+\\=/.1B(B);if(D||C){B=8.1H(19,"x")+1b(B.5J(D?"=":"+=",""),10)}1g{B=5L(1b(B,10))?2p:1b(B,10)}}if(I!==2p&&I.3S!=7w){b D=/^\\-\\=/.1B(I),C=/^\\+\\=/.1B(I);if(D||C){I=8.1H(19,"y")+1b(I.5J(D?"=":"+=",""),10)}1g{I=5L(1b(I,10))?2p:1b(I,10)}}if(H.2B!="3K"&&B!==2p){if(H.3w.x){B=1f.3E(B/H.3w.x)*H.3w.x}B=8.4M(B,"x");B=8.90(B,"x");B=8.8Z(B,"x");H.1E?8.2h.2y().1E({o:B},(1f.3T(1b(8.2h.q("o"))-B))*(!5L(1b(H.1E))?H.1E:5)):8.2h.q({o:B})}if(H.2B!="a5"&&I!==2p){if(H.3w.y){I=1f.3E(I/H.3w.y)*H.3w.y}I=8.4M(I,"y");I=8.90(I,"y");I=8.8Z(I,"y");H.1E?8.2h.2y().1E({p:I},(1f.3T(1b(8.2h.q("p"))-I))*(!5L(1b(H.1E))?H.1E:5)):8.2h.q({p:I})}if(8.5m){8.a4()}8.2h.1i("4s").a3={x:1f.3E(8.5K(B,"x"))||0,y:1f.3E(8.5K(I,"y"))||0};if(!G){8.2a("2j",19);8.2a("2y",19);8.2a("6Q",19);8.2a("6e",19)}}});A.l.4r.9U="1H";A.l.4r.4I={1G:".l-4r-1G",4L:1,1E:Z}})(1v);(c(A){A.4b("l.1q",{5l:c(){8.h.3C+=".1q";8.8W(1e)},5a:c(B,C){if((/^1L/).1B(B)){8.4o(C)}1g{8.h[B]=C;8.8W()}},1m:c(){k 8.$1q.1m},bl:c(B){k B.59&&B.59.5J(/\\s/g,"8Y").5J(/[^A-gJ-gI-9\\-8Y:\\.]/g,"")||8.h.dl+A.1i(B)},l:c(C,B){k{h:8.h,gH:C,dj:B,3D:8.$1q.3D(C)}},8W:c(O){8.$3Q=A("li:gG(a[3P])",8.r);8.$1q=8.$3Q.6d(c(){k A("a",8)[0]});8.$3g=A([]);b P=8,D=8.h;8.$1q.1x(c(R,Q){if(Q.6c&&Q.6c.5J("#","")){P.$3g=P.$3g.1T(Q.6c)}1g{if(A(Q).2L("3P")!="#"){A.1i(Q,"3P.1q",Q.3P);A.1i(Q,"54.1q",Q.3P);b T=P.bl(Q);Q.3P="#"+T;b S=A("#"+T);if(!S.1m){S=A(D.bj).2L("id",T).1n(D.8V).gF(P.$3g[R-1]||P.r);S.1i("3t.1q",1e)}P.$3g=P.$3g.1T(S)}1g{D.1I.4K(R+1)}}});if(O){8.r.1n(D.bi);8.$3g.1x(c(){b Q=A(8);Q.1n(D.8V)});if(D.1L===2p){if(a2.6c){8.$1q.1x(c(S,Q){if(Q.6c==a2.6c){D.1L=S;if(A.22.3v||A.22.7v){b R=A(a2.6c),T=R.2L("id");R.2L("id","");7s(c(){R.2L("id",T)},8b)}gE(0,0);k Z}})}1g{if(D.84){b J=1b(A.84("l-1q"+A.1i(P.r)),10);if(J&&P.$1q[J]){D.1L=J}}1g{if(P.$3Q.3u("."+D.3p).1m){D.1L=P.$3Q.3D(P.$3Q.3u("."+D.3p)[0])}}}}D.1L=D.1L===19||D.1L!==2p?D.1L:0;D.1I=A.gD(D.1I.5k(A.6d(8.$3Q.3u("."+D.7q),c(R,Q){k P.$3Q.3D(R)}))).5I();if(A.7t(D.1L,D.1I)!=-1){D.1I.bm(A.7t(D.1L,D.1I),1)}8.$3g.1n(D.6I);8.$3Q.1J(D.3p);if(D.1L!==19){8.$3g.eq(D.1L).1y().1J(D.6I);8.$3Q.eq(D.1L).1n(D.3p);b K=c(){A(P.r).2m("a1",[P.6b("a1"),P.l(P.$1q[D.1L],P.$3g[D.1L])],D.1y)};if(A.1i(8.$1q[D.1L],"54.1q")){8.54(D.1L,K)}1g{K()}}A(3a).2V("gC",c(){P.$1q.3o(".1q");P.$3Q=P.$1q=P.$3g=19})}1R(b G=0,N;N=8.$3Q[G];G++){A(N)[A.7t(G,D.1I)!=-1&&!A(N).4a(D.3p)?"1n":"1J"](D.7q)}if(D.6K===Z){8.$1q.49("6K.1q")}b C,I,B={"2q-u":0,1z:1},E="8X";if(D.fx&&D.fx.3S==8a){C=D.fx[0]||B,I=D.fx[1]||B}1g{C=I=D.fx||B}b H={4q:"",2X:"",t:""};if(!A.22.3v){H.1O=""}c M(R,Q,S){Q.1E(C,C.1z||E,c(){Q.1n(D.6I).q(H);if(A.22.3v&&C.1O){Q[0].2Q.3u=""}if(S){L(R,S,Q)}})}c L(R,S,Q){if(I===B){S.q("4q","6O")}S.1E(I,I.1z||E,c(){S.1J(D.6I).q(H);if(A.22.3v&&I.1O){S[0].2Q.3u=""}A(P.r).2m("a1",[P.6b("a1"),P.l(R,S[0])],D.1y)})}c F(R,T,Q,S){T.1n(D.3p).7u().1J(D.3p);M(R,Q,S)}8.$1q.3o(".1q").2V(D.3C,c(){b T=A(8).58("li:eq(0)"),Q=P.$3g.3u(":57"),S=A(8.6c);if((T.4a(D.3p)&&!D.9V)||T.4a(D.7q)||A(8).4a(D.8U)||A(P.r).2m("dx",[P.6b("dx"),P.l(8,S[0])],D.4o)===Z){8.6P();k Z}P.h.1L=P.$1q.3D(8);if(D.9V){if(T.4a(D.3p)){P.h.1L=19;T.1J(D.3p);P.$3g.2y();M(8,Q);8.6P();k Z}1g{if(!Q.1m){P.$3g.2y();b R=8;P.54(P.$1q.3D(8),c(){T.1n(D.3p).1n(D.bh);L(R,S)});8.6P();k Z}}}if(D.84){A.84("l-1q"+A.1i(P.r),P.h.1L,D.84)}P.$3g.2y();if(S.1m){b R=8;P.54(P.$1q.3D(8),Q.1m?c(){F(R,T,Q,S)}:c(){T.1n(D.3p);L(R,S)})}1g{89"1v gB gA: gz gy gx."}if(A.22.3v){8.6P()}k Z});if(!(/^1F/).1B(D.3C)){8.$1q.2V("1F.1q",c(){k Z})}},1T:c(E,D,C){if(C==2p){C=8.$1q.1m}b G=8.h;b I=A(G.dk.5J(/#\\{3P\\}/g,E).5J(/#\\{6J\\}/g,D));I.1i("3t.1q",1e);b H=E.88("#")==0?E.5J("#",""):8.bl(A("a:dw-2W",I)[0]);b F=A("#"+H);if(!F.1m){F=A(G.bj).2L("id",H).1n(G.6I).1i("3t.1q",1e)}F.1n(G.8V);if(C>=8.$3Q.1m){I.2K(8.r);F.2K(8.r[0].3R)}1g{I.a0(8.$3Q[C]);F.a0(8.$3g[C])}G.1I=A.6d(G.1I,c(K,J){k K>=C?++K:K});8.8W();if(8.$1q.1m==1){I.1n(G.3p);F.1J(G.6I);b B=A.1i(8.$1q[0],"54.1q");if(B){8.54(C,B)}}8.r.2m("dv",[8.6b("dv"),8.l(8.$1q[C],8.$3g[C])],G.1T)},1Z:c(B){b D=8.h,E=8.$3Q.eq(B).1Z(),C=8.$3g.eq(B).1Z();if(E.4a(D.3p)&&8.$1q.1m>1){8.4o(B+(B+1<8.$1q.1m?1:-1))}D.1I=A.6d(A.dt(D.1I,c(G,F){k G!=B}),c(G,F){k G>=B?--G:G});8.8W();8.r.2m("du",[8.6b("du"),8.l(E.4J("a")[0],C[0])],D.1Z)},87:c(B){b C=8.h;if(A.7t(B,C.1I)==-1){k}b D=8.$3Q.eq(B).1J(C.7q);if(A.22.9Z){D.q("4q","4f-6O");7s(c(){D.q("4q","6O")},0)}C.1I=A.dt(C.1I,c(F,E){k F!=B});8.r.2m("ds",[8.6b("ds"),8.l(8.$1q[B],8.$3g[B])],C.87)},6N:c(C){b B=8,D=8.h;if(C!=D.1L){8.$3Q.eq(C).1n(D.7q);D.1I.4K(C);D.1I.5I();8.r.2m("dr",[8.6b("dr"),8.l(8.$1q[C],8.$3g[C])],D.6N)}},4o:c(B){if(2D B=="56"){B=8.$1q.3D(8.$1q.3u("[3P$="+B+"]")[0])}8.$1q.eq(B).6M(8.h.3C)},54:c(G,K){b L=8,D=8.h,E=8.$1q.eq(G),J=E[0],H=K==2p||K===Z,B=E.1i("54.1q");K=K||c(){};if(!B||!H&&A.1i(J,"6K.1q")){K();k}b M=c(N){b O=A(N),P=O.4J("*:gw");k P.1m&&P.is(":6L(86)")&&P||O};b C=c(){L.$1q.3u("."+D.8U).1J(D.8U).1x(c(){if(D.9X){M(8).1o().2x(M(8).1i("6J.1q"))}});L.9Y=19};if(D.9X){b I=M(J).2x();M(J).gv("<em></em>").4J("em").1i("6J.1q",I).2x(D.9X)}b F=A.1Q({},D.9W,{dn:B,bk:c(O,N){A(J.6c).2x(O);C();if(D.6K){A.1i(J,"6K.1q",1e)}A(L.r).2m("dq",[L.6b("dq"),L.l(L.$1q[G],L.$3g[G])],D.54);D.9W.bk&&D.9W.bk(O,N);K()}});if(8.9Y){8.9Y.gu();C()}E.1n(D.8U);7s(c(){L.9Y=A.gt(F)},0)},dn:c(C,B){8.$1q.eq(C).49("6K.1q").1i("54.1q",B)},3t:c(){b B=8.h;8.r.3o(".1q").1J(B.bi).49("1q");8.$1q.1x(c(){b C=A.1i(8,"3P.1q");if(C){8.3P=C}b D=A(8).3o(".1q");A.1x(["3P","54","6K"],c(E,F){D.49(F+".1q")})});8.$3Q.1T(8.$3g).1x(c(){if(A.1i(8,"3t.1q")){A(8).1Z()}1g{A(8).1J([B.3p,B.bh,B.7q,B.8V,B.6I].7r(" "))}})},6b:c(B){k A.3C.dm({5H:B,1h:8.r[0]})}});A.l.1q.4I={9V:Z,3C:"1F",1I:[],84:19,9X:"gs&#gr;",6K:Z,dl:"l-1q-",9W:{},fx:19,dk:\'<li><a 3P="#{3P}"><4p>#{6J}</4p></a></li>\',bj:"<1w></1w>",bi:"l-1q-gq",3p:"l-1q-1L",bh:"l-1q-9V",7q:"l-1q-1I",8V:"l-1q-dj",6I:"l-1q-1C",8U:"l-1q-gp"};A.l.1q.9U="1m";A.1Q(A.l.1q.53,{bg:19,go:c(C,F){F=F||Z;b B=8,E=8.h.1L;c G(){B.bg=gn(c(){E=++E<B.$1q.1m?E:0;B.4o(E)},C)}c D(H){if(!H||H.di){gm(B.bg)}}if(C){G();if(!F){8.$1q.2V(8.h.3C,D)}1g{8.$1q.2V(8.h.3C,c(){D();E=B.h.1L;G()})}}1g{D();8.$1q.3o(8.h.3C,D)}}})})(1v)',62,1349,'||||||||this|||var|function|||inst||options|||return|ui|||left|top|css|element||height|width|offset||||||||||||||||||||||||||||||false||||||||position|datepicker|null|date|parseInt|helper|document|true|Math|else|target|data|effects|resizable|_get|length|addClass|parent|input|tabs|size|containment|apply|case|jQuery|div|each|show|duration|arguments|test|hide|break|animate|click|handle|value|disabled|removeClass|body|selected|new|easing|opacity|settings|extend|for|currentItem|add|from|instance|absolute|dialog|helperProportions|remove||Date|browser|call|draggable||year|||to|propagate|relative|items|max|scrollLeft|scrollTop|containers|currentHandle|resize|start|month|offsetParent|triggerHandler|day|callback|undefined|min|drawMonth|cursor|255|class|dpDiv|pos|html|stop|plugin|drawYear|axis|zIndex|typeof|overlay|minDate|mode|ddmanager|item|grid|appendTo|attr|outerHeight|getFullYear|originalPosition|sortable|style|maxDate|iFormat|100|px|bind|child|overflow|outerWidth|placeholder|margins|0px|||||||||window|pageX|pageY|handles|right|getDate|panels|bottom|match|format|queue|overflowX|overflowY|positionAbs|unbind|selectedClass|focus|over|selectable|destroy|filter|msie|stepping|getMonth|endYear|charAt|PROP_NAME|unselecting|event|index|round|drag|uiDialog|hidden|scrollSpeed|scrollSensitivity|vertical|active|numMonths|accordion|cursorAt|href|lis|parentNode|constructor|abs|margin|nw|sw|se|name|currentDay||monthNames||rangeStart|showStatus||auto||dequeue|removeData|hasClass|widget|documentElement|ne|printDate|inline|next|currentYear|dayNames|clear|isFixed|nodeName|ctrlKey|selecting|select|span|display|slider|mouse|currentMonth|selectedMonth|selectedDay|dayNamesShort|xa0|td|firstDay|matches|_defaults|checkDate|headers|setMode|restore|convertPositionTo|cssPosition|defaults|find|push|distance|translateValue|offsetWidth|offsetHeight|selectedYear|shortYearCutoff|end|isRTL|current|rangeSelect|literal|lookAhead|fixed|_pos|containerCache||ghost|droppable|prototype|load||string|visible|parents|title|setData|iValue|dateStr|showAnim|toggle|effect|tolerance|originalSize|get|4px|concat|init|rangeElement|none|mouseDrag|both|default|switch|append|monthNamesShort|getTime|endDate|endDay|_adjustDate|while|output|save|setTransition|drop|scroll|alsoResize|aspectRatio|isover|type|sort|replace|convertValue|isNaN|close|minWidth|minHeight|button|_getFormatConfig|period|status|unselectable|endMonth|prev|_updateDatepicker|_dialogInput|key|activate||down|complete|borderLeftWidth|borderTopWidth|removeWrapper|up|PI|revert|_change|accept|fakeEvent|hash|map|slide|keydown|mouseStop|mouseStart|plugins|cancel|object|formatDate|_getMinMaxDate|_addStatus|onclick|otherMonth|today|dow|stepMonths|chars|_stayOpen|_triggerClass|static|_disabledInputs|toShow|createWrapper|direction|clone|tagName|128|floating|proportionallyResize|knobHandles|_mouseStarted|hideClass|label|cache|not|trigger|disable|block|blur|change|previousHandle|actualSize|realMax|keyCode|version|scrollHeight|stack|maxHeight|maxWidth|years|showOtherMonths|week|nextText|prevText||_hideDatepicker|defaultDate|exec|dates|onSelect|_inDialog|markerClassName|buttonText|autoHeight|marginRight|marginBottom|pow|transparent|HTML|out|continue|sizeDiff|0pt|isout|widgetName|disabledClass|join|setTimeout|inArray|siblings|opera|Number|clickOffset|handleSize|steps|mousedown|instances|bgiframe|split|center|content|disableSelection|dateFormat|_formatDate|header|cell|dateStatus|row|currentText|yy|_datepickerShowing|postProcess|obj|scrollY|scrollX|showOn|toHide|andSelf|marginLeft|marginTop|backgroundColor|delay|deactivate|startselected|snapElements|cookie||img|enable|indexOf|throw|Array|500|wrap|mouseInit|mouseDestroy|titlebar|className|props|newMinDate|_getNumberOfMonths|getDay|number|selectedDate|highlightWeek|days|col|prompt|navigationAsDateFormat|val|firstMon|altFormat|_lastInput|toLowerCase|_showDatepicker|buttonImage|inlineSettings|running|visibility|sqrt|70158|139|F0|overflowXOffset|overflowYOffset|_opacity|_zIndex|_cursor|cancelHelperRemoval|generatePosition|isFunction|parentData|borderDif|_handles|intersect|droppables|isOver|loadingClass|panelClass|tabify|normal|_|translateRange|translateLimits|moveTo|oneStep|mouseCapture|scrollWidth|1000|text|uiDialogTitlebar|middle|Datepicker|extendRemove|_getDaysInMonth|_determineDate|iframe|closeAtTop|daySettings|beforeShowDay|showWeeks|changeFirstDay|DD|iso8601Week|hideIfNoPrevNext|maxDraw|rangeSeparator|getNumber|names|floor|altField|blockUI|_curInst|onClose|innerHeight|beforeShow|getData|appendText|the|Show|swing|alwaysOpen|sin|animateClass|dragging|update|refreshPositions|counter|offsetParentBorders|currentContainer|refresh|absolutePosition|hasScroll|_aspectRatio|containerOffset|_proportionallyResize|knob|mouseUp|cssCache|getter|unselect|ajaxOptions|spinner|xhr|safari|insertBefore|tabsshow|location|sliderValue|updateRange|horizontal|firstValue|range|border|modal|150|autoResize|isOpen|moveToTop|hover|setDate|_notifyChange|_adjustInstDate|option|tr|_currentClass|currentDate|calculateWeek|dayNamesMin|dayStatus|_getDate|shortNames|longNames|||mm|checkLiteral|num|_selectDate|_selectingMonthYear|browserHeight|browserWidth|innerWidth|String|preventDefault|handled|_doKeyDown|attrValue|attrName|animated|toggleClass|borderRightWidth|borderBottomWidth|neg|percent|color|pieces|5625|192|211|parseFloat|slow|defaultView|unit|background|dropBehaviour|rearrange|prepareOffsets|refreshItems|selectees|1px|textarea|shiftKey|containerPosition|containerSize|resizing|hoverClass|activeClass|proportions|sortables|iframeFix|_mouseDelayMet|_mouseDownEvent|rotation|unselectClass|navClass|panelTemplate|success|tabId|splice|handleOffset|createRange|initBoundaries|firstChild|mouseDown|generated|unwrap|after|padding|keypress|mouseup|buttons|empty|createButtons|open|resizeStop|resizeStart|dragStop|dragStart|otherArgs|_isInRange|_canAdjustMonth|onChange|onmouseout|onmouseover|_clickMonthYear|_selectMonthYear|secondary|cover|src|controls|_selectDay|_unselectableClass|dRow|daysInMonth|leadDays|_gotoToday|gotoCurrent|_promptClass|_clearDate|mandatory|startDate|_setDate|pattern|getDaysInMonth|_getDefaultDate|log|catch|parseDate|try|_setDateFromField|formatName|formatNumber|getName|origSize|_mainDivId|_dialogClass|_tidyDialog|showOptions|_findPos|clientHeight|clientWidth|dims|chr|_doKeyPress|_appendClass|_newInst|regional|step|animations|140|times|origin|scale|backgroundImage|explode|easeOutBounce|asin|169|rgb|fast|cssText|fxWrapper|float|guess|domPosition|createPlaceholder|custom|connectWith|pointer|touch|dragged|selectableunselecting|opos|alsoresize|removeChild|_updateCache|containerElement|preserveCursor|elementOffset|documentScroll|wrapper|originalElement|autohide|_nodeName|knobTheme|borderTop|borderLeft|borderRight|borderBottom|_helper|snap|original|uiHash||mouseDelayMet|mouseDistanceMet|_mouseUpDelegate|_mouseMoveDelegate|clientX|panel|tabTemplate|idPrefix|fix|url|||tabsload|tabsdisable|tabsenable|grep|tabsremove|tabsadd|first|tabsselect|handleIndex|getRange|removeRange|startValue|outline|javascript|events|create|300|200|closeOnEscape|autoOpen|uiDialogButtonPane|dialogfocus|uiDialogTitlebarClose|uiDialogContainer|stopPropagation|_checkExternalClick|_attachDatepicker|slice|toString|isArray|curMonth|curYear|_getFirstDayOfMonth|checkRange|minMax|numberOfMonths|onChangeMonthYear|yearStatus|onchange|yearRange|changeYear|inMaxYear|inMinYear|monthStatus|changeMonth|_generateMonthYearHeader|initStatus|table||tbody|getUTCDate|setUTCDate|numRows|ceil|isMultiMonth|thead|_changeFirstDay|||weekHeader|statusForDate|currentStatus||nextStatus|prevStatus|closeText|closeStatus|clearText|clearStatus|_generateDatepicker|offsetNumeric|offsetString|_possibleChars|getYear|Invalid|iInit|_updateAlternate|100px|nextSibling|_checkOffset|Class|_isDisabledDatepicker|charCode|dateText|_dialogInst|_inlineDatepicker|before|alt|buttonImageOnly|_connectDatepicker|debug|Select|different|May|Close|navigationFilter|oldContent|newContent|oldHeader|newHeader|accordionchange|fillSpace|zoom|animation|transfer|getBaseline|paddingRight|paddingLeft|paddingBottom|paddingTop|fontSize|fade|easeInBounce|525|cos|easeOutQuad|def|165|224|144|230||240|107|black|245|trim|rgba|elem|cssUnit|morph||_toggleClass|_removeClass||_addClass|__toggle|Function|_hide|_show|currentStyle|getComputedStyle|storage|dropOnEmpty|toArray|serialize|receive|appendChild|contactContainers|intersectsWithEdge|intersectsWith|refreshContainers|toleranceElement|expression|sender|compareDocumentPosition|contains|autoRefresh|unselected|fit|autoHide|_renderProxy|_respectSize|_updateRatio|originalMousePosition|_renderAxis|defaultTheme|8px|solid|F2F2F2|greedyChild|greedy|shouldRevert|connectToSortable|snapMode|mousemove|mouseMove|_mouseUnselectable|on|widgetBaseClass|MozUserSelect|5000px|clearInterval|setInterval|rotate|loading|nav|8230|Loading|ajax|abort|wrapInner|last|identifier|fragment|Mismatching|Tabs|UI|unload|unique|scrollTo|insertAfter|has|tab|z0|Za|Height|Width|noKeyboard|void|borderWidth|dialogclose|dialogopen|resizeHelper|dragHelper|buttonpane|tabIndex|dialogClass|prependTo|container|ready|isDisabled|setMilliseconds|setSeconds|setMinutes|setHours|cellspacing|cellpadding|one|links|9999|control|0123456789|W3C|TIMESTAMP|RSS|RFC_2822|RFC_1123|RFC_1036|RFC_850|RFC_822|ISO_8601|COOKIE|ATOM|Unexpected|Unknown|Missing|86400000|getTimezoneOffset|noWeekends|selectedIndex|unblockUI|fadeOut|fadeIn|slideUp|slideDown|nodeType|rtl|multi|1000px|fromCharCode|_getDateDatepicker|_setDateDatepicker|_changeDatepicker|_disableDatepicker|_enableDatepicker|_destroyDatepicker|_dialogDatepicker|_inlineShow|err|eval|getAttribute|setDefaults|console|hasDatepicker|Set|Sa|Fr|Th|We|Tu|Mo|Su|Sat|Fri|Thu|Wed|Tue|Mon|Sun|Saturday|Friday|Thursday|Wednesday|Tuesday|Monday|Sunday||of||Week|weekStatus|Wk|Dec|Nov|Oct|Sep||Aug|Jul|Jun|Apr||Mar|Feb|Jan|December|November|October|September|August|July|June|April|March|February|January|Today|x3e|Next|previous|Prev|x3c|without|Erase|Clear|700|easeinout|easeslide|bounceout|bounceslide|clearStyle|tabindex|navigation|shake|box|puff|pulsate|removeAttribute|ffff99|highlight|horizFirst|fold|IMG|clip|250|bounce|blind|easeInOutBounce|984375|625|9375|easeInOutBack|easeOutBack|easeInBack|easeInOutElastic|easeOutElastic|easeInElastic|easeInOutCirc|easeOutCirc|easeInCirc|easeInOutExpo|easeOutExpo|easeInExpo|easeInOutSine|easeOutSine|easeInSine|easeInOutQuint|easeOutQuint|easeInQuint|easeInOutQuart|easeOutQuart|easeInQuart|easeInOutCubic|easeOutCubic|easeInCubic|easeInOutQuad|easeInQuad|jswing|yellow|white|silver|red|violet|purple|203|pink|orange|olive|navy|maroon|magenta|lime|lightyellow|193|182|lightpink|lightgrey|238|lightgreen|lightcyan|216|173|lightblue|khaki|130|indigo|green|215|gold|fuchsia|148|darkviolet|122|233|darksalmon|darkred|204|153|darkorchid|darkorange|darkolivegreen|darkmagenta|183|189|darkkhaki|darkgreen|darkgrey|darkcyan|darkblue|cyan|brown|blue|220|beige|azure|aqua|curCSS|state|outlineColor|borderTopColor|borderRightColor|borderLeftColor|borderBottomColor|pt|switchClass|method|Moz|replaceWith|font|dynamic|semi|10000|forcePointerForContainers|attribute|522|selectablestop|selectableselected|selectableunselected|selectableselecting|keyboard|clientY|selectablestart|dotted|createElement|selectee|animateEasing|animateDuration|instanceof|children|mouseover|Left|Right|Bottom|Top|all|canvas|808080||DEDEDE|proxy|sortactivate|dragstart|dropdeactivate|dropactivate|dropout|dropover|group|makeArray|fromSortable|toSortable|sortreceive|outer|inner|snapTolerance|DragDropIframeFix|001|fff|valid|invalid|mozilla|_mouseDelayTimer|which|started|off|enableSelection|gen'.split('|'),0,{}))
-
Index: js/ui/packed/effects.fold.packed.js
===================================================================
--- js/ui/packed/effects.fold.packed.js	(revision 6370)
+++ js/ui/packed/effects.fold.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(c(A){A.4.U=c(B){T i.S(c(){3 E=A(i),J=["R","Q","P"];3 G=A.4.O(E,B.7.z||"b");3 N=B.7.y||x;3 M=!(!B.7.w);A.4.v(E,J);E.8();3 D=A.4.u(E).h({t:"s"});3 H=((G=="8")!=M);3 F=H?["5","6"]:["6","5"];3 C=H?[D.5(),D.6()]:[D.6(),D.5()];3 I=/([0-9]+)%/.r(N);a(I){N=q(I[1])/p*C[G=="b"?0:1]}a(G=="8"){D.h(M?{6:0,5:N}:{6:N,5:0})}3 L={},K={};L[F[0]]=G=="8"?C[0]:N;K[F[1]]=G=="8"?C[1]:0;D.g(L,B.f/2,B.7.e).g(K,B.f/2,B.7.e,c(){a(G=="b"){E.b()}A.4.o(E,J);A.4.n(E);a(B.d){B.d.m(E[0],l)}E.k()})})}})(j)',57,57,'|||var|effects|width|height|options|show||if|hide|function|callback|easing|duration|animate|css|this|jQuery|dequeue|arguments|apply|removeWrapper|restore|100|parseInt|exec|hidden|overflow|createWrapper|save|horizFirst|15|size|mode|||||||||||||||setMode|left|top|position|queue|return|fold'.split('|'),0,{}))
-
Index: js/ui/packed/ui.core.packed.js
===================================================================
--- js/ui/packed/ui.core.packed.js	(revision 6370)
+++ js/ui/packed/ui.core.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(3(C){C.8={2r:{V:3(E,F,H){6 G=C.8[E].o;1v(6 D 2q H){G.w[D]=G.w[D]||[];G.w[D].2p([F,H[D]])}},1p:3(D,F,E){6 H=D.w[F];5(!H){4}1v(6 G=0;G<H.1e;G++){5(D.a[H[G][0]]){H[G][1].v(D.c,E)}}}},p:{},d:3(D){5(C.8.p[D]){4 C.8.p[D]}6 E=C(\'<2o 2n="8-2m">\').1k(D).d({2l:"2k",12:"-1u",2j:"-1u",2i:"2h"}).2g("1t");C.8.p[D]=!!((!(/2f|2e/).h(E.d("2d"))||(/^[1-9]/).h(E.d("2c"))||(/^[1-9]/).h(E.d("2b"))||!(/1r/).h(E.d("2a"))||!(/29|28\\(0, 0, 0, 0\\)/).h(E.d("27"))));26{C("1t").1s(0).25(E.1s(0))}24(F){}4 C.8.p[D]},23:3(D){C(D).k("j","1i").d("1q","1r")},22:3(D){C(D).k("j","21").d("1q","")},20:3(G,E){6 D=/12/.h(E||"12")?"1Z":"1Y",F=7;5(G[D]>0){4 f}G[D]=1;F=G[D]>0?f:7;G[D]=0;4 F}};6 B=C.10.u;C.10.u=3(){C("*",2).V(2).1X("u");4 B.v(2,1o)};3 A(E,F,G){6 D=C[E][F].1W||[];D=(X D=="W"?D.11(/,?\\s+/):D);4(C.1V(G,D)!=-1)}C.m=3(E,D){6 F=E.11(".")[0];E=E.11(".")[1];C.10[E]=3(J){6 H=(X J=="W"),I=1U.o.1T.1p(1o,1);5(H&&A(F,E,J)){6 G=C.Z(2[0],E);4(G?G[J].v(G,I):1S)}4 2.1R(3(){6 K=C.Z(2,E);5(H&&K&&C.1Q(K[J])){K[J].v(K,I)}1P{5(!H){C.Z(2,E,1O C[F][E](2,J))}}})};C[F][E]=3(I,H){6 G=2;2.e=E;2.1j=F+"-"+E;2.a=C.1n({},C.m.q,C[F][E].q,H);2.c=C(I).g("n."+E,3(L,J,K){4 G.n(J,K)}).g("Y."+E,3(K,J){4 G.Y(J)}).g("u",3(){4 G.1l()});2.1m()};C[F][E].o=C.1n({},C.m.o,D)};C.m.o={1m:3(){},1l:3(){2.c.1N(2.e)},Y:3(D){4 2.a[D]},n:3(D,E){2.a[D]=E;5(D=="l"){2.c[E?"1k":"1M"](2.1j+"-l")}},1L:3(){2.n("l",7)},1K:3(){2.n("l",f)}};C.m.q={l:7};C.8.14={1J:3(){6 D=2;2.c.g("1I."+2.e,3(E){4 D.1g(E)});5(C.U.T){2.1h=2.c.k("j");2.c.k("j","1i")}2.1H=7},1G:3(){2.c.R("."+2.e);(C.U.T&&2.c.k("j",2.1h))},1g:3(F){(2.b&&2.i(F));2.t=F;6 E=2,G=(F.1F==1),D=(X 2.a.y=="W"?C(F.1f).1E().V(F.1f).1D(2.a.y).1e:7);5(!G||D||!2.15(F)){4 f}2.r=!2.a.x;5(!2.r){2.1C=1B(3(){E.r=f},2.a.x)}5(2.P(F)&&2.N(F)){2.b=(2.M(F)!==7);5(!2.b){F.1A();4 f}}2.S=3(H){4 E.1d(H)};2.Q=3(H){4 E.i(H)};C(1c).g("1b."+2.e,2.S).g("1a."+2.e,2.Q);4 7},1d:3(D){5(C.U.T&&!D.1z){4 2.i(D)}5(2.b){2.z(D);4 7}5(2.P(D)&&2.N(D)){2.b=(2.M(2.t,D)!==7);(2.b?2.z(D):2.i(D))}4!2.b},i:3(D){C(1c).R("1b."+2.e,2.S).R("1a."+2.e,2.Q);5(2.b){2.b=7;2.16(D)}4 7},P:3(D){4(O.1y(O.18(2.t.19-D.19),O.18(2.t.17-D.17))>=2.a.13)},N:3(D){4 2.r},M:3(D){},z:3(D){},16:3(D){},15:3(D){4 f}};C.8.14.q={y:1x,13:1,x:0}})(1w)',62,152,'||this|function|return|if|var|false|ui||options|_mouseStarted|element|css|widgetName|true|bind|test|mouseUp|unselectable|attr|disabled|widget|setData|prototype|cssCache|defaults|_mouseDelayMet||_mouseDownEvent|remove|apply|plugins|delay|cancel|mouseDrag|||||||||||||mouseStart|mouseDelayMet|Math|mouseDistanceMet|_mouseUpDelegate|unbind|_mouseMoveDelegate|msie|browser|add|string|typeof|getData|data|fn|split|top|distance|mouse|mouseCapture|mouseStop|pageY|abs|pageX|mouseup|mousemove|document|mouseMove|length|target|mouseDown|_mouseUnselectable|on|widgetBaseClass|addClass|destroy|init|extend|arguments|call|MozUserSelect|none|get|body|5000px|for|jQuery|null|max|button|preventDefault|setTimeout|_mouseDelayTimer|filter|parents|which|mouseDestroy|started|mousedown|mouseInit|disable|enable|removeClass|removeData|new|else|isFunction|each|undefined|slice|Array|inArray|getter|triggerHandler|scrollLeft|scrollTop|hasScroll|off|enableSelection|disableSelection|catch|removeChild|try|backgroundColor|rgba|transparent|backgroundImage|width|height|cursor|default|auto|appendTo|block|display|left|absolute|position|gen|class|div|push|in|plugin'.split('|'),0,{}))
-
Index: js/ui/packed/effects.scale.packed.js
===================================================================
--- js/ui/packed/effects.scale.packed.js	(revision 6370)
+++ js/ui/packed/effects.scale.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(b(A){A.7.1y=b(B){U d.o(b(){5 F=A(d);5 C=A.13(s,{},B.9);5 H=A.7.T(F,B.9.k||"f");5 G=V(B.9.t)||1x;C.12=s;5 E={6:F.6(),4:F.4()};5 D=G/l;F.2=(H=="f")?E:{6:E.6*D,4:E.4*D};C.2=F.2;C.t=(H=="f")?G:l;C.k=H;F.j("S",C,B.h,B.m);F.u()})};A.7.S=b(B){U d.o(b(){5 G=A(d);5 D=A.13(s,{},B.9);5 J=A.7.T(G,B.9.k||"j");5 H=V(B.9.t)||(V(B.9.t)==0?0:(J=="f"?0:l));5 I=B.9.1w||"i";5 C=B.9.R;a(J!="j"){D.R=C||["1v","1u"];D.n=s}5 F={6:G.6(),4:G.4()};G.2=B.9.2||(J=="z"?{6:0,4:0}:F);5 E={y:I!="1t"?(H/l):1,x:I!="1s"?(H/l):1};G.3={6:F.6*E.y,4:F.4*E.x};a(B.9.12){a(J=="z"){G.2.g=0;G.3.g=1}a(J=="f"){G.2.g=1;G.3.g=0}}D.2=G.2;D.3=G.3;D.k=J;G.j("11",D,B.h,B.m);G.u()})};A.7.11=b(B){U d.o(b(){5 C=A(d),N=["10","r","q","4","6","p","g"];5 M=["10","r","q","p","g"];5 J=["4","6","p"];5 P=["1r"];5 K=["1q","1p","1o","1n"];5 F=["1m","1l","1k","1j"];5 G=A.7.T(C,B.9.k||"j");5 I=B.9.n||W;5 E=B.9.S||"i";5 O=B.9.R;5 D={6:C.6(),4:C.4()};C.2=B.9.2||D;C.3=B.9.3||D;a(O){5 H=A.7.1i(O,D);C.2.r=(D.6-C.2.6)*H.y;C.2.q=(D.4-C.2.4)*H.x;C.3.r=(D.6-C.3.6)*H.y;C.3.q=(D.4-C.3.4)*H.x}5 L={2:{y:C.2.6/D.6,x:C.2.4/D.4},3:{y:C.3.6/D.6,x:C.3.4/D.4}};a(E=="1h"||E=="i"){a(L.2.y!=L.3.y){N=N.e(K);C.2=A.7.c(C,K,L.2.y,C.2);C.3=A.7.c(C,K,L.3.y,C.3)}a(L.2.x!=L.3.x){N=N.e(F);C.2=A.7.c(C,F,L.2.x,C.2);C.3=A.7.c(C,F,L.3.x,C.3)}}a(E=="Z"||E=="i"){a(L.2.y!=L.3.y){N=N.e(P);C.2=A.7.c(C,P,L.2.y,C.2);C.3=A.7.c(C,P,L.3.y,C.3)}}A.7.Y(C,I?N:M);C.z();A.7.1g(C);C.w("p","1f").w(C.2);a(E=="Z"||E=="i"){K=K.e(["1e","1d"]).e(P);F=F.e(["1c","1b"]);J=N.e(K).e(F);C.1a("*[4]").19(b(){8=A(d);a(I){A.7.Y(8,J)}5 Q={6:8.6(),4:8.4()};8.2={6:Q.6*L.2.y,4:Q.4*L.2.x};8.3={6:Q.6*L.3.y,4:Q.4*L.3.x};a(L.2.y!=L.3.y){8.2=A.7.c(8,K,L.2.y,8.2);8.3=A.7.c(8,K,L.3.y,8.3)}a(L.2.x!=L.3.x){8.2=A.7.c(8,F,L.2.x,8.2);8.3=A.7.c(8,F,L.3.x,8.3)}8.w(8.2);8.X(8.3,B.h,B.9.v,b(){a(I){A.7.n(8,J)}})})}C.X(C.3,{o:W,h:B.h,v:B.9.v,18:b(){a(G=="f"){C.f()}A.7.n(C,I?N:M);A.7.17(C);a(B.m){B.m.16(d,15)}C.u()}})})}})(14)',62,97,'||from|to|width|var|height|effects|child|options|if|function|setTransition|this|concat|hide|opacity|duration|both|effect|mode|100|callback|restore|queue|overflow|left|top|true|percent|dequeue|easing|css|||show||||||||||||||||||origin|scale|setMode|return|parseInt|false|animate|save|content|position|size|fade|extend|jQuery|arguments|apply|removeWrapper|complete|each|find|marginRight|marginLeft|marginBottom|marginTop|hidden|createWrapper|box|getBaseline|paddingRight|paddingLeft|borderRightWidth|borderLeftWidth|paddingBottom|paddingTop|borderBottomWidth|borderTopWidth|fontSize|vertical|horizontal|center|middle|direction|150|puff'.split('|'),0,{}))
-
Index: js/ui/packed/effects.clip.packed.js
===================================================================
--- js/ui/packed/effects.clip.packed.js	(revision 6370)
+++ js/ui/packed/effects.clip.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(4(A){A.3.Q=4(B){P l.i(4(){1 F=A(l),J=["6","k","j","e","d"];1 I=A.3.O(F,B.a.N||"9");1 K=B.a.M||"7";A.3.L(F,J);F.5();1 C=A.3.z(F).c({y:"x"});1 E=F[0].w=="v"?C:F;1 G={b:(K=="7")?"e":"d",6:(K=="7")?"k":"j"};1 D=(K=="7")?E.e():E.d();8(I=="5"){E.c(G.b,0);E.c(G.6,D/2)}1 H={};H[G.b]=I=="5"?D:0;H[G.6]=I=="5"?0:D/2;E.u(H,{i:t,h:B.h,g:B.a.g,s:4(){8(I=="9"){F.9()}A.3.r(F,J);A.3.q(F);8(B.f){B.f.p(F[0],o)}F.n()}})})}})(m)',53,53,'|var||effects|function|show|position|vertical|if|hide|options|size|css|width|height|callback|easing|duration|queue|left|top|this|jQuery|dequeue|arguments|apply|removeWrapper|restore|complete|false|animate|IMG|tagName|hidden|overflow|createWrapper||||||||||||save|direction|mode|setMode|return|clip'.split('|'),0,{}))
-
Index: js/ui/packed/ui.tabs.packed.js
===================================================================
--- js/ui/packed/ui.tabs.packed.js	(revision 6370)
+++ js/ui/packed/ui.tabs.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(4(A){A.3g("8.3",{3f:4(){2.c.t+=".3";2.1f(1d)},3e:4(B,C){5((/^7/).26(B)){2.17(C)}m{2.c[B]=C;2.1f()}},j:4(){d 2.$3.j},1G:4(B){d B.2b&&B.2b.14(/\\s/g,"2a").14(/[^A-3d-3c-9\\-2a:\\.]/g,"")||2.c.1S+A.f(B)},8:4(C,B){d{c:2.c,3b:C,1O:B,V:2.$3.V(C)}},1f:4(O){2.$i=A("1j:3a(a[n])",2.h);2.$3=2.$i.1t(4(){d A("a",2)[0]});2.$b=A([]);6 P=2,D=2.c;2.$3.X(4(R,Q){5(Q.v&&Q.v.14("#","")){P.$b=P.$b.1c(Q.v)}m{5(A(Q).13("n")!="#"){A.f(Q,"n.3",Q.n);A.f(Q,"p.3",Q.n);6 T=P.1G(Q);Q.n="#"+T;6 S=A("#"+T);5(!S.j){S=A(D.1z).13("1g",T).l(D.19).39(P.$b[R-1]||P.h);S.f("1b.3",1d)}P.$b=P.$b.1c(S)}m{D.e.1Y(R+1)}}});5(O){2.h.l(D.1y);2.$b.X(4(){6 Q=A(2);Q.l(D.19)});5(D.7===1q){5(1L.v){2.$3.X(4(S,Q){5(Q.v==1L.v){D.7=S;5(A.Y.1h||A.Y.38){6 R=A(1L.v),T=R.13("1g");R.13("1g","");1B(4(){R.13("1g",T)},37)}36(0,0);d o}})}m{5(D.11){6 J=35(A.11("8-3"+A.f(P.h)),10);5(J&&P.$3[J]){D.7=J}}m{5(P.$i.U("."+D.k).j){D.7=P.$i.V(P.$i.U("."+D.k)[0])}}}}D.7=D.7===w||D.7!==1q?D.7:0;D.e=A.34(D.e.33(A.1t(2.$i.U("."+D.W),4(R,Q){d P.$i.V(R)}))).1X();5(A.1s(D.7,D.e)!=-1){D.e.32(A.1s(D.7,D.e),1)}2.$b.l(D.x);2.$i.q(D.k);5(D.7!==w){2.$b.r(D.7).1I().q(D.x);2.$i.r(D.7).l(D.k);6 K=4(){A(P.h).z("1v",[P.u("1v"),P.8(P.$3[D.7],P.$b[D.7])],D.1I)};5(A.f(2.$3[D.7],"p.3")){2.p(D.7,K)}m{K()}}A(31).16("30",4(){P.$3.15(".3");P.$i=P.$3=P.$b=w})}2Z(6 G=0,N;N=2.$i[G];G++){A(N)[A.1s(G,D.e)!=-1&&!A(N).12(D.k)?"l":"q"](D.W)}5(D.y===o){2.$3.1n("y.3")}6 C,I,B={"2Y-2X":0,1K:1},E="2W";5(D.Z&&D.Z.2V==2U){C=D.Z[0]||B,I=D.Z[1]||B}m{C=I=D.Z||B}6 H={1r:"",2T:"",2S:""};5(!A.Y.1h){H.1J=""}4 M(R,Q,S){Q.29(C,C.1K||E,4(){Q.l(D.x).1e(H);5(A.Y.1h&&C.1J){Q[0].28.U=""}5(S){L(R,S,Q)}})}4 L(R,S,Q){5(I===B){S.1e("1r","1F")}S.29(I,I.1K||E,4(){S.q(D.x).1e(H);5(A.Y.1h&&I.1J){S[0].28.U=""}A(P.h).z("1v",[P.u("1v"),P.8(R,S[0])],D.1I)})}4 F(R,T,Q,S){T.l(D.k).2R().q(D.k);M(R,Q,S)}2.$3.15(".3").16(D.t,4(){6 T=A(2).2Q("1j:r(0)"),Q=P.$b.U(":2P"),S=A(2.v);5((T.12(D.k)&&!D.1i)||T.12(D.W)||A(2).12(D.18)||A(P.h).z("27",[P.u("27"),P.8(2,S[0])],D.17)===o){2.1u();d o}P.c.7=P.$3.V(2);5(D.1i){5(T.12(D.k)){P.c.7=w;T.q(D.k);P.$b.1H();M(2,Q);2.1u();d o}m{5(!Q.j){P.$b.1H();6 R=2;P.p(P.$3.V(2),4(){T.l(D.k).l(D.1x);L(R,S)});2.1u();d o}}}5(D.11){A.11("8-3"+A.f(P.h),P.c.7,D.11)}P.$b.1H();5(S.j){6 R=2;P.p(P.$3.V(2),Q.j?4(){F(R,T,Q,S)}:4(){T.l(D.k);L(R,S)})}m{2O"1M 2N 2M: 2L 2K 2J."}5(A.Y.1h){2.1u()}d o});5(!(/^1A/).26(D.t)){2.$3.16("1A.3",4(){d o})}},1c:4(E,D,C){5(C==1q){C=2.$3.j}6 G=2.c;6 I=A(G.1R.14(/#\\{n\\}/g,E).14(/#\\{1k\\}/g,D));I.f("1b.3",1d);6 H=E.2I("#")==0?E.14("#",""):2.1G(A("a:2H-2G",I)[0]);6 F=A("#"+H);5(!F.j){F=A(G.1z).13("1g",H).l(G.x).f("1b.3",1d)}F.l(G.19);5(C>=2.$i.j){I.25(2.h);F.25(2.h[0].2F)}m{I.24(2.$i[C]);F.24(2.$b[C])}G.e=A.1t(G.e,4(K,J){d K>=C?++K:K});2.1f();5(2.$3.j==1){I.l(G.k);F.q(G.x);6 B=A.f(2.$3[0],"p.3");5(B){2.p(C,B)}}2.h.z("23",[2.u("23"),2.8(2.$3[C],2.$b[C])],G.1c)},1a:4(B){6 D=2.c,E=2.$i.r(B).1a(),C=2.$b.r(B).1a();5(E.12(D.k)&&2.$3.j>1){2.17(B+(B+1<2.$3.j?1:-1))}D.e=A.1t(A.21(D.e,4(G,F){d G!=B}),4(G,F){d G>=B?--G:G});2.1f();2.h.z("22",[2.u("22"),2.8(E.1E("a")[0],C[0])],D.1a)},1Z:4(B){6 C=2.c;5(A.1s(B,C.e)==-1){d}6 D=2.$i.r(B).q(C.W);5(A.Y.2E){D.1e("1r","2D-1F");1B(4(){D.1e("1r","1F")},0)}C.e=A.21(C.e,4(F,E){d F!=B});2.h.z("20",[2.u("20"),2.8(2.$3[B],2.$b[B])],C.1Z)},1V:4(C){6 B=2,D=2.c;5(C!=D.7){2.$i.r(C).l(D.W);D.e.1Y(C);D.e.1X();2.h.z("1W",[2.u("1W"),2.8(2.$3[C],2.$b[C])],D.1V)}},17:4(B){5(2C B=="2B"){B=2.$3.V(2.$3.U("[n$="+B+"]")[0])}2.$3.r(B).2A(2.c.t)},p:4(G,K){6 L=2,D=2.c,E=2.$3.r(G),J=E[0],H=K==1q||K===o,B=E.f("p.3");K=K||4(){};5(!B||!H&&A.f(J,"y.3")){K();d}6 M=4(N){6 O=A(N),P=O.1E("*:2z");d P.j&&P.2y(":2x(2w)")&&P||O};6 C=4(){L.$3.U("."+D.18).q(D.18).X(4(){5(D.1m){M(2).2v().1p(M(2).f("1k.3"))}});L.1o=w};5(D.1m){6 I=M(J).1p();M(J).2u("<1D></1D>").1E("1D").f("1k.3",I).1p(D.1m)}6 F=A.1N({},D.1l,{1T:B,1C:4(O,N){A(J.v).1p(O);C();5(D.y){A.f(J,"y.3",1d)}A(L.h).z("1U",[L.u("1U"),L.8(L.$3[G],L.$b[G])],D.p);D.1l.1C&&D.1l.1C(O,N);K()}});5(2.1o){2.1o.2t();C()}E.l(D.18);1B(4(){L.1o=A.2s(F)},0)},1T:4(C,B){2.$3.r(C).1n("y.3").f("p.3",B)},1b:4(){6 B=2.c;2.h.15(".3").q(B.1y).1n("3");2.$3.X(4(){6 C=A.f(2,"n.3");5(C){2.n=C}6 D=A(2).15(".3");A.X(["n","p","y"],4(E,F){D.1n(F+".3")})});2.$i.1c(2.$b).X(4(){5(A.f(2,"1b.3")){A(2).1a()}m{A(2).q([B.k,B.1x,B.W,B.19,B.x].2r(" "))}})},u:4(B){d A.t.2q({2p:B,2o:2.h[0]})}});A.8.3.2n={1i:o,t:"1A",e:[],11:w,1m:"2m&#2l;",y:o,1S:"8-3-",1l:{},Z:w,1R:\'<1j><a n="#{n}"><1Q>#{1k}</1Q></a></1j>\',1z:"<1P></1P>",1y:"8-3-2k",k:"8-3-7",1x:"8-3-1i",W:"8-3-e",19:"8-3-1O",x:"8-3-2j",18:"8-3-2i"};A.8.3.2h="j";A.1N(A.8.3.2g,{1w:w,2f:4(C,F){F=F||o;6 B=2,E=2.c.7;4 G(){B.1w=2e(4(){E=++E<B.$3.j?E:0;B.17(E)},C)}4 D(H){5(!H||H.2d){2c(B.1w)}}5(C){G();5(!F){2.$3.16(2.c.t,D)}m{2.$3.16(2.c.t,4(){D();E=B.c.7;G()})}}m{D();2.$3.15(2.c.t,D)}}})})(1M)',62,203,'||this|tabs|function|if|var|selected|ui|||panels|options|return|disabled|data||element|lis|length|selectedClass|addClass|else|href|false|load|removeClass|eq||event|fakeEvent|hash|null|hideClass|cache|triggerHandler|||||||||||||||||||||filter|index|disabledClass|each|browser|fx||cookie|hasClass|attr|replace|unbind|bind|select|loadingClass|panelClass|remove|destroy|add|true|css|tabify|id|msie|unselect|li|label|ajaxOptions|spinner|removeData|xhr|html|undefined|display|inArray|map|blur|tabsshow|rotation|unselectClass|navClass|panelTemplate|click|setTimeout|success|em|find|block|tabId|stop|show|opacity|duration|location|jQuery|extend|panel|div|span|tabTemplate|idPrefix|url|tabsload|disable|tabsdisable|sort|push|enable|tabsenable|grep|tabsremove|tabsadd|insertBefore|appendTo|test|tabsselect|style|animate|_|title|clearInterval|clientX|setInterval|rotate|prototype|getter|loading|hide|nav|8230|Loading|defaults|target|type|fix|join|ajax|abort|wrapInner|parent|img|not|is|last|trigger|string|typeof|inline|safari|parentNode|child|first|indexOf|identifier|fragment|Mismatching|Tabs|UI|throw|visible|parents|siblings|height|overflow|Array|constructor|normal|width|min|for|unload|window|splice|concat|unique|parseInt|scrollTo|500|opera|insertAfter|has|tab|z0|Za|setData|init|widget'.split('|'),0,{}))
-
Index: js/ui/packed/effects.core.packed.js
===================================================================
--- js/ui/packed/effects.core.packed.js	(revision 6370)
+++ js/ui/packed/effects.core.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(b(C){C.r=C.r||{};C.14(C.r,{52:b(F,G){1T(d E=0;E<G.1m;E++){8(G[E]!==U){C.2D(F[0],"2C.2B."+G[E],F[0].Q[G[E]])}}},51:b(F,G){1T(d E=0;E<G.1m;E++){8(G[E]!==U){F.k(G[E],C.2D(F[0],"2C.2B."+G[E]))}}},4Z:b(E,F){8(F=="t"){F=E.4Y(":4X")?"1c":"1r"}6 F},4W:b(F,G){d H,E;2A(F[0]){12"1e":H=0;S;12"4V":H=0.5;S;12"2q":H=1;S;2z:H=F[0]/G.2x}2A(F[1]){12"1f":E=0;S;12"4U":E=0.5;S;12"2p":E=1;S;2z:E=F[1]/G.2y}6{x:E,y:H}},4T:b(F){8(F.1v().W("1V")=="1U"){6 F}d E={2y:F.4S({1X:2w}),2x:F.4R({1X:2w}),"2v":F.k("2v")};F.4Q(\'<2u 1V="1U" Q="4P-4O:2c%;4N:1i;4M:4L;1X:0;4K:0"></2u>\');d I=F.1v();8(F.k("R")=="1R"){I.k({R:"1W"});F.k({R:"1W"})}m{d H=F.k("1e");8(1S(j(H))){H="2t"}d G=F.k("1f");8(1S(j(G))){G="2t"}I.k({R:F.k("R"),1e:H,1f:G,4J:F.k("z-4I")}).1c();F.k({R:"1W",1e:0,1f:0})}I.k(E);6 I},4H:b(E){8(E.1v().W("1V")=="1U"){6 E.1v().4G(E)}6 E},4F:b(F,G,E,H){H=H||{};C.1n(G,b(J,I){1u=F.2g(I);8(1u[0]>0){H[I]=1u[0]*E+1u[1]}});6 H},19:b(G,H,J,I){d E=(1d J=="b"?J:(I?I:U));d F=(1d J=="1P"?J:U);6 e.1n(b(){d O={};d M=C(e);d N=M.W("Q")||"";8(1d N=="1P"){N=N["1O"]}8(G.t){M.4E(G.t)?G.p=G.t:G.q=G.t}d K=C.14({},(1t.1s?1t.1s.2s(e,U):e.2r));8(G.q){M.1b(G.q)}8(G.p){M.1a(G.p)}d L=C.14({},(1t.1s?1t.1s.2s(e,U):e.2r));8(G.q){M.1a(G.q)}8(G.p){M.1b(G.p)}1T(d P 4D L){8(1d L[P]!="b"&&L[P]&&P.1H("4C")==-1&&P.1H("1m")==-1&&L[P]!=K[P]&&(P.1Q(/1G/i)||(!P.1Q(/1G/i)&&!1S(j(L[P],10))))&&(K.R!="1R"||(K.R=="1R"&&!P.1Q(/1f|1e|2q|2p/)))){O[P]=L[P]}}M.4B(O,H,F,b(){8(1d C(e).W("Q")=="1P"){C(e).W("Q")["1O"]="";C(e).W("Q")["1O"]=N}m{C(e).W("Q",N)}8(G.q){C(e).1b(G.q)}8(G.p){C(e).1a(G.p)}8(E){E.l(e,g)}})})}});C.V.14({2o:C.V.1c,2n:C.V.1r,2m:C.V.t,2l:C.V.1b,2k:C.V.1a,2i:C.V.2j,1q:b(E,G,F,H){6 C.r[E]?C.r[E].4A(e,{4z:E,4y:G||{},1p:F,1o:H}):U},1c:b(){8(!g[0]||(g[0].17==1N||/(1M|1L|1K)/.1J(g[0]))){6 e.2o.l(e,g)}m{d E=g[1]||{};E["1I"]="1c";6 e.1q.l(e,[g[0],E,g[2]||E.1p,g[3]||E.1o])}},1r:b(){8(!g[0]||(g[0].17==1N||/(1M|1L|1K)/.1J(g[0]))){6 e.2n.l(e,g)}m{d E=g[1]||{};E["1I"]="1r";6 e.1q.l(e,[g[0],E,g[2]||E.1p,g[3]||E.1o])}},t:b(){8(!g[0]||(g[0].17==1N||/(1M|1L|1K)/.1J(g[0]))||(g[0].17==4x)){6 e.2m.l(e,g)}m{d E=g[1]||{};E["1I"]="t";6 e.1q.l(e,[g[0],E,g[2]||E.1p,g[3]||E.1o])}},1b:b(F,E,H,G){6 E?C.r.19.l(e,[{q:F},E,H,G]):e.2l(F)},1a:b(F,E,H,G){6 E?C.r.19.l(e,[{p:F},E,H,G]):e.2k(F)},2j:b(F,E,H,G){6 E?C.r.19.l(e,[{t:F},E,H,G]):e.2i(F)},2h:b(E,G,F,I,H){6 C.r.19.l(e,[{q:G,p:E},F,I,H])},4w:b(){6 e.2h.l(e,g)},2g:b(E){d F=e.k(E),G=[];C.1n(["4v","4u","%","4t"],b(H,I){8(F.1H(I)>0){G=[1l(F),I]}});6 G}});h.1n(["2e","4s","4r","4q","4p","1G","4o"],b(F,E){h.4n.4m[E]=b(G){8(G.4l==0){G.T=D(G.2f,E);G.18=B(G.18)}G.2f.Q[E]="1C("+[c.1F(c.1E(j((G.1D*(G.18[0]-G.T[0]))+G.T[0]),f),0),c.1F(c.1E(j((G.1D*(G.18[1]-G.T[1]))+G.T[1]),f),0),c.1F(c.1E(j((G.1D*(G.18[2]-G.T[2]))+G.T[2]),f),0)].4k(",")+")"}});b B(F){d E;8(F&&F.17==4j&&F.1m==3){6 F}8(E=/1C\\(\\s*([0-9]{1,3})\\s*,\\s*([0-9]{1,3})\\s*,\\s*([0-9]{1,3})\\s*\\)/.15(F)){6[j(E[1]),j(E[2]),j(E[3])]}8(E=/1C\\(\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*,\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*,\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*\\)/.15(F)){6[1l(E[1])*2.1B,1l(E[2])*2.1B,1l(E[3])*2.1B]}8(E=/#([a-11-Z-9]{2})([a-11-Z-9]{2})([a-11-Z-9]{2})/.15(F)){6[j(E[1],16),j(E[2],16),j(E[3],16)]}8(E=/#([a-11-Z-9])([a-11-Z-9])([a-11-Z-9])/.15(F)){6[j(E[1]+E[1],16),j(E[2]+E[2],16),j(E[3]+E[3],16)]}8(E=/4i\\(0, 0, 0, 0\\)/.15(F)){6 A["1i"]}6 A[h.4h(F).4g()]}b D(G,E){d F;4f{F=h.4e(G,E);8(F!=""&&F!="1i"||h.4d(G,"4c")){S}E="2e"}4b(G=G.4a);6 B(F)}d A={49:[0,f,f],48:[2a,f,f],46:[2d,2d,45],44:[0,0,0],43:[0,0,f],41:[24,42,42],40:[0,f,f],3Z:[0,0,Y],3Y:[0,Y,Y],3X:[1A,1A,1A],3W:[0,2c,0],3V:[3U,3T,2b],3S:[Y,0,Y],3R:[3Q,2b,47],3P:[f,29,0],3O:[3N,50,3M],3L:[Y,0,0],3K:[3J,3I,3H],3G:[3F,0,1k],3E:[f,0,f],3D:[f,3C,0],3B:[0,o,0],3A:[v,0,3z],3y:[2a,28,29],3x:[3w,3v,28],3u:[26,f,f],3t:[27,3s,27],3r:[1k,1k,1k],3q:[f,3p,3o],3n:[f,f,26],3m:[0,f,0],3l:[f,0,f],3k:[o,0,0],3j:[0,0,o],3i:[o,o,0],3h:[f,24,0],3g:[f,1j,3f],3e:[o,0,o],3d:[o,0,o],3c:[f,0,0],3b:[1j,1j,1j],3a:[f,f,f],39:[f,f,0],1i:[f,f,f]};h.u["38"]=h.u["23"];h.14(h.u,{22:"21",23:b(F,G,E,I,H){6 h.u[h.u.22](F,G,E,I,H)},37:b(F,G,E,I,H){6 I*(G/=H)*G+E},21:b(F,G,E,I,H){6-I*(G/=H)*(G-2)+E},36:b(F,G,E,I,H){8((G/=H/2)<1){6 I/2*G*G+E}6-I/2*((--G)*(G-2)-1)+E},35:b(F,G,E,I,H){6 I*(G/=H)*G*G+E},34:b(F,G,E,I,H){6 I*((G=G/H-1)*G*G+1)+E},33:b(F,G,E,I,H){8((G/=H/2)<1){6 I/2*G*G*G+E}6 I/2*((G-=2)*G*G+2)+E},32:b(F,G,E,I,H){6 I*(G/=H)*G*G*G+E},31:b(F,G,E,I,H){6-I*((G=G/H-1)*G*G*G-1)+E},30:b(F,G,E,I,H){8((G/=H/2)<1){6 I/2*G*G*G*G+E}6-I/2*((G-=2)*G*G*G-2)+E},2Z:b(F,G,E,I,H){6 I*(G/=H)*G*G*G*G+E},2Y:b(F,G,E,I,H){6 I*((G=G/H-1)*G*G*G*G+1)+E},2X:b(F,G,E,I,H){8((G/=H/2)<1){6 I/2*G*G*G*G*G+E}6 I/2*((G-=2)*G*G*G*G+2)+E},2W:b(F,G,E,I,H){6-I*c.20(G/H*(c.n/2))+I+E},2V:b(F,G,E,I,H){6 I*c.13(G/H*(c.n/2))+E},2U:b(F,G,E,I,H){6-I/2*(c.20(c.n*G/H)-1)+E},2T:b(F,G,E,I,H){6(G==0)?E:I*c.w(2,10*(G/H-1))+E},2S:b(F,G,E,I,H){6(G==H)?E+I:I*(-c.w(2,-10*G/H)+1)+E},2R:b(F,G,E,I,H){8(G==0){6 E}8(G==H){6 E+I}8((G/=H/2)<1){6 I/2*c.w(2,10*(G-1))+E}6 I/2*(-c.w(2,-10*--G)+2)+E},2Q:b(F,G,E,I,H){6-I*(c.1h(1-(G/=H)*G)-1)+E},2P:b(F,G,E,I,H){6 I*c.1h(1-(G=G/H-1)*G)+E},2O:b(F,G,E,I,H){8((G/=H/2)<1){6-I/2*(c.1h(1-G*G)-1)+E}6 I/2*(c.1h(1-(G-=2)*G)+1)+E},2N:b(F,H,E,L,K){d I=1.X;d J=0;d G=L;8(H==0){6 E}8((H/=K)==1){6 E+L}8(!J){J=K*0.3}8(G<c.1z(L)){G=L;d I=J/4}m{d I=J/(2*c.n)*c.1y(L/G)}6-(G*c.w(2,10*(H-=1))*c.13((H*K-I)*(2*c.n)/J))+E},2M:b(F,H,E,L,K){d I=1.X;d J=0;d G=L;8(H==0){6 E}8((H/=K)==1){6 E+L}8(!J){J=K*0.3}8(G<c.1z(L)){G=L;d I=J/4}m{d I=J/(2*c.n)*c.1y(L/G)}6 G*c.w(2,-10*H)*c.13((H*K-I)*(2*c.n)/J)+L+E},2L:b(F,H,E,L,K){d I=1.X;d J=0;d G=L;8(H==0){6 E}8((H/=K/2)==2){6 E+L}8(!J){J=K*(0.3*1.5)}8(G<c.1z(L)){G=L;d I=J/4}m{d I=J/(2*c.n)*c.1y(L/G)}8(H<1){6-0.5*(G*c.w(2,10*(H-=1))*c.13((H*K-I)*(2*c.n)/J))+E}6 G*c.w(2,-10*(H-=1))*c.13((H*K-I)*(2*c.n)/J)*0.5+L+E},2K:b(F,G,E,J,I,H){8(H==1x){H=1.X}6 J*(G/=I)*G*((H+1)*G-H)+E},2J:b(F,G,E,J,I,H){8(H==1x){H=1.X}6 J*((G=G/I-1)*G*((H+1)*G+H)+1)+E},2I:b(F,G,E,J,I,H){8(H==1x){H=1.X}8((G/=I/2)<1){6 J/2*(G*G*(((H*=(1.1Z))+1)*G-H))+E}6 J/2*((G-=2)*G*(((H*=(1.1Z))+1)*G+H)+2)+E},1Y:b(F,G,E,I,H){6 I-h.u.1w(F,H-G,0,I,H)+E},1w:b(F,G,E,I,H){8((G/=H)<(1/2.v)){6 I*(7.1g*G*G)+E}m{8(G<(2/2.v)){6 I*(7.1g*(G-=(1.5/2.v))*G+0.v)+E}m{8(G<(2.5/2.v)){6 I*(7.1g*(G-=(2.25/2.v))*G+0.2H)+E}m{6 I*(7.1g*(G-=(2.2G/2.v))*G+0.2F)+E}}}},2E:b(F,G,E,I,H){8(G<H/2){6 h.u.1Y(F,G*2,0,I,H)*0.5+E}6 h.u.1w(F,G*2-H,0,I,H)*0.5+I*0.5+E}})})(h)',62,313,'||||||return||if|||function|Math|var|this|255|arguments|jQuery||parseInt|css|apply|else|PI|128|remove|add|effects||toggle|easing|75|pow||||||||||||||||||||style|position|break|start|null|fn|attr|70158|139|F0||fA|case|sin|extend|exec||constructor|end|animateClass|removeClass|addClass|show|typeof|top|left|5625|sqrt|transparent|192|211|parseFloat|length|each|callback|duration|effect|hide|defaultView|document|unit|parent|easeOutBounce|undefined|asin|abs|169|55|rgb|pos|min|max|color|indexOf|mode|test|fast|normal|slow|Number|cssText|object|match|static|isNaN|for|fxWrapper|id|relative|margin|easeInBounce|525|cos|easeOutQuad|def|swing|165||224|144|230|140|240|107|100|245|backgroundColor|elem|cssUnit|morph|_toggleClass|toggleClass|_removeClass|_addClass|__toggle|_hide|_show|right|bottom|currentStyle|getComputedStyle|auto|div|float|true|height|width|default|switch|storage|ec|data|easeInOutBounce|984375|625|9375|easeInOutBack|easeOutBack|easeInBack|easeInOutElastic|easeOutElastic|easeInElastic|easeInOutCirc|easeOutCirc|easeInCirc|easeInOutExpo|easeOutExpo|easeInExpo|easeInOutSine|easeOutSine|easeInSine|easeInOutQuint|easeOutQuint|easeInQuint|easeInOutQuart|easeOutQuart|easeInQuart|easeInOutCubic|easeOutCubic|easeInCubic|easeInOutQuad|easeInQuad|jswing|yellow|white|silver|red|violet|purple|203|pink|orange|olive|navy|maroon|magenta|lime|lightyellow|193|182|lightpink|lightgrey|238|lightgreen|lightcyan|216|173|lightblue|khaki|130|indigo|green|215|gold|fuchsia|148|darkviolet|122|150|233|darksalmon|darkred|204|153|darkorchid|darkorange|85|darkolivegreen|darkmagenta|183|189|darkkhaki|darkgreen|darkgrey|darkcyan|darkblue|cyan|brown||blue|black|220|beige||azure|aqua|parentNode|while|body|nodeName|curCSS|do|toLowerCase|trim|rgba|Array|join|state|step|fx|outlineColor|borderTopColor|borderRightColor|borderLeftColor|borderBottomColor|pt|px|em|switchClass|Function|options|method|call|animate|Moz|in|hasClass|setTransition|replaceWith|removeWrapper|index|zIndex|padding|none|border|background|size|font|wrap|outerHeight|outerWidth|createWrapper|center|middle|getBaseline|hidden|is|setMode||restore|save'.split('|'),0,{}))
-
Index: js/ui/packed/effects.blind.packed.js
===================================================================
--- js/ui/packed/effects.blind.packed.js	(revision 6370)
+++ js/ui/packed/effects.blind.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(3(A){A.2.z=3(B){y d.x(3(){1 D=A(d),C=["w","v","u"];1 H=A.2.t(D,B.6.s||"5");1 G=B.6.r||"8";A.2.q(D,C);D.7();1 J=A.2.p(D).a({o:"n"});1 E=(G=="8")?"c":"b";1 I=(G=="8")?J.c():J.b();4(H=="7"){J.a(E,0)}1 F={};F[E]=H=="7"?I:0;J.m(F,B.l,B.6.k,3(){4(H=="5"){D.5()}A.2.j(D,C);A.2.i(D);4(B.9){B.9.h(D[0],g)}D.f()})})}})(e)',46,46,'|var|effects|function|if|hide|options|show|vertical|callback|css|width|height|this|jQuery|dequeue|arguments|apply|removeWrapper|restore|easing|duration|animate|hidden|overflow|createWrapper|save|direction|mode|setMode|left|top|position|queue|return|blind||||||||||'.split('|'),0,{}))
-
Index: js/ui/packed/effects.shake.packed.js
===================================================================
--- js/ui/packed/effects.shake.packed.js	(revision 6370)
+++ js/ui/packed/effects.shake.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(6(A){A.5.U=6(B){T b.d(6(){4 E=A(b),K=["S","g","a"];4 J=A.5.R(E,B.0.Q||"P");4 M=B.0.z||"a";4 C=B.0.y||x;4 D=B.0.w||3;4 G=B.h||B.0.h||v;A.5.u(E,K);E.t();A.5.s(E);4 F=(M=="f"||M=="r")?"g":"a";4 O=(M=="f"||M=="a")?"9":"q";4 H={},N={},L={};H[F]=(O=="9"?"-=":"+=")+C;N[F]=(O=="9"?"+=":"-=")+C*2;L[F]=(O=="9"?"-=":"+=")+C*2;E.8(H,G,B.0.7);p(4 I=1;I<D;I++){E.8(N,G,B.0.7).8(L,G,B.0.7)}E.8(N,G,B.0.7).8(H,G/2,B.0.7,6(){A.5.o(E,K);A.5.n(E);m(B.e){B.e.l(b,k)}});E.d("j",6(){E.c()});E.c()})}})(i)',57,57,'options||||var|effects|function|easing|animate|pos|left|this|dequeue|queue|callback|up|top|duration|jQuery|fx|arguments|apply|if|removeWrapper|restore|for|neg|down|createWrapper|show|save|140|times|20|distance|direction||||||||||||||||effect|mode|setMode|position|return|shake'.split('|'),0,{}))
-
Index: js/ui/packed/ui.dialog.packed.js
===================================================================
--- js/ui/packed/ui.dialog.packed.js	(revision 6370)
+++ js/ui/packed/ui.dialog.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(5(B){b A={1W:"1z.t",15:"15.t",1V:"1y.t",1A:"1A.i",1e:"1e.i",1B:"1B.i",1d:"1d.i",1U:"1z.i",p:"15.i",1T:"1y.i"};B.2p("6.4",{3o:5(){b J=3,K=3.9,D=2u K.i=="2t"?K.i:"n,e,s,w,3n,3m,3l,3k",E=3.k.y("6-4-1f").2z("<1a/>").2z("<1a/>"),G=(3.2l=E.2x().y("6-4-3j").g({q:"3i",d:"1K%",c:"1K%"})),H=K.1j||E.1Y("1j")||"",C=(3.1i=B(\'<1a 1Z="6-4-16"/>\')).2y(\'<1C 1Z="6-4-1j">\'+H+"</1C>").2y(\'<a 3h="#" 1Z="6-4-16-v"><1C>X</1C></a>\').3g(G),I=(3.f=G.2x()).12(j.x).14().y("6-4").y(K.3f).y(E.1Y("3e")).1O("6-4-1f").g({q:"1F",d:K.d,c:K.c,3d:"3c",1b:K.1b}).1Y("3b",-1).g("3a",0).1H(5(L){h(K.2f){b M=27;(L.1o&&L.1o==M&&J.v())}}).1J(5(){J.1u()}),F=(3.2i=B("<1a/>")).y("6-4-39").g({q:"1F",1h:0}).12(I);3.2k=B(".6-4-16-v",C).1X(5(){B(3).y("6-4-16-v-1X")},5(){B(3).1O("6-4-16-v-1X")}).1J(5(L){L.38()}).1I(5(){J.v();l U});3.1i.37("*").1E(3.1i).W(5(){B.6.36(3)});h(B.1n.t){I.t({2w:".6-4-1f",2v:K.35,34:".6-4-16",1z:5(M,L){J.1u();(K.1W&&K.1W.u(J.k[0],O))},15:5(M,L){(K.15&&K.15.u(J.k[0],O))},1y:5(M,L){(K.1V&&K.1V.u(J.k[0],O));B.6.4.8.p()}});(K.t||I.t("1x"))}h(B.1n.i){I.i({2w:".6-4-1f",2v:K.33,1B:K.1B,1A:K.1A,1d:K.1d,1e:K.1e,1z:5(){(K.1U&&K.1U.u(J.k[0],O))},p:5(M,L){(K.1r&&J.1v.u(J));(K.p&&K.p.u(J.k[0],O))},2r:D,1y:5(M,L){(K.1r&&J.1v.u(J));(K.1T&&K.1T.u(J.k[0],O));B.6.4.8.p()}});(K.i||I.i("1x"))}3.1N(K.1L);3.1s=U;(K.T&&B.1n.T&&I.T());(K.2g&&3.1P())},2o:5(C,D){(A[C]&&3.f.2s(A[C],D));1R(C){m"1L":3.1N(D);o;m"t":3.f.t(D?"2q":"1x");o;m"c":3.f.c(D);o;m"q":3.q(D);o;m"i":(2u D=="2t"&&3.f.2s("2r.i",D));3.f.i(D?"2q":"1x");o;m"1j":B(".6-4-1j",3.1i).2h(D);o;m"d":3.f.d(D);o}B.2p.20.2o.u(3,O)},q:5(H){b D=B(17),E=B(j),F=E.32(),C=E.31(),G=F;h(B.2b(H,["1c","11","1w","1h","Z"])>=0){H=[H=="1w"||H=="Z"?H:"1c",H=="11"||H=="1h"?H:"1Q"]}h(H.1S!=30){H=["1c","1Q"]}h(H[0].1S==2n){C+=H[0]}Q{1R(H[0]){m"Z":C+=0;o;m"1w":C+=D.d()-3.f.d();o;2m:m"1c":C+=(D.d()-3.f.d())/2}}h(H[1].1S==2n){F+=H[1]}Q{1R(H[1]){m"11":F+=0;o;m"1h":F+=D.c()-3.f.c();o;2m:m"1Q":F+=(D.c()-3.f.c())/2}}F=S.R(F,G);3.f.g({11:F,Z:C})},1v:5(){b D=3.2l,G=3.1i,E=3.k,F=N(E.g("19-11"),10)+N(E.g("19-1h"),10),C=N(E.g("19-Z"),10)+N(E.g("19-1w"),10);E.c(D.c()-G.2Z()-F);E.d(D.d()-C)},1P:5(){h(3.1s){l}3.8=3.9.1q?2Y B.6.4.8(3):1g;(3.f.2X().18>0)&&3.f.12("x");3.q(3.9.q);3.f.1M(3.9.1M);3.9.1r&&3.1v();3.1u(r);b C=1g;b D={9:3.9};3.2k.1p();3.k.1t("2W",[C,D],3.9.1P);3.1s=r},1u:5(E){h((3.9.1q&&!E)||(!3.9.2e&&!3.9.1q)){l 3.k.1t("2j",[1g,{9:3.9}],3.9.1p)}b D=3.9.1b,C=3.9;B(".6-4:2V").W(5(){D=S.R(D,N(B(3).g("z-13"),10)||C.1b)});(3.8&&3.8.$1D.g("z-13",++D));3.f.g("z-13",++D);3.k.1t("2j",[1g,{9:3.9}],3.9.1p)},v:5(){(3.8&&3.8.V());3.f.14(3.9.14);b D=1g;b C={9:3.9};3.k.1t("2U",[D,C],3.9.v);B.6.4.8.p();3.1s=U},V:5(){(3.8&&3.8.V());3.f.14();3.k.29(".4").2T("4").1O("6-4-1f").14().12("x");3.f.28()},1N:5(F){b E=3,C=U,D=3.2i;D.2S().14();B.W(F,5(){l!(C=r)});h(C){D.1M();B.W(F,5(G,H){B("<2R/>").2h(G).1I(5(){H.u(E.k[0],O)}).12(D)})}}});B.1k(B.6.4,{2Q:{2g:r,1r:r,T:U,1L:{},2f:r,t:r,c:2P,1e:1K,1d:2O,1q:U,8:{},q:"1c",i:r,2e:r,d:2N,1b:2M},8:5(C){3.$1D=B.6.4.8.2d(C)}});B.1k(B.6.4.8,{P:[],2c:B.2L("1p,1J,2K,1H,2J,1I".2I(","),5(C){l C+".4-8"}).2H(" "),2d:5(D){h(3.P.18===0){2G(5(){B("a, :2a").1G(B.6.4.8.2c,5(){b F=U;b H=B(3).2F(".6-4");h(H.18){b E=B(".6-4-8");h(E.18){b G=N(E.g("z-13"),10);E.W(5(){G=S.R(G,N(B(3).g("z-13"),10))});F=N(H.g("z-13"),10)>G}Q{F=r}}l F})},1);B(j).1G("1H.4-8",5(E){b F=27;(E.1o&&E.1o==F&&D.v())});B(17).1G("p.4-8",B.6.4.8.p)}b C=B("<1a/>").12(j.x).y("6-4-8").g(B.1k({2E:0,19:0,2D:0,q:"1F",11:0,Z:0,d:3.d(),c:3.c()},D.9.8));(D.9.T&&B.1n.T&&C.T());3.P.2C(C);l C},V:5(C){3.P.2B(B.2b(3.P,C),1);h(3.P.18===0){B("a, :2a").1E([j,17]).29(".4-8")}C.28()},c:5(){h(B.1m.24&&B.1m.23<7){b D=S.R(j.1l.26,j.x.26);b C=S.R(j.1l.25,j.x.25);h(D<C){l B(17).c()+"Y"}Q{l D+"Y"}}Q{l B(j).c()+"Y"}},d:5(){h(B.1m.24&&B.1m.23<7){b C=S.R(j.1l.22,j.x.22);b D=S.R(j.1l.21,j.x.21);h(C<D){l B(17).d()+"Y"}Q{l C+"Y"}}Q{l B(j).d()+"Y"}},p:5(){b C=B([]);B.W(B.6.4.8.P,5(){C=C.1E(3)});C.g({d:0,c:0}).g({d:B.6.4.8.d(),c:B.6.4.8.c()})}});B.1k(B.6.4.8.20,{V:5(){B.6.4.8.V(3.$1D)}})})(2A)',62,211,'|||this|dialog|function|ui||overlay|options||var|height|width||uiDialog|css|if|resizable|document|element|return|case||break|resize|position|true||draggable|apply|close||body|addClass|||||||||||||||parseInt|arguments|instances|else|max|Math|bgiframe|false|destroy|each||px|left||top|appendTo|index|hide|drag|titlebar|window|length|margin|div|zIndex|center|minWidth|minHeight|content|null|bottom|uiDialogTitlebar|title|extend|documentElement|browser|fn|keyCode|focus|modal|autoResize|isOpen|triggerHandler|moveToTop|size|right|disable|stop|start|maxHeight|maxWidth|span|el|add|absolute|bind|keydown|click|mousedown|100|buttons|show|createButtons|removeClass|open|middle|switch|constructor|resizeStop|resizeStart|dragStop|dragStart|hover|attr|class|prototype|offsetWidth|scrollWidth|version|msie|offsetHeight|scrollHeight||remove|unbind|input|inArray|events|create|stack|closeOnEscape|autoOpen|text|uiDialogButtonPane|dialogfocus|uiDialogTitlebarClose|uiDialogContainer|default|Number|setData|widget|enable|handles|data|string|typeof|helper|cancel|parent|append|wrap|jQuery|splice|push|padding|borderWidth|parents|setTimeout|join|split|keypress|mouseup|map|1000|300|150|200|defaults|button|empty|removeData|dialogclose|visible|dialogopen|next|new|outerHeight|Array|scrollLeft|scrollTop|resizeHelper|handle|dragHelper|disableSelection|find|stopPropagation|buttonpane|outline|tabIndex|hidden|overflow|className|dialogClass|prependTo|href|relative|container|nw|ne|sw|se|init'.split('|'),0,{}))
-
Index: js/ui/packed/ui.accordion.packed.js
===================================================================
--- js/ui/packed/ui.accordion.packed.js	(revision 6370)
+++ js/ui/packed/ui.accordion.packed.js	(working copy)
@@ -1,2 +0,0 @@
-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}('(4(E){E.2i("e.5",{2h:4(){7 G=2.c;3(G.2g){7 J=2.d.13("a").l(G.1c);3(J.1q){3(J.l(G.n).1q){G.6=J}w{G.6=J.j().j().2f();J.v("2e")}}}G.8=2.d.13(G.n);G.6=C(G.8,G.6);3(E.W.15){2.d.13("a").k("2d","1")}3(!2.d.2c("e-5")){2.d.v("e-5");E("<1p 1o=\'e-5-2b\'/>").2a(G.8);E("<1p 1o=\'e-5-29\'/>").28(G.8);G.8.v("e-5-n").27("26","0")}7 I;3(G.1l){I=2.d.j().b();G.8.O(4(){I-=E(2).1m()});7 H=0;G.8.h().O(4(){H=V.1n(H,E(2).25()-E(2).b())}).b(I-H)}w{3(G.g){I=0;G.8.h().O(4(){I=V.1n(I,E(2).1m())}).b(I)}}G.8.11(G.6||"").h().X();G.6.j().S().v(G.t);3(G.Q){2.d.24((G.Q)+".5",F)}},U:4(G){F.12(2.d[0],{T:C(2.c.8,G)[0]})},23:4(){2.c.8.h().k("22","");3(2.c.1l||2.c.g){2.c.8.h().k("b","")}E.21(2.d[0],"5");2.d.20("e-5").1Z(".5")}});4 B(H,G){9 4(){9 H.1Y(G,1X)}}4 D(I){3(!E.o(2,"5")){9}7 G=E.o(2,"5");7 H=G.c;H.m=I?0:--H.m;3(H.m){9}3(H.1W){H.f.1V(H.i).k({b:"",18:""})}E(2).1U("1k",[E.Q.1T({1S:"1k",T:G.d[0]}),H.o],H.1R)}4 A(G,K,L,J,M){7 I=E.o(2,"5").c;I.f=G;I.i=K;I.o=L;7 H=B(D,2);I.m=K.P()===0?G.P():K.P();3(I.R){3(!I.s&&J){E.e.5.Z[I.R]({f:x([]),i:K,r:H,z:M,g:I.g})}w{E.e.5.Z[I.R]({f:G,i:K,r:H,z:M,g:I.g})}}w{3(!I.s&&J){G.1Q()}w{K.X();G.Y()}H(10)}}4 F(L){7 J=E.o(2,"5").c;3(J.1P){9 u}3(!L.T&&!J.s){J.6.j().S().1j(J.t);7 I=J.6.h(),M={c:J,1i:x([]),1h:J.6,1g:x([]),1f:I},G=(J.6=E([]));A.12(2,G,I,M);9 u}7 K=E(L.T);K=E(K.1O(J.n)[0]||K);7 H=K[0]==J.6[0];3(J.m||(J.s&&H)){9 u}3(!K.1N(J.n)){9}J.6.j().S().1j(J.t);3(!H){K.j().S().v(J.t)}7 G=K.h(),I=J.6.h(),M={c:J,1i:K,1h:J.6,1g:G,1f:I},N=J.8.1e(J.6[0])>J.8.1e(K[0]);J.6=H?E([]):K;A.12(2,G,I,M,H,N);9 u}4 C(H,G){9 G!=1M?1L G=="1K"?H.l(":1d("+G+")"):H.11(H.11(G)):G===u?E([]):H.l(":1d(0)")}E.19(E.e.5,{1J:{t:"1I",s:10,R:"y",Q:"1H",n:"a",g:10,m:0,1c:4(){9 2.1b.1a()==1G.1b.1a()}},Z:{y:4(G,I){G=E.19({q:"14",p:1F},G,I);3(!G.i.P()){G.f.16({b:"Y"},G);9}7 H=G.i.b(),J=G.f.b(),K=J/H;G.f.k({b:0,18:"17"}).Y();G.i.l(":17").O(G.r).1E().l(":1D").16({b:"X"},{1C:4(L){7 M=(H-L)*K;3(E.W.15||E.W.1B){M=V.1A(M)}G.f.b(M)},p:G.p,q:G.q,r:4(){3(!G.g){G.f.k("b","1z")}G.r()}})},1y:4(G){2.y(G,{q:G.z?"1x":"14",p:G.z?1w:1v})},1u:4(G){2.y(G,{q:"1t",p:1s})}}});E.1r.U=4(G){9 2.5("U",G)}})(x)',62,143,'||this|if|function|accordion|active|var|headers|return||height|options|element|ui|toShow|autoHeight|next|toHide|parent|css|filter|running|header|data|duration|easing|complete|alwaysOpen|selectedClass|false|addClass|else|jQuery|slide|down|||||||||||||||each|size|event|animated|andSelf|target|activate|Math|browser|hide|show|animations|true|not|call|find|swing|msie|animate|hidden|overflow|extend|toLowerCase|href|navigationFilter|eq|index|oldContent|newContent|oldHeader|newHeader|toggleClass|accordionchange|fillSpace|outerHeight|max|class|span|length|fn|700|easeinout|easeslide|200|1000|bounceout|bounceslide|auto|ceil|opera|step|visible|end|300|location|click|selected|defaults|number|typeof|undefined|is|parents|disabled|toggle|change|type|fix|triggerHandler|add|clearStyle|arguments|apply|unbind|removeClass|removeData|display|destroy|bind|innerHeight|tabindex|attr|appendTo|right|insertBefore|left|hasClass|zoom|current|prev|navigation|init|widget'.split('|'),0,{}))
-
Index: js/ui/ui.accordion.js
===================================================================
--- js/ui/ui.accordion.js	(revision 6370)
+++ js/ui/ui.accordion.js	(working copy)
@@ -1,295 +0,0 @@
-/*
- * jQuery UI Accordion
- * 
- * Copyright (c) 2007, 2008 Jörn Zaefferer
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Accordion
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.accordion", {
-	init: function() {
-		var options = this.options;
-		
-		if ( options.navigation ) {
-			var current = this.element.find("a").filter(options.navigationFilter);
-			if ( current.length ) {
-				if ( current.filter(options.header).length ) {
-					options.active = current;
-				} else {
-					options.active = current.parent().parent().prev();
-					current.addClass("current");
-				}
-			}
-		}
-		
-		// calculate active if not specified, using the first header
-		options.headers = this.element.find(options.header);
-		options.active = findActive(options.headers, options.active);
-		
-		// IE7-/Win - Extra vertical space in Lists fixed
-		if ($.browser.msie) {
-			this.element.find('a').css('zoom', '1');
-		}
-		
-		if (!this.element.hasClass("ui-accordion")) {
-			this.element.addClass("ui-accordion");
-			$("<span class='ui-accordion-left'/>").insertBefore(options.headers);
-			$("<span class='ui-accordion-right'/>").appendTo(options.headers);
-			options.headers.addClass("ui-accordion-header").attr("tabindex", "0");
-		}
-		
-		var maxHeight;
-		if ( options.fillSpace ) {
-			maxHeight = this.element.parent().height();
-			options.headers.each(function() {
-				maxHeight -= $(this).outerHeight();
-			});
-			var maxPadding = 0;
-			options.headers.next().each(function() {
-				maxPadding = Math.max(maxPadding, $(this).innerHeight() - $(this).height());
-			}).height(maxHeight - maxPadding);
-		} else if ( options.autoHeight ) {
-			maxHeight = 0;
-			options.headers.next().each(function() {
-				maxHeight = Math.max(maxHeight, $(this).outerHeight());
-			}).height(maxHeight);
-		}
-	
-		options.headers
-			.not(options.active || "")
-			.next()
-			.hide();
-		options.active.parent().andSelf().addClass(options.selectedClass);
-		
-		if (options.event) {
-			this.element.bind((options.event) + ".accordion", clickHandler);
-		}
-	},
-	activate: function(index) {
-		// call clickHandler with custom event
-		clickHandler.call(this.element[0], {
-			target: findActive( this.options.headers, index )[0]
-		});
-	},
-	destroy: function() {
-		this.options.headers.next().css("display", "");
-		if ( this.options.fillSpace || this.options.autoHeight ) {
-			this.options.headers.next().css("height", "");
-		}
-		$.removeData(this.element[0], "accordion");
-		this.element.removeClass("ui-accordion").unbind(".accordion");
-	}
-});
-
-function scopeCallback(callback, scope) {
-	return function() {
-		return callback.apply(scope, arguments);
-	};
-};
-
-function completed(cancel) {
-	// if removed while animated data can be empty
-	if (!$.data(this, "accordion")) {
-		return;
-	}
-	
-	var instance = $.data(this, "accordion");
-	var options = instance.options;
-	options.running = cancel ? 0 : --options.running;
-	if ( options.running ) {
-		return;
-	}
-	if ( options.clearStyle ) {
-		options.toShow.add(options.toHide).css({
-			height: "",
-			overflow: ""
-		});
-	}
-	$(this).triggerHandler("accordionchange", [$.event.fix({type: 'accordionchange', target: instance.element[0]}), options.data], options.change);
-}
-
-function toggle(toShow, toHide, data, clickedActive, down) {
-	var options = $.data(this, "accordion").options;
-	options.toShow = toShow;
-	options.toHide = toHide;
-	options.data = data;
-	var complete = scopeCallback(completed, this);
-	
-	// count elements to animate
-	options.running = toHide.size() === 0 ? toShow.size() : toHide.size();
-	
-	if ( options.animated ) {
-		if ( !options.alwaysOpen && clickedActive ) {
-			$.ui.accordion.animations[options.animated]({
-				toShow: jQuery([]),
-				toHide: toHide,
-				complete: complete,
-				down: down,
-				autoHeight: options.autoHeight
-			});
-		} else {
-			$.ui.accordion.animations[options.animated]({
-				toShow: toShow,
-				toHide: toHide,
-				complete: complete,
-				down: down,
-				autoHeight: options.autoHeight
-			});
-		}
-	} else {
-		if ( !options.alwaysOpen && clickedActive ) {
-			toShow.toggle();
-		} else {
-			toHide.hide();
-			toShow.show();
-		}
-		complete(true);
-	}
-}
-
-function clickHandler(event) {
-	var options = $.data(this, "accordion").options;
-	if (options.disabled) {
-		return false;
-	}
-	
-	// called only when using activate(false) to close all parts programmatically
-	if ( !event.target && !options.alwaysOpen ) {
-		options.active.parent().andSelf().toggleClass(options.selectedClass);
-		var toHide = options.active.next(),
-			data = {
-				options: options,
-				newHeader: jQuery([]),
-				oldHeader: options.active,
-				newContent: jQuery([]),
-				oldContent: toHide
-			},
-			toShow = (options.active = $([]));
-		toggle.call(this, toShow, toHide, data );
-		return false;
-	}
-	// get the click target
-	var clicked = $(event.target);
-	
-	// due to the event delegation model, we have to check if one
-	// of the parent elements is our actual header, and find that
-	// otherwise stick with the initial target
-	clicked = $( clicked.parents(options.header)[0] || clicked );
-	
-	var clickedActive = clicked[0] == options.active[0];
-	
-	// if animations are still active, or the active header is the target, ignore click
-	if (options.running || (options.alwaysOpen && clickedActive)) {
-		return false;
-	}
-	if (!clicked.is(options.header)) {
-		return;
-	}
-	
-	// switch classes
-	options.active.parent().andSelf().toggleClass(options.selectedClass);
-	if ( !clickedActive ) {
-		clicked.parent().andSelf().addClass(options.selectedClass);
-	}
-	
-	// find elements to show and hide
-	var toShow = clicked.next(),
-		toHide = options.active.next(),
-		//data = [clicked, options.active, toShow, toHide],
-		data = {
-			options: options,
-			newHeader: clicked,
-			oldHeader: options.active,
-			newContent: toShow,
-			oldContent: toHide
-		},
-		down = options.headers.index( options.active[0] ) > options.headers.index( clicked[0] );
-	
-	options.active = clickedActive ? $([]) : clicked;
-	toggle.call(this, toShow, toHide, data, clickedActive, down );
-
-	return false;
-};
-
-function findActive(headers, selector) {
-	return selector != undefined
-		? typeof selector == "number"
-			? headers.filter(":eq(" + selector + ")")
-			: headers.not(headers.not(selector))
-		: selector === false
-			? $([])
-			: headers.filter(":eq(0)");
-}
-
-$.extend($.ui.accordion, {
-	defaults: {
-		selectedClass: "selected",
-		alwaysOpen: true,
-		animated: 'slide',
-		event: "click",
-		header: "a",
-		autoHeight: true,
-		running: 0,
-		navigationFilter: function() {
-			return this.href.toLowerCase() == location.href.toLowerCase();
-		}
-	},
-	animations: {
-		slide: function(options, additions) {
-			options = $.extend({
-				easing: "swing",
-				duration: 300
-			}, options, additions);
-			if ( !options.toHide.size() ) {
-				options.toShow.animate({height: "show"}, options);
-				return;
-			}
-			var hideHeight = options.toHide.height(),
-				showHeight = options.toShow.height(),
-				difference = showHeight / hideHeight;
-			options.toShow.css({ height: 0, overflow: 'hidden' }).show();
-			options.toHide.filter(":hidden").each(options.complete).end().filter(":visible").animate({height:"hide"},{
-				step: function(now) {
-					var current = (hideHeight - now) * difference;
-					if ($.browser.msie || $.browser.opera) {
-						current = Math.ceil(current);
-					}
-					options.toShow.height( current );
-				},
-				duration: options.duration,
-				easing: options.easing,
-				complete: function() {
-					if ( !options.autoHeight ) {
-						options.toShow.css("height", "auto");
-					}
-					options.complete();
-				}
-			});
-		},
-		bounceslide: function(options) {
-			this.slide(options, {
-				easing: options.down ? "bounceout" : "swing",
-				duration: options.down ? 1000 : 200
-			});
-		},
-		easeslide: function(options) {
-			this.slide(options, {
-				easing: "easeinout",
-				duration: 700
-			});
-		}
-	}
-});
-
-// deprecated, use accordion("activate", index) instead
-$.fn.activate = function(index) {
-	return this.accordion("activate", index);
-};
-
-})(jQuery);
Index: js/ui/effects.explode.js
===================================================================
--- js/ui/effects.explode.js	(revision 6370)
+++ js/ui/effects.explode.js	(working copy)
@@ -1,79 +0,0 @@
-/*
- * jQuery UI Effects Explode
- *
- * Copyright (c) 2008 Paul Bakaus (ui.jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Explode
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.explode = function(o) {
-
-	return this.queue(function() {
-
-	var rows = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
-	var cells = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
-	
-	o.options.mode = o.options.mode == 'toggle' ? ($(this).is(':visible') ? 'hide' : 'show') : o.options.mode;
-	var el = $(this).show().css('visibility', 'hidden');
-	var offset = el.offset();
-	
-	//Substract the margins - not fixing the problem yet.
-	offset.top -= parseInt(el.css("marginTop")) || 0;
-	offset.left -= parseInt(el.css("marginLeft")) || 0;
-	
-	var width = el.outerWidth(true);
-	var height = el.outerHeight(true);
-
-	for(var i=0;i<rows;i++) { // =
-		for(var j=0;j<cells;j++) { // ||
-			el
-				.clone()
-				.appendTo('body')
-				.wrap('<div></div>')
-				.css({
-					position: 'absolute',
-					visibility: 'visible',
-					left: -j*(width/cells),
-					top: -i*(height/rows)
-				})
-				.parent()
-				.addClass('effects-explode')
-				.css({
-					position: 'absolute',
-					overflow: 'hidden',
-					width: width/cells,
-					height: height/rows,
-					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? (j-Math.floor(cells/2))*(width/cells) : 0),
-					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? (i-Math.floor(rows/2))*(height/rows) : 0),
-					opacity: o.options.mode == 'show' ? 0 : 1
-				}).animate({
-					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? 0 : (j-Math.floor(cells/2))*(width/cells)),
-					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? 0 : (i-Math.floor(rows/2))*(height/rows)),
-					opacity: o.options.mode == 'show' ? 1 : 0
-				}, o.duration || 500);
-		}
-	}
-
-	// Set a timeout, to call the callback approx. when the other animations have finished
-	setTimeout(function() {
-		
-		o.options.mode == 'show' ? el.css({ visibility: 'visible' }) : el.css({ visibility: 'visible' }).hide();
-				if(o.callback) o.callback.apply(el[0]); // Callback
-				el.dequeue();
-				
-				$('.effects-explode').remove();
-		
-	}, o.duration || 500);
-	
-		
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/effects.slide.js
===================================================================
--- js/ui/effects.slide.js	(revision 6370)
+++ js/ui/effects.slide.js	(working copy)
@@ -1,50 +0,0 @@
-/*
- * jQuery UI Effects Slide
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Slide
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.slide = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
-		var direction = o.options.direction || 'left'; // Default Direction
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		$.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
-		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
-		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
-		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) : el.outerWidth({margin:true}));
-		if (mode == 'show') el.css(ref, motion == 'pos' ? -distance : distance); // Shift
-		
-		// Animation
-		var animation = {};
-		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
-		
-		// Animate
-		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(this, arguments); // Callback
-			el.dequeue();
-		}});
-		
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/ui.selectable.js
===================================================================
--- js/ui/ui.selectable.js	(revision 6370)
+++ js/ui/ui.selectable.js	(working copy)
@@ -1,264 +0,0 @@
-/*
- * jQuery UI Selectable
- *
- * Copyright (c) 2008 Richard D. Worth (rdworth.org)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Selectables
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.selectable", $.extend({}, $.ui.mouse, {
-	init: function() {
-		var self = this;
-		
-		this.element.addClass("ui-selectable");
-		
-		this.dragged = false;
-
-		// cache selectee children based on filter
-		var selectees;
-		this.refresh = function() {
-			selectees = $(self.options.filter, self.element[0]);
-			selectees.each(function() {
-				var $this = $(this);
-				var pos = $this.offset();
-				$.data(this, "selectable-item", {
-					element: this,
-					$element: $this,
-					left: pos.left,
-					top: pos.top,
-					right: pos.left + $this.width(),
-					bottom: pos.top + $this.height(),
-					startselected: false,
-					selected: $this.hasClass('ui-selected'),
-					selecting: $this.hasClass('ui-selecting'),
-					unselecting: $this.hasClass('ui-unselecting')
-				});
-			});
-		};
-		this.refresh();
-
-		this.selectees = selectees.addClass("ui-selectee");
-		
-		this.mouseInit();
-		
-		this.helper = $(document.createElement('div')).css({border:'1px dotted black'});
-	},
-	toggle: function() {
-		if(this.options.disabled){
-			this.enable();
-		} else {
-			this.disable();
-		}
-	},
-	destroy: function() {
-		this.element
-			.removeClass("ui-selectable ui-selectable-disabled")
-			.removeData("selectable")
-			.unbind(".selectable");
-		this.mouseDestroy();
-	},
-	mouseStart: function(e) {
-		var self = this;
-		
-		this.opos = [e.pageX, e.pageY];
-		
-		if (this.options.disabled)
-			return;
-
-		var options = this.options;
-
-		this.selectees = $(options.filter, this.element[0]);
-
-		// selectable START callback
-		this.element.triggerHandler("selectablestart", [e, {
-			"selectable": this.element[0],
-			"options": options
-		}], options.start);
-
-		$('body').append(this.helper);
-		// position helper (lasso)
-		this.helper.css({
-			"z-index": 100,
-			"position": "absolute",
-			"left": e.clientX,
-			"top": e.clientY,
-			"width": 0,
-			"height": 0
-		});
-
-		if (options.autoRefresh) {
-			this.refresh();
-		}
-
-		this.selectees.filter('.ui-selected').each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.startselected = true;
-			if (!e.ctrlKey) {
-				selectee.$element.removeClass('ui-selected');
-				selectee.selected = false;
-				selectee.$element.addClass('ui-unselecting');
-				selectee.unselecting = true;
-				// selectable UNSELECTING callback
-				self.element.triggerHandler("selectableunselecting", [e, {
-					selectable: self.element[0],
-					unselecting: selectee.element,
-					options: options
-				}], options.unselecting);
-			}
-		});
-		
-		var isSelectee = false;
-		$(e.target).parents().andSelf().each(function() {
-			if($.data(this, "selectable-item")) isSelectee = true;
-		});
-		return this.options.keyboard ? !isSelectee : true;
-	},
-	mouseDrag: function(e) {
-		var self = this;
-		this.dragged = true;
-		
-		if (this.options.disabled)
-			return;
-
-		var options = this.options;
-
-		var x1 = this.opos[0], y1 = this.opos[1], x2 = e.pageX, y2 = e.pageY;
-		if (x1 > x2) { var tmp = x2; x2 = x1; x1 = tmp; }
-		if (y1 > y2) { var tmp = y2; y2 = y1; y1 = tmp; }
-		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
-
-		this.selectees.each(function() {
-			var selectee = $.data(this, "selectable-item");
-			//prevent helper from being selected if appendTo: selectable
-			if (!selectee || selectee.element == self.element[0])
-				return;
-			var hit = false;
-			if (options.tolerance == 'touch') {
-				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
-			} else if (options.tolerance == 'fit') {
-				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
-			}
-
-			if (hit) {
-				// SELECT
-				if (selectee.selected) {
-					selectee.$element.removeClass('ui-selected');
-					selectee.selected = false;
-				}
-				if (selectee.unselecting) {
-					selectee.$element.removeClass('ui-unselecting');
-					selectee.unselecting = false;
-				}
-				if (!selectee.selecting) {
-					selectee.$element.addClass('ui-selecting');
-					selectee.selecting = true;
-					// selectable SELECTING callback
-					self.element.triggerHandler("selectableselecting", [e, {
-						selectable: self.element[0],
-						selecting: selectee.element,
-						options: options
-					}], options.selecting);
-				}
-			} else {
-				// UNSELECT
-				if (selectee.selecting) {
-					if (e.ctrlKey && selectee.startselected) {
-						selectee.$element.removeClass('ui-selecting');
-						selectee.selecting = false;
-						selectee.$element.addClass('ui-selected');
-						selectee.selected = true;
-					} else {
-						selectee.$element.removeClass('ui-selecting');
-						selectee.selecting = false;
-						if (selectee.startselected) {
-							selectee.$element.addClass('ui-unselecting');
-							selectee.unselecting = true;
-						}
-						// selectable UNSELECTING callback
-						self.element.triggerHandler("selectableunselecting", [e, {
-							selectable: self.element[0],
-							unselecting: selectee.element,
-							options: options
-						}], options.unselecting);
-					}
-				}
-				if (selectee.selected) {
-					if (!e.ctrlKey && !selectee.startselected) {
-						selectee.$element.removeClass('ui-selected');
-						selectee.selected = false;
-
-						selectee.$element.addClass('ui-unselecting');
-						selectee.unselecting = true;
-						// selectable UNSELECTING callback
-						self.element.triggerHandler("selectableunselecting", [e, {
-							selectable: self.element[0],
-							unselecting: selectee.element,
-							options: options
-						}], options.unselecting);
-					}
-				}
-			}
-		});
-		
-		return false;
-	},
-	mouseStop: function(e) {
-		var self = this;
-		
-		this.dragged = false;
-		
-		var options = this.options;
-
-		$('.ui-unselecting', this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass('ui-unselecting');
-			selectee.unselecting = false;
-			selectee.startselected = false;
-			self.element.triggerHandler("selectableunselected", [e, {
-				selectable: self.element[0],
-				unselected: selectee.element,
-				options: options
-			}], options.unselected);
-		});
-		$('.ui-selecting', this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass('ui-selecting').addClass('ui-selected');
-			selectee.selecting = false;
-			selectee.selected = true;
-			selectee.startselected = true;
-			self.element.triggerHandler("selectableselected", [e, {
-				selectable: self.element[0],
-				selected: selectee.element,
-				options: options
-			}], options.selected);
-		});
-		this.element.triggerHandler("selectablestop", [e, {
-			selectable: self.element[0],
-			options: this.options
-		}], this.options.stop);
-		
-		this.helper.remove();
-		
-		return false;
-	}
-}));
-
-$.extend($.ui.selectable, {
-	defaults: {
-		distance: 1,
-		delay: 0,
-		cancel: ":input",
-		appendTo: 'body',
-		autoRefresh: true,
-		filter: '*',
-		tolerance: 'touch'
-	}
-});
-
-})(jQuery);
Index: js/ui/effects.drop.js
===================================================================
--- js/ui/effects.drop.js	(revision 6370)
+++ js/ui/effects.drop.js	(working copy)
@@ -1,50 +0,0 @@
-/*
- * jQuery UI Effects Drop
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Drop
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.drop = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left','opacity'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var direction = o.options.direction || 'left'; // Default Direction
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		$.effects.createWrapper(el); // Create Wrapper
-		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
-		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
-		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 2 : el.outerWidth({margin:true}) / 2);
-		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
-		
-		// Animation
-		var animation = {opacity: mode == 'show' ? 1 : 0};
-		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
-		
-		// Animate
-		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(this, arguments); // Callback
-			el.dequeue();
-		}});
-		
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/ui.draggable.js
===================================================================
--- js/ui/ui.draggable.js	(revision 6370)
+++ js/ui/ui.draggable.js	(working copy)
@@ -1,562 +0,0 @@
-/*
- * jQuery UI Draggable
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Draggables
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.draggable", $.extend({}, $.ui.mouse, {
-	init: function() {
-		
-		//Initialize needed constants
-		var o = this.options;
-
-		//Position the node
-		if (o.helper == 'original' && !(/(relative|absolute|fixed)/).test(this.element.css('position')))
-			this.element.css('position', 'relative');
-
-		this.element.addClass('ui-draggable');
-		(o.disabled && this.element.addClass('ui-draggable-disabled'));
-		
-		this.mouseInit();
-		
-	},
-	mouseStart: function(e) {
-		var o = this.options;
-		
-		if (this.helper || o.disabled || $(e.target).is('.ui-resizable-handle')) return false;
-		
-		var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
-		
-	
-		$(this.options.handle, this.element).find("*").andSelf().each(function() {
-			if(this == e.target) handle = true;
-		});
-		if (!handle) return false;
-		
-		if($.ui.ddmanager) $.ui.ddmanager.current = this;
-		
-		//Create and append the visible helper
-		this.helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [e])) : (o.helper == 'clone' ? this.element.clone() : this.element);
-		if(!this.helper.parents('body').length) this.helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
-		if(this.helper[0] != this.element[0] && !(/(fixed|absolute)/).test(this.helper.css("position"))) this.helper.css("position", "absolute");
-		
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-		
-		this.margins = {																				//Cache the margins
-			left: (parseInt(this.element.css("marginLeft"),10) || 0),
-			top: (parseInt(this.element.css("marginTop"),10) || 0)
-		};		
-		
-		this.cssPosition = this.helper.css("position");													//Store the helper's css position
-		this.offset = this.element.offset();															//The element's absolute position on the page
-		this.offset = {																					//Substract the margins from the element's absolute offset
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-		
-		this.offset.click = {																			//Where the click happened, relative to the element
-			left: e.pageX - this.offset.left,
-			top: e.pageY - this.offset.top
-		};
-		
-		this.offsetParent = this.helper.offsetParent(); var po = this.offsetParent.offset();			//Get the offsetParent and cache its position
-		if(this.offsetParent[0] == document.body && $.browser.mozilla) po = { top: 0, left: 0 };		//Ugly FF3 fix
-		this.offset.parent = {																			//Store its position plus border
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-		
-		var p = this.element.position();																//This is a relative to absolute position minus the actual position calculation - only used for relative positioned helpers
-		this.offset.relative = this.cssPosition == "relative" ? {
-			top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.offsetParent[0].scrollTop,
-			left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.offsetParent[0].scrollLeft
-		} : { top: 0, left: 0 };
-		
-		this.originalPosition = this.generatePosition(e);												//Generate the original position
-		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Cache the helper size
-		
-		if(o.cursorAt) {
-			if(o.cursorAt.left != undefined) this.offset.click.left = o.cursorAt.left + this.margins.left;
-			if(o.cursorAt.right != undefined) this.offset.click.left = this.helperProportions.width - o.cursorAt.right + this.margins.left;
-			if(o.cursorAt.top != undefined) this.offset.click.top = o.cursorAt.top + this.margins.top;
-			if(o.cursorAt.bottom != undefined) this.offset.click.top = this.helperProportions.height - o.cursorAt.bottom + this.margins.top;
-		}
-		
-		
-		/*
-		 * - Position constraining -
-		 * Here we prepare position constraining like grid and containment.
-		 */	
-		
-		if(o.containment) {
-			if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-			if(o.containment == 'document' || o.containment == 'window') this.containment = [
-				0 - this.offset.relative.left - this.offset.parent.left,
-				0 - this.offset.relative.top - this.offset.parent.top,
-				$(o.containment == 'document' ? document : window).width() - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
-				($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
-			];
-			
-			if(!(/^(document|window|parent)$/).test(o.containment)) {
-				var ce = $(o.containment)[0];
-				var co = $(o.containment).offset();
-				
-				this.containment = [
-					co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left,
-					co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top,
-					co.left+Math.max(ce.scrollWidth,ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
-					co.top+Math.max(ce.scrollHeight,ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
-				];
-			}
-		}
-		
-		//Call plugins and callbacks
-		this.propagate("start", e);
-		
-		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Recache the helper size
-		if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e);
-		
-		this.helper.addClass("ui-draggable-dragging");
-		this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-		return true;
-	},
-	convertPositionTo: function(d, pos) {
-		if(!pos) pos = this.position;
-		var mod = d == "absolute" ? 1 : -1;
-		return {
-			top: (
-				pos.top																	// the calculated relative position
-				+ this.offset.relative.top	* mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
-				- (this.cssPosition == "fixed" || (this.cssPosition == "absolute" && this.offsetParent[0] == document.body) ? 0 : this.offsetParent[0].scrollTop) * mod	// The offsetParent's scroll position, not if the element is fixed
-				+ (this.cssPosition == "fixed" ? $(document).scrollTop() : 0) * mod
-				+ this.margins.top * mod												//Add the margin (you don't want the margin counting in intersection methods)
-			),
-			left: (
-				pos.left																// the calculated relative position
-				+ this.offset.relative.left	* mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
-				- (this.cssPosition == "fixed" || (this.cssPosition == "absolute" && this.offsetParent[0] == document.body) ? 0 : this.offsetParent[0].scrollLeft) * mod	// The offsetParent's scroll position, not if the element is fixed
-				+ (this.cssPosition == "fixed" ? $(document).scrollLeft() : 0) * mod
-				+ this.margins.left * mod												//Add the margin (you don't want the margin counting in intersection methods)
-			)
-		};
-	},
-	generatePosition: function(e) {
-		
-		var o = this.options;
-		var position = {
-			top: (
-				e.pageY																	// The absolute mouse position
-				- this.offset.click.top													// Click offset (relative to the element)
-				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
-				+ (this.cssPosition == "fixed" || (this.cssPosition == "absolute" && this.offsetParent[0] == document.body) ? 0 : this.offsetParent[0].scrollTop)	// The offsetParent's scroll position, not if the element is fixed
-				- (this.cssPosition == "fixed" ? $(document).scrollTop() : 0)
-			),
-			left: (
-				e.pageX																	// The absolute mouse position
-				- this.offset.click.left												// Click offset (relative to the element)
-				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
-				+ (this.cssPosition == "fixed" || (this.cssPosition == "absolute" && this.offsetParent[0] == document.body) ? 0 : this.offsetParent[0].scrollLeft)	// The offsetParent's scroll position, not if the element is fixed
-				- (this.cssPosition == "fixed" ? $(document).scrollLeft() : 0)
-			)
-		};
-		
-		if(!this.originalPosition) return position;										//If we are not dragging yet, we won't check for options
-		
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-		if(this.containment) {
-			if(position.left < this.containment[0]) position.left = this.containment[0];
-			if(position.top < this.containment[1]) position.top = this.containment[1];
-			if(position.left > this.containment[2]) position.left = this.containment[2];
-			if(position.top > this.containment[3]) position.top = this.containment[3];
-		}
-		
-		if(o.grid) {
-			var top = this.originalPosition.top + Math.round((position.top - this.originalPosition.top) / o.grid[1]) * o.grid[1];
-			position.top = this.containment ? (!(top < this.containment[1] || top > this.containment[3]) ? top : (!(top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-			
-			var left = this.originalPosition.left + Math.round((position.left - this.originalPosition.left) / o.grid[0]) * o.grid[0];
-			position.left = this.containment ? (!(left < this.containment[0] || left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-		}
-		
-		return position;
-	},
-	mouseDrag: function(e) {
-		
-		//Compute the helpers position
-		this.position = this.generatePosition(e);
-		this.positionAbs = this.convertPositionTo("absolute");
-		
-		//Call plugins and callbacks and use the resulting position if something is returned		
-		this.position = this.propagate("drag", e) || this.position;
-		
-		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
-		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
-		if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
-		
-		return false;
-	},
-	mouseStop: function(e) {
-		
-		//If we are using droppables, inform the manager about the drop
-		var dropped = false;
-		if ($.ui.ddmanager && !this.options.dropBehaviour)
-			var dropped = $.ui.ddmanager.drop(this, e);		
-		
-		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true) {
-			var self = this;
-			$(this.helper).animate(this.originalPosition, parseInt(this.options.revert, 10) || 500, function() {
-				self.propagate("stop", e);
-				self.clear();
-			});
-		} else {
-			this.propagate("stop", e);
-			this.clear();
-		}
-		
-		return false;
-	},
-	clear: function() {
-		this.helper.removeClass("ui-draggable-dragging");
-		if(this.options.helper != 'original' && !this.cancelHelperRemoval) this.helper.remove();
-		//if($.ui.ddmanager) $.ui.ddmanager.current = null;
-		this.helper = null;
-		this.cancelHelperRemoval = false;
-	},
-	
-	// From now on bulk stuff - mainly helpers
-	plugins: {},
-	uiHash: function(e) {
-		return {
-			helper: this.helper,
-			position: this.position,
-			absolutePosition: this.positionAbs,
-			options: this.options			
-		};
-	},
-	propagate: function(n,e) {
-		$.ui.plugin.call(this, n, [e, this.uiHash()]);
-		if(n == "drag") this.positionAbs = this.convertPositionTo("absolute"); //The absolute position has to be recalculated after plugins
-		return this.element.triggerHandler(n == "drag" ? n : "drag"+n, [e, this.uiHash()], this.options[n]);
-	},
-	destroy: function() {
-		if(!this.element.data('draggable')) return;
-		this.element.removeData("draggable").unbind(".draggable").removeClass('ui-draggable');
-		this.mouseDestroy();
-	}
-}));
-
-$.extend($.ui.draggable, {
-	defaults: {
-		appendTo: "parent",
-		axis: false,
-		cancel: ":input",
-		delay: 0,
-		distance: 1,
-		helper: "original"
-	}
-});
-
-$.ui.plugin.add("draggable", "cursor", {
-	start: function(e, ui) {
-		var t = $('body');
-		if (t.css("cursor")) ui.options._cursor = t.css("cursor");
-		t.css("cursor", ui.options.cursor);
-	},
-	stop: function(e, ui) {
-		if (ui.options._cursor) $('body').css("cursor", ui.options._cursor);
-	}
-});
-
-$.ui.plugin.add("draggable", "zIndex", {
-	start: function(e, ui) {
-		var t = $(ui.helper);
-		if(t.css("zIndex")) ui.options._zIndex = t.css("zIndex");
-		t.css('zIndex', ui.options.zIndex);
-	},
-	stop: function(e, ui) {
-		if(ui.options._zIndex) $(ui.helper).css('zIndex', ui.options._zIndex);
-	}
-});
-
-$.ui.plugin.add("draggable", "opacity", {
-	start: function(e, ui) {
-		var t = $(ui.helper);
-		if(t.css("opacity")) ui.options._opacity = t.css("opacity");
-		t.css('opacity', ui.options.opacity);
-	},
-	stop: function(e, ui) {
-		if(ui.options._opacity) $(ui.helper).css('opacity', ui.options._opacity);
-	}
-});
-
-$.ui.plugin.add("draggable", "iframeFix", {
-	start: function(e, ui) {
-		$(ui.options.iframeFix === true ? "iframe" : ui.options.iframeFix).each(function() {					
-			$('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
-			.css({
-				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
-				position: "absolute", opacity: "0.001", zIndex: 1000
-			})
-			.css($(this).offset())
-			.appendTo("body");
-		});
-	},
-	stop: function(e, ui) {
-		$("div.DragDropIframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers	
-	}
-});
-
-$.ui.plugin.add("draggable", "scroll", {
-	start: function(e, ui) {
-		var o = ui.options;
-		var i = $(this).data("draggable");
-		o.scrollSensitivity	= o.scrollSensitivity || 20;
-		o.scrollSpeed		= o.scrollSpeed || 20;
-		
-		i.overflowY = function(el) {
-			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
-			return $(document);
-		}(this);
-		i.overflowX = function(el) {
-			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
-			return $(document);
-		}(this);
-		
-		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') i.overflowYOffset = i.overflowY.offset();
-		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') i.overflowXOffset = i.overflowX.offset();
-		
-	},
-	drag: function(e, ui) {
-		
-		var o = ui.options;
-		var i = $(this).data("draggable");
-		
-		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') {
-			if((i.overflowYOffset.top + i.overflowY[0].offsetHeight) - e.pageY < o.scrollSensitivity)
-				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop + o.scrollSpeed;
-			if(e.pageY - i.overflowYOffset.top < o.scrollSensitivity)
-				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop - o.scrollSpeed;
-							
-		} else {
-			if(e.pageY - $(document).scrollTop() < o.scrollSensitivity)
-				$(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-			if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-				$(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-		}
-		
-		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') {
-			if((i.overflowXOffset.left + i.overflowX[0].offsetWidth) - e.pageX < o.scrollSensitivity)
-				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft + o.scrollSpeed;
-			if(e.pageX - i.overflowXOffset.left < o.scrollSensitivity)
-				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft - o.scrollSpeed;
-		} else {
-			if(e.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-				$(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-			if($(window).width() - (e.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-				$(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-		}
-		
-	}
-});
-
-$.ui.plugin.add("draggable", "snap", {
-	start: function(e, ui) {
-		
-		var inst = $(this).data("draggable");
-		inst.snapElements = [];
-		$(ui.options.snap === true ? '.ui-draggable' : ui.options.snap).each(function() {
-			var $t = $(this); var $o = $t.offset();
-			if(this != inst.element[0]) inst.snapElements.push({
-				item: this,
-				width: $t.outerWidth(), height: $t.outerHeight(),
-				top: $o.top, left: $o.left
-			});
-		});
-		
-	},
-	drag: function(e, ui) {
-		
-		var inst = $(this).data("draggable");
-		var d = ui.options.snapTolerance || 20;
-		var x1 = ui.absolutePosition.left, x2 = x1 + inst.helperProportions.width,
-			y1 = ui.absolutePosition.top, y2 = y1 + inst.helperProportions.height;
-		
-		for (var i = inst.snapElements.length - 1; i >= 0; i--){
-			
-			var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width, 
-				t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
-			
-			//Yes, I know, this is insane ;)
-			if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) continue;
-			
-			if(ui.options.snapMode != 'inner') {
-				var ts = Math.abs(t - y2) <= 20;
-				var bs = Math.abs(b - y1) <= 20;
-				var ls = Math.abs(l - x2) <= 20;
-				var rs = Math.abs(r - x1) <= 20;
-				if(ts) ui.position.top = inst.convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top;
-				if(bs) ui.position.top = inst.convertPositionTo("relative", { top: b, left: 0 }).top;
-				if(ls) ui.position.left = inst.convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left;
-				if(rs) ui.position.left = inst.convertPositionTo("relative", { top: 0, left: r }).left;
-			}
-			
-			if(ui.options.snapMode != 'outer') {
-				var ts = Math.abs(t - y1) <= 20;
-				var bs = Math.abs(b - y2) <= 20;
-				var ls = Math.abs(l - x1) <= 20;
-				var rs = Math.abs(r - x2) <= 20;
-				if(ts) ui.position.top = inst.convertPositionTo("relative", { top: t, left: 0 }).top;
-				if(bs) ui.position.top = inst.convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top;
-				if(ls) ui.position.left = inst.convertPositionTo("relative", { top: 0, left: l }).left;
-				if(rs) ui.position.left = inst.convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left;
-			}
-			
-		};
-	}
-});
-
-$.ui.plugin.add("draggable", "connectToSortable", {
-	start: function(e,ui) {
-	
-		var inst = $(this).data("draggable");
-		inst.sortables = [];
-		$(ui.options.connectToSortable).each(function() {
-			if($.data(this, 'sortable')) {
-				var sortable = $.data(this, 'sortable');
-				inst.sortables.push({
-					instance: sortable,
-					shouldRevert: sortable.options.revert
-				});
-				sortable.refreshItems();	//Do a one-time refresh at start to refresh the containerCache	
-				sortable.propagate("activate", e, inst);
-			}
-		});
-
-	},
-	stop: function(e,ui) {
-		
-		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
-		var inst = $(this).data("draggable");
-		
-		$.each(inst.sortables, function() {
-			if(this.instance.isOver) {
-				this.instance.isOver = 0;
-				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
-				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
-				if(this.shouldRevert) this.instance.options.revert = true; //revert here
-				this.instance.mouseStop(e);
-				
-				//Also propagate receive event, since the sortable is actually receiving a element
-				this.instance.element.triggerHandler("sortreceive", [e, $.extend(this.instance.ui(), { sender: inst.element })], this.instance.options["receive"]);
-
-				this.instance.options.helper = this.instance.options._helper;
-			} else {
-				this.instance.propagate("deactivate", e, inst);
-			}
-
-		});
-		
-	},
-	drag: function(e,ui) {
-
-		var inst = $(this).data("draggable"), self = this;
-		
-		var checkPos = function(o) {
-				
-			var l = o.left, r = l + o.width,
-				t = o.top, b = t + o.height;
-
-			return (l < (this.positionAbs.left + this.offset.click.left) && (this.positionAbs.left + this.offset.click.left) < r
-					&& t < (this.positionAbs.top + this.offset.click.top) && (this.positionAbs.top + this.offset.click.top) < b);				
-		};
-		
-		$.each(inst.sortables, function(i) {
-
-			if(checkPos.call(inst, this.instance.containerCache)) {
-
-				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
-				if(!this.instance.isOver) {
-					this.instance.isOver = 1;
-
-					//Now we fake the start of dragging for the sortable instance,
-					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
-					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
-					this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
-					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
-					this.instance.options.helper = function() { return ui.helper[0]; };
-				
-					e.target = this.instance.currentItem[0];
-					this.instance.mouseCapture(e, true);
-					this.instance.mouseStart(e, true, true);
-
-					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
-					this.instance.offset.click.top = inst.offset.click.top;
-					this.instance.offset.click.left = inst.offset.click.left;
-					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
-					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
-					
-					inst.propagate("toSortable", e);
-				
-				}
-				
-				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
-				if(this.instance.currentItem) this.instance.mouseDrag(e);
-				
-			} else {
-				
-				//If it doesn't intersect with the sortable, and it intersected before,
-				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
-				if(this.instance.isOver) {
-					this.instance.isOver = 0;
-					this.instance.cancelHelperRemoval = true;
-					this.instance.options.revert = false; //No revert here
-					this.instance.mouseStop(e, true);
-					this.instance.options.helper = this.instance.options._helper;
-					
-					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
-					this.instance.currentItem.remove();
-					if(this.instance.placeholder) this.instance.placeholder.remove();
-					
-					inst.propagate("fromSortable", e);
-				}
-				
-			};
-
-		});
-
-	}
-});
-
-$.ui.plugin.add("draggable", "stack", {
-	start: function(e,ui) {
-		var group = $.makeArray($(ui.options.stack.group)).sort(function(a,b) {
-			return (parseInt($(a).css("zIndex"),10) || ui.options.stack.min) - (parseInt($(b).css("zIndex"),10) || ui.options.stack.min);
-		});
-		
-		$(group).each(function(i) {
-			this.style.zIndex = ui.options.stack.min + i;
-		});
-		
-		this[0].style.zIndex = ui.options.stack.min + group.length;
-	}
-});
-
-})(jQuery);
Index: js/ui/ui.droppable.js
===================================================================
--- js/ui/ui.droppable.js	(revision 6370)
+++ js/ui/ui.droppable.js	(working copy)
@@ -1,281 +0,0 @@
-/*
- * jQuery UI Droppable
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Droppables
- *
- * Depends:
- *	ui.core.js
- *	ui.draggable.js
- */
-(function($) {
-
-$.widget("ui.droppable", {
-	init: function() {
-
-		this.element.addClass("ui-droppable");
-		this.isover = 0; this.isout = 1;
-		
-		//Prepare the passed options
-		var o = this.options, accept = o.accept;
-		o = $.extend(o, {
-			accept: o.accept && o.accept.constructor == Function ? o.accept : function(d) {
-				return $(d).is(accept);
-			}
-		});
-		
-		//Store the droppable's proportions
-		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
-		
-		// Add the reference and positions to the manager
-		$.ui.ddmanager.droppables.push(this);
-		
-	},
-	plugins: {},
-	ui: function(c) {
-		return {
-			draggable: (c.currentItem || c.element),
-			helper: c.helper,
-			position: c.position,
-			absolutePosition: c.positionAbs,
-			options: this.options,
-			element: this.element
-		};
-	},
-	destroy: function() {
-		var drop = $.ui.ddmanager.droppables;
-		for ( var i = 0; i < drop.length; i++ )
-			if ( drop[i] == this )
-				drop.splice(i, 1);
-		
-		this.element
-			.removeClass("ui-droppable ui-droppable-disabled")
-			.removeData("droppable")
-			.unbind(".droppable");
-	},
-	over: function(e) {
-		
-		var draggable = $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-		
-		if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
-			$.ui.plugin.call(this, 'over', [e, this.ui(draggable)]);
-			this.element.triggerHandler("dropover", [e, this.ui(draggable)], this.options.over);
-		}
-		
-	},
-	out: function(e) {
-		
-		var draggable = $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-		
-		if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
-			$.ui.plugin.call(this, 'out', [e, this.ui(draggable)]);
-			this.element.triggerHandler("dropout", [e, this.ui(draggable)], this.options.out);
-		}
-		
-	},
-	drop: function(e,custom) {
-		
-		var draggable = custom || $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element
-		
-		var childrenIntersection = false;
-		this.element.find(".ui-droppable").not(".ui-draggable-dragging").each(function() {
-			var inst = $.data(this, 'droppable');
-			if(inst.options.greedy && $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)) {
-				childrenIntersection = true; return false;
-			}
-		});
-		if(childrenIntersection) return false;
-		
-		if(this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
-			$.ui.plugin.call(this, 'drop', [e, this.ui(draggable)]);
-			this.element.triggerHandler("drop", [e, this.ui(draggable)], this.options.drop);
-			return true;
-		}
-		
-		return false;
-		
-	},
-	activate: function(e) {
-		
-		var draggable = $.ui.ddmanager.current;
-		$.ui.plugin.call(this, 'activate', [e, this.ui(draggable)]);
-		if(draggable) this.element.triggerHandler("dropactivate", [e, this.ui(draggable)], this.options.activate);
-		
-	},
-	deactivate: function(e) {
-		
-		var draggable = $.ui.ddmanager.current;
-		$.ui.plugin.call(this, 'deactivate', [e, this.ui(draggable)]);
-		if(draggable) this.element.triggerHandler("dropdeactivate", [e, this.ui(draggable)], this.options.deactivate);
-		
-	}
-});
-
-$.extend($.ui.droppable, {
-	defaults: {
-		disabled: false,
-		tolerance: 'intersect'
-	}
-});
-
-$.ui.intersect = function(draggable, droppable, toleranceMode) {
-	
-	if (!droppable.offset) return false;
-	
-	var x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
-		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height;
-	var l = droppable.offset.left, r = l + droppable.proportions.width,
-		t = droppable.offset.top, b = t + droppable.proportions.height;
-	
-	switch (toleranceMode) {
-		case 'fit':
-			return (l < x1 && x2 < r
-				&& t < y1 && y2 < b);
-			break;
-		case 'intersect':
-			return (l < x1 + (draggable.helperProportions.width / 2) // Right Half
-				&& x2 - (draggable.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (draggable.helperProportions.height / 2) // Bottom Half
-				&& y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
-			break;
-		case 'pointer':
-			return (l < ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left) && ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left) < r
-				&& t < ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top) && ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top) < b);
-			break;
-		case 'touch':
-			return (
-					(y1 >= t && y1 <= b) ||	// Top edge touching
-					(y2 >= t && y2 <= b) ||	// Bottom edge touching
-					(y1 < t && y2 > b)		// Surrounded vertically
-				) && (
-					(x1 >= l && x1 <= r) ||	// Left edge touching
-					(x2 >= l && x2 <= r) ||	// Right edge touching
-					(x1 < l && x2 > r)		// Surrounded horizontally
-				);
-			break;
-		default:
-			return false;
-			break;
-		}
-	
-};
-
-/*
-	This manager tracks offsets of draggables and droppables
-*/
-$.ui.ddmanager = {
-	current: null,
-	droppables: [],
-	prepareOffsets: function(t, e) {
-		
-		var m = $.ui.ddmanager.droppables;
-		var type = e ? e.type : null; // workaround for #2317
-
-		for (var i = 0; i < m.length; i++) {
-			if(m[i].options.disabled || (t && !m[i].options.accept.call(m[i].element,(t.currentItem || t.element)))) continue;
-			m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; //If the element is not visible, continue
-			m[i].offset = m[i].element.offset();
-			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
-			
-			if(type == "dragstart" || type == "sortactivate") m[i].activate.call(m[i], e); //Activate the droppable if used directly from draggables
-		}
-		
-	},
-	drop: function(draggable, e) {
-		
-		var dropped = false;
-		$.each($.ui.ddmanager.droppables, function() {
-			
-			if(!this.options) return;
-			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
-				dropped = this.drop.call(this, e);
-			
-			if (!this.options.disabled && this.visible && this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
-				this.isout = 1; this.isover = 0;
-				this.deactivate.call(this, e);
-			}
-			
-		});
-		return dropped;
-		
-	},
-	drag: function(draggable, e) {
-		
-		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
-		if(draggable.options.refreshPositions) $.ui.ddmanager.prepareOffsets(draggable, e);
-		
-		//Run through all droppables and check their positions based on specific tolerance options
-
-		$.each($.ui.ddmanager.droppables, function() {
-			
-			if(this.options.disabled || this.greedyChild || !this.visible) return;
-			var intersects = $.ui.intersect(draggable, this, this.options.tolerance);
-			
-			var c = !intersects && this.isover == 1 ? 'isout' : (intersects && this.isover == 0 ? 'isover' : null);
-			if(!c) return;
-			
-			var parentInstance;
-			if (this.options.greedy) {
-				var parent = this.element.parents('.ui-droppable:eq(0)');
-				if (parent.length) {
-					parentInstance = $.data(parent[0], 'droppable');
-					parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
-				}
-			}
-			
-			// we just moved into a greedy child
-			if (parentInstance && c == 'isover') {
-				parentInstance['isover'] = 0;
-				parentInstance['isout'] = 1;
-				parentInstance.out.call(parentInstance, e);
-			}
-			
-			this[c] = 1; this[c == 'isout' ? 'isover' : 'isout'] = 0;
-			this[c == "isover" ? "over" : "out"].call(this, e);
-			
-			// we just moved out of a greedy child
-			if (parentInstance && c == 'isout') {
-				parentInstance['isout'] = 0;
-				parentInstance['isover'] = 1;
-				parentInstance.over.call(parentInstance, e);
-			}
-		});
-		
-	}
-};
-
-/*
- * Droppable Extensions
- */
-
-$.ui.plugin.add("droppable", "activeClass", {
-	activate: function(e, ui) {
-		$(this).addClass(ui.options.activeClass);
-	},
-	deactivate: function(e, ui) {
-		$(this).removeClass(ui.options.activeClass);
-	},
-	drop: function(e, ui) {
-		$(this).removeClass(ui.options.activeClass);
-	}
-});
-
-$.ui.plugin.add("droppable", "hoverClass", {
-	over: function(e, ui) {
-		$(this).addClass(ui.options.hoverClass);
-	},
-	out: function(e, ui) {
-		$(this).removeClass(ui.options.hoverClass);
-	},
-	drop: function(e, ui) {
-		$(this).removeClass(ui.options.hoverClass);
-	}
-});
-
-})(jQuery);
Index: js/ui/effects.highlight.js
===================================================================
--- js/ui/effects.highlight.js	(revision 6370)
+++ js/ui/effects.highlight.js	(working copy)
@@ -1,48 +0,0 @@
-/*
- * jQuery UI Effects Highlight
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Highlight
- *
- * Depends:
- *	effects.core.js
- */
-;(function($) {
-
-$.effects.highlight = function(o) {
-
-	return this.queue(function() {
-		
-		// Create element
-		var el = $(this), props = ['backgroundImage','backgroundColor','opacity'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
-		var color = o.options.color || "#ffff99"; // Default highlight color
-		var oldColor = el.css("backgroundColor");
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		el.css({backgroundImage: 'none', backgroundColor: color}); // Shift
-		
-		// Animation
-		var animation = {backgroundColor: oldColor };
-		if (mode == "hide") animation['opacity'] = 0;
-		
-		// Animate
-		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == "hide") el.hide();
-			$.effects.restore(el, props);
-		if (mode == "show" && jQuery.browser.msie) this.style.removeAttribute('filter'); 
-			if(o.callback) o.callback.apply(this, arguments);
-			el.dequeue();
-		}});
-		
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/ui.datepicker.js
===================================================================
--- js/ui/ui.datepicker.js	(revision 6370)
+++ js/ui/ui.datepicker.js	(working copy)
@@ -1,1533 +0,0 @@
-/*
- * jQuery UI Datepicker
- *
- * Copyright (c) 2006, 2007, 2008 Marc Grabanski
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Datepicker
- *
- * Depends:
- *	ui.core.js
- *
- * Marc Grabanski (m@marcgrabanski.com) and Keith Wood (kbwood@virginbroadband.com.au).
- */
-   
-(function($) { // hide the namespace
-
-var PROP_NAME = 'datepicker';
-
-/* Date picker manager.
-   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
-   Settings for (groups of) date pickers are maintained in an instance object,
-   allowing multiple different settings on the same page. */
-
-function Datepicker() {
-	this.debug = false; // Change this to true to start debugging
-	this._curInst = null; // The current instance in use
-	this._disabledInputs = []; // List of date picker inputs that have been disabled
-	this._datepickerShowing = false; // True if the popup picker is showing , false if not
-	this._inDialog = false; // True if showing within a "dialog", false if not
-	this._mainDivId = 'ui-datepicker-div'; // The ID of the main datepicker division
-	this._appendClass = 'ui-datepicker-append'; // The name of the append marker class
-	this._triggerClass = 'ui-datepicker-trigger'; // The name of the trigger marker class
-	this._dialogClass = 'ui-datepicker-dialog'; // The name of the dialog marker class
-	this._promptClass = 'ui-datepicker-prompt'; // The name of the dialog prompt marker class
-	this._unselectableClass = 'ui-datepicker-unselectable'; // The name of the unselectable cell marker class
-	this._currentClass = 'ui-datepicker-current-day'; // The name of the current day marker class
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[''] = { // Default regional settings
-		clearText: 'Clear', // Display text for clear link
-		clearStatus: 'Erase the current date', // Status text for clear link
-		closeText: 'Close', // Display text for close link
-		closeStatus: 'Close without change', // Status text for close link
-		prevText: '&#x3c;Prev', // Display text for previous month link
-		prevStatus: 'Show the previous month', // Status text for previous month link
-		nextText: 'Next&#x3e;', // Display text for next month link
-		nextStatus: 'Show the next month', // Status text for next month link
-		currentText: 'Today', // Display text for current month link
-		currentStatus: 'Show the current month', // Status text for current month link
-		monthNames: ['January','February','March','April','May','June',
-			'July','August','September','October','November','December'], // Names of months for drop-down and formatting
-		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], // For formatting
-		monthStatus: 'Show a different month', // Status text for selecting a month
-		yearStatus: 'Show a different year', // Status text for selecting a year
-		weekHeader: 'Wk', // Header for the week of the year column
-		weekStatus: 'Week of the year', // Status text for the week of the year column
-		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], // For formatting
-		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], // For formatting
-		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'], // Column headings for days starting at Sunday
-		dayStatus: 'Set DD as first week day', // Status text for the day of the week selection
-		dateStatus: 'Select DD, M d', // Status text for the date selection
-		dateFormat: 'mm/dd/yy', // See format options on parseDate
-		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
-		initStatus: 'Select a date', // Initial Status text on opening
-		isRTL: false // True if right-to-left language, false if left-to-right
-	};
-	this._defaults = { // Global defaults for all the date picker instances
-		showOn: 'focus', // 'focus' for popup on focus,
-			// 'button' for trigger button, or 'both' for either
-		showAnim: 'show', // Name of jQuery animation for popup
-		showOptions: {}, // Options for enhanced animations
-		defaultDate: null, // Used when field is blank: actual date,
-			// +/-number for offset from today, null for today
-		appendText: '', // Display text following the input box, e.g. showing the format
-		buttonText: '...', // Text for trigger button
-		buttonImage: '', // URL for trigger button image
-		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
-		closeAtTop: true, // True to have the clear/close at the top,
-			// false to have them at the bottom
-		mandatory: false, // True to hide the Clear link, false to include it
-		hideIfNoPrevNext: false, // True to hide next/previous month links
-			// if not applicable, false to just disable them
-		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
-		gotoCurrent: false, // True if today link goes back to current selection instead
-		changeMonth: true, // True if month can be selected directly, false if only prev/next
-		changeYear: true, // True if year can be selected directly, false if only prev/next
-		yearRange: '-10:+10', // Range of years to display in drop-down,
-			// either relative to current year (-nn:+nn) or absolute (nnnn:nnnn)
-		changeFirstDay: true, // True to click on day name to change, false to remain as set
-		highlightWeek: false, // True to highlight the selected week
-		showOtherMonths: false, // True to show dates in other months, false to leave blank
-		showWeeks: false, // True to show week of the year, false to omit
-		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
-			// takes a Date and returns the number of the week for it
-		shortYearCutoff: '+10', // Short year values < this are in the current century,
-			// > this are in the previous century, 
-			// string value starting with '+' for current year + value
-		showStatus: false, // True to show status bar at bottom, false to not show it
-		statusForDate: this.dateStatus, // Function to provide status text for a date -
-			// takes date and instance as parameters, returns display text
-		minDate: null, // The earliest selectable date, or null for no limit
-		maxDate: null, // The latest selectable date, or null for no limit
-		duration: 'normal', // Duration of display/closure
-		beforeShowDay: null, // Function that takes a date and returns an array with
-			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or '', 
-			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
-		beforeShow: null, // Function that takes an input field and
-			// returns a set of custom settings for the date picker
-		onSelect: null, // Define a callback function when a date is selected
-		onChangeMonthYear: null, // Define a callback function when the month or year is changed
-		onClose: null, // Define a callback function when the datepicker is closed
-		numberOfMonths: 1, // Number of months to show at a time
-		stepMonths: 1, // Number of months to step back/forward
-		rangeSelect: false, // Allows for selecting a date range on one date picker
-		rangeSeparator: ' - ', // Text between two dates in a range
-		altField: '', // Selector for an alternate field to store selected dates into
-		altFormat: '' // The date format to use for the alternate field
-	};
-	$.extend(this._defaults, this.regional['']);
-	this.dpDiv = $('<div id="' + this._mainDivId + '" style="display: none;"></div>');
-}
-
-$.extend(Datepicker.prototype, {
-	/* Class name added to elements to indicate already configured with a date picker. */
-	markerClassName: 'hasDatepicker',
-
-	/* Debug logging (if enabled). */
-	log: function () {
-		if (this.debug)
-			console.log.apply('', arguments);
-	},
-	
-	/* Override the default settings for all instances of the date picker. 
-	   @param  settings  object - the new settings to use as defaults (anonymous object)
-	   @return the manager object */
-	setDefaults: function(settings) {
-		extendRemove(this._defaults, settings || {});
-		return this;
-	},
-
-	/* Attach the date picker to a jQuery selection.
-	   @param  target    element - the target input field or division or span
-	   @param  settings  object - the new settings to use for this date picker instance (anonymous) */
-	_attachDatepicker: function(target, settings) {
-		// check for settings on the control itself - in namespace 'date:'
-		var inlineSettings = null;
-		for (attrName in this._defaults) {
-			var attrValue = target.getAttribute('date:' + attrName);
-			if (attrValue) {
-				inlineSettings = inlineSettings || {};
-				try {
-					inlineSettings[attrName] = eval(attrValue);
-				} catch (err) {
-					inlineSettings[attrName] = attrValue;
-				}
-			}
-		}
-		var nodeName = target.nodeName.toLowerCase();
-		var inline = (nodeName == 'div' || nodeName == 'span');
-		if (!target.id)
-			target.id = 'dp' + new Date().getTime();
-		var inst = this._newInst($(target), inline);
-		inst.settings = $.extend({}, settings || {}, inlineSettings || {}); 
-		if (nodeName == 'input') {
-			this._connectDatepicker(target, inst);
-		} else if (inline) {
-			this._inlineDatepicker(target, inst);
-		}
-	},
-
-	/* Create a new instance object. */
-	_newInst: function(target, inline) {
-		return {id: target[0].id, input: target, // associated target
-			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
-			drawMonth: 0, drawYear: 0, // month being drawn
-			inline: inline, // is datepicker inline or not
-			dpDiv: (!inline ? this.dpDiv : // presentation div
-			$('<div class="ui-datepicker-inline"></div>'))};
-	},
-
-	/* Attach the date picker to an input field. */
-	_connectDatepicker: function(target, inst) {
-		var input = $(target);
-		if (input.hasClass(this.markerClassName))
-			return;
-		var appendText = this._get(inst, 'appendText');
-		var isRTL = this._get(inst, 'isRTL');
-		if (appendText)
-			input[isRTL ? 'before' : 'after']('<span class="' + this._appendClass + '">' + appendText + '</span>');
-		var showOn = this._get(inst, 'showOn');
-		if (showOn == 'focus' || showOn == 'both') // pop-up date picker when in the marked field
-			input.focus(this._showDatepicker);
-		if (showOn == 'button' || showOn == 'both') { // pop-up date picker when button clicked
-			var buttonText = this._get(inst, 'buttonText');
-			var buttonImage = this._get(inst, 'buttonImage');
-			var trigger = $(this._get(inst, 'buttonImageOnly') ? 
-				$('<img/>').addClass(this._triggerClass).
-					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
-				$('<button type="button"></button>').addClass(this._triggerClass).
-					html(buttonImage == '' ? buttonText : $('<img/>').attr(
-					{ src:buttonImage, alt:buttonText, title:buttonText })));
-			input[isRTL ? 'before' : 'after'](trigger);
-			trigger.click(function() {
-				if ($.datepicker._datepickerShowing && $.datepicker._lastInput == target)
-					$.datepicker._hideDatepicker();
-				else
-					$.datepicker._showDatepicker(target);
-				return false;
-			});
-		}
-		input.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).
-			bind("setData.datepicker", function(event, key, value) {
-				inst.settings[key] = value;
-			}).bind("getData.datepicker", function(event, key) {
-				return this._get(inst, key);
-			});
-		$.data(target, PROP_NAME, inst);
-	},
-
-	/* Attach an inline date picker to a div. */
-	_inlineDatepicker: function(target, inst) {
-		var input = $(target);
-		if (input.hasClass(this.markerClassName))
-			return;
-		input.addClass(this.markerClassName).append(inst.dpDiv).
-			bind("setData.datepicker", function(event, key, value){
-				inst.settings[key] = value;
-			}).bind("getData.datepicker", function(event, key){
-				return this._get(inst, key);
-			});
-		$.data(target, PROP_NAME, inst);
-		this._setDate(inst, this._getDefaultDate(inst));
-		this._updateDatepicker(inst);
-	},
-
-	/* Tidy up after displaying the date picker. */
-	_inlineShow: function(inst) {
-		var numMonths = this._getNumberOfMonths(inst); // fix width for dynamic number of date pickers
-		inst.dpDiv.width(numMonths[1] * $('.ui-datepicker', inst.dpDiv[0]).width());
-	}, 
-
-	/* Pop-up the date picker in a "dialog" box.
-	   @param  input     element - ignored
-	   @param  dateText  string - the initial date to display (in the current format)
-	   @param  onSelect  function - the function(dateText) to call when a date is selected
-	   @param  settings  object - update the dialog date picker instance's settings (anonymous object)
-	   @param  pos       int[2] - coordinates for the dialog's position within the screen or
-	                     event - with x/y coordinates or
-	                     leave empty for default (screen centre)
-	   @return the manager object */
-	_dialogDatepicker: function(input, dateText, onSelect, settings, pos) {
-		var inst = this._dialogInst; // internal instance
-		if (!inst) {
-			var id = 'dp' + new Date().getTime();
-			this._dialogInput = $('<input type="text" id="' + id +
-				'" size="1" style="position: absolute; top: -100px;"/>');
-			this._dialogInput.keydown(this._doKeyDown);
-			$('body').append(this._dialogInput);
-			inst = this._dialogInst = this._newInst(this._dialogInput, false);
-			inst.settings = {};
-			$.data(this._dialogInput[0], PROP_NAME, inst);
-		}
-		extendRemove(inst.settings, settings || {});
-		this._dialogInput.val(dateText);
-
-		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
-		if (!this._pos) {
-			var browserWidth = window.innerWidth || document.documentElement.clientWidth ||	document.body.clientWidth;
-			var browserHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
-			var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
-			var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-			this._pos = // should use actual width/height below
-				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
-		}
-
-		// move input on screen for focus, but hidden behind dialog
-		this._dialogInput.css('left', this._pos[0] + 'px').css('top', this._pos[1] + 'px');
-		inst.settings.onSelect = onSelect;
-		this._inDialog = true;
-		this.dpDiv.addClass(this._dialogClass);
-		this._showDatepicker(this._dialogInput[0]);
-		if ($.blockUI)
-			$.blockUI(this.dpDiv);
-		$.data(this._dialogInput[0], PROP_NAME, inst);
-		return this;
-	},
-
-	/* Detach a datepicker from its control.
-	   @param  target    element - the target input field or division or span */
-	_destroyDatepicker: function(target) {
-		var nodeName = target.nodeName.toLowerCase();
-		var $target = $(target);
-		$.removeData(target, PROP_NAME);
-		if (nodeName == 'input') {
-			$target.siblings('.' + this._appendClass).remove().end().
-				siblings('.' + this._triggerClass).remove().end().
-				removeClass(this.markerClassName).
-				unbind('focus', this._showDatepicker).
-				unbind('keydown', this._doKeyDown).
-				unbind('keypress', this._doKeyPress);
-		} else if (nodeName == 'div' || nodeName == 'span')
-			$target.removeClass(this.markerClassName).empty();
-	},
-
-	/* Enable the date picker to a jQuery selection.
-	   @param  target    element - the target input field or division or span */
-	_enableDatepicker: function(target) {
-		target.disabled = false;
-		$(target).siblings('button.' + this._triggerClass).each(function() { this.disabled = false; }).end().
-			siblings('img.' + this._triggerClass).css({opacity: '1.0', cursor: ''});
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value == target ? null : value); }); // delete entry
-	},
-
-	/* Disable the date picker to a jQuery selection.
-	   @param  target    element - the target input field or division or span */
-	_disableDatepicker: function(target) {
-		target.disabled = true;
-		$(target).siblings('button.' + this._triggerClass).each(function() { this.disabled = true; }).end().
-			siblings('img.' + this._triggerClass).css({opacity: '0.5', cursor: 'default'});
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value == target ? null : value); }); // delete entry
-		this._disabledInputs[this._disabledInputs.length] = target;
-	},
-
-	/* Is the first field in a jQuery collection disabled as a datepicker?
-	   @param  target    element - the target input field or division or span
-	   @return boolean - true if disabled, false if enabled */
-	_isDisabledDatepicker: function(target) {
-		if (!target)
-			return false;
-		for (var i = 0; i < this._disabledInputs.length; i++) {
-			if (this._disabledInputs[i] == target)
-				return true;
-		}
-		return false;
-	},
-
-	/* Update the settings for a date picker attached to an input field or division.
-	   @param  target  element - the target input field or division or span
-	   @param  name    object - the new settings to update or
-	                   string - the name of the setting to change or
-	   @param  value   any - the new value for the setting (omit if above is an object) */
-	_changeDatepicker: function(target, name, value) {
-		var settings = name || {};
-		if (typeof name == 'string') {
-			settings = {};
-			settings[name] = value;
-		}
-		if (inst = $.data(target, PROP_NAME)) {
-			extendRemove(inst.settings, settings);
-			this._updateDatepicker(inst);
-		}
-	},
-
-	/* Set the dates for a jQuery selection.
-	   @param  target   element - the target input field or division or span
-	   @param  date     Date - the new date
-	   @param  endDate  Date - the new end date for a range (optional) */
-	_setDateDatepicker: function(target, date, endDate) {
-		var inst = $.data(target, PROP_NAME);
-		if (inst) {
-			this._setDate(inst, date, endDate);
-			this._updateDatepicker(inst);
-		}
-	},
-
-	/* Get the date(s) for the first entry in a jQuery selection.
-	   @param  target  element - the target input field or division or span
-	   @return Date - the current date or
-	           Date[2] - the current dates for a range */
-	_getDateDatepicker: function(target) {
-		var inst = $.data(target, PROP_NAME);
-		if (inst)
-			this._setDateFromField(inst); 
-		return (inst ? this._getDate(inst) : null);
-	},
-
-	/* Handle keystrokes. */
-	_doKeyDown: function(e) {
-		var inst = $.data(e.target, PROP_NAME);
-		var handled = true;
-		if ($.datepicker._datepickerShowing)
-			switch (e.keyCode) {
-				case 9:  $.datepicker._hideDatepicker(null, '');
-						break; // hide on tab out
-				case 13: $.datepicker._selectDay(e.target, inst.selectedMonth, inst.selectedYear,
-							$('td.ui-datepicker-days-cell-over', inst.dpDiv)[0]);
-						return false; // don't submit the form
-						break; // select the value on enter
-				case 27: $.datepicker._hideDatepicker(null, $.datepicker._get(inst, 'duration'));
-						break; // hide on escape
-				case 33: $.datepicker._adjustDate(e.target, (e.ctrlKey ? -1 :
-							-$.datepicker._get(inst, 'stepMonths')), (e.ctrlKey ? 'Y' : 'M'));
-						break; // previous month/year on page up/+ ctrl
-				case 34: $.datepicker._adjustDate(e.target, (e.ctrlKey ? +1 :
-							+$.datepicker._get(inst, 'stepMonths')), (e.ctrlKey ? 'Y' : 'M'));
-						break; // next month/year on page down/+ ctrl
-				case 35: if (e.ctrlKey) $.datepicker._clearDate(e.target);
-						break; // clear on ctrl+end
-				case 36: if (e.ctrlKey) $.datepicker._gotoToday(e.target);
-						break; // current on ctrl+home
-				case 37: if (e.ctrlKey) $.datepicker._adjustDate(e.target, -1, 'D');
-						break; // -1 day on ctrl+left
-				case 38: if (e.ctrlKey) $.datepicker._adjustDate(e.target, -7, 'D');
-						break; // -1 week on ctrl+up
-				case 39: if (e.ctrlKey) $.datepicker._adjustDate(e.target, +1, 'D');
-						break; // +1 day on ctrl+right
-				case 40: if (e.ctrlKey) $.datepicker._adjustDate(e.target, +7, 'D');
-						break; // +1 week on ctrl+down
-				default: handled = false;
-			}
-		else if (e.keyCode == 36 && e.ctrlKey) // display the date picker on ctrl+home
-			$.datepicker._showDatepicker(this);
-		else
-			handled = false;
-		if (handled) {
-			e.preventDefault();
-			e.stopPropagation();
-		}
-	},
-
-	/* Filter entered characters - based on date format. */
-	_doKeyPress: function(e) {
-		var inst = $.data(e.target, PROP_NAME);
-		var chars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat'));
-		var chr = String.fromCharCode(e.charCode == undefined ? e.keyCode : e.charCode);
-		return e.ctrlKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
-	},
-
-	/* Pop-up the date picker for a given input field.
-	   @param  input  element - the input field attached to the date picker or
-	                  event - if triggered by focus */
-	_showDatepicker: function(input) {
-		input = input.target || input;
-		if (input.nodeName.toLowerCase() != 'input') // find from button/image trigger
-			input = $('input', input.parentNode)[0];
-		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput == input) // already here
-			return;
-		var inst = $.data(input, PROP_NAME);
-		var beforeShow = $.datepicker._get(inst, 'beforeShow');
-		extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
-		$.datepicker._hideDatepicker(null, '');
-		$.datepicker._lastInput = input;
-		$.datepicker._setDateFromField(inst);
-		if ($.datepicker._inDialog) // hide cursor
-			input.value = '';
-		if (!$.datepicker._pos) { // position below input
-			$.datepicker._pos = $.datepicker._findPos(input);
-			$.datepicker._pos[1] += input.offsetHeight; // add the height
-		}
-		var isFixed = false;
-		$(input).parents().each(function() {
-			isFixed |= $(this).css('position') == 'fixed';
-			return !isFixed;
-		});
-		if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
-			$.datepicker._pos[0] -= document.documentElement.scrollLeft;
-			$.datepicker._pos[1] -= document.documentElement.scrollTop;
-		}
-		var offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
-		$.datepicker._pos = null;
-		inst.rangeStart = null;
-		// determine sizing offscreen
-		inst.dpDiv.css({position: 'absolute', display: 'block', top: '-1000px'});
-		$.datepicker._updateDatepicker(inst);
-		// fix width for dynamic number of date pickers
-		inst.dpDiv.width($.datepicker._getNumberOfMonths(inst)[1] *
-			$('.ui-datepicker', inst.dpDiv[0])[0].offsetWidth);
-		// and adjust position before showing
-		offset = $.datepicker._checkOffset(inst, offset, isFixed);
-		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
-			'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
-			left: offset.left + 'px', top: offset.top + 'px'});
-		if (!inst.inline) {
-			var showAnim = $.datepicker._get(inst, 'showAnim') || 'show';
-			var duration = $.datepicker._get(inst, 'duration');
-			var postProcess = function() {
-				$.datepicker._datepickerShowing = true;
-				if ($.browser.msie && parseInt($.browser.version) < 7) // fix IE < 7 select problems
-					$('iframe.ui-datepicker-cover').css({width: inst.dpDiv.width() + 4,
-						height: inst.dpDiv.height() + 4});
-			};
-			if ($.effects && $.effects[showAnim])
-				inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
-			else
-				inst.dpDiv[showAnim](duration, postProcess);
-			if (duration == '')
-				postProcess();
-			if (inst.input[0].type != 'hidden')
-				inst.input[0].focus();
-			$.datepicker._curInst = inst;
-		}
-	},
-
-	/* Generate the date picker content. */
-	_updateDatepicker: function(inst) {
-		var dims = {width: inst.dpDiv.width() + 4,
-			height: inst.dpDiv.height() + 4};
-		inst.dpDiv.empty().append(this._generateDatepicker(inst)).
-			find('iframe.ui-datepicker-cover').
-			css({width: dims.width, height: dims.height});
-		var numMonths = this._getNumberOfMonths(inst);
-		inst.dpDiv[(numMonths[0] != 1 || numMonths[1] != 1 ? 'add' : 'remove') +
-			'Class']('ui-datepicker-multi');
-		inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +
-			'Class']('ui-datepicker-rtl');
-		if (inst.input && inst.input[0].type != 'hidden')
-			$(inst.input[0]).focus();
-	},
-
-	/* Check positioning to remain on screen. */
-	_checkOffset: function(inst, offset, isFixed) {
-		var pos = inst.input ? this._findPos(inst.input[0]) : null;
-		var browserWidth = window.innerWidth || document.documentElement.clientWidth;
-		var browserHeight = window.innerHeight || document.documentElement.clientHeight;
-		var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
-		var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-		// reposition date picker horizontally if outside the browser window
-		if (this._get(inst, 'isRTL') || (offset.left + inst.dpDiv.width() - scrollX) > browserWidth)
-			offset.left = Math.max((isFixed ? 0 : scrollX),
-				pos[0] + (inst.input ? inst.input.width() : 0) - (isFixed ? scrollX : 0) - inst.dpDiv.width() -
-				(isFixed && $.browser.opera ? document.documentElement.scrollLeft : 0));
-		else
-			offset.left -= (isFixed ? scrollX : 0);
-		// reposition date picker vertically if outside the browser window
-		if ((offset.top + inst.dpDiv.height() - scrollY) > browserHeight)
-			offset.top = Math.max((isFixed ? 0 : scrollY),
-				pos[1] - (isFixed ? scrollY : 0) - (this._inDialog ? 0 : inst.dpDiv.height()) -
-				(isFixed && $.browser.opera ? document.documentElement.scrollTop : 0));
-		else
-			offset.top -= (isFixed ? scrollY : 0);
-		return offset;
-	},
-	
-	/* Find an object's position on the screen. */
-	_findPos: function(obj) {
-        while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
-            obj = obj.nextSibling;
-        }
-        var position = $(obj).offset();
-	    return [position.left, position.top];
-	},
-
-	/* Hide the date picker from view.
-	   @param  input  element - the input field attached to the date picker
-	   @param  duration  string - the duration over which to close the date picker */
-	_hideDatepicker: function(input, duration) {
-		var inst = this._curInst;
-		if (!inst)
-			return;
-		var rangeSelect = this._get(inst, 'rangeSelect');
-		if (rangeSelect && this._stayOpen)
-			this._selectDate('#' + inst.id, this._formatDate(inst,
-				inst.currentDay, inst.currentMonth, inst.currentYear));
-		this._stayOpen = false;
-		if (this._datepickerShowing) {
-			duration = (duration != null ? duration : this._get(inst, 'duration'));
-			var showAnim = this._get(inst, 'showAnim');
-			var postProcess = function() {
-				$.datepicker._tidyDialog(inst);
-			};
-			if (duration != '' && $.effects && $.effects[showAnim])
-				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, 'showOptions'),
-					duration, postProcess);
-			else
-				inst.dpDiv[(duration == '' ? 'hide' : (showAnim == 'slideDown' ? 'slideUp' :
-					(showAnim == 'fadeIn' ? 'fadeOut' : 'hide')))](duration, postProcess);
-			if (duration == '')
-				this._tidyDialog(inst);
-			var onClose = this._get(inst, 'onClose');
-			if (onClose)
-				onClose.apply((inst.input ? inst.input[0] : null),
-					[this._getDate(inst), inst]);  // trigger custom callback
-			this._datepickerShowing = false;
-			this._lastInput = null;
-			inst.settings.prompt = null;
-			if (this._inDialog) {
-				this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
-				if ($.blockUI) {
-					$.unblockUI();
-					$('body').append(this.dpDiv);
-				}
-			}
-			this._inDialog = false;
-		}
-		this._curInst = null;
-	},
-
-	/* Tidy up after a dialog display. */
-	_tidyDialog: function(inst) {
-		inst.dpDiv.removeClass(this._dialogClass).unbind('.ui-datepicker');
-		$('.' + this._promptClass, inst.dpDiv).remove();
-	},
-
-	/* Close date picker if clicked elsewhere. */
-	_checkExternalClick: function(event) {
-		if (!$.datepicker._curInst)
-			return;
-		var $target = $(event.target);
-		if (($target.parents('#' + $.datepicker._mainDivId).length == 0) &&
-				!$target.hasClass($.datepicker.markerClassName) &&
-				!$target.hasClass($.datepicker._triggerClass) &&
-				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI))
-			$.datepicker._hideDatepicker(null, '');
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustDate: function(id, offset, period) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		this._adjustInstDate(inst, offset, period);
-		this._updateDatepicker(inst);
-	},
-
-	/* Action for current link. */
-	_gotoToday: function(id) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		if (this._get(inst, 'gotoCurrent') && inst.currentDay) {
-			inst.selectedDay = inst.currentDay;
-			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
-			inst.drawYear = inst.selectedYear = inst.currentYear;
-		}
-		else {
-		var date = new Date();
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		}
-		this._adjustDate(target);
-		this._notifyChange(inst);
-	},
-
-	/* Action for selecting a new month/year. */
-	_selectMonthYear: function(id, select, period) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		inst._selectingMonthYear = false;
-		inst[period == 'M' ? 'drawMonth' : 'drawYear'] =
-			select.options[select.selectedIndex].value - 0;
-		this._adjustDate(target);
-		this._notifyChange(inst);
-	},
-
-	/* Restore input focus after not changing month/year. */
-	_clickMonthYear: function(id) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		if (inst.input && inst._selectingMonthYear && !$.browser.msie)
-			inst.input[0].focus();
-		inst._selectingMonthYear = !inst._selectingMonthYear;
-	},
-
-	/* Action for changing the first week day. */
-	_changeFirstDay: function(id, day) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		inst.settings.firstDay = day;
-		this._updateDatepicker(inst);
-	},
-
-	/* Action for selecting a day. */
-	_selectDay: function(id, month, year, td) {
-		if ($(td).hasClass(this._unselectableClass))
-			return;
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		var rangeSelect = this._get(inst, 'rangeSelect');
-		if (rangeSelect) {
-			this._stayOpen = !this._stayOpen;
-			if (this._stayOpen) {
-				$('.ui-datepicker td').removeClass(this._currentClass);
-				$(td).addClass(this._currentClass);
-			} 
-		}
-		inst.selectedDay = inst.currentDay = $('a', td).html();
-		inst.selectedMonth = inst.currentMonth = month;
-		inst.selectedYear = inst.currentYear = year;
-		if (this._stayOpen) {
-			inst.endDay = inst.endMonth = inst.endYear = null;
-		}
-		else if (rangeSelect) {
-			inst.endDay = inst.currentDay;
-			inst.endMonth = inst.currentMonth;
-			inst.endYear = inst.currentYear;
-		}
-		this._selectDate(id, this._formatDate(inst,
-			inst.currentDay, inst.currentMonth, inst.currentYear));
-		if (this._stayOpen) {
-			inst.rangeStart = new Date(inst.currentYear, inst.currentMonth, inst.currentDay);
-			this._updateDatepicker(inst);
-		}
-		else if (rangeSelect) {
-			inst.selectedDay = inst.currentDay = inst.rangeStart.getDate();
-			inst.selectedMonth = inst.currentMonth = inst.rangeStart.getMonth();
-			inst.selectedYear = inst.currentYear = inst.rangeStart.getFullYear();
-			inst.rangeStart = null;
-			if (inst.inline)
-				this._updateDatepicker(inst);
-		}
-	},
-
-	/* Erase the input field and hide the date picker. */
-	_clearDate: function(id) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		if (this._get(inst, 'mandatory'))
-			return;
-		this._stayOpen = false;
-		inst.endDay = inst.endMonth = inst.endYear = inst.rangeStart = null;
-		this._selectDate(target, '');
-	},
-
-	/* Update the input field with the selected date. */
-	_selectDate: function(id, dateStr) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
-		if (this._get(inst, 'rangeSelect') && dateStr)
-			dateStr = (inst.rangeStart ? this._formatDate(inst, inst.rangeStart) :
-				dateStr) + this._get(inst, 'rangeSeparator') + dateStr;
-		if (inst.input)
-			inst.input.val(dateStr);
-		this._updateAlternate(inst);
-		var onSelect = this._get(inst, 'onSelect');
-		if (onSelect)
-			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
-		else if (inst.input)
-			inst.input.trigger('change'); // fire the change event
-		if (inst.inline)
-			this._updateDatepicker(inst);
-		else if (!this._stayOpen) {
-			this._hideDatepicker(null, this._get(inst, 'duration'));
-			this._lastInput = inst.input[0];
-			if (typeof(inst.input[0]) != 'object')
-				inst.input[0].focus(); // restore focus
-			this._lastInput = null;
-		}
-	},
-	
-	/* Update any alternate field to synchronise with the main field. */
-	_updateAlternate: function(inst) {
-		var altField = this._get(inst, 'altField');
-		if (altField) { // update alternate field too
-			var altFormat = this._get(inst, 'altFormat');
-			var date = this._getDate(inst);
-			dateStr = (isArray(date) ? (!date[0] && !date[1] ? '' :
-				this.formatDate(altFormat, date[0], this._getFormatConfig(inst)) +
-				this._get(inst, 'rangeSeparator') + this.formatDate(
-				altFormat, date[1] || date[0], this._getFormatConfig(inst))) :
-				this.formatDate(altFormat, date, this._getFormatConfig(inst)));
-			$(altField).each(function() { $(this).val(dateStr); });
-		}
-	},
-
-	/* Set as beforeShowDay function to prevent selection of weekends.
-	   @param  date  Date - the date to customise
-	   @return [boolean, string] - is this date selectable?, what is its CSS class? */
-	noWeekends: function(date) {
-		var day = date.getDay();
-		return [(day > 0 && day < 6), ''];
-	},
-	
-	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
-	   @param  date  Date - the date to get the week for
-	   @return  number - the number of the week within the year that contains this date */
-	iso8601Week: function(date) {
-		var checkDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), (date.getTimezoneOffset() / -60));
-		var firstMon = new Date(checkDate.getFullYear(), 1 - 1, 4); // First week always contains 4 Jan
-		var firstDay = firstMon.getDay() || 7; // Day of week: Mon = 1, ..., Sun = 7
-		firstMon.setDate(firstMon.getDate() + 1 - firstDay); // Preceding Monday
-		if (firstDay < 4 && checkDate < firstMon) { // Adjust first three days in year if necessary
-			checkDate.setDate(checkDate.getDate() - 3); // Generate for previous year
-			return $.datepicker.iso8601Week(checkDate);
-		} else if (checkDate > new Date(checkDate.getFullYear(), 12 - 1, 28)) { // Check last three days in year
-			firstDay = new Date(checkDate.getFullYear() + 1, 1 - 1, 4).getDay() || 7;
-			if (firstDay > 4 && (checkDate.getDay() || 7) < firstDay - 3) { // Adjust if necessary
-				checkDate.setDate(checkDate.getDate() + 3); // Generate for next year
-				return $.datepicker.iso8601Week(checkDate);
-			}
-		}
-		return Math.floor(((checkDate - firstMon) / 86400000) / 7) + 1; // Weeks to given date
-	},
-	
-	/* Provide status text for a particular date.
-	   @param  date  the date to get the status for
-	   @param  inst  the current datepicker instance
-	   @return  the status display text for this date */
-	dateStatus: function(date, inst) {
-		return $.datepicker.formatDate($.datepicker._get(inst, 'dateStatus'),
-			date, $.datepicker._getFormatConfig(inst));
-	},
-
-	/* Parse a string value into a date object.
-	   See formatDate below for the possible formats.
-
-	   @param  format    string - the expected format of the date
-	   @param  value     string - the date in the above format
-	   @param  settings  Object - attributes include:
-	                     shortYearCutoff  number - the cutoff year for determining the century (optional)
-	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
-	                     dayNames         string[7] - names of the days from Sunday (optional)
-	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
-	                     monthNames       string[12] - names of the months (optional)
-	   @return  Date - the extracted date value or null if value is blank */
-	parseDate: function (format, value, settings) {
-		if (format == null || value == null)
-			throw 'Invalid arguments';
-		value = (typeof value == 'object' ? value.toString() : value + '');
-		if (value == '')
-			return null;
-		var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
-		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
-		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
-		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
-		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
-		var year = -1;
-		var month = -1;
-		var day = -1;
-		var literal = false;
-		// Check whether a format character is doubled
-		var lookAhead = function(match) {
-			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
-			if (matches)
-				iFormat++;
-			return matches;	
-		};
-		// Extract a number from the string value
-		var getNumber = function(match) {
-			lookAhead(match);
-			var origSize = (match == '@' ? 14 : (match == 'y' ? 4 : 2));
-			var size = origSize;
-			var num = 0;
-			while (size > 0 && iValue < value.length &&
-					value.charAt(iValue) >= '0' && value.charAt(iValue) <= '9') {
-				num = num * 10 + (value.charAt(iValue++) - 0);
-				size--;
-			}
-			if (size == origSize)
-				throw 'Missing number at position ' + iValue;
-			return num;
-		};
-		// Extract a name from the string value and convert to an index
-		var getName = function(match, shortNames, longNames) {
-			var names = (lookAhead(match) ? longNames : shortNames);
-			var size = 0;
-			for (var j = 0; j < names.length; j++)
-				size = Math.max(size, names[j].length);
-			var name = '';
-			var iInit = iValue;
-			while (size > 0 && iValue < value.length) {
-				name += value.charAt(iValue++);
-				for (var i = 0; i < names.length; i++)
-					if (name == names[i])
-						return i + 1;
-				size--;
-			}
-			throw 'Unknown name at position ' + iInit;
-		};
-		// Confirm that a literal character matches the string value
-		var checkLiteral = function() {
-			if (value.charAt(iValue) != format.charAt(iFormat))
-				throw 'Unexpected literal at position ' + iValue;
-			iValue++;
-		};
-		var iValue = 0;
-		for (var iFormat = 0; iFormat < format.length; iFormat++) {
-			if (literal)
-				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
-					literal = false;
-				else
-					checkLiteral();
-			else
-				switch (format.charAt(iFormat)) {
-					case 'd':
-						day = getNumber('d');
-						break;
-					case 'D': 
-						getName('D', dayNamesShort, dayNames);
-						break;
-					case 'm': 
-						month = getNumber('m');
-						break;
-					case 'M':
-						month = getName('M', monthNamesShort, monthNames); 
-						break;
-					case 'y':
-						year = getNumber('y');
-						break;
-					case '@':
-						var date = new Date(getNumber('@'));
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "'":
-						if (lookAhead("'"))
-							checkLiteral();
-						else
-							literal = true;
-						break;
-					default:
-						checkLiteral();
-				}
-		}
-		if (year < 100)
-			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
-				(year <= shortYearCutoff ? 0 : -100);
-		var date = new Date(year, month - 1, day);
-		if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day)
-			throw 'Invalid date'; // E.g. 31/02/*
-		return date;
-	},
-
-	/* Standard date formats. */
-	ATOM: 'yy-mm-dd', // RFC 3339 (ISO 8601)
-	COOKIE: 'D, dd M yy',
-	ISO_8601: 'yy-mm-dd',
-	RFC_822: 'D, d M y',
-	RFC_850: 'DD, dd-M-y',
-	RFC_1036: 'D, d M y',
-	RFC_1123: 'D, d M yy',
-	RFC_2822: 'D, d M yy',
-	RSS: 'D, d M y', // RFC 822
-	TIMESTAMP: '@',
-	W3C: 'yy-mm-dd', // ISO 8601
-
-	/* Format a date object into a string value.
-	   The format can be combinations of the following:
-	   d  - day of month (no leading zero)
-	   dd - day of month (two digit)
-	   D  - day name short
-	   DD - day name long
-	   m  - month of year (no leading zero)
-	   mm - month of year (two digit)
-	   M  - month name short
-	   MM - month name long
-	   y  - year (two digit)
-	   yy - year (four digit)
-	   @ - Unix timestamp (ms since 01/01/1970)
-	   '...' - literal text
-	   '' - single quote
-
-	   @param  format    string - the desired format of the date
-	   @param  date      Date - the date value to format
-	   @param  settings  Object - attributes include:
-	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
-	                     dayNames         string[7] - names of the days from Sunday (optional)
-	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
-	                     monthNames       string[12] - names of the months (optional)
-	   @return  string - the date in the above format */
-	formatDate: function (format, date, settings) {
-		if (!date)
-			return '';
-		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
-		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
-		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
-		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
-		// Check whether a format character is doubled
-		var lookAhead = function(match) {
-			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
-			if (matches)
-				iFormat++;
-			return matches;	
-		};
-		// Format a number, with leading zero if necessary
-		var formatNumber = function(match, value) {
-			return (lookAhead(match) && value < 10 ? '0' : '') + value;
-		};
-		// Format a name, short or long as requested
-		var formatName = function(match, value, shortNames, longNames) {
-			return (lookAhead(match) ? longNames[value] : shortNames[value]);
-		};
-		var output = '';
-		var literal = false;
-		if (date)
-			for (var iFormat = 0; iFormat < format.length; iFormat++) {
-				if (literal)
-					if (format.charAt(iFormat) == "'" && !lookAhead("'"))
-						literal = false;
-					else
-						output += format.charAt(iFormat);
-				else
-					switch (format.charAt(iFormat)) {
-						case 'd':
-							output += formatNumber('d', date.getDate()); 
-							break;
-						case 'D': 
-							output += formatName('D', date.getDay(), dayNamesShort, dayNames);
-							break;
-						case 'm': 
-							output += formatNumber('m', date.getMonth() + 1); 
-							break;
-						case 'M':
-							output += formatName('M', date.getMonth(), monthNamesShort, monthNames); 
-							break;
-						case 'y':
-							output += (lookAhead('y') ? date.getFullYear() : 
-								(date.getYear() % 100 < 10 ? '0' : '') + date.getYear() % 100);
-							break;
-						case '@':
-							output += date.getTime(); 
-							break;
-						case "'":
-							if (lookAhead("'"))
-								output += "'";
-							else
-								literal = true;
-							break;
-						default:
-							output += format.charAt(iFormat);
-					}
-			}
-		return output;
-	},
-
-	/* Extract all possible characters from the date format. */
-	_possibleChars: function (format) {
-		var chars = '';
-		var literal = false;
-		for (var iFormat = 0; iFormat < format.length; iFormat++)
-			if (literal)
-				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
-					literal = false;
-				else
-					chars += format.charAt(iFormat);
-			else
-				switch (format.charAt(iFormat)) {
-					case 'd': case 'm': case 'y': case '@':
-						chars += '0123456789'; 
-						break;
-					case 'D': case 'M':
-						return null; // Accept anything
-					case "'":
-						if (lookAhead("'"))
-							chars += "'";
-						else
-							literal = true;
-						break;
-					default:
-						chars += format.charAt(iFormat);
-				}
-		return chars;
-	},
-
-	/* Get a setting value, defaulting if necessary. */
-	_get: function(inst, name) {
-		return inst.settings[name] !== undefined ?
-			inst.settings[name] : this._defaults[name];
-	},
-
-	/* Parse existing date and initialise date picker. */
-	_setDateFromField: function(inst) {
-		var dateFormat = this._get(inst, 'dateFormat');
-		var dates = inst.input ? inst.input.val().split(this._get(inst, 'rangeSeparator')) : null; 
-		inst.endDay = inst.endMonth = inst.endYear = null;
-		var date = defaultDate = this._getDefaultDate(inst);
-		if (dates.length > 0) {
-			var settings = this._getFormatConfig(inst);
-			if (dates.length > 1) {
-				date = this.parseDate(dateFormat, dates[1], settings) || defaultDate;
-				inst.endDay = date.getDate();
-				inst.endMonth = date.getMonth();
-				inst.endYear = date.getFullYear();
-			}
-			try {
-				date = this.parseDate(dateFormat, dates[0], settings) || defaultDate;
-			} catch (e) {
-				this.log(e);
-				date = defaultDate;
-			}
-		}
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		inst.currentDay = (dates[0] ? date.getDate() : 0);
-		inst.currentMonth = (dates[0] ? date.getMonth() : 0);
-		inst.currentYear = (dates[0] ? date.getFullYear() : 0);
-		this._adjustInstDate(inst);
-	},
-	
-	/* Retrieve the default date shown on opening. */
-	_getDefaultDate: function(inst) {
-		var date = this._determineDate(this._get(inst, 'defaultDate'), new Date());
-		var minDate = this._getMinMaxDate(inst, 'min', true);
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		date = (minDate && date < minDate ? minDate : date);
-		date = (maxDate && date > maxDate ? maxDate : date);
-		return date;
-	},
-
-	/* A date may be specified as an exact value or a relative one. */
-	_determineDate: function(date, defaultDate) {
-		var offsetNumeric = function(offset) {
-			var date = new Date();
-			date.setUTCDate(date.getUTCDate() + offset);
-			return date;
-		};
-		var offsetString = function(offset, getDaysInMonth) {
-			var date = new Date();
-			var year = date.getFullYear();
-			var month = date.getMonth();
-			var day = date.getDate();
-			var pattern = /([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;
-			var matches = pattern.exec(offset);
-			while (matches) {
-				switch (matches[2] || 'd') {
-					case 'd' : case 'D' :
-						day += (matches[1] - 0); break;
-					case 'w' : case 'W' :
-						day += (matches[1] * 7); break;
-					case 'm' : case 'M' :
-						month += (matches[1] - 0); 
-						day = Math.min(day, getDaysInMonth(year, month));
-						break;
-					case 'y': case 'Y' :
-						year += (matches[1] - 0);
-						day = Math.min(day, getDaysInMonth(year, month));
-						break;
-				}
-				matches = pattern.exec(offset);
-			}
-			return new Date(year, month, day);
-		};
-		return (date == null ? defaultDate :
-			(typeof date == 'string' ? offsetString(date, this._getDaysInMonth) :
-			(typeof date == 'number' ? offsetNumeric(date) : date)));
-	},
-
-	/* Set the date(s) directly. */
-	_setDate: function(inst, date, endDate) {
-		var clear = !(date);
-		date = this._determineDate(date, new Date());
-		inst.selectedDay = inst.currentDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = inst.currentMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = inst.currentYear = date.getFullYear();
-		if (this._get(inst, 'rangeSelect')) {
-			if (endDate) {
-				endDate = this._determineDate(endDate, null);
-				inst.endDay = endDate.getDate();
-				inst.endMonth = endDate.getMonth();
-				inst.endYear = endDate.getFullYear();
-			} else {
-				inst.endDay = inst.currentDay;
-				inst.endMonth = inst.currentMonth;
-				inst.endYear = inst.currentYear;
-			}
-		}
-		this._adjustInstDate(inst);
-		if (inst.input)
-			inst.input.val(clear ? '' : this._formatDate(inst) +
-				(!this._get(inst, 'rangeSelect') ? '' : this._get(inst, 'rangeSeparator') +
-				this._formatDate(inst, inst.endDay, inst.endMonth, inst.endYear)));
-	},
-
-	/* Retrieve the date(s) directly. */
-	_getDate: function(inst) {
-		var startDate = (!inst.currentYear || (inst.input && inst.input.val() == '') ? null :
-			new Date(inst.currentYear, inst.currentMonth, inst.currentDay));
-		if (this._get(inst, 'rangeSelect')) {
-			return [inst.rangeStart || startDate, (!inst.endYear ? null :
-				new Date(inst.endYear, inst.endMonth, inst.endDay))];
-		} else
-			return startDate;
-	},
-
-	/* Generate the HTML for the current state of the date picker. */
-	_generateDatepicker: function(inst) {
-		var today = new Date();
-		today = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // clear time
-		var showStatus = this._get(inst, 'showStatus');
-		var isRTL = this._get(inst, 'isRTL');
-		// build the date picker HTML
-		var clear = (this._get(inst, 'mandatory') ? '' :
-			'<div class="ui-datepicker-clear"><a onclick="jQuery.datepicker._clearDate(\'#' + inst.id + '\');"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'clearStatus') || '&#xa0;') : '') + '>' +
-			this._get(inst, 'clearText') + '</a></div>');
-		var controls = '<div class="ui-datepicker-control">' + (isRTL ? '' : clear) +
-			'<div class="ui-datepicker-close"><a onclick="jQuery.datepicker._hideDatepicker();"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'closeStatus') || '&#xa0;') : '') + '>' +
-			this._get(inst, 'closeText') + '</a></div>' + (isRTL ? clear : '')  + '</div>';
-		var prompt = this._get(inst, 'prompt');
-		var closeAtTop = this._get(inst, 'closeAtTop');
-		var hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext');
-		var navigationAsDateFormat = this._get(inst, 'navigationAsDateFormat');
-		var numMonths = this._getNumberOfMonths(inst);
-		var stepMonths = this._get(inst, 'stepMonths');
-		var isMultiMonth = (numMonths[0] != 1 || numMonths[1] != 1);
-		var currentDate = (!inst.currentDay ? new Date(9999, 9, 9) :
-			new Date(inst.currentYear, inst.currentMonth, inst.currentDay));
-		var minDate = this._getMinMaxDate(inst, 'min', true);
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		var drawMonth = inst.drawMonth;
-		var drawYear = inst.drawYear;
-		if (maxDate) {
-			var maxDraw = new Date(maxDate.getFullYear(),
-				maxDate.getMonth() - numMonths[1] + 1, maxDate.getDate());
-			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
-			while (new Date(drawYear, drawMonth, 1) > maxDraw) {
-				drawMonth--;
-				if (drawMonth < 0) {
-					drawMonth = 11;
-					drawYear--;
-				}
-			}
-		}
-		// controls and links
-		var prevText = this._get(inst, 'prevText');
-		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(
-			prevText, new Date(drawYear, drawMonth - stepMonths, 1), this._getFormatConfig(inst)));
-		var prev = '<div class="ui-datepicker-prev">' + (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ? 
-			'<a onclick="jQuery.datepicker._adjustDate(\'#' + inst.id + '\', -' + stepMonths + ', \'M\');"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'prevStatus') || '&#xa0;') : '') + '>' + prevText + '</a>' :
-			(hideIfNoPrevNext ? '' : '<label>' + prevText + '</label>')) + '</div>';
-		var nextText = this._get(inst, 'nextText');
-		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(
-			nextText, new Date(drawYear, drawMonth + stepMonths, 1), this._getFormatConfig(inst)));
-		var next = '<div class="ui-datepicker-next">' + (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
-			'<a onclick="jQuery.datepicker._adjustDate(\'#' + inst.id + '\', +' + stepMonths + ', \'M\');"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'nextStatus') || '&#xa0;') : '') + '>' + nextText + '</a>' :
-			(hideIfNoPrevNext ? '' : '<label>' + nextText + '</label>')) + '</div>';
-		var currentText = this._get(inst, 'currentText');
-		currentText = (!navigationAsDateFormat ? currentText: this.formatDate(
-			currentText, today, this._getFormatConfig(inst)));
-		var html = (prompt ? '<div class="' + this._promptClass + '">' + prompt + '</div>' : '') +
-			(closeAtTop && !inst.inline ? controls : '') +
-			'<div class="ui-datepicker-links">' + (isRTL ? next : prev) +
-			(this._isInRange(inst, (this._get(inst, 'gotoCurrent') && inst.currentDay ?
-			currentDate : today)) ? '<div class="ui-datepicker-current">' +
-			'<a onclick="jQuery.datepicker._gotoToday(\'#' + inst.id + '\');"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'currentStatus') || '&#xa0;') : '') + '>' +
-			currentText + '</a></div>' : '') + (isRTL ? prev : next) + '</div>';
-		var firstDay = this._get(inst, 'firstDay');
-		var changeFirstDay = this._get(inst, 'changeFirstDay');
-		var dayNames = this._get(inst, 'dayNames');
-		var dayNamesShort = this._get(inst, 'dayNamesShort');
-		var dayNamesMin = this._get(inst, 'dayNamesMin');
-		var monthNames = this._get(inst, 'monthNames');
-		var beforeShowDay = this._get(inst, 'beforeShowDay');
-		var highlightWeek = this._get(inst, 'highlightWeek');
-		var showOtherMonths = this._get(inst, 'showOtherMonths');
-		var showWeeks = this._get(inst, 'showWeeks');
-		var calculateWeek = this._get(inst, 'calculateWeek') || this.iso8601Week;
-		var status = (showStatus ? this._get(inst, 'dayStatus') || '&#xa0;' : '');
-		var dateStatus = this._get(inst, 'statusForDate') || this.dateStatus;
-		var endDate = inst.endDay ? new Date(inst.endYear, inst.endMonth, inst.endDay) : currentDate;
-		for (var row = 0; row < numMonths[0]; row++)
-			for (var col = 0; col < numMonths[1]; col++) {
-				var selectedDate = new Date(drawYear, drawMonth, inst.selectedDay);
-				html += '<div class="ui-datepicker-one-month' + (col == 0 ? ' ui-datepicker-new-row' : '') + '">' +
-					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
-					selectedDate, row > 0 || col > 0, showStatus, monthNames) + // draw month headers
-					'<table class="ui-datepicker" cellpadding="0" cellspacing="0"><thead>' + 
-					'<tr class="ui-datepicker-title-row">' +
-					(showWeeks ? '<td>' + this._get(inst, 'weekHeader') + '</td>' : '');
-				for (var dow = 0; dow < 7; dow++) { // days of the week
-					var day = (dow + firstDay) % 7;
-					var dayStatus = (status.indexOf('DD') > -1 ? status.replace(/DD/, dayNames[day]) :
-						status.replace(/D/, dayNamesShort[day]));
-					html += '<td' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end-cell"' : '') + '>' +
-						(!changeFirstDay ? '<span' :
-						'<a onclick="jQuery.datepicker._changeFirstDay(\'#' + inst.id + '\', ' + day + ');"') + 
-						(showStatus ? this._addStatus(inst, dayStatus) : '') + ' title="' + dayNames[day] + '">' +
-						dayNamesMin[day] + (changeFirstDay ? '</a>' : '</span>') + '</td>';
-				}
-				html += '</tr></thead><tbody>';
-				var daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
-				if (drawYear == inst.selectedYear && drawMonth == inst.selectedMonth)
-					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
-				var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
-				var printDate = new Date(drawYear, drawMonth, 1 - leadDays);
-				var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate
-				for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
-					html += '<tr class="ui-datepicker-days-row">' +
-						(showWeeks ? '<td class="ui-datepicker-week-col">' + calculateWeek(printDate) + '</td>' : '');
-					for (var dow = 0; dow < 7; dow++) { // create date picker days
-						var daySettings = (beforeShowDay ?
-							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, '']);
-						var otherMonth = (printDate.getMonth() != drawMonth);
-						var unselectable = otherMonth || !daySettings[0] ||
-							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
-						html += '<td class="ui-datepicker-days-cell' +
-							((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end-cell' : '') + // highlight weekends
-							(otherMonth ? ' ui-datepicker-otherMonth' : '') + // highlight days from other months
-							(printDate.getTime() == selectedDate.getTime() && drawMonth == inst.selectedMonth ?
-							' ui-datepicker-days-cell-over' : '') + // highlight selected day
-							(unselectable ? ' ' + this._unselectableClass : '') +  // highlight unselectable days
-							(otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
-							(printDate.getTime() >= currentDate.getTime() && printDate.getTime() <= endDate.getTime() ?  // in current range
-							' ' + this._currentClass : '') + // highlight selected day
-							(printDate.getTime() == today.getTime() ? ' ui-datepicker-today' : '')) + '"' + // highlight today (if different)
-							((!otherMonth || showOtherMonths) && daySettings[2] ? ' title="' + daySettings[2] + '"' : '') + // cell title
-							(unselectable ? (highlightWeek ? ' onmouseover="jQuery(this).parent().addClass(\'ui-datepicker-week-over\');"' + // highlight selection week
-							' onmouseout="jQuery(this).parent().removeClass(\'ui-datepicker-week-over\');"' : '') : // unhighlight selection week
-							' onmouseover="jQuery(this).addClass(\'ui-datepicker-days-cell-over\')' + // highlight selection
-							(highlightWeek ? '.parent().addClass(\'ui-datepicker-week-over\')' : '') + ';' + // highlight selection week
-							(!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#ui-datepicker-status-' +
-							inst.id + '\').html(\'' + (dateStatus.apply((inst.input ? inst.input[0] : null),
-							[printDate, inst]) || '&#xa0;') +'\');') + '"' +
-							' onmouseout="jQuery(this).removeClass(\'ui-datepicker-days-cell-over\')' + // unhighlight selection
-							(highlightWeek ? '.parent().removeClass(\'ui-datepicker-week-over\')' : '') + ';' + // unhighlight selection week
-							(!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#ui-datepicker-status-' +
-							inst.id + '\').html(\'&#xa0;\');') + '" onclick="jQuery.datepicker._selectDay(\'#' +
-							inst.id + '\',' + drawMonth + ',' + drawYear + ', this);"') + '>' + // actions
-							(otherMonth ? (showOtherMonths ? printDate.getDate() : '&#xa0;') : // display for other months
-							(unselectable ? printDate.getDate() : '<a>' + printDate.getDate() + '</a>')) + '</td>'; // display for this month
-						printDate.setUTCDate(printDate.getUTCDate() + 1);
-					}
-					html += '</tr>';
-				}
-				drawMonth++;
-				if (drawMonth > 11) {
-					drawMonth = 0;
-					drawYear++;
-				}
-				html += '</tbody></table></div>';
-			}
-		html += (showStatus ? '<div style="clear: both;"></div><div id="ui-datepicker-status-' + inst.id + 
-			'" class="ui-datepicker-status">' + (this._get(inst, 'initStatus') || '&#xa0;') + '</div>' : '') +
-			(!closeAtTop && !inst.inline ? controls : '') +
-			'<div style="clear: both;"></div>' + 
-			($.browser.msie && parseInt($.browser.version) < 7 && !inst.inline ? 
-			'<iframe src="javascript:false;" class="ui-datepicker-cover"></iframe>' : '');
-		return html;
-	},
-	
-	/* Generate the month and year header. */
-	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
-			selectedDate, secondary, showStatus, monthNames) {
-		minDate = (inst.rangeStart && minDate && selectedDate < minDate ? selectedDate : minDate);
-		var html = '<div class="ui-datepicker-header">';
-		// month selection
-		if (secondary || !this._get(inst, 'changeMonth'))
-			html += monthNames[drawMonth] + '&#xa0;';
-		else {
-			var inMinYear = (minDate && minDate.getFullYear() == drawYear);
-			var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
-			html += '<select class="ui-datepicker-new-month" ' +
-				'onchange="jQuery.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'M\');" ' +
-				'onclick="jQuery.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
-				(showStatus ? this._addStatus(inst, this._get(inst, 'monthStatus') || '&#xa0;') : '') + '>';
-			for (var month = 0; month < 12; month++) {
-				if ((!inMinYear || month >= minDate.getMonth()) &&
-						(!inMaxYear || month <= maxDate.getMonth()))
-					html += '<option value="' + month + '"' +
-						(month == drawMonth ? ' selected="selected"' : '') +
-						'>' + monthNames[month] + '</option>';
-			}
-			html += '</select>';
-		}
-		// year selection
-		if (secondary || !this._get(inst, 'changeYear'))
-			html += drawYear;
-		else {
-			// determine range of years to display
-			var years = this._get(inst, 'yearRange').split(':');
-			var year = 0;
-			var endYear = 0;
-			if (years.length != 2) {
-				year = drawYear - 10;
-				endYear = drawYear + 10;
-			} else if (years[0].charAt(0) == '+' || years[0].charAt(0) == '-') {
-				year = endYear = new Date().getFullYear();
-				year += parseInt(years[0], 10);
-				endYear += parseInt(years[1], 10);
-			} else {
-				year = parseInt(years[0], 10);
-				endYear = parseInt(years[1], 10);
-			}
-			year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
-			endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
-			html += '<select class="ui-datepicker-new-year" ' +
-				'onchange="jQuery.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'Y\');" ' +
-				'onclick="jQuery.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
-				(showStatus ? this._addStatus(inst, this._get(inst, 'yearStatus') || '&#xa0;') : '') + '>';
-			for (; year <= endYear; year++) {
-				html += '<option value="' + year + '"' +
-					(year == drawYear ? ' selected="selected"' : '') +
-					'>' + year + '</option>';
-			}
-			html += '</select>';
-		}
-		html += '</div>'; // Close datepicker_header
-		return html;
-	},
-
-	/* Provide code to set and clear the status panel. */
-	_addStatus: function(inst, text) {
-		return ' onmouseover="jQuery(\'#ui-datepicker-status-' + inst.id + '\').html(\'' + text + '\');" ' +
-			'onmouseout="jQuery(\'#ui-datepicker-status-' + inst.id + '\').html(\'&#xa0;\');"';
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustInstDate: function(inst, offset, period) {
-		var year = inst.drawYear + (period == 'Y' ? offset : 0);
-		var month = inst.drawMonth + (period == 'M' ? offset : 0);
-		var day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) +
-			(period == 'D' ? offset : 0);
-		var date = new Date(year, month, day);
-		// ensure it is within the bounds set
-		var minDate = this._getMinMaxDate(inst, 'min', true);
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		date = (minDate && date < minDate ? minDate : date);
-		date = (maxDate && date > maxDate ? maxDate : date);
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		if (period == 'M' || period == 'Y')
-			this._notifyChange(inst);
-	},
-
-	/* Notify change of month/year. */
-	_notifyChange: function(inst) {
-		var onChange = this._get(inst, 'onChangeMonthYear');
-		if (onChange)
-			onChange.apply((inst.input ? inst.input[0] : null),
-				[new Date(inst.selectedYear, inst.selectedMonth, 1), inst]);
-	},
-	
-	/* Determine the number of months to show. */
-	_getNumberOfMonths: function(inst) {
-		var numMonths = this._get(inst, 'numberOfMonths');
-		return (numMonths == null ? [1, 1] : (typeof numMonths == 'number' ? [1, numMonths] : numMonths));
-	},
-
-	/* Determine the current maximum date - ensure no time components are set - may be overridden for a range. */
-	_getMinMaxDate: function(inst, minMax, checkRange) {
-		var date = this._determineDate(this._get(inst, minMax + 'Date'), null);
-		if (date) {
-			date.setHours(0);
-			date.setMinutes(0);
-			date.setSeconds(0);
-			date.setMilliseconds(0);
-		}
-		return (!checkRange || !inst.rangeStart ? date :
-			(!date || inst.rangeStart > date ? inst.rangeStart : date));
-	},
-
-	/* Find the number of days in a given month. */
-	_getDaysInMonth: function(year, month) {
-		return 32 - new Date(year, month, 32).getDate();
-	},
-
-	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function(year, month) {
-		return new Date(year, month, 1).getDay();
-	},
-
-	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
-		var numMonths = this._getNumberOfMonths(inst);
-		var date = new Date(curYear, curMonth + (offset < 0 ? offset : numMonths[1]), 1);
-		if (offset < 0)
-			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
-		return this._isInRange(inst, date);
-	},
-
-	/* Is the given date in the accepted range? */
-	_isInRange: function(inst, date) {
-		// during range selection, use minimum of selected date and range start
-		var newMinDate = (!inst.rangeStart ? null :
-			new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay));
-		newMinDate = (newMinDate && inst.rangeStart < newMinDate ? inst.rangeStart : newMinDate);
-		var minDate = newMinDate || this._getMinMaxDate(inst, 'min');
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		return ((!minDate || date >= minDate) && (!maxDate || date <= maxDate));
-	},
-	
-	/* Provide the configuration settings for formatting/parsing. */
-	_getFormatConfig: function(inst) {
-		var shortYearCutoff = this._get(inst, 'shortYearCutoff');
-		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
-		return {shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get(inst, 'dayNamesShort'), dayNames: this._get(inst, 'dayNames'),
-			monthNamesShort: this._get(inst, 'monthNamesShort'), monthNames: this._get(inst, 'monthNames')};
-	},
-
-	/* Format the given date for display. */
-	_formatDate: function(inst, day, month, year) {
-		if (!day) {
-			inst.currentDay = inst.selectedDay;
-			inst.currentMonth = inst.selectedMonth;
-			inst.currentYear = inst.selectedYear;
-		}
-		var date = (day ? (typeof day == 'object' ? day : new Date(year, month, day)) :
-			new Date(inst.currentYear, inst.currentMonth, inst.currentDay));
-		return this.formatDate(this._get(inst, 'dateFormat'), date, this._getFormatConfig(inst));
-	}
-});
-
-/* jQuery extend now ignores nulls! */
-function extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props)
-		if (props[name] == null || props[name] == undefined)
-			target[name] = props[name];
-	return target;
-};
-
-/* Determine whether an object is an array. */
-function isArray(a) {
-	return (a && (($.browser.safari && typeof a == 'object' && a.length) ||
-		(a.constructor && a.constructor.toString().match(/\Array\(\)/))));
-};
-
-/* Invoke the datepicker functionality.
-   @param  options  string - a command, optionally followed by additional parameters or
-                    Object - settings for attaching new datepicker functionality
-   @return  jQuery object */
-$.fn.datepicker = function(options){
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate'))
-		return $.datepicker['_' + options + 'Datepicker'].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	return this.each(function() {
-		typeof options == 'string' ?
-			$.datepicker['_' + options + 'Datepicker'].
-				apply($.datepicker, [this].concat(otherArgs)) :
-			$.datepicker._attachDatepicker(this, options);
-	});
-};
-
-$.datepicker = new Datepicker(); // singleton instance
-	
-/* Initialise the date picker. */
-$(document).ready(function() {
-	$(document.body).append($.datepicker.dpDiv).
-		mousedown($.datepicker._checkExternalClick);
-});
-
-})(jQuery);
Index: js/ui/ui.sortable.js
===================================================================
--- js/ui/ui.sortable.js	(revision 6370)
+++ js/ui/ui.sortable.js	(working copy)
@@ -1,743 +0,0 @@
-/*
- * jQuery UI Sortable
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Sortables
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-function contains(a, b) { 
-    var safari2 = $.browser.safari && $.browser.version < 522; 
-    if (a.contains && !safari2) { 
-        return a.contains(b); 
-    } 
-    if (a.compareDocumentPosition) 
-        return !!(a.compareDocumentPosition(b) & 16); 
-    while (b = b.parentNode) 
-          if (b == a) return true; 
-    return false; 
-};
-
-$.widget("ui.sortable", $.extend({}, $.ui.mouse, {
-	init: function() {
-
-		var o = this.options;
-		this.containerCache = {};
-		this.element.addClass("ui-sortable");
-	
-		//Get the items
-		this.refresh();
-
-		//Let's determine if the items are floating
-		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
-		
-		//Let's determine the parent's offset
-		if(!(/(relative|absolute|fixed)/).test(this.element.css('position'))) this.element.css('position', 'relative');
-		this.offset = this.element.offset();
-
-		//Initialize mouse events for interaction
-		this.mouseInit();
-		
-	},
-	plugins: {},
-	ui: function(inst) {
-		return {
-			helper: (inst || this)["helper"],
-			placeholder: (inst || this)["placeholder"] || $([]),
-			position: (inst || this)["position"],
-			absolutePosition: (inst || this)["positionAbs"],
-			options: this.options,
-			element: this.element,
-			item: (inst || this)["currentItem"],
-			sender: inst ? inst.element : null
-		};		
-	},
-	propagate: function(n,e,inst, noPropagation) {
-		$.ui.plugin.call(this, n, [e, this.ui(inst)]);
-		if(!noPropagation) this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]);
-	},
-	serialize: function(o) {
-
-		var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself
-		var str = []; o = o || {};
-		
-		items.each(function() {
-			var res = ($(this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-			if(res) str.push((o.key || res[1])+'[]='+(o.key && o.expression ? res[1] : res[2]));
-		});
-		
-		return str.join('&');
-		
-	},
-	toArray: function(attr) {
-		
-		var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself
-		var ret = [];
-
-		items.each(function() { ret.push($(this).attr(attr || 'id')); });
-		return ret;
-		
-	},
-	/* Be careful with the following core functions */
-	intersectsWith: function(item) {
-		
-		var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
-		y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
-		var l = item.left, r = l + item.width, 
-		t = item.top, b = t + item.height;
-
-		if(this.options.tolerance == "pointer" || this.options.forcePointerForContainers || (this.options.tolerance == "guess" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) {
-			return (y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r);
-		} else {
-		
-			return (l < x1 + (this.helperProportions.width / 2) // Right Half
-				&& x2 - (this.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
-				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
-		
-		}
-		
-	},
-	intersectsWithEdge: function(item) {	
-		var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
-			y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
-		var l = item.left, r = l + item.width, 
-			t = item.top, b = t + item.height;
-
-		if(this.options.tolerance == "pointer" || (this.options.tolerance == "guess" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) {
-
-			if(!(y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r)) return false;
-			
-			if(this.floating) {
-				if(x1 + this.offset.click.left > l && x1 + this.offset.click.left < l + item.width/2) return 2;
-				if(x1 + this.offset.click.left > l+item.width/2 && x1 + this.offset.click.left < r) return 1;
-			} else {
-				if(y1 + this.offset.click.top > t && y1 + this.offset.click.top < t + item.height/2) return 2;
-				if(y1 + this.offset.click.top > t+item.height/2 && y1 + this.offset.click.top < b) return 1;
-			}
-
-		} else {
-		
-			if (!(l < x1 + (this.helperProportions.width / 2) // Right Half
-				&& x2 - (this.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
-				&& y2 - (this.helperProportions.height / 2) < b )) return false; // Top Half
-			
-			if(this.floating) {
-				if(x2 > l && x1 < l) return 2; //Crosses left edge
-				if(x1 < r && x2 > r) return 1; //Crosses right edge
-			} else {
-				if(y2 > t && y1 < t) return 1; //Crosses top edge
-				if(y1 < b && y2 > b) return 2; //Crosses bottom edge
-			}
-		
-		}
-		
-		return false;
-		
-	},
-	refresh: function() {
-		this.refreshItems();
-		this.refreshPositions();
-	},
-	refreshItems: function() {
-		
-		this.items = [];
-		this.containers = [this];
-		var items = this.items;
-		var self = this;
-		var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element), this]];
-	
-		if(this.options.connectWith) {
-			for (var i = this.options.connectWith.length - 1; i >= 0; i--){
-				var cur = $(this.options.connectWith[i]);
-				for (var j = cur.length - 1; j >= 0; j--){
-					var inst = $.data(cur[j], 'sortable');
-					if(inst && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element), inst]);
-						this.containers.push(inst);
-					}
-				};
-			};
-		}
-
-		for (var i = queries.length - 1; i >= 0; i--){
-			queries[i][0].each(function() {
-				$.data(this, 'sortable-item', queries[i][1]); // Data for target checking (mouse manager)
-				items.push({
-					item: $(this),
-					instance: queries[i][1],
-					width: 0, height: 0,
-					left: 0, top: 0
-				});
-			});
-		};
-
-	},
-	refreshPositions: function(fast) {
-
-		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
-		if(this.offsetParent) {
-			var po = this.offsetParent.offset();
-			this.offset.parent = { top: po.top + this.offsetParentBorders.top, left: po.left + this.offsetParentBorders.left };
-		}
-
-		for (var i = this.items.length - 1; i >= 0; i--){		
-			
-			//We ignore calculating positions of all connected containers when we're not over them
-			if(this.items[i].instance != this.currentContainer && this.currentContainer && this.items[i].item[0] != this.currentItem[0])
-				continue;
-				
-			var t = this.options.toleranceElement ? $(this.options.toleranceElement, this.items[i].item) : this.items[i].item;
-			
-			if(!fast) {
-				this.items[i].width = t[0].offsetWidth;
-				this.items[i].height = t[0].offsetHeight;
-			}
-			
-			var p = t.offset();
-			this.items[i].left = p.left;
-			this.items[i].top = p.top;
-			
-		};
-
-		if(this.options.custom && this.options.custom.refreshContainers) {
-			this.options.custom.refreshContainers.call(this);
-		} else {
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				var p =this.containers[i].element.offset();
-				this.containers[i].containerCache.left = p.left;
-				this.containers[i].containerCache.top = p.top;
-				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
-				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
-			};
-		}
-
-	},
-	destroy: function() {
-		this.element
-			.removeClass("ui-sortable ui-sortable-disabled")
-			.removeData("sortable")
-			.unbind(".sortable");
-		this.mouseDestroy();
-		
-		for ( var i = this.items.length - 1; i >= 0; i-- )
-			this.items[i].item.removeData("sortable-item");
-	},
-	createPlaceholder: function(that) {
-		
-		var self = that || this, o = self.options;
-
-		if(o.placeholder.constructor == String) {
-			var className = o.placeholder;
-			o.placeholder = {
-				element: function() {
-					return $('<div></div>').addClass(className)[0];
-				},
-				update: function(i, p) {
-					p.css(i.offset()).css({ width: i.outerWidth(), height: i.outerHeight() });
-				}
-			};
-		}
-		
-		self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem)).appendTo('body').css({ position: 'absolute' });
-		o.placeholder.update.call(self.element, self.currentItem, self.placeholder);
-	},
-	contactContainers: function(e) {
-		for (var i = this.containers.length - 1; i >= 0; i--){
-
-			if(this.intersectsWith(this.containers[i].containerCache)) {
-				if(!this.containers[i].containerCache.over) {
-					
-
-					if(this.currentContainer != this.containers[i]) {
-						
-						//When entering a new container, we will find the item with the least distance and append our item near it
-						var dist = 10000; var itemWithLeastDistance = null; var base = this.positionAbs[this.containers[i].floating ? 'left' : 'top'];
-						for (var j = this.items.length - 1; j >= 0; j--) {
-							if(!contains(this.containers[i].element[0], this.items[j].item[0])) continue;
-							var cur = this.items[j][this.containers[i].floating ? 'left' : 'top'];
-							if(Math.abs(cur - base) < dist) {
-								dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
-							}
-						}
-						
-						if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
-							continue;
-						
-						//We also need to exchange the placeholder
-						if(this.placeholder) this.placeholder.remove();
-						if(this.containers[i].options.placeholder) {
-							this.containers[i].createPlaceholder(this);
-						} else {
-							this.placeholder = null;;
-						}
-						
-						this.currentContainer = this.containers[i];
-						itemWithLeastDistance ? this.rearrange(e, itemWithLeastDistance, null, true) : this.rearrange(e, null, this.containers[i].element, true);
-						this.propagate("change", e); //Call plugins and callbacks
-						this.containers[i].propagate("change", e, this); //Call plugins and callbacks
-
-					}
-					
-					this.containers[i].propagate("over", e, this);
-					this.containers[i].containerCache.over = 1;
-				}
-			} else {
-				if(this.containers[i].containerCache.over) {
-					this.containers[i].propagate("out", e, this);
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-			
-		};			
-	},
-	mouseCapture: function(e, overrideHandle) {
-	
-		if(this.options.disabled || this.options.type == 'static') return false;
-
-		//We have to refresh the items data once first
-		this.refreshItems();
-
-		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		var currentItem = null, self = this, nodes = $(e.target).parents().each(function() {	
-			if($.data(this, 'sortable-item') == self) {
-				currentItem = $(this);
-				return false;
-			}
-		});
-		if($.data(e.target, 'sortable-item') == self) currentItem = $(e.target);
-
-		if(!currentItem) return false;
-		if(this.options.handle && !overrideHandle) {
-			var validHandle = false;
-			
-			$(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == e.target) validHandle = true; });
-			if(!validHandle) return false;
-		}
-			
-		this.currentItem = currentItem;
-		return true;	
-			
-	},
-	mouseStart: function(e, overrideHandle, noActivation) {
-
-		var o = this.options;
-		this.currentContainer = this;
-
-		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
-		this.refreshPositions();
-
-		//Create and append the visible helper			
-		this.helper = typeof o.helper == 'function' ? $(o.helper.apply(this.element[0], [e, this.currentItem])) : this.currentItem.clone();
-		if (!this.helper.parents('body').length) $(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(this.helper[0]); //Add the helper to the DOM if that didn't happen already
-		this.helper.css({ position: 'absolute', clear: 'both' }).addClass('ui-sortable-helper'); //Position it absolutely and add a helper class
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		this.margins = {																				//Cache the margins
-			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
-			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
-		};		
-	
-		this.offset = this.currentItem.offset();														//The element's absolute position on the page
-		this.offset = {																					//Substract the margins from the element's absolute offset
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-		
-		this.offset.click = {																			//Where the click happened, relative to the element
-			left: e.pageX - this.offset.left,
-			top: e.pageY - this.offset.top
-		};
-		
-		this.offsetParent = this.helper.offsetParent();													//Get the offsetParent and cache its position
-		var po = this.offsetParent.offset();			
-
-		this.offsetParentBorders = {
-			top: (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-		this.offset.parent = {																			//Store its position plus border
-			top: po.top + this.offsetParentBorders.top,
-			left: po.left + this.offsetParentBorders.left
-		};
-	
-		this.originalPosition = this.generatePosition(e);												//Generate the original position
-		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };  //Cache the former DOM position
-		
-		//If o.placeholder is used, create a new element at the given position with the class
-		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Cache the helper size
-		if(o.placeholder) this.createPlaceholder();
-		
-		//Call plugins and callbacks
-		this.propagate("start", e);
-		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Recache the helper size
-		
-		if(o.cursorAt) {
-			if(o.cursorAt.left != undefined) this.offset.click.left = o.cursorAt.left;
-			if(o.cursorAt.right != undefined) this.offset.click.left = this.helperProportions.width - o.cursorAt.right;
-			if(o.cursorAt.top != undefined) this.offset.click.top = o.cursorAt.top;
-			if(o.cursorAt.bottom != undefined) this.offset.click.top = this.helperProportions.height - o.cursorAt.bottom;
-		}
-
-		/*
-		 * - Position constraining -
-		 * Here we prepare position constraining like grid and containment.
-		 */	
-		
-		if(o.containment) {
-			if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-			if(o.containment == 'document' || o.containment == 'window') this.containment = [
-				0 - this.offset.parent.left,
-				0 - this.offset.parent.top,
-				$(o.containment == 'document' ? document : window).width() - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
-				($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
-			];
-
-			if(!(/^(document|window|parent)$/).test(o.containment)) {
-				var ce = $(o.containment)[0];
-				var co = $(o.containment).offset();
-				
-				this.containment = [
-					co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left,
-					co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top,
-					co.left+Math.max(ce.scrollWidth,ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.currentItem.css("marginRight"),10) || 0),
-					co.top+Math.max(ce.scrollHeight,ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.currentItem.css("marginBottom"),10) || 0)
-				];
-			}
-		}
-
-		//Set the original element visibility to hidden to still fill out the white space
-		if(this.options.placeholder != 'clone')
-			this.currentItem.css('visibility', 'hidden');
-		
-		//Post 'activate' events to possible containers
-		if(!noActivation) {
-			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i].propagate("activate", e, this); }
-		}
-		
-		//Prepare possible droppables
-		if($.ui.ddmanager) $.ui.ddmanager.current = this;
-		if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e);
-
-		this.dragging = true;
-
-		this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-		return true;
-
-
-	},
-	convertPositionTo: function(d, pos) {
-		if(!pos) pos = this.position;
-		var mod = d == "absolute" ? 1 : -1;
-		return {
-			top: (
-				pos.top																	// the calculated relative position
-				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
-				- (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) * mod	// The offsetParent's scroll position
-				+ this.margins.top * mod												//Add the margin (you don't want the margin counting in intersection methods)
-			),
-			left: (
-				pos.left																// the calculated relative position
-				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
-				- (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft) * mod	// The offsetParent's scroll position
-				+ this.margins.left * mod												//Add the margin (you don't want the margin counting in intersection methods)
-			)
-		};
-	},
-	generatePosition: function(e) {
-		
-		var o = this.options;
-		var position = {
-			top: (
-				e.pageY																	// The absolute mouse position
-				- this.offset.click.top													// Click offset (relative to the element)
-				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
-				+ (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)	// The offsetParent's scroll position, not if the element is fixed
-			),
-			left: (
-				e.pageX																	// The absolute mouse position
-				- this.offset.click.left												// Click offset (relative to the element)
-				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
-				+ (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft)	// The offsetParent's scroll position, not if the element is fixed
-			)
-		};
-		
-		if(!this.originalPosition) return position;										//If we are not dragging yet, we won't check for options
-		
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-		if(this.containment) {
-			if(position.left < this.containment[0]) position.left = this.containment[0];
-			if(position.top < this.containment[1]) position.top = this.containment[1];
-			if(position.left > this.containment[2]) position.left = this.containment[2];
-			if(position.top > this.containment[3]) position.top = this.containment[3];
-		}
-		
-		if(o.grid) {
-			var top = this.originalPosition.top + Math.round((position.top - this.originalPosition.top) / o.grid[1]) * o.grid[1];
-			position.top = this.containment ? (!(top < this.containment[1] || top > this.containment[3]) ? top : (!(top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-			
-			var left = this.originalPosition.left + Math.round((position.left - this.originalPosition.left) / o.grid[0]) * o.grid[0];
-			position.left = this.containment ? (!(left < this.containment[0] || left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-		}
-		
-		return position;
-	},
-	mouseDrag: function(e) {
-
-		//Compute the helpers position
-		this.position = this.generatePosition(e);
-		this.positionAbs = this.convertPositionTo("absolute");
-
-		//Call the internal plugins
-		$.ui.plugin.call(this, "sort", [e, this.ui()]);
-		
-		//Regenerate the absolute position used for position checks
-		this.positionAbs = this.convertPositionTo("absolute");
-		
-		//Set the helper's position
-		this.helper[0].style.left = this.position.left+'px';
-		this.helper[0].style.top = this.position.top+'px';
-
-		//Rearrange
-		for (var i = this.items.length - 1; i >= 0; i--) {
-			var intersection = this.intersectsWithEdge(this.items[i]);
-			if(!intersection) continue;
-			
-			if(this.items[i].item[0] != this.currentItem[0] //cannot intersect with itself
-				&&	this.currentItem[intersection == 1 ? "next" : "prev"]()[0] != this.items[i].item[0] //no useless actions that have been done before
-				&&	!contains(this.currentItem[0], this.items[i].item[0]) //no action if the item moved is the parent of the item checked
-				&& (this.options.type == 'semi-dynamic' ? !contains(this.element[0], this.items[i].item[0]) : true)
-			) {
-				
-				this.direction = intersection == 1 ? "down" : "up";
-				this.rearrange(e, this.items[i]);
-				this.propagate("change", e); //Call plugins and callbacks
-				break;
-			}
-		}
-		
-		//Post events to containers
-		this.contactContainers(e);
-		
-		//Interconnect with droppables
-		if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
-
-		//Call callbacks
-		this.element.triggerHandler("sort", [e, this.ui()], this.options["sort"]);
-
-		return false;
-		
-	},
-	rearrange: function(e, i, a, hardRefresh) {
-		a ? a[0].appendChild(this.currentItem[0]) : i.item[0].parentNode.insertBefore(this.currentItem[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
-		
-		//Various things done here to improve the performance:
-		// 1. we create a setTimeout, that calls refreshPositions
-		// 2. on the instance, we have a counter variable, that get's higher after every append
-		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
-		// 4. this lets only the last addition to the timeout stack through
-		this.counter = this.counter ? ++this.counter : 1;
-		var self = this, counter = this.counter;
-
-		window.setTimeout(function() {
-			if(counter == self.counter) self.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
-		},0);
-		
-		if(this.options.placeholder)
-			this.options.placeholder.update.call(this.element, this.currentItem, this.placeholder);
-	},
-	mouseStop: function(e, noPropagation) {
-
-		//If we are using droppables, inform the manager about the drop
-		if ($.ui.ddmanager && !this.options.dropBehaviour)
-			$.ui.ddmanager.drop(this, e);
-			
-		if(this.options.revert) {
-			var self = this;
-			var cur = self.currentItem.offset();
-
-			//Also animate the placeholder if we have one
-			if(self.placeholder) self.placeholder.animate({ opacity: 'hide' }, (parseInt(this.options.revert, 10) || 500)-50);
-
-			$(this.helper).animate({
-				left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
-				top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
-			}, parseInt(this.options.revert, 10) || 500, function() {
-				self.clear(e);
-			});
-		} else {
-			this.clear(e, noPropagation);
-		}
-
-		return false;
-		
-	},
-	clear: function(e, noPropagation) {
-
-		if(this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) this.propagate("update", e, null, noPropagation); //Trigger update callback if the DOM position has changed
-		if(!contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
-			this.propagate("remove", e, null, noPropagation);
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				if(contains(this.containers[i].element[0], this.currentItem[0])) {
-					this.containers[i].propagate("update", e, this, noPropagation);
-					this.containers[i].propagate("receive", e, this, noPropagation);
-				}
-			};
-		};
-		
-		//Post events to containers
-		for (var i = this.containers.length - 1; i >= 0; i--){
-			this.containers[i].propagate("deactivate", e, this, noPropagation);
-			if(this.containers[i].containerCache.over) {
-				this.containers[i].propagate("out", e, this);
-				this.containers[i].containerCache.over = 0;
-			}
-		}
-		
-		this.dragging = false;
-		if(this.cancelHelperRemoval) {
-			this.propagate("stop", e, null, noPropagation);
-			return false;
-		}
-		
-		$(this.currentItem).css('visibility', '');
-		if(this.placeholder) this.placeholder.remove();
-		this.helper.remove(); this.helper = null;
-		this.propagate("stop", e, null, noPropagation);
-		
-		return true;
-		
-	}
-}));
-
-$.extend($.ui.sortable, {
-	getter: "serialize toArray",
-	defaults: {
-		helper: "clone",
-		tolerance: "guess",
-		distance: 1,
-		delay: 0,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		cancel: ":input",
-		items: '> *',
-		zIndex: 1000,
-		dropOnEmpty: true,
-		appendTo: "parent"
-	}
-});
-
-/*
- * Sortable Extensions
- */
-
-$.ui.plugin.add("sortable", "cursor", {
-	start: function(e, ui) {
-		var t = $('body');
-		if (t.css("cursor")) ui.options._cursor = t.css("cursor");
-		t.css("cursor", ui.options.cursor);
-	},
-	stop: function(e, ui) {
-		if (ui.options._cursor) $('body').css("cursor", ui.options._cursor);
-	}
-});
-
-$.ui.plugin.add("sortable", "zIndex", {
-	start: function(e, ui) {
-		var t = ui.helper;
-		if(t.css("zIndex")) ui.options._zIndex = t.css("zIndex");
-		t.css('zIndex', ui.options.zIndex);
-	},
-	stop: function(e, ui) {
-		if(ui.options._zIndex) $(ui.helper).css('zIndex', ui.options._zIndex);
-	}
-});
-
-$.ui.plugin.add("sortable", "opacity", {
-	start: function(e, ui) {
-		var t = ui.helper;
-		if(t.css("opacity")) ui.options._opacity = t.css("opacity");
-		t.css('opacity', ui.options.opacity);
-	},
-	stop: function(e, ui) {
-		if(ui.options._opacity) $(ui.helper).css('opacity', ui.options._opacity);
-	}
-});
-
-$.ui.plugin.add("sortable", "scroll", {
-	start: function(e, ui) {
-		var o = ui.options;
-		var i = $(this).data("sortable");
-	
-		i.overflowY = function(el) {
-			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
-			return $(document);
-		}(i.currentItem);
-		i.overflowX = function(el) {
-			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
-			return $(document);
-		}(i.currentItem);
-		
-		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') i.overflowYOffset = i.overflowY.offset();
-		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') i.overflowXOffset = i.overflowX.offset();
-		
-	},
-	sort: function(e, ui) {
-		
-		var o = ui.options;
-		var i = $(this).data("sortable");
-		
-		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') {
-			if((i.overflowYOffset.top + i.overflowY[0].offsetHeight) - e.pageY < o.scrollSensitivity)
-				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop + o.scrollSpeed;
-			if(e.pageY - i.overflowYOffset.top < o.scrollSensitivity)
-				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop - o.scrollSpeed;
-		} else {
-			if(e.pageY - $(document).scrollTop() < o.scrollSensitivity)
-				$(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-			if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-				$(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-		}
-		
-		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') {
-			if((i.overflowXOffset.left + i.overflowX[0].offsetWidth) - e.pageX < o.scrollSensitivity)
-				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft + o.scrollSpeed;
-			if(e.pageX - i.overflowXOffset.left < o.scrollSensitivity)
-				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft - o.scrollSpeed;
-		} else {
-			if(e.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-				$(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-			if($(window).width() - (e.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-				$(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-		}
-		
-	}
-});
-
-$.ui.plugin.add("sortable", "axis", {
-	sort: function(e, ui) {
-		
-		var i = $(this).data("sortable");
-		
-		if(ui.options.axis == "y") i.position.left = i.originalPosition.left;
-		if(ui.options.axis == "x") i.position.top = i.originalPosition.top;
-		
-	}
-});
-
-})(jQuery);
Index: js/ui/effects.bounce.js
===================================================================
--- js/ui/effects.bounce.js	(revision 6370)
+++ js/ui/effects.bounce.js	(working copy)
@@ -1,78 +0,0 @@
-/*
- * jQuery UI Effects Bounce
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Bounce
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.bounce = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var direction = o.options.direction || 'up'; // Default direction
-		var distance = o.options.distance || 20; // Default distance
-		var times = o.options.times || 5; // Default # of times
-		var speed = o.duration || 250; // Default speed per bounce
-		if (/show|hide/.test(mode)) props.push('opacity'); // Avoid touching opacity to prevent clearType and PNG issues in IE
-
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		$.effects.createWrapper(el); // Create Wrapper
-		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
-		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
-		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 3 : el.outerWidth({margin:true}) / 3);
-		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
-		if (mode == 'hide') distance = distance / (times * 2);
-		if (mode != 'hide') times--;
-		
-		// Animate
-		if (mode == 'show') { // Show Bounce
-			var animation = {opacity: 1};
-			animation[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
-			el.animate(animation, speed / 2, o.options.easing);
-			distance = distance / 2;
-			times--;
-		};
-		for (var i = 0; i < times; i++) { // Bounces
-			var animation1 = {}, animation2 = {};
-			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
-			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
-			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing);
-			distance = (mode == 'hide') ? distance * 2 : distance / 2;
-		};
-		if (mode == 'hide') { // Last Bounce
-			var animation = {opacity: 0};
-			animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
-			el.animate(animation, speed / 2, o.options.easing, function(){
-				el.hide(); // Hide
-				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-				if(o.callback) o.callback.apply(this, arguments); // Callback
-			});
-		} else {
-			var animation1 = {}, animation2 = {};
-			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
-			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
-			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing, function(){
-				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-				if(o.callback) o.callback.apply(this, arguments); // Callback
-			});
-		};
-		el.queue('fx', function() { el.dequeue(); });
-		el.dequeue();
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/effects.pulsate.js
===================================================================
--- js/ui/effects.pulsate.js	(revision 6370)
+++ js/ui/effects.pulsate.js	(working copy)
@@ -1,55 +0,0 @@
-/*
- * jQuery UI Effects Pulsate
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Pulsate
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.pulsate = function(o) {
-
-	return this.queue(function() {
-		
-		// Create element
-		var el = $(this);
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
-		var times = o.options.times || 5; // Default # of times
-		
-		// Adjust
-		if (mode == 'hide') times--;
-		if (el.is(':hidden')) { // Show fadeIn
-			el.css('opacity', 0);
-			el.show(); // Show
-			el.animate({opacity: 1}, o.duration / 2, o.options.easing);
-			times = times-2;
-		}
-		
-		// Animate
-		for (var i = 0; i < times; i++) { // Pulsate
-			el.animate({opacity: 0}, o.duration / 2, o.options.easing).animate({opacity: 1}, o.duration / 2, o.options.easing);
-		};
-		if (mode == 'hide') { // Last Pulse
-			el.animate({opacity: 0}, o.duration / 2, o.options.easing, function(){
-				el.hide(); // Hide
-				if(o.callback) o.callback.apply(this, arguments); // Callback
-			});
-		} else {
-			el.animate({opacity: 0}, o.duration / 2, o.options.easing).animate({opacity: 1}, o.duration / 2, o.options.easing, function(){
-				if(o.callback) o.callback.apply(this, arguments); // Callback
-			});
-		};
-		el.queue('fx', function() { el.dequeue(); });
-		el.dequeue();
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/ui.resizable.js
===================================================================
--- js/ui/ui.resizable.js	(revision 6370)
+++ js/ui/ui.resizable.js	(working copy)
@@ -1,770 +0,0 @@
-/*
- * jQuery UI Resizable
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.resizable", $.extend({}, $.ui.mouse, {
-	init: function() {
-
-		var self = this, o = this.options;
-
-		var elpos = this.element.css('position');
-		
-		this.originalElement = this.element;
-		
-		// simulate .ui-resizable { position: relative; }
-		this.element.addClass("ui-resizable").css({ position: /static/.test(elpos) ? 'relative' : elpos });
-		
-		$.extend(o, {
-			_aspectRatio: !!(o.aspectRatio),
-			helper: o.helper || o.ghost || o.animate ? o.helper || 'proxy' : null,
-			knobHandles: o.knobHandles === true ? 'ui-resizable-knob-handle' : o.knobHandles
-		});
-		
-		//Default Theme
-		var aBorder = '1px solid #DEDEDE';
-		
-		o.defaultTheme = {
-			'ui-resizable': { display: 'block' },
-			'ui-resizable-handle': { position: 'absolute', background: '#F2F2F2', fontSize: '0.1px' },
-			'ui-resizable-n': { cursor: 'n-resize', height: '4px', left: '0px', right: '0px', borderTop: aBorder },
-			'ui-resizable-s': { cursor: 's-resize', height: '4px', left: '0px', right: '0px', borderBottom: aBorder },
-			'ui-resizable-e': { cursor: 'e-resize', width: '4px', top: '0px', bottom: '0px', borderRight: aBorder },
-			'ui-resizable-w': { cursor: 'w-resize', width: '4px', top: '0px', bottom: '0px', borderLeft: aBorder },
-			'ui-resizable-se': { cursor: 'se-resize', width: '4px', height: '4px', borderRight: aBorder, borderBottom: aBorder },
-			'ui-resizable-sw': { cursor: 'sw-resize', width: '4px', height: '4px', borderBottom: aBorder, borderLeft: aBorder },
-			'ui-resizable-ne': { cursor: 'ne-resize', width: '4px', height: '4px', borderRight: aBorder, borderTop: aBorder },
-			'ui-resizable-nw': { cursor: 'nw-resize', width: '4px', height: '4px', borderLeft: aBorder, borderTop: aBorder }
-		};
-		
-		o.knobTheme = {
-			'ui-resizable-handle': { background: '#F2F2F2', border: '1px solid #808080', height: '8px', width: '8px' },
-			'ui-resizable-n': { cursor: 'n-resize', top: '0px', left: '45%' },
-			'ui-resizable-s': { cursor: 's-resize', bottom: '0px', left: '45%' },
-			'ui-resizable-e': { cursor: 'e-resize', right: '0px', top: '45%' },
-			'ui-resizable-w': { cursor: 'w-resize', left: '0px', top: '45%' },
-			'ui-resizable-se': { cursor: 'se-resize', right: '0px', bottom: '0px' },
-			'ui-resizable-sw': { cursor: 'sw-resize', left: '0px', bottom: '0px' },
-			'ui-resizable-nw': { cursor: 'nw-resize', left: '0px', top: '0px' },
-			'ui-resizable-ne': { cursor: 'ne-resize', right: '0px', top: '0px' }
-		};
-		
-		o._nodeName = this.element[0].nodeName;
-		
-		//Wrap the element if it cannot hold child nodes
-		if(o._nodeName.match(/canvas|textarea|input|select|button|img/i)) {
-			var el = this.element;
-			
-			//Opera fixing relative position
-			if (/relative/.test(el.css('position')) && $.browser.opera)
-				el.css({ position: 'relative', top: 'auto', left: 'auto' });
-			
-			//Create a wrapper element and set the wrapper to the new current internal element
-			el.wrap(
-				$('<div class="ui-wrapper"	style="overflow: hidden;"></div>').css( {
-					position: el.css('position'),
-					width: el.outerWidth(),
-					height: el.outerHeight(),
-					top: el.css('top'),
-					left: el.css('left')
-				})
-			);
-			
-			var oel = this.element; this.element = this.element.parent();
-			
-			// store instance on wrapper
-			this.element.data('resizable', this); 
-			
-			//Move margins to the wrapper
-			this.element.css({ marginLeft: oel.css("marginLeft"), marginTop: oel.css("marginTop"),
-				marginRight: oel.css("marginRight"), marginBottom: oel.css("marginBottom")
-			});
-			
-			oel.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
-			
-			//Prevent Safari textarea resize
-			if ($.browser.safari && o.preventDefault) oel.css('resize', 'none');
-			
-			o.proportionallyResize = oel.css({ position: 'static', zoom: 1, display: 'block' });
-			
-			// avoid IE jump
-			this.element.css({ margin: oel.css('margin') });
-			
-			// fix handlers offset
-			this._proportionallyResize();
-		}
-		
-		if(!o.handles) o.handles = !$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' };
-		if(o.handles.constructor == String) {
-			
-			o.zIndex = o.zIndex || 1000;
-			
-			if(o.handles == 'all') o.handles = 'n,e,s,w,se,sw,ne,nw';
-			
-			var n = o.handles.split(","); o.handles = {};
-			
-			// insertions are applied when don't have theme loaded
-			var insertionsDefault = {
-				handle: 'position: absolute; display: none; overflow:hidden;',
-				n: 'top: 0pt; width:100%;',
-				e: 'right: 0pt; height:100%;',
-				s: 'bottom: 0pt; width:100%;',
-				w: 'left: 0pt; height:100%;',
-				se: 'bottom: 0pt; right: 0px;',
-				sw: 'bottom: 0pt; left: 0px;',
-				ne: 'top: 0pt; right: 0px;',
-				nw: 'top: 0pt; left: 0px;'
-			};
-			
-			for(var i = 0; i < n.length; i++) {
-				var handle = $.trim(n[i]), dt = o.defaultTheme, hname = 'ui-resizable-'+handle, loadDefault = !$.ui.css(hname) && !o.knobHandles, userKnobClass = $.ui.css('ui-resizable-knob-handle'), 
-							allDefTheme = $.extend(dt[hname], dt['ui-resizable-handle']), allKnobTheme = $.extend(o.knobTheme[hname], !userKnobClass ? o.knobTheme['ui-resizable-handle'] : {});
-				
-				// increase zIndex of sw, se, ne, nw axis
-				var applyZIndex = /sw|se|ne|nw/.test(handle) ? { zIndex: ++o.zIndex } : {};
-				
-				var defCss = (loadDefault ? insertionsDefault[handle] : ''), 
-					axis = $(['<div class="ui-resizable-handle ', hname, '" style="', defCss, insertionsDefault.handle, '"></div>'].join('')).css( applyZIndex );
-				o.handles[handle] = '.ui-resizable-'+handle;
-				
-				this.element.append(
-					//Theme detection, if not loaded, load o.defaultTheme
-					axis.css( loadDefault ? allDefTheme : {} )
-						// Load the knobHandle css, fix width, height, top, left...
-						.css( o.knobHandles ? allKnobTheme : {} ).addClass(o.knobHandles ? 'ui-resizable-knob-handle' : '').addClass(o.knobHandles)
-				);
-			}
-			
-			if (o.knobHandles) this.element.addClass('ui-resizable-knob').css( !$.ui.css('ui-resizable-knob') ? { /*border: '1px #fff dashed'*/ } : {} );
-		}
-		
-		this._renderAxis = function(target) {
-			target = target || this.element;
-			
-			for(var i in o.handles) {
-				if(o.handles[i].constructor == String) 
-					o.handles[i] = $(o.handles[i], this.element).show();
-				
-				if (o.transparent)
-					o.handles[i].css({opacity:0});
-				
-				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
-				if (this.element.is('.ui-wrapper') && 
-					o._nodeName.match(/textarea|input|select|button/i)) {
-					
-					var axis = $(o.handles[i], this.element), padWrapper = 0;
-					
-					//Checking the correct pad and border
-					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
-					
-					//The padding type i have to apply...
-					var padPos = [ 'padding', 
-						/ne|nw|n/.test(i) ? 'Top' :
-						/se|sw|s/.test(i) ? 'Bottom' : 
-						/^e$/.test(i) ? 'Right' : 'Left' ].join(""); 
-					
-					if (!o.transparent)
-						target.css(padPos, padWrapper);
-					
-					this._proportionallyResize();
-				}
-				if(!$(o.handles[i]).length) continue;
-			}
-		};
-		
-		this._renderAxis(this.element);
-		o._handles = $('.ui-resizable-handle', self.element);
-		
-		if (o.disableSelection)
-			o._handles.each(function(i, e) { $.ui.disableSelection(e); });
-		
-		//Matching axis name
-		o._handles.mouseover(function() {
-			if (!o.resizing) {
-				if (this.className) 
-					var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
-				//Axis, default = se
-				self.axis = o.axis = axis && axis[1] ? axis[1] : 'se';
-			}
-		});
-		
-		//If we want to auto hide the elements
-		if (o.autoHide) {
-			o._handles.hide();
-			$(self.element).addClass("ui-resizable-autohide").hover(function() {
-				$(this).removeClass("ui-resizable-autohide");
-				o._handles.show();
-			},
-			function(){
-				if (!o.resizing) {
-					$(this).addClass("ui-resizable-autohide");
-					o._handles.hide();
-				}
-			});
-		}
-		
-		this.mouseInit();
-	},
-	plugins: {},
-	ui: function() {
-		return {
-			originalElement: this.originalElement,
-			element: this.element,
-			helper: this.helper,
-			position: this.position,
-			size: this.size,
-			options: this.options,
-			originalSize: this.originalSize,
-			originalPosition: this.originalPosition
-		};
-	},
-	propagate: function(n,e) {
-		$.ui.plugin.call(this, n, [e, this.ui()]);
-		if (n != "resize") this.element.triggerHandler(["resize", n].join(""), [e, this.ui()], this.options[n]);
-	},
-	destroy: function() {
-		var el = this.element, wrapped = el.children(".ui-resizable").get(0);
-		
-		this.mouseDestroy();
-		
-		var _destroy = function(exp) {
-			$(exp).removeClass("ui-resizable ui-resizable-disabled")
-				.removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
-		};
-		
-		_destroy(el);
-		
-		if (el.is('.ui-wrapper') && wrapped) {
-			el.parent().append(
-				$(wrapped).css({
-					position: el.css('position'),
-					width: el.outerWidth(),
-					height: el.outerHeight(),
-					top: el.css('top'),
-					left: el.css('left')
-				})
-			).end().remove();
-			
-			_destroy(wrapped);
-		}
-	},
-	mouseStart: function(e) {
-		if(this.options.disabled) return false;
-		
-		var handle = false;
-		for(var i in this.options.handles) {
-			if($(this.options.handles[i])[0] == e.target) handle = true;
-		}
-		if (!handle) return false;
-		
-		var o = this.options, iniPos = this.element.position(), el = this.element, 
-			num = function(v) { return parseInt(v, 10) || 0; }, ie6 = $.browser.msie && $.browser.version < 7;
-		o.resizing = true;
-		o.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
-		
-		// bugfix #1749
-		if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
-			
-			// sOffset decides if document scrollOffset will be added to the top/left of the resizable element
-			var sOffset = $.browser.msie && !o.containment && (/absolute/).test(el.css('position')) && !(/relative/).test(el.parent().css('position'));
-			var dscrollt = sOffset ? o.documentScroll.top : 0, dscrolll = sOffset ? o.documentScroll.left : 0;
-			
-			el.css({ position: 'absolute', top: (iniPos.top + dscrollt), left: (iniPos.left + dscrolll) });
-		}
-		
-		//Opera fixing relative position
-		if ($.browser.opera && /relative/.test(el.css('position')))
-			el.css({ position: 'relative', top: 'auto', left: 'auto' });
-		
-		this._renderProxy();
-		
-		var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
-		
-		if (o.containment) {
-			curleft += $(o.containment).scrollLeft()||0;
-			curtop += $(o.containment).scrollTop()||0;
-		}
-		
-		//Store needed variables
-		this.offset = this.helper.offset();
-		this.position = { left: curleft, top: curtop };
-		this.size = o.helper || ie6 ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
-		this.originalSize = o.helper || ie6 ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
-		this.originalPosition = { left: curleft, top: curtop };
-		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
-		this.originalMousePosition = { left: e.pageX, top: e.pageY };
-		
-		//Aspect Ratio
-		o.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.height / this.originalSize.width)||1);
-		
-		if (o.preserveCursor)
-			$('body').css('cursor', this.axis + '-resize');
-			
-		this.propagate("start", e);
-		return true;
-	},
-	mouseDrag: function(e) {
-		
-		//Increase performance, avoid regex
-		var el = this.helper, o = this.options, props = {},
-			self = this, smp = this.originalMousePosition, a = this.axis;
-		
-		var dx = (e.pageX-smp.left)||0, dy = (e.pageY-smp.top)||0;
-		var trigger = this._change[a];
-		if (!trigger) return false;
-		
-		// Calculate the attrs that will be change
-		var data = trigger.apply(this, [e, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
-		
-		if (o._aspectRatio || e.shiftKey)
-			data = this._updateRatio(data, e);
-		
-		data = this._respectSize(data, e);
-		
-		// plugins callbacks need to be called first
-		this.propagate("resize", e);
-		
-		el.css({
-			top: this.position.top + "px", left: this.position.left + "px", 
-			width: this.size.width + "px", height: this.size.height + "px"
-		});
-		
-		if (!o.helper && o.proportionallyResize)
-			this._proportionallyResize();
-		
-		this._updateCache(data);
-		
-		// calling the user callback at the end
-		this.element.triggerHandler("resize", [e, this.ui()], this.options["resize"]);
-		
-		return false;
-	},
-	mouseStop: function(e) {
-		
-		this.options.resizing = false;
-		var o = this.options, num = function(v) { return parseInt(v, 10) || 0; }, self = this;
-		
-		if(o.helper) {
-			var pr = o.proportionallyResize, ista = pr && (/textarea/i).test(pr.get(0).nodeName), 
-						soffseth = ista && $.ui.hasScroll(pr.get(0), 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
-							soffsetw = ista ? 0 : self.sizeDiff.width;
-			
-			var s = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
-				left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null, 
-				top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
-			
-			if (!o.animate)
-				this.element.css($.extend(s, { top: top, left: left }));
-			
-			if (o.helper && !o.animate) this._proportionallyResize();
-		}
-		
-		if (o.preserveCursor)
-			$('body').css('cursor', 'auto');
-		
-		this.propagate("stop", e);
-		
-		if (o.helper) this.helper.remove();
-		
-		return false;
-	},
-	_updateCache: function(data) {
-		var o = this.options;
-		this.offset = this.helper.offset();
-		if (data.left) this.position.left = data.left;
-		if (data.top) this.position.top = data.top;
-		if (data.height) this.size.height = data.height;
-		if (data.width) this.size.width = data.width;
-	},
-	_updateRatio: function(data, e) {
-		var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
-		
-		if (data.height) data.width = (csize.height / o.aspectRatio);
-		else if (data.width) data.height = (csize.width * o.aspectRatio);
-		
-		if (a == 'sw') {
-			data.left = cpos.left + (csize.width - data.width);
-			data.top = null;
-		}
-		if (a == 'nw') { 
-			data.top = cpos.top + (csize.height - data.height);
-			data.left = cpos.left + (csize.width - data.width);
-		}
-		
-		return data;
-	},
-	_respectSize: function(data, e) {
-		
-		var el = this.helper, o = this.options, pRatio = o._aspectRatio || e.shiftKey, a = this.axis, 
-				ismaxw = data.width && o.maxWidth && o.maxWidth < data.width, ismaxh = data.height && o.maxHeight && o.maxHeight < data.height,
-					isminw = data.width && o.minWidth && o.minWidth > data.width, isminh = data.height && o.minHeight && o.minHeight > data.height;
-		
-		if (isminw) data.width = o.minWidth;
-		if (isminh) data.height = o.minHeight;
-		if (ismaxw) data.width = o.maxWidth;
-		if (ismaxh) data.height = o.maxHeight;
-		
-		var dw = this.originalPosition.left + this.originalSize.width, dh = this.position.top + this.size.height;
-		var cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
-		
-		if (isminw && cw) data.left = dw - o.minWidth;
-		if (ismaxw && cw) data.left = dw - o.maxWidth;
-		if (isminh && ch)	data.top = dh - o.minHeight;
-		if (ismaxh && ch)	data.top = dh - o.maxHeight;
-		
-		// fixing jump error on top/left - bug #2330
-		var isNotwh = !data.width && !data.height;
-		if (isNotwh && !data.left && data.top) data.top = null;
-		else if (isNotwh && !data.top && data.left) data.left = null;
-		
-		return data;
-	},
-	_proportionallyResize: function() {
-		var o = this.options;
-		if (!o.proportionallyResize) return;
-		var prel = o.proportionallyResize, el = this.helper || this.element;
-		
-		if (!o.borderDif) {
-			var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
-				p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
-			
-			o.borderDif = $.map(b, function(v, i) {
-				var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
-				return border + padding; 
-			});
-		}
-		prel.css({
-			height: (el.height() - o.borderDif[0] - o.borderDif[2]) + "px",
-			width: (el.width() - o.borderDif[1] - o.borderDif[3]) + "px"
-		});
-	},
-	_renderProxy: function() {
-		var el = this.element, o = this.options;
-		this.elementOffset = el.offset();
-		
-		if(o.helper) {
-			this.helper = this.helper || $('<div style="overflow:hidden;"></div>');
-			
-			// fix ie6 offset
-			var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
-			pxyoffset = ( ie6 ? 2 : -1 );
-			
-			this.helper.addClass(o.helper).css({
-				width: el.outerWidth() + pxyoffset,
-				height: el.outerHeight() + pxyoffset,
-				position: 'absolute',
-				left: this.elementOffset.left - ie6offset +'px',
-				top: this.elementOffset.top - ie6offset +'px',
-				zIndex: ++o.zIndex
-			});
-			
-			this.helper.appendTo("body");
-			
-			if (o.disableSelection)
-				$.ui.disableSelection(this.helper.get(0));
-			
-		} else {
-			this.helper = el; 
-		}
-	},
-	_change: {
-		e: function(e, dx, dy) {
-			return { width: this.originalSize.width + dx };
-		},
-		w: function(e, dx, dy) {
-			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
-			return { left: sp.left + dx, width: cs.width - dx };
-		},
-		n: function(e, dx, dy) {
-			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
-			return { top: sp.top + dy, height: cs.height - dy };
-		},
-		s: function(e, dx, dy) {
-			return { height: this.originalSize.height + dy };
-		},
-		se: function(e, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [e, dx, dy]));
-		},
-		sw: function(e, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [e, dx, dy]));
-		},
-		ne: function(e, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [e, dx, dy]));
-		},
-		nw: function(e, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [e, dx, dy]));
-		}
-	}
-}));
-
-$.extend($.ui.resizable, {
-	defaults: {
-		cancel: ":input",
-		distance: 1,
-		delay: 0,
-		preventDefault: true,
-		transparent: false,
-		minWidth: 10,
-		minHeight: 10,
-		aspectRatio: false,
-		disableSelection: true,
-		preserveCursor: true,
-		autoHide: false,
-		knobHandles: false
-	}
-});
-
-/*
- * Resizable Extensions
- */
-
-$.ui.plugin.add("resizable", "containment", {
-	
-	start: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), el = self.element;
-		var oc = o.containment,	ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
-		if (!ce) return;
-		
-		self.containerElement = $(ce);
-		
-		if (/document/.test(oc) || oc == document) {
-			self.containerOffset = { left: 0, top: 0 };
-			self.containerPosition = { left: 0, top: 0 };
-			
-			self.parentData = { 
-				element: $(document), left: 0, top: 0, 
-				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
-			};
-		}
-		
-				
-		// i'm a node, so compute top, left, right, bottom
-		else{
-			self.containerOffset = $(ce).offset();
-			self.containerPosition = $(ce).position();
-			self.containerSize = { height: $(ce).innerHeight(), width: $(ce).innerWidth() };
-		
-			var co = self.containerOffset, ch = self.containerSize.height,	cw = self.containerSize.width, 
-						width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
-		
-			self.parentData = { 
-				element: ce, left: co.left, top: co.top, width: width, height: height
-			};
-		}
-	},
-	
-	resize: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), 
-				ps = self.containerSize, co = self.containerOffset, cs = self.size, cp = self.position,
-				pRatio = o._aspectRatio || e.shiftKey, cop = { top:0, left:0 }, ce = self.containerElement;
-		
-		if (ce[0] != document && /static/.test(ce.css('position')))
-			cop = self.containerPosition;
-		
-		if (cp.left < (o.helper ? co.left : cop.left)) {
-			self.size.width = self.size.width + (o.helper ? (self.position.left - co.left) : (self.position.left - cop.left));
-			if (pRatio) self.size.height = self.size.width * o.aspectRatio;
-			self.position.left = o.helper ? co.left : cop.left;
-		}
-		
-		if (cp.top < (o.helper ? co.top : 0)) {
-			self.size.height = self.size.height + (o.helper ? (self.position.top - co.top) : self.position.top);
-			if (pRatio) self.size.width = self.size.height / o.aspectRatio;
-			self.position.top = o.helper ? co.top : 0;
-		}
-		
-		var woset = (o.helper ? self.offset.left - co.left : (self.position.left - cop.left)) + self.sizeDiff.width, 
-					hoset = (o.helper ? self.offset.top - co.top : self.position.top) + self.sizeDiff.height;
-		
-		if (woset + self.size.width >= self.parentData.width) {
-			self.size.width = self.parentData.width - woset;
-			if (pRatio) self.size.height = self.size.width * o.aspectRatio;
-		}
-		
-		if (hoset + self.size.height >= self.parentData.height) {
-			self.size.height = self.parentData.height - hoset;
-			if (pRatio) self.size.width = self.size.height / o.aspectRatio;
-		}
-	},
-	
-	stop: function(e, ui){
-		var o = ui.options, self = $(this).data("resizable"), cp = self.position,
-				co = self.containerOffset, cop = self.containerPosition, ce = self.containerElement;
-		
-		var helper = $(self.helper), ho = helper.offset(), w = helper.innerWidth(), h = helper.innerHeight();
-		
-		
-		if (o.helper && !o.animate && /relative/.test(ce.css('position')))
-			$(this).css({ left: (ho.left - co.left), top: (ho.top - co.top), width: w, height: h });
-		
-		if (o.helper && !o.animate && /static/.test(ce.css('position')))
-			$(this).css({ left: cop.left + (ho.left - co.left), top: cop.top + (ho.top - co.top), width: w, height: h });
-		
-	}
-});
-
-$.ui.plugin.add("resizable", "grid", {
-	
-	resize: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), cs = self.size, os = self.originalSize, op = self.originalPosition, a = self.axis, ratio = o._aspectRatio || e.shiftKey;
-		o.grid = typeof o.grid == "number" ? [o.grid, o.grid] : o.grid;
-		var ox = Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[0]||1), oy = Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.grid[1]||1);
-		
-		if (/^(se|s|e)$/.test(a)) {
-			self.size.width = os.width + ox;
-			self.size.height = os.height + oy;
-		}
-		else if (/^(ne)$/.test(a)) {
-			self.size.width = os.width + ox;
-			self.size.height = os.height + oy;
-			self.position.top = op.top - oy;
-		}
-		else if (/^(sw)$/.test(a)) {
-			self.size.width = os.width + ox;
-			self.size.height = os.height + oy;
-			self.position.left = op.left - ox;
-		}
-		else {
-			self.size.width = os.width + ox;
-			self.size.height = os.height + oy;
-			self.position.top = op.top - oy;
-			self.position.left = op.left - ox;
-		}
-	}
-	
-});
-
-$.ui.plugin.add("resizable", "animate", {
-	
-	stop: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable");
-		
-		var pr = o.proportionallyResize, ista = pr && (/textarea/i).test(pr.get(0).nodeName), 
-						soffseth = ista && $.ui.hasScroll(pr.get(0), 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
-							soffsetw = ista ? 0 : self.sizeDiff.width;
-		
-		var style = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
-					left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null, 
-						top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null; 
-		
-		self.element.animate(
-			$.extend(style, top && left ? { top: top, left: left } : {}), { 
-				duration: o.animateDuration || "slow", easing: o.animateEasing || "swing", 
-				step: function() {
-					
-					var data = {
-						width: parseInt(self.element.css('width'), 10),
-						height: parseInt(self.element.css('height'), 10),
-						top: parseInt(self.element.css('top'), 10),
-						left: parseInt(self.element.css('left'), 10)
-					};
-					
-					if (pr) pr.css({ width: data.width, height: data.height });
-					
-					// propagating resize, and updating values for each animation step
-					self._updateCache(data);
-					self.propagate("animate", e);
-					
-				}
-			}
-		);
-	}
-	
-});
-
-$.ui.plugin.add("resizable", "ghost", {
-	
-	start: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize, cs = self.size;
-		
-		if (!pr) self.ghost = self.element.clone();
-		else self.ghost = pr.clone();
-		
-		self.ghost.css(
-			{ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 }
-		)
-		.addClass('ui-resizable-ghost').addClass(typeof o.ghost == 'string' ? o.ghost : '');
-		
-		self.ghost.appendTo(self.helper);
-		
-	},
-	
-	resize: function(e, ui){
-		var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize;
-		
-		if (self.ghost) self.ghost.css({ position: 'relative', height: self.size.height, width: self.size.width });
-		
-	},
-	
-	stop: function(e, ui){
-		var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize;
-		if (self.ghost && self.helper) self.helper.get(0).removeChild(self.ghost.get(0));
-	}
-	
-});
-
-$.ui.plugin.add("resizable", "alsoResize", {
-	
-	start: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), 
-		
-		_store = function(exp) {
-			$(exp).each(function() {
-				$(this).data("resizable-alsoresize", {
-					width: parseInt($(this).width(), 10), height: parseInt($(this).height(), 10),
-					left: parseInt($(this).css('left'), 10), top: parseInt($(this).css('top'), 10)
-				});
-			});
-		};
-		
-		if (typeof(o.alsoResize) == 'object') {
-			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0];	_store(o.alsoResize); }
-			else { $.each(o.alsoResize, function(exp, c) { _store(exp); }); }
-		}else{
-			_store(o.alsoResize);
-		} 
-	},
-	
-	resize: function(e, ui){
-		var o = ui.options, self = $(this).data("resizable"), os = self.originalSize, op = self.originalPosition;
-		
-		var delta = { 
-			height: (self.size.height - os.height) || 0, width: (self.size.width - os.width) || 0,
-			top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
-		},
-		
-		_alsoResize = function(exp, c) {
-			$(exp).each(function() {
-				var start = $(this).data("resizable-alsoresize"), style = {}, css = c && c.length ? c : ['width', 'height', 'top', 'left'];
-				
-				$.each(css || ['width', 'height', 'top', 'left'], function(i, prop) {
-					var sum = (start[prop]||0) + (delta[prop]||0);
-					if (sum && sum >= 0)
-						style[prop] = sum || null;
-				});
-				$(this).css(style);
-			});
-		};
-		
-		if (typeof(o.alsoResize) == 'object') {
-			$.each(o.alsoResize, function(exp, c) { _alsoResize(exp, c); });
-		}else{
-			_alsoResize(o.alsoResize);
-		}
-	},
-	
-	stop: function(e, ui){
-		$(this).removeData("resizable-alsoresize-start");
-	}
-});
-
-})(jQuery);
Index: js/ui/ui.slider.js
===================================================================
--- js/ui/ui.slider.js	(revision 6370)
+++ js/ui/ui.slider.js	(working copy)
@@ -1,440 +0,0 @@
-/*
- * jQuery UI Slider
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Slider
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.fn.unwrap = $.fn.unwrap || function(expr) {
-  return this.each(function(){
-     $(this).parents(expr).eq(0).after(this).remove();
-  });
-};
-
-$.widget("ui.slider", {
-	plugins: {},
-	ui: function(e) {
-		return {
-			options: this.options,
-			handle: this.currentHandle,
-			value: this.options.axis != "both" || !this.options.axis ? Math.round(this.value(null,this.options.axis == "vertical" ? "y" : "x")) : {
-				x: Math.round(this.value(null,"x")),
-				y: Math.round(this.value(null,"y"))
-			},
-			range: this.getRange()
-		};
-	},
-	propagate: function(n,e) {
-		$.ui.plugin.call(this, n, [e, this.ui()]);
-		this.element.triggerHandler(n == "slide" ? n : "slide"+n, [e, this.ui()], this.options[n]);
-	},
-	destroy: function() {
-		
-		this.element
-			.removeClass("ui-slider ui-slider-disabled")
-			.removeData("slider")
-			.unbind(".slider");
-		
-		if(this.handle && this.handle.length) {
-			this.handle
-				.unwrap("a");
-			this.handle.each(function() {
-				$(this).data("mouse").mouseDestroy();
-			});
-		}
-		
-		this.generated && this.generated.remove();
-		
-	},
-	setData: function(key, value) {
-		$.widget.prototype.setData.apply(this, arguments);
-		if (/min|max|steps/.test(key)) {
-			this.initBoundaries();
-		}
-		
-		if(key == "range") {
-			value ? this.handle.length == 2 && this.createRange() : this.removeRange();
-		}
-		
-	},
-
-	init: function() {
-		
-		var self = this;
-		this.element.addClass("ui-slider");
-		this.initBoundaries();
-		
-		// Initialize mouse and key events for interaction
-		this.handle = $(this.options.handle, this.element);
-		if (!this.handle.length) {
-			self.handle = self.generated = $(self.options.handles || [0]).map(function() {
-				var handle = $("<div/>").addClass("ui-slider-handle").appendTo(self.element);
-				if (this.id)
-					handle.attr("id", this.id);
-				return handle[0];
-			});
-		}
-		
-		
-		var handleclass = function(el) {
-			this.element = $(el);
-			this.element.data("mouse", this);
-			this.options = self.options;
-			
-			this.element.bind("mousedown", function() {
-				if(self.currentHandle) this.blur(self.currentHandle);
-				self.focus(this,1);
-			});
-			
-			this.mouseInit();
-		};
-		
-		$.extend(handleclass.prototype, $.ui.mouse, {
-			mouseStart: function(e) { return self.start.call(self, e, this.element[0]); },
-			mouseStop: function(e) { return self.stop.call(self, e, this.element[0]); },
-			mouseDrag: function(e) { return self.drag.call(self, e, this.element[0]); },
-			mouseCapture: function() { return true; },
-			trigger: function(e) { this.mouseDown(e); }
-		});
-		
-		
-		$(this.handle)
-			.each(function() {
-				new handleclass(this);
-			})
-			.wrap('<a href="javascript:void(0)" style="outline:none;border:none;"></a>')
-			.parent()
-				.bind('focus', function(e) { self.focus(this.firstChild); })
-				.bind('blur', function(e) { self.blur(this.firstChild); })
-				.bind('keydown', function(e) { if(!self.options.noKeyboard) self.keydown(e.keyCode, this.firstChild); })
-		;
-		
-		// Bind the click to the slider itself
-		this.element.bind('mousedown.slider', function(e) {
-			self.click.apply(self, [e]);
-			self.currentHandle.data("mouse").trigger(e);
-			self.firstValue = self.firstValue + 1; //This is for always triggering the change event
-		});
-		
-		// Move the first handle to the startValue
-		$.each(this.options.handles || [], function(index, handle) {
-			self.moveTo(handle.start, index, true);
-		});
-		if (!isNaN(this.options.startValue))
-			this.moveTo(this.options.startValue, 0, true);
-
-		this.previousHandle = $(this.handle[0]); //set the previous handle to the first to allow clicking before selecting the handle
-		if(this.handle.length == 2 && this.options.range) this.createRange();
-	},
-	initBoundaries: function() {
-		
-		var element = this.element[0], o = this.options;
-		this.actualSize = { width: this.element.outerWidth() , height: this.element.outerHeight() };			
-		
-		$.extend(o, {
-			axis: o.axis || (element.offsetWidth < element.offsetHeight ? 'vertical' : 'horizontal'),
-			max: !isNaN(parseInt(o.max,10)) ? { x: parseInt(o.max, 10), y: parseInt(o.max, 10) } : ({ x: o.max && o.max.x || 100, y: o.max && o.max.y || 100 }),
-			min: !isNaN(parseInt(o.min,10)) ? { x: parseInt(o.min, 10), y: parseInt(o.min, 10) } : ({ x: o.min && o.min.x || 0, y: o.min && o.min.y || 0 })
-		});
-		//Prepare the real maxValue
-		o.realMax = {
-			x: o.max.x - o.min.x,
-			y: o.max.y - o.min.y
-		};
-		//Calculate stepping based on steps
-		o.stepping = {
-			x: o.stepping && o.stepping.x || parseInt(o.stepping, 10) || (o.steps ? o.realMax.x/(o.steps.x || parseInt(o.steps, 10) || o.realMax.x) : 0),
-			y: o.stepping && o.stepping.y || parseInt(o.stepping, 10) || (o.steps ? o.realMax.y/(o.steps.y || parseInt(o.steps, 10) || o.realMax.y) : 0)
-		};
-	},
-
-	
-	keydown: function(keyCode, handle) {
-		if(/(37|38|39|40)/.test(keyCode)) {
-			this.moveTo({
-				x: /(37|39)/.test(keyCode) ? (keyCode == 37 ? '-' : '+') + '=' + this.oneStep("x") : 0,
-				y: /(38|40)/.test(keyCode) ? (keyCode == 38 ? '-' : '+') + '=' + this.oneStep("y") : 0
-			}, handle);
-		}
-	},
-	focus: function(handle,hard) {
-		this.currentHandle = $(handle).addClass('ui-slider-handle-active');
-		if (hard)
-			this.currentHandle.parent()[0].focus();
-	},
-	blur: function(handle) {
-		$(handle).removeClass('ui-slider-handle-active');
-		if(this.currentHandle && this.currentHandle[0] == handle) { this.previousHandle = this.currentHandle; this.currentHandle = null; };
-	},
-	click: function(e) {
-		// This method is only used if:
-		// - The user didn't click a handle
-		// - The Slider is not disabled
-		// - There is a current, or previous selected handle (otherwise we wouldn't know which one to move)
-		
-		var pointer = [e.pageX,e.pageY];
-		
-		var clickedHandle = false;
-		this.handle.each(function() {
-			if(this == e.target)
-				clickedHandle = true;
-		});
-		if (clickedHandle || this.options.disabled || !(this.currentHandle || this.previousHandle))
-			return;
-
-		// If a previous handle was focussed, focus it again
-		if (!this.currentHandle && this.previousHandle)
-			this.focus(this.previousHandle, true);
-		
-		// propagate only for distance > 0, otherwise propagation is done my drag
-		this.offset = this.element.offset();
-
-		this.moveTo({
-			y: this.convertValue(e.pageY - this.offset.top - this.currentHandle[0].offsetHeight/2, "y"),
-			x: this.convertValue(e.pageX - this.offset.left - this.currentHandle[0].offsetWidth/2, "x")
-		}, null, !this.options.distance);
-	},
-	
-
-
-	createRange: function() {
-		if(this.rangeElement) return;
-		this.rangeElement = $('<div></div>')
-			.addClass('ui-slider-range')
-			.css({ position: 'absolute' })
-			.appendTo(this.element);
-		this.updateRange();
-	},
-	removeRange: function() {
-		this.rangeElement.remove();
-		this.rangeElement = null;
-	},
-	updateRange: function() {
-			var prop = this.options.axis == "vertical" ? "top" : "left";
-			var size = this.options.axis == "vertical" ? "height" : "width";
-			this.rangeElement.css(prop, (parseInt($(this.handle[0]).css(prop),10) || 0) + this.handleSize(0, this.options.axis == "vertical" ? "y" : "x")/2);
-			this.rangeElement.css(size, (parseInt($(this.handle[1]).css(prop),10) || 0) - (parseInt($(this.handle[0]).css(prop),10) || 0));
-	},
-	getRange: function() {
-		return this.rangeElement ? this.convertValue(parseInt(this.rangeElement.css(this.options.axis == "vertical" ? "height" : "width"),10), this.options.axis == "vertical" ? "y" : "x") : null;
-	},
-
-	handleIndex: function() {
-		return this.handle.index(this.currentHandle[0]);
-	},
-	value: function(handle, axis) {
-		if(this.handle.length == 1) this.currentHandle = this.handle;
-		if(!axis) axis = this.options.axis == "vertical" ? "y" : "x";
-
-		var curHandle = $(handle != undefined && handle !== null ? this.handle[handle] || handle : this.currentHandle);
-		
-		if(curHandle.data("mouse").sliderValue) {
-			return parseInt(curHandle.data("mouse").sliderValue[axis],10);
-		} else {
-			return parseInt(((parseInt(curHandle.css(axis == "x" ? "left" : "top"),10) / (this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(handle,axis))) * this.options.realMax[axis]) + this.options.min[axis],10);
-		}
-
-	},
-	convertValue: function(value,axis) {
-		return this.options.min[axis] + (value / (this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(null,axis))) * this.options.realMax[axis];
-	},
-	
-	translateValue: function(value,axis) {
-		return ((value - this.options.min[axis]) / this.options.realMax[axis]) * (this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(null,axis));
-	},
-	translateRange: function(value,axis) {
-		if (this.rangeElement) {
-			if (this.currentHandle[0] == this.handle[0] && value >= this.translateValue(this.value(1),axis))
-				value = this.translateValue(this.value(1,axis) - this.oneStep(axis), axis);
-			if (this.currentHandle[0] == this.handle[1] && value <= this.translateValue(this.value(0),axis))
-				value = this.translateValue(this.value(0,axis) + this.oneStep(axis), axis);
-		}
-		if (this.options.handles) {
-			var handle = this.options.handles[this.handleIndex()];
-			if (value < this.translateValue(handle.min,axis)) {
-				value = this.translateValue(handle.min,axis);
-			} else if (value > this.translateValue(handle.max,axis)) {
-				value = this.translateValue(handle.max,axis);
-			}
-		}
-		return value;
-	},
-	translateLimits: function(value,axis) {
-		if (value >= this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(null,axis))
-			value = this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(null,axis);
-		if (value <= 0)
-			value = 0;
-		return value;
-	},
-	handleSize: function(handle,axis) {
-		return $(handle != undefined && handle !== null ? this.handle[handle] : this.currentHandle)[0]["offset"+(axis == "x" ? "Width" : "Height")];	
-	},
-	oneStep: function(axis) {
-		return this.options.stepping[axis] || 1;
-	},
-
-
-	start: function(e, handle) {
-	
-		var o = this.options;
-		if(o.disabled) return false;
-
-		// Prepare the outer size
-		this.actualSize = { width: this.element.outerWidth() , height: this.element.outerHeight() };
-	
-		// This is a especially ugly fix for strange blur events happening on mousemove events
-		if (!this.currentHandle)
-			this.focus(this.previousHandle, true); 
-
-		this.offset = this.element.offset();
-		
-		this.handleOffset = this.currentHandle.offset();
-		this.clickOffset = { top: e.pageY - this.handleOffset.top, left: e.pageX - this.handleOffset.left };
-		
-		this.firstValue = this.value();
-		
-		this.propagate('start', e);
-		this.drag(e, handle);
-		return true;
-					
-	},
-	stop: function(e) {
-		this.propagate('stop', e);
-		if (this.firstValue != this.value())
-			this.propagate('change', e);
-		// This is a especially ugly fix for strange blur events happening on mousemove events
-		this.focus(this.currentHandle, true);
-		return false;
-	},
-	drag: function(e, handle) {
-
-		var o = this.options;
-		var position = { top: e.pageY - this.offset.top - this.clickOffset.top, left: e.pageX - this.offset.left - this.clickOffset.left};
-		if(!this.currentHandle) this.focus(this.previousHandle, true); //This is a especially ugly fix for strange blur events happening on mousemove events
-
-		position.left = this.translateLimits(position.left, "x");
-		position.top = this.translateLimits(position.top, "y");
-		
-		if (o.stepping.x) {
-			var value = this.convertValue(position.left, "x");
-			value = Math.round(value / o.stepping.x) * o.stepping.x;
-			position.left = this.translateValue(value, "x");	
-		}
-		if (o.stepping.y) {
-			var value = this.convertValue(position.top, "y");
-			value = Math.round(value / o.stepping.y) * o.stepping.y;
-			position.top = this.translateValue(value, "y");	
-		}
-		
-		position.left = this.translateRange(position.left, "x");
-		position.top = this.translateRange(position.top, "y");
-
-		if(o.axis != "vertical") this.currentHandle.css({ left: position.left });
-		if(o.axis != "horizontal") this.currentHandle.css({ top: position.top });
-		
-		//Store the slider's value
-		this.currentHandle.data("mouse").sliderValue = {
-			x: Math.round(this.convertValue(position.left, "x")) || 0,
-			y: Math.round(this.convertValue(position.top, "y")) || 0
-		};
-		
-		if (this.rangeElement)
-			this.updateRange();
-		this.propagate('slide', e);
-		return false;
-	},
-	
-	moveTo: function(value, handle, noPropagation) {
-
-		var o = this.options;
-
-		// Prepare the outer size
-		this.actualSize = { width: this.element.outerWidth() , height: this.element.outerHeight() };
-
-		//If no handle has been passed, no current handle is available and we have multiple handles, return false
-		if (handle == undefined && !this.currentHandle && this.handle.length != 1)
-			return false; 
-		
-		//If only one handle is available, use it
-		if (handle == undefined && !this.currentHandle)
-			handle = 0;
-		
-		if (handle != undefined)
-			this.currentHandle = this.previousHandle = $(this.handle[handle] || handle);
-
-
-		if(value.x !== undefined && value.y !== undefined) {
-			var x = value.x, y = value.y;
-		} else {
-			var x = value, y = value;
-		}
-
-		if(x !== undefined && x.constructor != Number) {
-			var me = /^\-\=/.test(x), pe = /^\+\=/.test(x);
-			if(me || pe) {
-				x = this.value(null, "x") + parseInt(x.replace(me ? '=' : '+=', ''), 10);
-			} else {
-				x = isNaN(parseInt(x, 10)) ? undefined : parseInt(x, 10);
-			}
-		}
-		
-		if(y !== undefined && y.constructor != Number) {
-			var me = /^\-\=/.test(y), pe = /^\+\=/.test(y);
-			if(me || pe) {
-				y = this.value(null, "y") + parseInt(y.replace(me ? '=' : '+=', ''), 10);
-			} else {
-				y = isNaN(parseInt(y, 10)) ? undefined : parseInt(y, 10);
-			}
-		}
-
-		if(o.axis != "vertical" && x !== undefined) {
-			if(o.stepping.x) x = Math.round(x / o.stepping.x) * o.stepping.x;
-			x = this.translateValue(x, "x");
-			x = this.translateLimits(x, "x");
-			x = this.translateRange(x, "x");
-
-			o.animate ? this.currentHandle.stop().animate({ left: x }, (Math.abs(parseInt(this.currentHandle.css("left")) - x)) * (!isNaN(parseInt(o.animate)) ? o.animate : 5)) : this.currentHandle.css({ left: x });
-		}
-
-		if(o.axis != "horizontal" && y !== undefined) {
-			if(o.stepping.y) y = Math.round(y / o.stepping.y) * o.stepping.y;
-			y = this.translateValue(y, "y");
-			y = this.translateLimits(y, "y");
-			y = this.translateRange(y, "y");
-			o.animate ? this.currentHandle.stop().animate({ top: y }, (Math.abs(parseInt(this.currentHandle.css("top")) - y)) * (!isNaN(parseInt(o.animate)) ? o.animate : 5)) : this.currentHandle.css({ top: y });
-		}
-		
-		if (this.rangeElement)
-			this.updateRange();
-			
-		//Store the slider's value
-		this.currentHandle.data("mouse").sliderValue = {
-			x: Math.round(this.convertValue(x, "x")) || 0,
-			y: Math.round(this.convertValue(y, "y")) || 0
-		};
-	
-		if (!noPropagation) {
-			this.propagate('start', null);
-			this.propagate('stop', null);
-			this.propagate('change', null);
-			this.propagate("slide", null);
-		}
-	}
-});
-
-$.ui.slider.getter = "value";
-
-$.ui.slider.defaults = {
-	handle: ".ui-slider-handle",
-	distance: 1,
-	animate: false
-};
-
-})(jQuery);
Index: js/ui/jquery.ui.all.js
===================================================================
--- js/ui/jquery.ui.all.js	(revision 6370)
+++ js/ui/jquery.ui.all.js	(working copy)
@@ -1,7598 +0,0 @@
-/*
- * jQuery UI 1.5.2
- *
- * Copyright (c) 2008 Paul Bakaus (ui.jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI
- */
-;(function($) {
-
-$.ui = {
-	plugin: {
-		add: function(module, option, set) {
-			var proto = $.ui[module].prototype;
-			for(var i in set) {
-				proto.plugins[i] = proto.plugins[i] || [];
-				proto.plugins[i].push([option, set[i]]);
-			}
-		},
-		call: function(instance, name, args) {
-			var set = instance.plugins[name];
-			if(!set) { return; }
-			
-			for (var i = 0; i < set.length; i++) {
-				if (instance.options[set[i][0]]) {
-					set[i][1].apply(instance.element, args);
-				}
-			}
-		}	
-	},
-	cssCache: {},
-	css: function(name) {
-		if ($.ui.cssCache[name]) { return $.ui.cssCache[name]; }
-		var tmp = $('<div class="ui-gen">').addClass(name).css({position:'absolute', top:'-5000px', left:'-5000px', display:'block'}).appendTo('body');
-		
-		//if (!$.browser.safari)
-			//tmp.appendTo('body'); 
-		
-		//Opera and Safari set width and height to 0px instead of auto
-		//Safari returns rgba(0,0,0,0) when bgcolor is not set
-		$.ui.cssCache[name] = !!(
-			(!(/auto|default/).test(tmp.css('cursor')) || (/^[1-9]/).test(tmp.css('height')) || (/^[1-9]/).test(tmp.css('width')) || 
-			!(/none/).test(tmp.css('backgroundImage')) || !(/transparent|rgba\(0, 0, 0, 0\)/).test(tmp.css('backgroundColor')))
-		);
-		try { $('body').get(0).removeChild(tmp.get(0));	} catch(e){}
-		return $.ui.cssCache[name];
-	},
-	disableSelection: function(el) {
-		$(el).attr('unselectable', 'on').css('MozUserSelect', 'none');
-	},
-	enableSelection: function(el) {
-		$(el).attr('unselectable', 'off').css('MozUserSelect', '');
-	},
-	hasScroll: function(e, a) {
-		var scroll = /top/.test(a||"top") ? 'scrollTop' : 'scrollLeft', has = false;
-		if (e[scroll] > 0) return true; e[scroll] = 1;
-		has = e[scroll] > 0 ? true : false; e[scroll] = 0;
-		return has;
-	}
-};
-
-
-/** jQuery core modifications and additions **/
-
-var _remove = $.fn.remove;
-$.fn.remove = function() {
-	$("*", this).add(this).triggerHandler("remove");
-	return _remove.apply(this, arguments );
-};
-
-// $.widget is a factory to create jQuery plugins
-// taking some boilerplate code out of the plugin code
-// created by Scott González and Jörn Zaefferer
-function getter(namespace, plugin, method) {
-	var methods = $[namespace][plugin].getter || [];
-	methods = (typeof methods == "string" ? methods.split(/,?\s+/) : methods);
-	return ($.inArray(method, methods) != -1);
-}
-
-$.widget = function(name, prototype) {
-	var namespace = name.split(".")[0];
-	name = name.split(".")[1];
-	
-	// create plugin method
-	$.fn[name] = function(options) {
-		var isMethodCall = (typeof options == 'string'),
-			args = Array.prototype.slice.call(arguments, 1);
-		
-		if (isMethodCall && getter(namespace, name, options)) {
-			var instance = $.data(this[0], name);
-			return (instance ? instance[options].apply(instance, args)
-				: undefined);
-		}
-		
-		return this.each(function() {
-			var instance = $.data(this, name);
-			if (isMethodCall && instance && $.isFunction(instance[options])) {
-				instance[options].apply(instance, args);
-			} else if (!isMethodCall) {
-				$.data(this, name, new $[namespace][name](this, options));
-			}
-		});
-	};
-	
-	// create widget constructor
-	$[namespace][name] = function(element, options) {
-		var self = this;
-		
-		this.widgetName = name;
-		this.widgetBaseClass = namespace + '-' + name;
-		
-		this.options = $.extend({}, $.widget.defaults, $[namespace][name].defaults, options);
-		this.element = $(element)
-			.bind('setData.' + name, function(e, key, value) {
-				return self.setData(key, value);
-			})
-			.bind('getData.' + name, function(e, key) {
-				return self.getData(key);
-			})
-			.bind('remove', function() {
-				return self.destroy();
-			});
-		this.init();
-	};
-	
-	// add widget prototype
-	$[namespace][name].prototype = $.extend({}, $.widget.prototype, prototype);
-};
-
-$.widget.prototype = {
-	init: function() {},
-	destroy: function() {
-		this.element.removeData(this.widgetName);
-	},
-	
-	getData: function(key) {
-		return this.options[key];
-	},
-	setData: function(key, value) {
-		this.options[key] = value;
-		
-		if (key == 'disabled') {
-			this.element[value ? 'addClass' : 'removeClass'](
-				this.widgetBaseClass + '-disabled');
-		}
-	},
-	
-	enable: function() {
-		this.setData('disabled', false);
-	},
-	disable: function() {
-		this.setData('disabled', true);
-	}
-};
-
-$.widget.defaults = {
-	disabled: false
-};
-
-
-/** Mouse Interaction Plugin **/
-
-$.ui.mouse = {
-	mouseInit: function() {
-		var self = this;
-	
-		this.element.bind('mousedown.'+this.widgetName, function(e) {
-			return self.mouseDown(e);
-		});
-		
-		// Prevent text selection in IE
-		if ($.browser.msie) {
-			this._mouseUnselectable = this.element.attr('unselectable');
-			this.element.attr('unselectable', 'on');
-		}
-		
-		this.started = false;
-	},
-	
-	// TODO: make sure destroying one instance of mouse doesn't mess with
-	// other instances of mouse
-	mouseDestroy: function() {
-		this.element.unbind('.'+this.widgetName);
-		
-		// Restore text selection in IE
-		($.browser.msie
-			&& this.element.attr('unselectable', this._mouseUnselectable));
-	},
-	
-	mouseDown: function(e) {
-		// we may have missed mouseup (out of window)
-		(this._mouseStarted && this.mouseUp(e));
-		
-		this._mouseDownEvent = e;
-		
-		var self = this,
-			btnIsLeft = (e.which == 1),
-			elIsCancel = (typeof this.options.cancel == "string" ? $(e.target).parents().add(e.target).filter(this.options.cancel).length : false);
-		if (!btnIsLeft || elIsCancel || !this.mouseCapture(e)) {
-			return true;
-		}
-		
-		this._mouseDelayMet = !this.options.delay;
-		if (!this._mouseDelayMet) {
-			this._mouseDelayTimer = setTimeout(function() {
-				self._mouseDelayMet = true;
-			}, this.options.delay);
-		}
-		
-		if (this.mouseDistanceMet(e) && this.mouseDelayMet(e)) {
-			this._mouseStarted = (this.mouseStart(e) !== false);
-			if (!this._mouseStarted) {
-				e.preventDefault();
-				return true;
-			}
-		}
-		
-		// these delegates are required to keep context
-		this._mouseMoveDelegate = function(e) {
-			return self.mouseMove(e);
-		};
-		this._mouseUpDelegate = function(e) {
-			return self.mouseUp(e);
-		};
-		$(document)
-			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-		
-		return false;
-	},
-	
-	mouseMove: function(e) {
-		// IE mouseup check - mouseup happened when mouse was out of window
-		if ($.browser.msie && !e.button) {
-			return this.mouseUp(e);
-		}
-		
-		if (this._mouseStarted) {
-			this.mouseDrag(e);
-			return false;
-		}
-		
-		if (this.mouseDistanceMet(e) && this.mouseDelayMet(e)) {
-			this._mouseStarted =
-				(this.mouseStart(this._mouseDownEvent, e) !== false);
-			(this._mouseStarted ? this.mouseDrag(e) : this.mouseUp(e));
-		}
-		
-		return !this._mouseStarted;
-	},
-	
-	mouseUp: function(e) {
-		$(document)
-			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
-		
-		if (this._mouseStarted) {
-			this._mouseStarted = false;
-			this.mouseStop(e);
-		}
-		
-		return false;
-	},
-	
-	mouseDistanceMet: function(e) {
-		return (Math.max(
-				Math.abs(this._mouseDownEvent.pageX - e.pageX),
-				Math.abs(this._mouseDownEvent.pageY - e.pageY)
-			) >= this.options.distance
-		);
-	},
-	
-	mouseDelayMet: function(e) {
-		return this._mouseDelayMet;
-	},
-	
-	// These are placeholder methods, to be overriden by extending plugin
-	mouseStart: function(e) {},
-	mouseDrag: function(e) {},
-	mouseStop: function(e) {},
-	mouseCapture: function(e) { return true; }
-};
-
-$.ui.mouse.defaults = {
-	cancel: null,
-	distance: 1,
-	delay: 0
-};
-
-})(jQuery);
-/*
- * jQuery UI Draggable
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Draggables
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.draggable", $.extend({}, $.ui.mouse, {
-	init: function() {
-		
-		//Initialize needed constants
-		var o = this.options;
-
-		//Position the node
-		if (o.helper == 'original' && !(/(relative|absolute|fixed)/).test(this.element.css('position')))
-			this.element.css('position', 'relative');
-
-		this.element.addClass('ui-draggable');
-		(o.disabled && this.element.addClass('ui-draggable-disabled'));
-		
-		this.mouseInit();
-		
-	},
-	mouseStart: function(e) {
-		var o = this.options;
-		
-		if (this.helper || o.disabled || $(e.target).is('.ui-resizable-handle')) return false;
-		
-		var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
-		
-	
-		$(this.options.handle, this.element).find("*").andSelf().each(function() {
-			if(this == e.target) handle = true;
-		});
-		if (!handle) return false;
-		
-		if($.ui.ddmanager) $.ui.ddmanager.current = this;
-		
-		//Create and append the visible helper
-		this.helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [e])) : (o.helper == 'clone' ? this.element.clone() : this.element);
-		if(!this.helper.parents('body').length) this.helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
-		if(this.helper[0] != this.element[0] && !(/(fixed|absolute)/).test(this.helper.css("position"))) this.helper.css("position", "absolute");
-		
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-		
-		this.margins = {																				//Cache the margins
-			left: (parseInt(this.element.css("marginLeft"),10) || 0),
-			top: (parseInt(this.element.css("marginTop"),10) || 0)
-		};		
-		
-		this.cssPosition = this.helper.css("position");													//Store the helper's css position
-		this.offset = this.element.offset();															//The element's absolute position on the page
-		this.offset = {																					//Substract the margins from the element's absolute offset
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-		
-		this.offset.click = {																			//Where the click happened, relative to the element
-			left: e.pageX - this.offset.left,
-			top: e.pageY - this.offset.top
-		};
-		
-		this.offsetParent = this.helper.offsetParent(); var po = this.offsetParent.offset();			//Get the offsetParent and cache its position
-		if(this.offsetParent[0] == document.body && $.browser.mozilla) po = { top: 0, left: 0 };		//Ugly FF3 fix
-		this.offset.parent = {																			//Store its position plus border
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-		
-		var p = this.element.position();																//This is a relative to absolute position minus the actual position calculation - only used for relative positioned helpers
-		this.offset.relative = this.cssPosition == "relative" ? {
-			top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.offsetParent[0].scrollTop,
-			left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.offsetParent[0].scrollLeft
-		} : { top: 0, left: 0 };
-		
-		this.originalPosition = this.generatePosition(e);												//Generate the original position
-		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Cache the helper size
-		
-		if(o.cursorAt) {
-			if(o.cursorAt.left != undefined) this.offset.click.left = o.cursorAt.left + this.margins.left;
-			if(o.cursorAt.right != undefined) this.offset.click.left = this.helperProportions.width - o.cursorAt.right + this.margins.left;
-			if(o.cursorAt.top != undefined) this.offset.click.top = o.cursorAt.top + this.margins.top;
-			if(o.cursorAt.bottom != undefined) this.offset.click.top = this.helperProportions.height - o.cursorAt.bottom + this.margins.top;
-		}
-		
-		
-		/*
-		 * - Position constraining -
-		 * Here we prepare position constraining like grid and containment.
-		 */	
-		
-		if(o.containment) {
-			if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-			if(o.containment == 'document' || o.containment == 'window') this.containment = [
-				0 - this.offset.relative.left - this.offset.parent.left,
-				0 - this.offset.relative.top - this.offset.parent.top,
-				$(o.containment == 'document' ? document : window).width() - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
-				($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
-			];
-			
-			if(!(/^(document|window|parent)$/).test(o.containment)) {
-				var ce = $(o.containment)[0];
-				var co = $(o.containment).offset();
-				
-				this.containment = [
-					co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left,
-					co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top,
-					co.left+Math.max(ce.scrollWidth,ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
-					co.top+Math.max(ce.scrollHeight,ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
-				];
-			}
-		}
-		
-		//Call plugins and callbacks
-		this.propagate("start", e);
-		
-		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Recache the helper size
-		if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e);
-		
-		this.helper.addClass("ui-draggable-dragging");
-		this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-		return true;
-	},
-	convertPositionTo: function(d, pos) {
-		if(!pos) pos = this.position;
-		var mod = d == "absolute" ? 1 : -1;
-		return {
-			top: (
-				pos.top																	// the calculated relative position
-				+ this.offset.relative.top	* mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
-				- (this.cssPosition == "fixed" || (this.cssPosition == "absolute" && this.offsetParent[0] == document.body) ? 0 : this.offsetParent[0].scrollTop) * mod	// The offsetParent's scroll position, not if the element is fixed
-				+ (this.cssPosition == "fixed" ? $(document).scrollTop() : 0) * mod
-				+ this.margins.top * mod												//Add the margin (you don't want the margin counting in intersection methods)
-			),
-			left: (
-				pos.left																// the calculated relative position
-				+ this.offset.relative.left	* mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
-				- (this.cssPosition == "fixed" || (this.cssPosition == "absolute" && this.offsetParent[0] == document.body) ? 0 : this.offsetParent[0].scrollLeft) * mod	// The offsetParent's scroll position, not if the element is fixed
-				+ (this.cssPosition == "fixed" ? $(document).scrollLeft() : 0) * mod
-				+ this.margins.left * mod												//Add the margin (you don't want the margin counting in intersection methods)
-			)
-		};
-	},
-	generatePosition: function(e) {
-		
-		var o = this.options;
-		var position = {
-			top: (
-				e.pageY																	// The absolute mouse position
-				- this.offset.click.top													// Click offset (relative to the element)
-				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
-				+ (this.cssPosition == "fixed" || (this.cssPosition == "absolute" && this.offsetParent[0] == document.body) ? 0 : this.offsetParent[0].scrollTop)	// The offsetParent's scroll position, not if the element is fixed
-				- (this.cssPosition == "fixed" ? $(document).scrollTop() : 0)
-			),
-			left: (
-				e.pageX																	// The absolute mouse position
-				- this.offset.click.left												// Click offset (relative to the element)
-				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
-				+ (this.cssPosition == "fixed" || (this.cssPosition == "absolute" && this.offsetParent[0] == document.body) ? 0 : this.offsetParent[0].scrollLeft)	// The offsetParent's scroll position, not if the element is fixed
-				- (this.cssPosition == "fixed" ? $(document).scrollLeft() : 0)
-			)
-		};
-		
-		if(!this.originalPosition) return position;										//If we are not dragging yet, we won't check for options
-		
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-		if(this.containment) {
-			if(position.left < this.containment[0]) position.left = this.containment[0];
-			if(position.top < this.containment[1]) position.top = this.containment[1];
-			if(position.left > this.containment[2]) position.left = this.containment[2];
-			if(position.top > this.containment[3]) position.top = this.containment[3];
-		}
-		
-		if(o.grid) {
-			var top = this.originalPosition.top + Math.round((position.top - this.originalPosition.top) / o.grid[1]) * o.grid[1];
-			position.top = this.containment ? (!(top < this.containment[1] || top > this.containment[3]) ? top : (!(top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-			
-			var left = this.originalPosition.left + Math.round((position.left - this.originalPosition.left) / o.grid[0]) * o.grid[0];
-			position.left = this.containment ? (!(left < this.containment[0] || left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-		}
-		
-		return position;
-	},
-	mouseDrag: function(e) {
-		
-		//Compute the helpers position
-		this.position = this.generatePosition(e);
-		this.positionAbs = this.convertPositionTo("absolute");
-		
-		//Call plugins and callbacks and use the resulting position if something is returned		
-		this.position = this.propagate("drag", e) || this.position;
-		
-		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
-		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
-		if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
-		
-		return false;
-	},
-	mouseStop: function(e) {
-		
-		//If we are using droppables, inform the manager about the drop
-		var dropped = false;
-		if ($.ui.ddmanager && !this.options.dropBehaviour)
-			var dropped = $.ui.ddmanager.drop(this, e);		
-		
-		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true) {
-			var self = this;
-			$(this.helper).animate(this.originalPosition, parseInt(this.options.revert, 10) || 500, function() {
-				self.propagate("stop", e);
-				self.clear();
-			});
-		} else {
-			this.propagate("stop", e);
-			this.clear();
-		}
-		
-		return false;
-	},
-	clear: function() {
-		this.helper.removeClass("ui-draggable-dragging");
-		if(this.options.helper != 'original' && !this.cancelHelperRemoval) this.helper.remove();
-		//if($.ui.ddmanager) $.ui.ddmanager.current = null;
-		this.helper = null;
-		this.cancelHelperRemoval = false;
-	},
-	
-	// From now on bulk stuff - mainly helpers
-	plugins: {},
-	uiHash: function(e) {
-		return {
-			helper: this.helper,
-			position: this.position,
-			absolutePosition: this.positionAbs,
-			options: this.options			
-		};
-	},
-	propagate: function(n,e) {
-		$.ui.plugin.call(this, n, [e, this.uiHash()]);
-		if(n == "drag") this.positionAbs = this.convertPositionTo("absolute"); //The absolute position has to be recalculated after plugins
-		return this.element.triggerHandler(n == "drag" ? n : "drag"+n, [e, this.uiHash()], this.options[n]);
-	},
-	destroy: function() {
-		if(!this.element.data('draggable')) return;
-		this.element.removeData("draggable").unbind(".draggable").removeClass('ui-draggable');
-		this.mouseDestroy();
-	}
-}));
-
-$.extend($.ui.draggable, {
-	defaults: {
-		appendTo: "parent",
-		axis: false,
-		cancel: ":input",
-		delay: 0,
-		distance: 1,
-		helper: "original"
-	}
-});
-
-$.ui.plugin.add("draggable", "cursor", {
-	start: function(e, ui) {
-		var t = $('body');
-		if (t.css("cursor")) ui.options._cursor = t.css("cursor");
-		t.css("cursor", ui.options.cursor);
-	},
-	stop: function(e, ui) {
-		if (ui.options._cursor) $('body').css("cursor", ui.options._cursor);
-	}
-});
-
-$.ui.plugin.add("draggable", "zIndex", {
-	start: function(e, ui) {
-		var t = $(ui.helper);
-		if(t.css("zIndex")) ui.options._zIndex = t.css("zIndex");
-		t.css('zIndex', ui.options.zIndex);
-	},
-	stop: function(e, ui) {
-		if(ui.options._zIndex) $(ui.helper).css('zIndex', ui.options._zIndex);
-	}
-});
-
-$.ui.plugin.add("draggable", "opacity", {
-	start: function(e, ui) {
-		var t = $(ui.helper);
-		if(t.css("opacity")) ui.options._opacity = t.css("opacity");
-		t.css('opacity', ui.options.opacity);
-	},
-	stop: function(e, ui) {
-		if(ui.options._opacity) $(ui.helper).css('opacity', ui.options._opacity);
-	}
-});
-
-$.ui.plugin.add("draggable", "iframeFix", {
-	start: function(e, ui) {
-		$(ui.options.iframeFix === true ? "iframe" : ui.options.iframeFix).each(function() {					
-			$('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
-			.css({
-				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
-				position: "absolute", opacity: "0.001", zIndex: 1000
-			})
-			.css($(this).offset())
-			.appendTo("body");
-		});
-	},
-	stop: function(e, ui) {
-		$("div.DragDropIframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers	
-	}
-});
-
-$.ui.plugin.add("draggable", "scroll", {
-	start: function(e, ui) {
-		var o = ui.options;
-		var i = $(this).data("draggable");
-		o.scrollSensitivity	= o.scrollSensitivity || 20;
-		o.scrollSpeed		= o.scrollSpeed || 20;
-		
-		i.overflowY = function(el) {
-			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
-			return $(document);
-		}(this);
-		i.overflowX = function(el) {
-			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
-			return $(document);
-		}(this);
-		
-		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') i.overflowYOffset = i.overflowY.offset();
-		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') i.overflowXOffset = i.overflowX.offset();
-		
-	},
-	drag: function(e, ui) {
-		
-		var o = ui.options;
-		var i = $(this).data("draggable");
-		
-		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') {
-			if((i.overflowYOffset.top + i.overflowY[0].offsetHeight) - e.pageY < o.scrollSensitivity)
-				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop + o.scrollSpeed;
-			if(e.pageY - i.overflowYOffset.top < o.scrollSensitivity)
-				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop - o.scrollSpeed;
-							
-		} else {
-			if(e.pageY - $(document).scrollTop() < o.scrollSensitivity)
-				$(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-			if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-				$(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-		}
-		
-		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') {
-			if((i.overflowXOffset.left + i.overflowX[0].offsetWidth) - e.pageX < o.scrollSensitivity)
-				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft + o.scrollSpeed;
-			if(e.pageX - i.overflowXOffset.left < o.scrollSensitivity)
-				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft - o.scrollSpeed;
-		} else {
-			if(e.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-				$(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-			if($(window).width() - (e.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-				$(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-		}
-		
-	}
-});
-
-$.ui.plugin.add("draggable", "snap", {
-	start: function(e, ui) {
-		
-		var inst = $(this).data("draggable");
-		inst.snapElements = [];
-		$(ui.options.snap === true ? '.ui-draggable' : ui.options.snap).each(function() {
-			var $t = $(this); var $o = $t.offset();
-			if(this != inst.element[0]) inst.snapElements.push({
-				item: this,
-				width: $t.outerWidth(), height: $t.outerHeight(),
-				top: $o.top, left: $o.left
-			});
-		});
-		
-	},
-	drag: function(e, ui) {
-		
-		var inst = $(this).data("draggable");
-		var d = ui.options.snapTolerance || 20;
-		var x1 = ui.absolutePosition.left, x2 = x1 + inst.helperProportions.width,
-			y1 = ui.absolutePosition.top, y2 = y1 + inst.helperProportions.height;
-		
-		for (var i = inst.snapElements.length - 1; i >= 0; i--){
-			
-			var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width, 
-				t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
-			
-			//Yes, I know, this is insane ;)
-			if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) continue;
-			
-			if(ui.options.snapMode != 'inner') {
-				var ts = Math.abs(t - y2) <= 20;
-				var bs = Math.abs(b - y1) <= 20;
-				var ls = Math.abs(l - x2) <= 20;
-				var rs = Math.abs(r - x1) <= 20;
-				if(ts) ui.position.top = inst.convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top;
-				if(bs) ui.position.top = inst.convertPositionTo("relative", { top: b, left: 0 }).top;
-				if(ls) ui.position.left = inst.convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left;
-				if(rs) ui.position.left = inst.convertPositionTo("relative", { top: 0, left: r }).left;
-			}
-			
-			if(ui.options.snapMode != 'outer') {
-				var ts = Math.abs(t - y1) <= 20;
-				var bs = Math.abs(b - y2) <= 20;
-				var ls = Math.abs(l - x1) <= 20;
-				var rs = Math.abs(r - x2) <= 20;
-				if(ts) ui.position.top = inst.convertPositionTo("relative", { top: t, left: 0 }).top;
-				if(bs) ui.position.top = inst.convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top;
-				if(ls) ui.position.left = inst.convertPositionTo("relative", { top: 0, left: l }).left;
-				if(rs) ui.position.left = inst.convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left;
-			}
-			
-		};
-	}
-});
-
-$.ui.plugin.add("draggable", "connectToSortable", {
-	start: function(e,ui) {
-	
-		var inst = $(this).data("draggable");
-		inst.sortables = [];
-		$(ui.options.connectToSortable).each(function() {
-			if($.data(this, 'sortable')) {
-				var sortable = $.data(this, 'sortable');
-				inst.sortables.push({
-					instance: sortable,
-					shouldRevert: sortable.options.revert
-				});
-				sortable.refreshItems();	//Do a one-time refresh at start to refresh the containerCache	
-				sortable.propagate("activate", e, inst);
-			}
-		});
-
-	},
-	stop: function(e,ui) {
-		
-		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
-		var inst = $(this).data("draggable");
-		
-		$.each(inst.sortables, function() {
-			if(this.instance.isOver) {
-				this.instance.isOver = 0;
-				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
-				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
-				if(this.shouldRevert) this.instance.options.revert = true; //revert here
-				this.instance.mouseStop(e);
-				
-				//Also propagate receive event, since the sortable is actually receiving a element
-				this.instance.element.triggerHandler("sortreceive", [e, $.extend(this.instance.ui(), { sender: inst.element })], this.instance.options["receive"]);
-
-				this.instance.options.helper = this.instance.options._helper;
-			} else {
-				this.instance.propagate("deactivate", e, inst);
-			}
-
-		});
-		
-	},
-	drag: function(e,ui) {
-
-		var inst = $(this).data("draggable"), self = this;
-		
-		var checkPos = function(o) {
-				
-			var l = o.left, r = l + o.width,
-				t = o.top, b = t + o.height;
-
-			return (l < (this.positionAbs.left + this.offset.click.left) && (this.positionAbs.left + this.offset.click.left) < r
-					&& t < (this.positionAbs.top + this.offset.click.top) && (this.positionAbs.top + this.offset.click.top) < b);				
-		};
-		
-		$.each(inst.sortables, function(i) {
-
-			if(checkPos.call(inst, this.instance.containerCache)) {
-
-				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
-				if(!this.instance.isOver) {
-					this.instance.isOver = 1;
-
-					//Now we fake the start of dragging for the sortable instance,
-					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
-					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
-					this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
-					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
-					this.instance.options.helper = function() { return ui.helper[0]; };
-				
-					e.target = this.instance.currentItem[0];
-					this.instance.mouseCapture(e, true);
-					this.instance.mouseStart(e, true, true);
-
-					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
-					this.instance.offset.click.top = inst.offset.click.top;
-					this.instance.offset.click.left = inst.offset.click.left;
-					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
-					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
-					
-					inst.propagate("toSortable", e);
-				
-				}
-				
-				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
-				if(this.instance.currentItem) this.instance.mouseDrag(e);
-				
-			} else {
-				
-				//If it doesn't intersect with the sortable, and it intersected before,
-				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
-				if(this.instance.isOver) {
-					this.instance.isOver = 0;
-					this.instance.cancelHelperRemoval = true;
-					this.instance.options.revert = false; //No revert here
-					this.instance.mouseStop(e, true);
-					this.instance.options.helper = this.instance.options._helper;
-					
-					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
-					this.instance.currentItem.remove();
-					if(this.instance.placeholder) this.instance.placeholder.remove();
-					
-					inst.propagate("fromSortable", e);
-				}
-				
-			};
-
-		});
-
-	}
-});
-
-$.ui.plugin.add("draggable", "stack", {
-	start: function(e,ui) {
-		var group = $.makeArray($(ui.options.stack.group)).sort(function(a,b) {
-			return (parseInt($(a).css("zIndex"),10) || ui.options.stack.min) - (parseInt($(b).css("zIndex"),10) || ui.options.stack.min);
-		});
-		
-		$(group).each(function(i) {
-			this.style.zIndex = ui.options.stack.min + i;
-		});
-		
-		this[0].style.zIndex = ui.options.stack.min + group.length;
-	}
-});
-
-})(jQuery);
-/*
- * jQuery UI Droppable
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Droppables
- *
- * Depends:
- *	ui.core.js
- *	ui.draggable.js
- */
-(function($) {
-
-$.widget("ui.droppable", {
-	init: function() {
-
-		this.element.addClass("ui-droppable");
-		this.isover = 0; this.isout = 1;
-		
-		//Prepare the passed options
-		var o = this.options, accept = o.accept;
-		o = $.extend(o, {
-			accept: o.accept && o.accept.constructor == Function ? o.accept : function(d) {
-				return $(d).is(accept);
-			}
-		});
-		
-		//Store the droppable's proportions
-		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
-		
-		// Add the reference and positions to the manager
-		$.ui.ddmanager.droppables.push(this);
-		
-	},
-	plugins: {},
-	ui: function(c) {
-		return {
-			draggable: (c.currentItem || c.element),
-			helper: c.helper,
-			position: c.position,
-			absolutePosition: c.positionAbs,
-			options: this.options,
-			element: this.element
-		};
-	},
-	destroy: function() {
-		var drop = $.ui.ddmanager.droppables;
-		for ( var i = 0; i < drop.length; i++ )
-			if ( drop[i] == this )
-				drop.splice(i, 1);
-		
-		this.element
-			.removeClass("ui-droppable ui-droppable-disabled")
-			.removeData("droppable")
-			.unbind(".droppable");
-	},
-	over: function(e) {
-		
-		var draggable = $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-		
-		if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
-			$.ui.plugin.call(this, 'over', [e, this.ui(draggable)]);
-			this.element.triggerHandler("dropover", [e, this.ui(draggable)], this.options.over);
-		}
-		
-	},
-	out: function(e) {
-		
-		var draggable = $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-		
-		if (this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
-			$.ui.plugin.call(this, 'out', [e, this.ui(draggable)]);
-			this.element.triggerHandler("dropout", [e, this.ui(draggable)], this.options.out);
-		}
-		
-	},
-	drop: function(e,custom) {
-		
-		var draggable = custom || $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element
-		
-		var childrenIntersection = false;
-		this.element.find(".ui-droppable").not(".ui-draggable-dragging").each(function() {
-			var inst = $.data(this, 'droppable');
-			if(inst.options.greedy && $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)) {
-				childrenIntersection = true; return false;
-			}
-		});
-		if(childrenIntersection) return false;
-		
-		if(this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
-			$.ui.plugin.call(this, 'drop', [e, this.ui(draggable)]);
-			this.element.triggerHandler("drop", [e, this.ui(draggable)], this.options.drop);
-			return true;
-		}
-		
-		return false;
-		
-	},
-	activate: function(e) {
-		
-		var draggable = $.ui.ddmanager.current;
-		$.ui.plugin.call(this, 'activate', [e, this.ui(draggable)]);
-		if(draggable) this.element.triggerHandler("dropactivate", [e, this.ui(draggable)], this.options.activate);
-		
-	},
-	deactivate: function(e) {
-		
-		var draggable = $.ui.ddmanager.current;
-		$.ui.plugin.call(this, 'deactivate', [e, this.ui(draggable)]);
-		if(draggable) this.element.triggerHandler("dropdeactivate", [e, this.ui(draggable)], this.options.deactivate);
-		
-	}
-});
-
-$.extend($.ui.droppable, {
-	defaults: {
-		disabled: false,
-		tolerance: 'intersect'
-	}
-});
-
-$.ui.intersect = function(draggable, droppable, toleranceMode) {
-	
-	if (!droppable.offset) return false;
-	
-	var x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
-		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height;
-	var l = droppable.offset.left, r = l + droppable.proportions.width,
-		t = droppable.offset.top, b = t + droppable.proportions.height;
-	
-	switch (toleranceMode) {
-		case 'fit':
-			return (l < x1 && x2 < r
-				&& t < y1 && y2 < b);
-			break;
-		case 'intersect':
-			return (l < x1 + (draggable.helperProportions.width / 2) // Right Half
-				&& x2 - (draggable.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (draggable.helperProportions.height / 2) // Bottom Half
-				&& y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
-			break;
-		case 'pointer':
-			return (l < ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left) && ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left) < r
-				&& t < ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top) && ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top) < b);
-			break;
-		case 'touch':
-			return (
-					(y1 >= t && y1 <= b) ||	// Top edge touching
-					(y2 >= t && y2 <= b) ||	// Bottom edge touching
-					(y1 < t && y2 > b)		// Surrounded vertically
-				) && (
-					(x1 >= l && x1 <= r) ||	// Left edge touching
-					(x2 >= l && x2 <= r) ||	// Right edge touching
-					(x1 < l && x2 > r)		// Surrounded horizontally
-				);
-			break;
-		default:
-			return false;
-			break;
-		}
-	
-};
-
-/*
-	This manager tracks offsets of draggables and droppables
-*/
-$.ui.ddmanager = {
-	current: null,
-	droppables: [],
-	prepareOffsets: function(t, e) {
-		
-		var m = $.ui.ddmanager.droppables;
-		var type = e ? e.type : null; // workaround for #2317
-
-		for (var i = 0; i < m.length; i++) {
-			if(m[i].options.disabled || (t && !m[i].options.accept.call(m[i].element,(t.currentItem || t.element)))) continue;
-			m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; //If the element is not visible, continue
-			m[i].offset = m[i].element.offset();
-			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
-			
-			if(type == "dragstart" || type == "sortactivate") m[i].activate.call(m[i], e); //Activate the droppable if used directly from draggables
-		}
-		
-	},
-	drop: function(draggable, e) {
-		
-		var dropped = false;
-		$.each($.ui.ddmanager.droppables, function() {
-			
-			if(!this.options) return;
-			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
-				dropped = this.drop.call(this, e);
-			
-			if (!this.options.disabled && this.visible && this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
-				this.isout = 1; this.isover = 0;
-				this.deactivate.call(this, e);
-			}
-			
-		});
-		return dropped;
-		
-	},
-	drag: function(draggable, e) {
-		
-		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
-		if(draggable.options.refreshPositions) $.ui.ddmanager.prepareOffsets(draggable, e);
-		
-		//Run through all droppables and check their positions based on specific tolerance options
-
-		$.each($.ui.ddmanager.droppables, function() {
-			
-			if(this.options.disabled || this.greedyChild || !this.visible) return;
-			var intersects = $.ui.intersect(draggable, this, this.options.tolerance);
-			
-			var c = !intersects && this.isover == 1 ? 'isout' : (intersects && this.isover == 0 ? 'isover' : null);
-			if(!c) return;
-			
-			var parentInstance;
-			if (this.options.greedy) {
-				var parent = this.element.parents('.ui-droppable:eq(0)');
-				if (parent.length) {
-					parentInstance = $.data(parent[0], 'droppable');
-					parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
-				}
-			}
-			
-			// we just moved into a greedy child
-			if (parentInstance && c == 'isover') {
-				parentInstance['isover'] = 0;
-				parentInstance['isout'] = 1;
-				parentInstance.out.call(parentInstance, e);
-			}
-			
-			this[c] = 1; this[c == 'isout' ? 'isover' : 'isout'] = 0;
-			this[c == "isover" ? "over" : "out"].call(this, e);
-			
-			// we just moved out of a greedy child
-			if (parentInstance && c == 'isout') {
-				parentInstance['isout'] = 0;
-				parentInstance['isover'] = 1;
-				parentInstance.over.call(parentInstance, e);
-			}
-		});
-		
-	}
-};
-
-/*
- * Droppable Extensions
- */
-
-$.ui.plugin.add("droppable", "activeClass", {
-	activate: function(e, ui) {
-		$(this).addClass(ui.options.activeClass);
-	},
-	deactivate: function(e, ui) {
-		$(this).removeClass(ui.options.activeClass);
-	},
-	drop: function(e, ui) {
-		$(this).removeClass(ui.options.activeClass);
-	}
-});
-
-$.ui.plugin.add("droppable", "hoverClass", {
-	over: function(e, ui) {
-		$(this).addClass(ui.options.hoverClass);
-	},
-	out: function(e, ui) {
-		$(this).removeClass(ui.options.hoverClass);
-	},
-	drop: function(e, ui) {
-		$(this).removeClass(ui.options.hoverClass);
-	}
-});
-
-})(jQuery);
-/*
- * jQuery UI Resizable
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.resizable", $.extend({}, $.ui.mouse, {
-	init: function() {
-
-		var self = this, o = this.options;
-
-		var elpos = this.element.css('position');
-		
-		this.originalElement = this.element;
-		
-		// simulate .ui-resizable { position: relative; }
-		this.element.addClass("ui-resizable").css({ position: /static/.test(elpos) ? 'relative' : elpos });
-		
-		$.extend(o, {
-			_aspectRatio: !!(o.aspectRatio),
-			helper: o.helper || o.ghost || o.animate ? o.helper || 'proxy' : null,
-			knobHandles: o.knobHandles === true ? 'ui-resizable-knob-handle' : o.knobHandles
-		});
-		
-		//Default Theme
-		var aBorder = '1px solid #DEDEDE';
-		
-		o.defaultTheme = {
-			'ui-resizable': { display: 'block' },
-			'ui-resizable-handle': { position: 'absolute', background: '#F2F2F2', fontSize: '0.1px' },
-			'ui-resizable-n': { cursor: 'n-resize', height: '4px', left: '0px', right: '0px', borderTop: aBorder },
-			'ui-resizable-s': { cursor: 's-resize', height: '4px', left: '0px', right: '0px', borderBottom: aBorder },
-			'ui-resizable-e': { cursor: 'e-resize', width: '4px', top: '0px', bottom: '0px', borderRight: aBorder },
-			'ui-resizable-w': { cursor: 'w-resize', width: '4px', top: '0px', bottom: '0px', borderLeft: aBorder },
-			'ui-resizable-se': { cursor: 'se-resize', width: '4px', height: '4px', borderRight: aBorder, borderBottom: aBorder },
-			'ui-resizable-sw': { cursor: 'sw-resize', width: '4px', height: '4px', borderBottom: aBorder, borderLeft: aBorder },
-			'ui-resizable-ne': { cursor: 'ne-resize', width: '4px', height: '4px', borderRight: aBorder, borderTop: aBorder },
-			'ui-resizable-nw': { cursor: 'nw-resize', width: '4px', height: '4px', borderLeft: aBorder, borderTop: aBorder }
-		};
-		
-		o.knobTheme = {
-			'ui-resizable-handle': { background: '#F2F2F2', border: '1px solid #808080', height: '8px', width: '8px' },
-			'ui-resizable-n': { cursor: 'n-resize', top: '0px', left: '45%' },
-			'ui-resizable-s': { cursor: 's-resize', bottom: '0px', left: '45%' },
-			'ui-resizable-e': { cursor: 'e-resize', right: '0px', top: '45%' },
-			'ui-resizable-w': { cursor: 'w-resize', left: '0px', top: '45%' },
-			'ui-resizable-se': { cursor: 'se-resize', right: '0px', bottom: '0px' },
-			'ui-resizable-sw': { cursor: 'sw-resize', left: '0px', bottom: '0px' },
-			'ui-resizable-nw': { cursor: 'nw-resize', left: '0px', top: '0px' },
-			'ui-resizable-ne': { cursor: 'ne-resize', right: '0px', top: '0px' }
-		};
-		
-		o._nodeName = this.element[0].nodeName;
-		
-		//Wrap the element if it cannot hold child nodes
-		if(o._nodeName.match(/canvas|textarea|input|select|button|img/i)) {
-			var el = this.element;
-			
-			//Opera fixing relative position
-			if (/relative/.test(el.css('position')) && $.browser.opera)
-				el.css({ position: 'relative', top: 'auto', left: 'auto' });
-			
-			//Create a wrapper element and set the wrapper to the new current internal element
-			el.wrap(
-				$('<div class="ui-wrapper"	style="overflow: hidden;"></div>').css( {
-					position: el.css('position'),
-					width: el.outerWidth(),
-					height: el.outerHeight(),
-					top: el.css('top'),
-					left: el.css('left')
-				})
-			);
-			
-			var oel = this.element; this.element = this.element.parent();
-			
-			// store instance on wrapper
-			this.element.data('resizable', this); 
-			
-			//Move margins to the wrapper
-			this.element.css({ marginLeft: oel.css("marginLeft"), marginTop: oel.css("marginTop"),
-				marginRight: oel.css("marginRight"), marginBottom: oel.css("marginBottom")
-			});
-			
-			oel.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
-			
-			//Prevent Safari textarea resize
-			if ($.browser.safari && o.preventDefault) oel.css('resize', 'none');
-			
-			o.proportionallyResize = oel.css({ position: 'static', zoom: 1, display: 'block' });
-			
-			// avoid IE jump
-			this.element.css({ margin: oel.css('margin') });
-			
-			// fix handlers offset
-			this._proportionallyResize();
-		}
-		
-		if(!o.handles) o.handles = !$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' };
-		if(o.handles.constructor == String) {
-			
-			o.zIndex = o.zIndex || 1000;
-			
-			if(o.handles == 'all') o.handles = 'n,e,s,w,se,sw,ne,nw';
-			
-			var n = o.handles.split(","); o.handles = {};
-			
-			// insertions are applied when don't have theme loaded
-			var insertionsDefault = {
-				handle: 'position: absolute; display: none; overflow:hidden;',
-				n: 'top: 0pt; width:100%;',
-				e: 'right: 0pt; height:100%;',
-				s: 'bottom: 0pt; width:100%;',
-				w: 'left: 0pt; height:100%;',
-				se: 'bottom: 0pt; right: 0px;',
-				sw: 'bottom: 0pt; left: 0px;',
-				ne: 'top: 0pt; right: 0px;',
-				nw: 'top: 0pt; left: 0px;'
-			};
-			
-			for(var i = 0; i < n.length; i++) {
-				var handle = $.trim(n[i]), dt = o.defaultTheme, hname = 'ui-resizable-'+handle, loadDefault = !$.ui.css(hname) && !o.knobHandles, userKnobClass = $.ui.css('ui-resizable-knob-handle'), 
-							allDefTheme = $.extend(dt[hname], dt['ui-resizable-handle']), allKnobTheme = $.extend(o.knobTheme[hname], !userKnobClass ? o.knobTheme['ui-resizable-handle'] : {});
-				
-				// increase zIndex of sw, se, ne, nw axis
-				var applyZIndex = /sw|se|ne|nw/.test(handle) ? { zIndex: ++o.zIndex } : {};
-				
-				var defCss = (loadDefault ? insertionsDefault[handle] : ''), 
-					axis = $(['<div class="ui-resizable-handle ', hname, '" style="', defCss, insertionsDefault.handle, '"></div>'].join('')).css( applyZIndex );
-				o.handles[handle] = '.ui-resizable-'+handle;
-				
-				this.element.append(
-					//Theme detection, if not loaded, load o.defaultTheme
-					axis.css( loadDefault ? allDefTheme : {} )
-						// Load the knobHandle css, fix width, height, top, left...
-						.css( o.knobHandles ? allKnobTheme : {} ).addClass(o.knobHandles ? 'ui-resizable-knob-handle' : '').addClass(o.knobHandles)
-				);
-			}
-			
-			if (o.knobHandles) this.element.addClass('ui-resizable-knob').css( !$.ui.css('ui-resizable-knob') ? { /*border: '1px #fff dashed'*/ } : {} );
-		}
-		
-		this._renderAxis = function(target) {
-			target = target || this.element;
-			
-			for(var i in o.handles) {
-				if(o.handles[i].constructor == String) 
-					o.handles[i] = $(o.handles[i], this.element).show();
-				
-				if (o.transparent)
-					o.handles[i].css({opacity:0});
-				
-				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
-				if (this.element.is('.ui-wrapper') && 
-					o._nodeName.match(/textarea|input|select|button/i)) {
-					
-					var axis = $(o.handles[i], this.element), padWrapper = 0;
-					
-					//Checking the correct pad and border
-					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
-					
-					//The padding type i have to apply...
-					var padPos = [ 'padding', 
-						/ne|nw|n/.test(i) ? 'Top' :
-						/se|sw|s/.test(i) ? 'Bottom' : 
-						/^e$/.test(i) ? 'Right' : 'Left' ].join(""); 
-					
-					if (!o.transparent)
-						target.css(padPos, padWrapper);
-					
-					this._proportionallyResize();
-				}
-				if(!$(o.handles[i]).length) continue;
-			}
-		};
-		
-		this._renderAxis(this.element);
-		o._handles = $('.ui-resizable-handle', self.element);
-		
-		if (o.disableSelection)
-			o._handles.each(function(i, e) { $.ui.disableSelection(e); });
-		
-		//Matching axis name
-		o._handles.mouseover(function() {
-			if (!o.resizing) {
-				if (this.className) 
-					var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
-				//Axis, default = se
-				self.axis = o.axis = axis && axis[1] ? axis[1] : 'se';
-			}
-		});
-		
-		//If we want to auto hide the elements
-		if (o.autoHide) {
-			o._handles.hide();
-			$(self.element).addClass("ui-resizable-autohide").hover(function() {
-				$(this).removeClass("ui-resizable-autohide");
-				o._handles.show();
-			},
-			function(){
-				if (!o.resizing) {
-					$(this).addClass("ui-resizable-autohide");
-					o._handles.hide();
-				}
-			});
-		}
-		
-		this.mouseInit();
-	},
-	plugins: {},
-	ui: function() {
-		return {
-			originalElement: this.originalElement,
-			element: this.element,
-			helper: this.helper,
-			position: this.position,
-			size: this.size,
-			options: this.options,
-			originalSize: this.originalSize,
-			originalPosition: this.originalPosition
-		};
-	},
-	propagate: function(n,e) {
-		$.ui.plugin.call(this, n, [e, this.ui()]);
-		if (n != "resize") this.element.triggerHandler(["resize", n].join(""), [e, this.ui()], this.options[n]);
-	},
-	destroy: function() {
-		var el = this.element, wrapped = el.children(".ui-resizable").get(0);
-		
-		this.mouseDestroy();
-		
-		var _destroy = function(exp) {
-			$(exp).removeClass("ui-resizable ui-resizable-disabled")
-				.removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
-		};
-		
-		_destroy(el);
-		
-		if (el.is('.ui-wrapper') && wrapped) {
-			el.parent().append(
-				$(wrapped).css({
-					position: el.css('position'),
-					width: el.outerWidth(),
-					height: el.outerHeight(),
-					top: el.css('top'),
-					left: el.css('left')
-				})
-			).end().remove();
-			
-			_destroy(wrapped);
-		}
-	},
-	mouseStart: function(e) {
-		if(this.options.disabled) return false;
-		
-		var handle = false;
-		for(var i in this.options.handles) {
-			if($(this.options.handles[i])[0] == e.target) handle = true;
-		}
-		if (!handle) return false;
-		
-		var o = this.options, iniPos = this.element.position(), el = this.element, 
-			num = function(v) { return parseInt(v, 10) || 0; }, ie6 = $.browser.msie && $.browser.version < 7;
-		o.resizing = true;
-		o.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
-		
-		// bugfix #1749
-		if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
-			
-			// sOffset decides if document scrollOffset will be added to the top/left of the resizable element
-			var sOffset = $.browser.msie && !o.containment && (/absolute/).test(el.css('position')) && !(/relative/).test(el.parent().css('position'));
-			var dscrollt = sOffset ? o.documentScroll.top : 0, dscrolll = sOffset ? o.documentScroll.left : 0;
-			
-			el.css({ position: 'absolute', top: (iniPos.top + dscrollt), left: (iniPos.left + dscrolll) });
-		}
-		
-		//Opera fixing relative position
-		if ($.browser.opera && /relative/.test(el.css('position')))
-			el.css({ position: 'relative', top: 'auto', left: 'auto' });
-		
-		this._renderProxy();
-		
-		var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
-		
-		if (o.containment) {
-			curleft += $(o.containment).scrollLeft()||0;
-			curtop += $(o.containment).scrollTop()||0;
-		}
-		
-		//Store needed variables
-		this.offset = this.helper.offset();
-		this.position = { left: curleft, top: curtop };
-		this.size = o.helper || ie6 ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
-		this.originalSize = o.helper || ie6 ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
-		this.originalPosition = { left: curleft, top: curtop };
-		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
-		this.originalMousePosition = { left: e.pageX, top: e.pageY };
-		
-		//Aspect Ratio
-		o.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.height / this.originalSize.width)||1);
-		
-		if (o.preserveCursor)
-			$('body').css('cursor', this.axis + '-resize');
-			
-		this.propagate("start", e);
-		return true;
-	},
-	mouseDrag: function(e) {
-		
-		//Increase performance, avoid regex
-		var el = this.helper, o = this.options, props = {},
-			self = this, smp = this.originalMousePosition, a = this.axis;
-		
-		var dx = (e.pageX-smp.left)||0, dy = (e.pageY-smp.top)||0;
-		var trigger = this._change[a];
-		if (!trigger) return false;
-		
-		// Calculate the attrs that will be change
-		var data = trigger.apply(this, [e, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
-		
-		if (o._aspectRatio || e.shiftKey)
-			data = this._updateRatio(data, e);
-		
-		data = this._respectSize(data, e);
-		
-		// plugins callbacks need to be called first
-		this.propagate("resize", e);
-		
-		el.css({
-			top: this.position.top + "px", left: this.position.left + "px", 
-			width: this.size.width + "px", height: this.size.height + "px"
-		});
-		
-		if (!o.helper && o.proportionallyResize)
-			this._proportionallyResize();
-		
-		this._updateCache(data);
-		
-		// calling the user callback at the end
-		this.element.triggerHandler("resize", [e, this.ui()], this.options["resize"]);
-		
-		return false;
-	},
-	mouseStop: function(e) {
-		
-		this.options.resizing = false;
-		var o = this.options, num = function(v) { return parseInt(v, 10) || 0; }, self = this;
-		
-		if(o.helper) {
-			var pr = o.proportionallyResize, ista = pr && (/textarea/i).test(pr.get(0).nodeName), 
-						soffseth = ista && $.ui.hasScroll(pr.get(0), 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
-							soffsetw = ista ? 0 : self.sizeDiff.width;
-			
-			var s = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
-				left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null, 
-				top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
-			
-			if (!o.animate)
-				this.element.css($.extend(s, { top: top, left: left }));
-			
-			if (o.helper && !o.animate) this._proportionallyResize();
-		}
-		
-		if (o.preserveCursor)
-			$('body').css('cursor', 'auto');
-		
-		this.propagate("stop", e);
-		
-		if (o.helper) this.helper.remove();
-		
-		return false;
-	},
-	_updateCache: function(data) {
-		var o = this.options;
-		this.offset = this.helper.offset();
-		if (data.left) this.position.left = data.left;
-		if (data.top) this.position.top = data.top;
-		if (data.height) this.size.height = data.height;
-		if (data.width) this.size.width = data.width;
-	},
-	_updateRatio: function(data, e) {
-		var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
-		
-		if (data.height) data.width = (csize.height / o.aspectRatio);
-		else if (data.width) data.height = (csize.width * o.aspectRatio);
-		
-		if (a == 'sw') {
-			data.left = cpos.left + (csize.width - data.width);
-			data.top = null;
-		}
-		if (a == 'nw') { 
-			data.top = cpos.top + (csize.height - data.height);
-			data.left = cpos.left + (csize.width - data.width);
-		}
-		
-		return data;
-	},
-	_respectSize: function(data, e) {
-		
-		var el = this.helper, o = this.options, pRatio = o._aspectRatio || e.shiftKey, a = this.axis, 
-				ismaxw = data.width && o.maxWidth && o.maxWidth < data.width, ismaxh = data.height && o.maxHeight && o.maxHeight < data.height,
-					isminw = data.width && o.minWidth && o.minWidth > data.width, isminh = data.height && o.minHeight && o.minHeight > data.height;
-		
-		if (isminw) data.width = o.minWidth;
-		if (isminh) data.height = o.minHeight;
-		if (ismaxw) data.width = o.maxWidth;
-		if (ismaxh) data.height = o.maxHeight;
-		
-		var dw = this.originalPosition.left + this.originalSize.width, dh = this.position.top + this.size.height;
-		var cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
-		
-		if (isminw && cw) data.left = dw - o.minWidth;
-		if (ismaxw && cw) data.left = dw - o.maxWidth;
-		if (isminh && ch)	data.top = dh - o.minHeight;
-		if (ismaxh && ch)	data.top = dh - o.maxHeight;
-		
-		// fixing jump error on top/left - bug #2330
-		var isNotwh = !data.width && !data.height;
-		if (isNotwh && !data.left && data.top) data.top = null;
-		else if (isNotwh && !data.top && data.left) data.left = null;
-		
-		return data;
-	},
-	_proportionallyResize: function() {
-		var o = this.options;
-		if (!o.proportionallyResize) return;
-		var prel = o.proportionallyResize, el = this.helper || this.element;
-		
-		if (!o.borderDif) {
-			var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
-				p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
-			
-			o.borderDif = $.map(b, function(v, i) {
-				var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
-				return border + padding; 
-			});
-		}
-		prel.css({
-			height: (el.height() - o.borderDif[0] - o.borderDif[2]) + "px",
-			width: (el.width() - o.borderDif[1] - o.borderDif[3]) + "px"
-		});
-	},
-	_renderProxy: function() {
-		var el = this.element, o = this.options;
-		this.elementOffset = el.offset();
-		
-		if(o.helper) {
-			this.helper = this.helper || $('<div style="overflow:hidden;"></div>');
-			
-			// fix ie6 offset
-			var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
-			pxyoffset = ( ie6 ? 2 : -1 );
-			
-			this.helper.addClass(o.helper).css({
-				width: el.outerWidth() + pxyoffset,
-				height: el.outerHeight() + pxyoffset,
-				position: 'absolute',
-				left: this.elementOffset.left - ie6offset +'px',
-				top: this.elementOffset.top - ie6offset +'px',
-				zIndex: ++o.zIndex
-			});
-			
-			this.helper.appendTo("body");
-			
-			if (o.disableSelection)
-				$.ui.disableSelection(this.helper.get(0));
-			
-		} else {
-			this.helper = el; 
-		}
-	},
-	_change: {
-		e: function(e, dx, dy) {
-			return { width: this.originalSize.width + dx };
-		},
-		w: function(e, dx, dy) {
-			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
-			return { left: sp.left + dx, width: cs.width - dx };
-		},
-		n: function(e, dx, dy) {
-			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
-			return { top: sp.top + dy, height: cs.height - dy };
-		},
-		s: function(e, dx, dy) {
-			return { height: this.originalSize.height + dy };
-		},
-		se: function(e, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [e, dx, dy]));
-		},
-		sw: function(e, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [e, dx, dy]));
-		},
-		ne: function(e, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [e, dx, dy]));
-		},
-		nw: function(e, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [e, dx, dy]));
-		}
-	}
-}));
-
-$.extend($.ui.resizable, {
-	defaults: {
-		cancel: ":input",
-		distance: 1,
-		delay: 0,
-		preventDefault: true,
-		transparent: false,
-		minWidth: 10,
-		minHeight: 10,
-		aspectRatio: false,
-		disableSelection: true,
-		preserveCursor: true,
-		autoHide: false,
-		knobHandles: false
-	}
-});
-
-/*
- * Resizable Extensions
- */
-
-$.ui.plugin.add("resizable", "containment", {
-	
-	start: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), el = self.element;
-		var oc = o.containment,	ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
-		if (!ce) return;
-		
-		self.containerElement = $(ce);
-		
-		if (/document/.test(oc) || oc == document) {
-			self.containerOffset = { left: 0, top: 0 };
-			self.containerPosition = { left: 0, top: 0 };
-			
-			self.parentData = { 
-				element: $(document), left: 0, top: 0, 
-				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
-			};
-		}
-		
-				
-		// i'm a node, so compute top, left, right, bottom
-		else{
-			self.containerOffset = $(ce).offset();
-			self.containerPosition = $(ce).position();
-			self.containerSize = { height: $(ce).innerHeight(), width: $(ce).innerWidth() };
-		
-			var co = self.containerOffset, ch = self.containerSize.height,	cw = self.containerSize.width, 
-						width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
-		
-			self.parentData = { 
-				element: ce, left: co.left, top: co.top, width: width, height: height
-			};
-		}
-	},
-	
-	resize: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), 
-				ps = self.containerSize, co = self.containerOffset, cs = self.size, cp = self.position,
-				pRatio = o._aspectRatio || e.shiftKey, cop = { top:0, left:0 }, ce = self.containerElement;
-		
-		if (ce[0] != document && /static/.test(ce.css('position')))
-			cop = self.containerPosition;
-		
-		if (cp.left < (o.helper ? co.left : cop.left)) {
-			self.size.width = self.size.width + (o.helper ? (self.position.left - co.left) : (self.position.left - cop.left));
-			if (pRatio) self.size.height = self.size.width * o.aspectRatio;
-			self.position.left = o.helper ? co.left : cop.left;
-		}
-		
-		if (cp.top < (o.helper ? co.top : 0)) {
-			self.size.height = self.size.height + (o.helper ? (self.position.top - co.top) : self.position.top);
-			if (pRatio) self.size.width = self.size.height / o.aspectRatio;
-			self.position.top = o.helper ? co.top : 0;
-		}
-		
-		var woset = (o.helper ? self.offset.left - co.left : (self.position.left - cop.left)) + self.sizeDiff.width, 
-					hoset = (o.helper ? self.offset.top - co.top : self.position.top) + self.sizeDiff.height;
-		
-		if (woset + self.size.width >= self.parentData.width) {
-			self.size.width = self.parentData.width - woset;
-			if (pRatio) self.size.height = self.size.width * o.aspectRatio;
-		}
-		
-		if (hoset + self.size.height >= self.parentData.height) {
-			self.size.height = self.parentData.height - hoset;
-			if (pRatio) self.size.width = self.size.height / o.aspectRatio;
-		}
-	},
-	
-	stop: function(e, ui){
-		var o = ui.options, self = $(this).data("resizable"), cp = self.position,
-				co = self.containerOffset, cop = self.containerPosition, ce = self.containerElement;
-		
-		var helper = $(self.helper), ho = helper.offset(), w = helper.innerWidth(), h = helper.innerHeight();
-		
-		
-		if (o.helper && !o.animate && /relative/.test(ce.css('position')))
-			$(this).css({ left: (ho.left - co.left), top: (ho.top - co.top), width: w, height: h });
-		
-		if (o.helper && !o.animate && /static/.test(ce.css('position')))
-			$(this).css({ left: cop.left + (ho.left - co.left), top: cop.top + (ho.top - co.top), width: w, height: h });
-		
-	}
-});
-
-$.ui.plugin.add("resizable", "grid", {
-	
-	resize: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), cs = self.size, os = self.originalSize, op = self.originalPosition, a = self.axis, ratio = o._aspectRatio || e.shiftKey;
-		o.grid = typeof o.grid == "number" ? [o.grid, o.grid] : o.grid;
-		var ox = Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[0]||1), oy = Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.grid[1]||1);
-		
-		if (/^(se|s|e)$/.test(a)) {
-			self.size.width = os.width + ox;
-			self.size.height = os.height + oy;
-		}
-		else if (/^(ne)$/.test(a)) {
-			self.size.width = os.width + ox;
-			self.size.height = os.height + oy;
-			self.position.top = op.top - oy;
-		}
-		else if (/^(sw)$/.test(a)) {
-			self.size.width = os.width + ox;
-			self.size.height = os.height + oy;
-			self.position.left = op.left - ox;
-		}
-		else {
-			self.size.width = os.width + ox;
-			self.size.height = os.height + oy;
-			self.position.top = op.top - oy;
-			self.position.left = op.left - ox;
-		}
-	}
-	
-});
-
-$.ui.plugin.add("resizable", "animate", {
-	
-	stop: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable");
-		
-		var pr = o.proportionallyResize, ista = pr && (/textarea/i).test(pr.get(0).nodeName), 
-						soffseth = ista && $.ui.hasScroll(pr.get(0), 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
-							soffsetw = ista ? 0 : self.sizeDiff.width;
-		
-		var style = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
-					left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null, 
-						top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null; 
-		
-		self.element.animate(
-			$.extend(style, top && left ? { top: top, left: left } : {}), { 
-				duration: o.animateDuration || "slow", easing: o.animateEasing || "swing", 
-				step: function() {
-					
-					var data = {
-						width: parseInt(self.element.css('width'), 10),
-						height: parseInt(self.element.css('height'), 10),
-						top: parseInt(self.element.css('top'), 10),
-						left: parseInt(self.element.css('left'), 10)
-					};
-					
-					if (pr) pr.css({ width: data.width, height: data.height });
-					
-					// propagating resize, and updating values for each animation step
-					self._updateCache(data);
-					self.propagate("animate", e);
-					
-				}
-			}
-		);
-	}
-	
-});
-
-$.ui.plugin.add("resizable", "ghost", {
-	
-	start: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize, cs = self.size;
-		
-		if (!pr) self.ghost = self.element.clone();
-		else self.ghost = pr.clone();
-		
-		self.ghost.css(
-			{ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 }
-		)
-		.addClass('ui-resizable-ghost').addClass(typeof o.ghost == 'string' ? o.ghost : '');
-		
-		self.ghost.appendTo(self.helper);
-		
-	},
-	
-	resize: function(e, ui){
-		var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize;
-		
-		if (self.ghost) self.ghost.css({ position: 'relative', height: self.size.height, width: self.size.width });
-		
-	},
-	
-	stop: function(e, ui){
-		var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize;
-		if (self.ghost && self.helper) self.helper.get(0).removeChild(self.ghost.get(0));
-	}
-	
-});
-
-$.ui.plugin.add("resizable", "alsoResize", {
-	
-	start: function(e, ui) {
-		var o = ui.options, self = $(this).data("resizable"), 
-		
-		_store = function(exp) {
-			$(exp).each(function() {
-				$(this).data("resizable-alsoresize", {
-					width: parseInt($(this).width(), 10), height: parseInt($(this).height(), 10),
-					left: parseInt($(this).css('left'), 10), top: parseInt($(this).css('top'), 10)
-				});
-			});
-		};
-		
-		if (typeof(o.alsoResize) == 'object') {
-			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0];	_store(o.alsoResize); }
-			else { $.each(o.alsoResize, function(exp, c) { _store(exp); }); }
-		}else{
-			_store(o.alsoResize);
-		} 
-	},
-	
-	resize: function(e, ui){
-		var o = ui.options, self = $(this).data("resizable"), os = self.originalSize, op = self.originalPosition;
-		
-		var delta = { 
-			height: (self.size.height - os.height) || 0, width: (self.size.width - os.width) || 0,
-			top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
-		},
-		
-		_alsoResize = function(exp, c) {
-			$(exp).each(function() {
-				var start = $(this).data("resizable-alsoresize"), style = {}, css = c && c.length ? c : ['width', 'height', 'top', 'left'];
-				
-				$.each(css || ['width', 'height', 'top', 'left'], function(i, prop) {
-					var sum = (start[prop]||0) + (delta[prop]||0);
-					if (sum && sum >= 0)
-						style[prop] = sum || null;
-				});
-				$(this).css(style);
-			});
-		};
-		
-		if (typeof(o.alsoResize) == 'object') {
-			$.each(o.alsoResize, function(exp, c) { _alsoResize(exp, c); });
-		}else{
-			_alsoResize(o.alsoResize);
-		}
-	},
-	
-	stop: function(e, ui){
-		$(this).removeData("resizable-alsoresize-start");
-	}
-});
-
-})(jQuery);
-/*
- * jQuery UI Selectable
- *
- * Copyright (c) 2008 Richard D. Worth (rdworth.org)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Selectables
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.selectable", $.extend({}, $.ui.mouse, {
-	init: function() {
-		var self = this;
-		
-		this.element.addClass("ui-selectable");
-		
-		this.dragged = false;
-
-		// cache selectee children based on filter
-		var selectees;
-		this.refresh = function() {
-			selectees = $(self.options.filter, self.element[0]);
-			selectees.each(function() {
-				var $this = $(this);
-				var pos = $this.offset();
-				$.data(this, "selectable-item", {
-					element: this,
-					$element: $this,
-					left: pos.left,
-					top: pos.top,
-					right: pos.left + $this.width(),
-					bottom: pos.top + $this.height(),
-					startselected: false,
-					selected: $this.hasClass('ui-selected'),
-					selecting: $this.hasClass('ui-selecting'),
-					unselecting: $this.hasClass('ui-unselecting')
-				});
-			});
-		};
-		this.refresh();
-
-		this.selectees = selectees.addClass("ui-selectee");
-		
-		this.mouseInit();
-		
-		this.helper = $(document.createElement('div')).css({border:'1px dotted black'});
-	},
-	toggle: function() {
-		if(this.options.disabled){
-			this.enable();
-		} else {
-			this.disable();
-		}
-	},
-	destroy: function() {
-		this.element
-			.removeClass("ui-selectable ui-selectable-disabled")
-			.removeData("selectable")
-			.unbind(".selectable");
-		this.mouseDestroy();
-	},
-	mouseStart: function(e) {
-		var self = this;
-		
-		this.opos = [e.pageX, e.pageY];
-		
-		if (this.options.disabled)
-			return;
-
-		var options = this.options;
-
-		this.selectees = $(options.filter, this.element[0]);
-
-		// selectable START callback
-		this.element.triggerHandler("selectablestart", [e, {
-			"selectable": this.element[0],
-			"options": options
-		}], options.start);
-
-		$('body').append(this.helper);
-		// position helper (lasso)
-		this.helper.css({
-			"z-index": 100,
-			"position": "absolute",
-			"left": e.clientX,
-			"top": e.clientY,
-			"width": 0,
-			"height": 0
-		});
-
-		if (options.autoRefresh) {
-			this.refresh();
-		}
-
-		this.selectees.filter('.ui-selected').each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.startselected = true;
-			if (!e.ctrlKey) {
-				selectee.$element.removeClass('ui-selected');
-				selectee.selected = false;
-				selectee.$element.addClass('ui-unselecting');
-				selectee.unselecting = true;
-				// selectable UNSELECTING callback
-				self.element.triggerHandler("selectableunselecting", [e, {
-					selectable: self.element[0],
-					unselecting: selectee.element,
-					options: options
-				}], options.unselecting);
-			}
-		});
-		
-		var isSelectee = false;
-		$(e.target).parents().andSelf().each(function() {
-			if($.data(this, "selectable-item")) isSelectee = true;
-		});
-		return this.options.keyboard ? !isSelectee : true;
-	},
-	mouseDrag: function(e) {
-		var self = this;
-		this.dragged = true;
-		
-		if (this.options.disabled)
-			return;
-
-		var options = this.options;
-
-		var x1 = this.opos[0], y1 = this.opos[1], x2 = e.pageX, y2 = e.pageY;
-		if (x1 > x2) { var tmp = x2; x2 = x1; x1 = tmp; }
-		if (y1 > y2) { var tmp = y2; y2 = y1; y1 = tmp; }
-		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
-
-		this.selectees.each(function() {
-			var selectee = $.data(this, "selectable-item");
-			//prevent helper from being selected if appendTo: selectable
-			if (!selectee || selectee.element == self.element[0])
-				return;
-			var hit = false;
-			if (options.tolerance == 'touch') {
-				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
-			} else if (options.tolerance == 'fit') {
-				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
-			}
-
-			if (hit) {
-				// SELECT
-				if (selectee.selected) {
-					selectee.$element.removeClass('ui-selected');
-					selectee.selected = false;
-				}
-				if (selectee.unselecting) {
-					selectee.$element.removeClass('ui-unselecting');
-					selectee.unselecting = false;
-				}
-				if (!selectee.selecting) {
-					selectee.$element.addClass('ui-selecting');
-					selectee.selecting = true;
-					// selectable SELECTING callback
-					self.element.triggerHandler("selectableselecting", [e, {
-						selectable: self.element[0],
-						selecting: selectee.element,
-						options: options
-					}], options.selecting);
-				}
-			} else {
-				// UNSELECT
-				if (selectee.selecting) {
-					if (e.ctrlKey && selectee.startselected) {
-						selectee.$element.removeClass('ui-selecting');
-						selectee.selecting = false;
-						selectee.$element.addClass('ui-selected');
-						selectee.selected = true;
-					} else {
-						selectee.$element.removeClass('ui-selecting');
-						selectee.selecting = false;
-						if (selectee.startselected) {
-							selectee.$element.addClass('ui-unselecting');
-							selectee.unselecting = true;
-						}
-						// selectable UNSELECTING callback
-						self.element.triggerHandler("selectableunselecting", [e, {
-							selectable: self.element[0],
-							unselecting: selectee.element,
-							options: options
-						}], options.unselecting);
-					}
-				}
-				if (selectee.selected) {
-					if (!e.ctrlKey && !selectee.startselected) {
-						selectee.$element.removeClass('ui-selected');
-						selectee.selected = false;
-
-						selectee.$element.addClass('ui-unselecting');
-						selectee.unselecting = true;
-						// selectable UNSELECTING callback
-						self.element.triggerHandler("selectableunselecting", [e, {
-							selectable: self.element[0],
-							unselecting: selectee.element,
-							options: options
-						}], options.unselecting);
-					}
-				}
-			}
-		});
-		
-		return false;
-	},
-	mouseStop: function(e) {
-		var self = this;
-		
-		this.dragged = false;
-		
-		var options = this.options;
-
-		$('.ui-unselecting', this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass('ui-unselecting');
-			selectee.unselecting = false;
-			selectee.startselected = false;
-			self.element.triggerHandler("selectableunselected", [e, {
-				selectable: self.element[0],
-				unselected: selectee.element,
-				options: options
-			}], options.unselected);
-		});
-		$('.ui-selecting', this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass('ui-selecting').addClass('ui-selected');
-			selectee.selecting = false;
-			selectee.selected = true;
-			selectee.startselected = true;
-			self.element.triggerHandler("selectableselected", [e, {
-				selectable: self.element[0],
-				selected: selectee.element,
-				options: options
-			}], options.selected);
-		});
-		this.element.triggerHandler("selectablestop", [e, {
-			selectable: self.element[0],
-			options: this.options
-		}], this.options.stop);
-		
-		this.helper.remove();
-		
-		return false;
-	}
-}));
-
-$.extend($.ui.selectable, {
-	defaults: {
-		distance: 1,
-		delay: 0,
-		cancel: ":input",
-		appendTo: 'body',
-		autoRefresh: true,
-		filter: '*',
-		tolerance: 'touch'
-	}
-});
-
-})(jQuery);
-/*
- * jQuery UI Sortable
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Sortables
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-function contains(a, b) { 
-    var safari2 = $.browser.safari && $.browser.version < 522; 
-    if (a.contains && !safari2) { 
-        return a.contains(b); 
-    } 
-    if (a.compareDocumentPosition) 
-        return !!(a.compareDocumentPosition(b) & 16); 
-    while (b = b.parentNode) 
-          if (b == a) return true; 
-    return false; 
-};
-
-$.widget("ui.sortable", $.extend({}, $.ui.mouse, {
-	init: function() {
-
-		var o = this.options;
-		this.containerCache = {};
-		this.element.addClass("ui-sortable");
-	
-		//Get the items
-		this.refresh();
-
-		//Let's determine if the items are floating
-		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
-		
-		//Let's determine the parent's offset
-		if(!(/(relative|absolute|fixed)/).test(this.element.css('position'))) this.element.css('position', 'relative');
-		this.offset = this.element.offset();
-
-		//Initialize mouse events for interaction
-		this.mouseInit();
-		
-	},
-	plugins: {},
-	ui: function(inst) {
-		return {
-			helper: (inst || this)["helper"],
-			placeholder: (inst || this)["placeholder"] || $([]),
-			position: (inst || this)["position"],
-			absolutePosition: (inst || this)["positionAbs"],
-			options: this.options,
-			element: this.element,
-			item: (inst || this)["currentItem"],
-			sender: inst ? inst.element : null
-		};		
-	},
-	propagate: function(n,e,inst, noPropagation) {
-		$.ui.plugin.call(this, n, [e, this.ui(inst)]);
-		if(!noPropagation) this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]);
-	},
-	serialize: function(o) {
-
-		var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself
-		var str = []; o = o || {};
-		
-		items.each(function() {
-			var res = ($(this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-			if(res) str.push((o.key || res[1])+'[]='+(o.key && o.expression ? res[1] : res[2]));
-		});
-		
-		return str.join('&');
-		
-	},
-	toArray: function(attr) {
-		
-		var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself
-		var ret = [];
-
-		items.each(function() { ret.push($(this).attr(attr || 'id')); });
-		return ret;
-		
-	},
-	/* Be careful with the following core functions */
-	intersectsWith: function(item) {
-		
-		var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
-		y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
-		var l = item.left, r = l + item.width, 
-		t = item.top, b = t + item.height;
-
-		if(this.options.tolerance == "pointer" || this.options.forcePointerForContainers || (this.options.tolerance == "guess" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) {
-			return (y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r);
-		} else {
-		
-			return (l < x1 + (this.helperProportions.width / 2) // Right Half
-				&& x2 - (this.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
-				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
-		
-		}
-		
-	},
-	intersectsWithEdge: function(item) {	
-		var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
-			y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
-		var l = item.left, r = l + item.width, 
-			t = item.top, b = t + item.height;
-
-		if(this.options.tolerance == "pointer" || (this.options.tolerance == "guess" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) {
-
-			if(!(y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r)) return false;
-			
-			if(this.floating) {
-				if(x1 + this.offset.click.left > l && x1 + this.offset.click.left < l + item.width/2) return 2;
-				if(x1 + this.offset.click.left > l+item.width/2 && x1 + this.offset.click.left < r) return 1;
-			} else {
-				if(y1 + this.offset.click.top > t && y1 + this.offset.click.top < t + item.height/2) return 2;
-				if(y1 + this.offset.click.top > t+item.height/2 && y1 + this.offset.click.top < b) return 1;
-			}
-
-		} else {
-		
-			if (!(l < x1 + (this.helperProportions.width / 2) // Right Half
-				&& x2 - (this.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
-				&& y2 - (this.helperProportions.height / 2) < b )) return false; // Top Half
-			
-			if(this.floating) {
-				if(x2 > l && x1 < l) return 2; //Crosses left edge
-				if(x1 < r && x2 > r) return 1; //Crosses right edge
-			} else {
-				if(y2 > t && y1 < t) return 1; //Crosses top edge
-				if(y1 < b && y2 > b) return 2; //Crosses bottom edge
-			}
-		
-		}
-		
-		return false;
-		
-	},
-	refresh: function() {
-		this.refreshItems();
-		this.refreshPositions();
-	},
-	refreshItems: function() {
-		
-		this.items = [];
-		this.containers = [this];
-		var items = this.items;
-		var self = this;
-		var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element), this]];
-	
-		if(this.options.connectWith) {
-			for (var i = this.options.connectWith.length - 1; i >= 0; i--){
-				var cur = $(this.options.connectWith[i]);
-				for (var j = cur.length - 1; j >= 0; j--){
-					var inst = $.data(cur[j], 'sortable');
-					if(inst && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element), inst]);
-						this.containers.push(inst);
-					}
-				};
-			};
-		}
-
-		for (var i = queries.length - 1; i >= 0; i--){
-			queries[i][0].each(function() {
-				$.data(this, 'sortable-item', queries[i][1]); // Data for target checking (mouse manager)
-				items.push({
-					item: $(this),
-					instance: queries[i][1],
-					width: 0, height: 0,
-					left: 0, top: 0
-				});
-			});
-		};
-
-	},
-	refreshPositions: function(fast) {
-
-		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
-		if(this.offsetParent) {
-			var po = this.offsetParent.offset();
-			this.offset.parent = { top: po.top + this.offsetParentBorders.top, left: po.left + this.offsetParentBorders.left };
-		}
-
-		for (var i = this.items.length - 1; i >= 0; i--){		
-			
-			//We ignore calculating positions of all connected containers when we're not over them
-			if(this.items[i].instance != this.currentContainer && this.currentContainer && this.items[i].item[0] != this.currentItem[0])
-				continue;
-				
-			var t = this.options.toleranceElement ? $(this.options.toleranceElement, this.items[i].item) : this.items[i].item;
-			
-			if(!fast) {
-				this.items[i].width = t[0].offsetWidth;
-				this.items[i].height = t[0].offsetHeight;
-			}
-			
-			var p = t.offset();
-			this.items[i].left = p.left;
-			this.items[i].top = p.top;
-			
-		};
-
-		if(this.options.custom && this.options.custom.refreshContainers) {
-			this.options.custom.refreshContainers.call(this);
-		} else {
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				var p =this.containers[i].element.offset();
-				this.containers[i].containerCache.left = p.left;
-				this.containers[i].containerCache.top = p.top;
-				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
-				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
-			};
-		}
-
-	},
-	destroy: function() {
-		this.element
-			.removeClass("ui-sortable ui-sortable-disabled")
-			.removeData("sortable")
-			.unbind(".sortable");
-		this.mouseDestroy();
-		
-		for ( var i = this.items.length - 1; i >= 0; i-- )
-			this.items[i].item.removeData("sortable-item");
-	},
-	createPlaceholder: function(that) {
-		
-		var self = that || this, o = self.options;
-
-		if(o.placeholder.constructor == String) {
-			var className = o.placeholder;
-			o.placeholder = {
-				element: function() {
-					return $('<div></div>').addClass(className)[0];
-				},
-				update: function(i, p) {
-					p.css(i.offset()).css({ width: i.outerWidth(), height: i.outerHeight() });
-				}
-			};
-		}
-		
-		self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem)).appendTo('body').css({ position: 'absolute' });
-		o.placeholder.update.call(self.element, self.currentItem, self.placeholder);
-	},
-	contactContainers: function(e) {
-		for (var i = this.containers.length - 1; i >= 0; i--){
-
-			if(this.intersectsWith(this.containers[i].containerCache)) {
-				if(!this.containers[i].containerCache.over) {
-					
-
-					if(this.currentContainer != this.containers[i]) {
-						
-						//When entering a new container, we will find the item with the least distance and append our item near it
-						var dist = 10000; var itemWithLeastDistance = null; var base = this.positionAbs[this.containers[i].floating ? 'left' : 'top'];
-						for (var j = this.items.length - 1; j >= 0; j--) {
-							if(!contains(this.containers[i].element[0], this.items[j].item[0])) continue;
-							var cur = this.items[j][this.containers[i].floating ? 'left' : 'top'];
-							if(Math.abs(cur - base) < dist) {
-								dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
-							}
-						}
-						
-						if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
-							continue;
-						
-						//We also need to exchange the placeholder
-						if(this.placeholder) this.placeholder.remove();
-						if(this.containers[i].options.placeholder) {
-							this.containers[i].createPlaceholder(this);
-						} else {
-							this.placeholder = null;;
-						}
-						
-						this.currentContainer = this.containers[i];
-						itemWithLeastDistance ? this.rearrange(e, itemWithLeastDistance, null, true) : this.rearrange(e, null, this.containers[i].element, true);
-						this.propagate("change", e); //Call plugins and callbacks
-						this.containers[i].propagate("change", e, this); //Call plugins and callbacks
-
-					}
-					
-					this.containers[i].propagate("over", e, this);
-					this.containers[i].containerCache.over = 1;
-				}
-			} else {
-				if(this.containers[i].containerCache.over) {
-					this.containers[i].propagate("out", e, this);
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-			
-		};			
-	},
-	mouseCapture: function(e, overrideHandle) {
-	
-		if(this.options.disabled || this.options.type == 'static') return false;
-
-		//We have to refresh the items data once first
-		this.refreshItems();
-
-		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		var currentItem = null, self = this, nodes = $(e.target).parents().each(function() {	
-			if($.data(this, 'sortable-item') == self) {
-				currentItem = $(this);
-				return false;
-			}
-		});
-		if($.data(e.target, 'sortable-item') == self) currentItem = $(e.target);
-
-		if(!currentItem) return false;
-		if(this.options.handle && !overrideHandle) {
-			var validHandle = false;
-			
-			$(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == e.target) validHandle = true; });
-			if(!validHandle) return false;
-		}
-			
-		this.currentItem = currentItem;
-		return true;	
-			
-	},
-	mouseStart: function(e, overrideHandle, noActivation) {
-
-		var o = this.options;
-		this.currentContainer = this;
-
-		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
-		this.refreshPositions();
-
-		//Create and append the visible helper			
-		this.helper = typeof o.helper == 'function' ? $(o.helper.apply(this.element[0], [e, this.currentItem])) : this.currentItem.clone();
-		if (!this.helper.parents('body').length) $(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(this.helper[0]); //Add the helper to the DOM if that didn't happen already
-		this.helper.css({ position: 'absolute', clear: 'both' }).addClass('ui-sortable-helper'); //Position it absolutely and add a helper class
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		this.margins = {																				//Cache the margins
-			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
-			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
-		};		
-	
-		this.offset = this.currentItem.offset();														//The element's absolute position on the page
-		this.offset = {																					//Substract the margins from the element's absolute offset
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-		
-		this.offset.click = {																			//Where the click happened, relative to the element
-			left: e.pageX - this.offset.left,
-			top: e.pageY - this.offset.top
-		};
-		
-		this.offsetParent = this.helper.offsetParent();													//Get the offsetParent and cache its position
-		var po = this.offsetParent.offset();			
-
-		this.offsetParentBorders = {
-			top: (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-		this.offset.parent = {																			//Store its position plus border
-			top: po.top + this.offsetParentBorders.top,
-			left: po.left + this.offsetParentBorders.left
-		};
-	
-		this.originalPosition = this.generatePosition(e);												//Generate the original position
-		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };  //Cache the former DOM position
-		
-		//If o.placeholder is used, create a new element at the given position with the class
-		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Cache the helper size
-		if(o.placeholder) this.createPlaceholder();
-		
-		//Call plugins and callbacks
-		this.propagate("start", e);
-		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Recache the helper size
-		
-		if(o.cursorAt) {
-			if(o.cursorAt.left != undefined) this.offset.click.left = o.cursorAt.left;
-			if(o.cursorAt.right != undefined) this.offset.click.left = this.helperProportions.width - o.cursorAt.right;
-			if(o.cursorAt.top != undefined) this.offset.click.top = o.cursorAt.top;
-			if(o.cursorAt.bottom != undefined) this.offset.click.top = this.helperProportions.height - o.cursorAt.bottom;
-		}
-
-		/*
-		 * - Position constraining -
-		 * Here we prepare position constraining like grid and containment.
-		 */	
-		
-		if(o.containment) {
-			if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-			if(o.containment == 'document' || o.containment == 'window') this.containment = [
-				0 - this.offset.parent.left,
-				0 - this.offset.parent.top,
-				$(o.containment == 'document' ? document : window).width() - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
-				($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
-			];
-
-			if(!(/^(document|window|parent)$/).test(o.containment)) {
-				var ce = $(o.containment)[0];
-				var co = $(o.containment).offset();
-				
-				this.containment = [
-					co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left,
-					co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top,
-					co.left+Math.max(ce.scrollWidth,ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.currentItem.css("marginRight"),10) || 0),
-					co.top+Math.max(ce.scrollHeight,ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.currentItem.css("marginBottom"),10) || 0)
-				];
-			}
-		}
-
-		//Set the original element visibility to hidden to still fill out the white space
-		if(this.options.placeholder != 'clone')
-			this.currentItem.css('visibility', 'hidden');
-		
-		//Post 'activate' events to possible containers
-		if(!noActivation) {
-			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i].propagate("activate", e, this); }
-		}
-		
-		//Prepare possible droppables
-		if($.ui.ddmanager) $.ui.ddmanager.current = this;
-		if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e);
-
-		this.dragging = true;
-
-		this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-		return true;
-
-
-	},
-	convertPositionTo: function(d, pos) {
-		if(!pos) pos = this.position;
-		var mod = d == "absolute" ? 1 : -1;
-		return {
-			top: (
-				pos.top																	// the calculated relative position
-				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
-				- (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) * mod	// The offsetParent's scroll position
-				+ this.margins.top * mod												//Add the margin (you don't want the margin counting in intersection methods)
-			),
-			left: (
-				pos.left																// the calculated relative position
-				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
-				- (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft) * mod	// The offsetParent's scroll position
-				+ this.margins.left * mod												//Add the margin (you don't want the margin counting in intersection methods)
-			)
-		};
-	},
-	generatePosition: function(e) {
-		
-		var o = this.options;
-		var position = {
-			top: (
-				e.pageY																	// The absolute mouse position
-				- this.offset.click.top													// Click offset (relative to the element)
-				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
-				+ (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)	// The offsetParent's scroll position, not if the element is fixed
-			),
-			left: (
-				e.pageX																	// The absolute mouse position
-				- this.offset.click.left												// Click offset (relative to the element)
-				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
-				+ (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft)	// The offsetParent's scroll position, not if the element is fixed
-			)
-		};
-		
-		if(!this.originalPosition) return position;										//If we are not dragging yet, we won't check for options
-		
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-		if(this.containment) {
-			if(position.left < this.containment[0]) position.left = this.containment[0];
-			if(position.top < this.containment[1]) position.top = this.containment[1];
-			if(position.left > this.containment[2]) position.left = this.containment[2];
-			if(position.top > this.containment[3]) position.top = this.containment[3];
-		}
-		
-		if(o.grid) {
-			var top = this.originalPosition.top + Math.round((position.top - this.originalPosition.top) / o.grid[1]) * o.grid[1];
-			position.top = this.containment ? (!(top < this.containment[1] || top > this.containment[3]) ? top : (!(top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-			
-			var left = this.originalPosition.left + Math.round((position.left - this.originalPosition.left) / o.grid[0]) * o.grid[0];
-			position.left = this.containment ? (!(left < this.containment[0] || left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-		}
-		
-		return position;
-	},
-	mouseDrag: function(e) {
-
-		//Compute the helpers position
-		this.position = this.generatePosition(e);
-		this.positionAbs = this.convertPositionTo("absolute");
-
-		//Call the internal plugins
-		$.ui.plugin.call(this, "sort", [e, this.ui()]);
-		
-		//Regenerate the absolute position used for position checks
-		this.positionAbs = this.convertPositionTo("absolute");
-		
-		//Set the helper's position
-		this.helper[0].style.left = this.position.left+'px';
-		this.helper[0].style.top = this.position.top+'px';
-
-		//Rearrange
-		for (var i = this.items.length - 1; i >= 0; i--) {
-			var intersection = this.intersectsWithEdge(this.items[i]);
-			if(!intersection) continue;
-			
-			if(this.items[i].item[0] != this.currentItem[0] //cannot intersect with itself
-				&&	this.currentItem[intersection == 1 ? "next" : "prev"]()[0] != this.items[i].item[0] //no useless actions that have been done before
-				&&	!contains(this.currentItem[0], this.items[i].item[0]) //no action if the item moved is the parent of the item checked
-				&& (this.options.type == 'semi-dynamic' ? !contains(this.element[0], this.items[i].item[0]) : true)
-			) {
-				
-				this.direction = intersection == 1 ? "down" : "up";
-				this.rearrange(e, this.items[i]);
-				this.propagate("change", e); //Call plugins and callbacks
-				break;
-			}
-		}
-		
-		//Post events to containers
-		this.contactContainers(e);
-		
-		//Interconnect with droppables
-		if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
-
-		//Call callbacks
-		this.element.triggerHandler("sort", [e, this.ui()], this.options["sort"]);
-
-		return false;
-		
-	},
-	rearrange: function(e, i, a, hardRefresh) {
-		a ? a[0].appendChild(this.currentItem[0]) : i.item[0].parentNode.insertBefore(this.currentItem[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
-		
-		//Various things done here to improve the performance:
-		// 1. we create a setTimeout, that calls refreshPositions
-		// 2. on the instance, we have a counter variable, that get's higher after every append
-		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
-		// 4. this lets only the last addition to the timeout stack through
-		this.counter = this.counter ? ++this.counter : 1;
-		var self = this, counter = this.counter;
-
-		window.setTimeout(function() {
-			if(counter == self.counter) self.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
-		},0);
-		
-		if(this.options.placeholder)
-			this.options.placeholder.update.call(this.element, this.currentItem, this.placeholder);
-	},
-	mouseStop: function(e, noPropagation) {
-
-		//If we are using droppables, inform the manager about the drop
-		if ($.ui.ddmanager && !this.options.dropBehaviour)
-			$.ui.ddmanager.drop(this, e);
-			
-		if(this.options.revert) {
-			var self = this;
-			var cur = self.currentItem.offset();
-
-			//Also animate the placeholder if we have one
-			if(self.placeholder) self.placeholder.animate({ opacity: 'hide' }, (parseInt(this.options.revert, 10) || 500)-50);
-
-			$(this.helper).animate({
-				left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
-				top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
-			}, parseInt(this.options.revert, 10) || 500, function() {
-				self.clear(e);
-			});
-		} else {
-			this.clear(e, noPropagation);
-		}
-
-		return false;
-		
-	},
-	clear: function(e, noPropagation) {
-
-		if(this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) this.propagate("update", e, null, noPropagation); //Trigger update callback if the DOM position has changed
-		if(!contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
-			this.propagate("remove", e, null, noPropagation);
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				if(contains(this.containers[i].element[0], this.currentItem[0])) {
-					this.containers[i].propagate("update", e, this, noPropagation);
-					this.containers[i].propagate("receive", e, this, noPropagation);
-				}
-			};
-		};
-		
-		//Post events to containers
-		for (var i = this.containers.length - 1; i >= 0; i--){
-			this.containers[i].propagate("deactivate", e, this, noPropagation);
-			if(this.containers[i].containerCache.over) {
-				this.containers[i].propagate("out", e, this);
-				this.containers[i].containerCache.over = 0;
-			}
-		}
-		
-		this.dragging = false;
-		if(this.cancelHelperRemoval) {
-			this.propagate("stop", e, null, noPropagation);
-			return false;
-		}
-		
-		$(this.currentItem).css('visibility', '');
-		if(this.placeholder) this.placeholder.remove();
-		this.helper.remove(); this.helper = null;
-		this.propagate("stop", e, null, noPropagation);
-		
-		return true;
-		
-	}
-}));
-
-$.extend($.ui.sortable, {
-	getter: "serialize toArray",
-	defaults: {
-		helper: "clone",
-		tolerance: "guess",
-		distance: 1,
-		delay: 0,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		cancel: ":input",
-		items: '> *',
-		zIndex: 1000,
-		dropOnEmpty: true,
-		appendTo: "parent"
-	}
-});
-
-/*
- * Sortable Extensions
- */
-
-$.ui.plugin.add("sortable", "cursor", {
-	start: function(e, ui) {
-		var t = $('body');
-		if (t.css("cursor")) ui.options._cursor = t.css("cursor");
-		t.css("cursor", ui.options.cursor);
-	},
-	stop: function(e, ui) {
-		if (ui.options._cursor) $('body').css("cursor", ui.options._cursor);
-	}
-});
-
-$.ui.plugin.add("sortable", "zIndex", {
-	start: function(e, ui) {
-		var t = ui.helper;
-		if(t.css("zIndex")) ui.options._zIndex = t.css("zIndex");
-		t.css('zIndex', ui.options.zIndex);
-	},
-	stop: function(e, ui) {
-		if(ui.options._zIndex) $(ui.helper).css('zIndex', ui.options._zIndex);
-	}
-});
-
-$.ui.plugin.add("sortable", "opacity", {
-	start: function(e, ui) {
-		var t = ui.helper;
-		if(t.css("opacity")) ui.options._opacity = t.css("opacity");
-		t.css('opacity', ui.options.opacity);
-	},
-	stop: function(e, ui) {
-		if(ui.options._opacity) $(ui.helper).css('opacity', ui.options._opacity);
-	}
-});
-
-$.ui.plugin.add("sortable", "scroll", {
-	start: function(e, ui) {
-		var o = ui.options;
-		var i = $(this).data("sortable");
-	
-		i.overflowY = function(el) {
-			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
-			return $(document);
-		}(i.currentItem);
-		i.overflowX = function(el) {
-			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
-			return $(document);
-		}(i.currentItem);
-		
-		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') i.overflowYOffset = i.overflowY.offset();
-		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') i.overflowXOffset = i.overflowX.offset();
-		
-	},
-	sort: function(e, ui) {
-		
-		var o = ui.options;
-		var i = $(this).data("sortable");
-		
-		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') {
-			if((i.overflowYOffset.top + i.overflowY[0].offsetHeight) - e.pageY < o.scrollSensitivity)
-				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop + o.scrollSpeed;
-			if(e.pageY - i.overflowYOffset.top < o.scrollSensitivity)
-				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop - o.scrollSpeed;
-		} else {
-			if(e.pageY - $(document).scrollTop() < o.scrollSensitivity)
-				$(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-			if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-				$(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-		}
-		
-		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') {
-			if((i.overflowXOffset.left + i.overflowX[0].offsetWidth) - e.pageX < o.scrollSensitivity)
-				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft + o.scrollSpeed;
-			if(e.pageX - i.overflowXOffset.left < o.scrollSensitivity)
-				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft - o.scrollSpeed;
-		} else {
-			if(e.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-				$(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-			if($(window).width() - (e.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-				$(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-		}
-		
-	}
-});
-
-$.ui.plugin.add("sortable", "axis", {
-	sort: function(e, ui) {
-		
-		var i = $(this).data("sortable");
-		
-		if(ui.options.axis == "y") i.position.left = i.originalPosition.left;
-		if(ui.options.axis == "x") i.position.top = i.originalPosition.top;
-		
-	}
-});
-
-})(jQuery);
-/*
- * jQuery UI Effects 1.5.2
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/
- */
-;(function($) {
-
-$.effects = $.effects || {}; //Add the 'effects' scope
-
-$.extend($.effects, {
-	save: function(el, set) {
-		for(var i=0;i<set.length;i++) {
-			if(set[i] !== null) $.data(el[0], "ec.storage."+set[i], el[0].style[set[i]]);
-		}
-	},
-	restore: function(el, set) {
-		for(var i=0;i<set.length;i++) {
-			if(set[i] !== null) el.css(set[i], $.data(el[0], "ec.storage."+set[i]));
-		}
-	},
-	setMode: function(el, mode) {
-		if (mode == 'toggle') mode = el.is(':hidden') ? 'show' : 'hide'; // Set for toggle
-		return mode;
-	},
-	getBaseline: function(origin, original) { // Translates a [top,left] array into a baseline value
-		// this should be a little more flexible in the future to handle a string & hash
-		var y, x;
-		switch (origin[0]) {
-			case 'top': y = 0; break;
-			case 'middle': y = 0.5; break;
-			case 'bottom': y = 1; break;
-			default: y = origin[0] / original.height;
-		};
-		switch (origin[1]) {
-			case 'left': x = 0; break;
-			case 'center': x = 0.5; break;
-			case 'right': x = 1; break;
-			default: x = origin[1] / original.width;
-		};
-		return {x: x, y: y};
-	},
-	createWrapper: function(el) {
-		if (el.parent().attr('id') == 'fxWrapper')
-			return el;
-		var props = {width: el.outerWidth({margin:true}), height: el.outerHeight({margin:true}), 'float': el.css('float')};
-		el.wrap('<div id="fxWrapper" style="font-size:100%;background:transparent;border:none;margin:0;padding:0"></div>');
-		var wrapper = el.parent();
-		if (el.css('position') == 'static'){
-			wrapper.css({position: 'relative'});
-			el.css({position: 'relative'});
-		} else {
-			var top = el.css('top'); if(isNaN(parseInt(top))) top = 'auto';
-			var left = el.css('left'); if(isNaN(parseInt(left))) left = 'auto';
-			wrapper.css({ position: el.css('position'), top: top, left: left, zIndex: el.css('z-index') }).show();
-			el.css({position: 'relative', top:0, left:0});
-		}
-		wrapper.css(props);
-		return wrapper;
-	},
-	removeWrapper: function(el) {
-		if (el.parent().attr('id') == 'fxWrapper')
-			return el.parent().replaceWith(el);
-		return el;
-	},
-	setTransition: function(el, list, factor, val) {
-		val = val || {};
-		$.each(list,function(i, x){
-			unit = el.cssUnit(x);
-			if (unit[0] > 0) val[x] = unit[0] * factor + unit[1];
-		});
-		return val;
-	},
-	animateClass: function(value, duration, easing, callback) {
-
-		var cb = (typeof easing == "function" ? easing : (callback ? callback : null));
-		var ea = (typeof easing == "object" ? easing : null);
-
-		return this.each(function() {
-
-			var offset = {}; var that = $(this); var oldStyleAttr = that.attr("style") || '';
-			if(typeof oldStyleAttr == 'object') oldStyleAttr = oldStyleAttr["cssText"]; /* Stupidly in IE, style is a object.. */
-			if(value.toggle) { that.hasClass(value.toggle) ? value.remove = value.toggle : value.add = value.toggle; }
-
-			//Let's get a style offset
-			var oldStyle = $.extend({}, (document.defaultView ? document.defaultView.getComputedStyle(this,null) : this.currentStyle));
-			if(value.add) that.addClass(value.add); if(value.remove) that.removeClass(value.remove);
-			var newStyle = $.extend({}, (document.defaultView ? document.defaultView.getComputedStyle(this,null) : this.currentStyle));
-			if(value.add) that.removeClass(value.add); if(value.remove) that.addClass(value.remove);
-
-			// The main function to form the object for animation
-			for(var n in newStyle) {
-				if( typeof newStyle[n] != "function" && newStyle[n] /* No functions and null properties */
-				&& n.indexOf("Moz") == -1 && n.indexOf("length") == -1 /* No mozilla spezific render properties. */
-				&& newStyle[n] != oldStyle[n] /* Only values that have changed are used for the animation */
-				&& (n.match(/color/i) || (!n.match(/color/i) && !isNaN(parseInt(newStyle[n],10)))) /* Only things that can be parsed to integers or colors */
-				&& (oldStyle.position != "static" || (oldStyle.position == "static" && !n.match(/left|top|bottom|right/))) /* No need for positions when dealing with static positions */
-				) offset[n] = newStyle[n];
-			}
-
-			that.animate(offset, duration, ea, function() { // Animate the newly constructed offset object
-				// Change style attribute back to original. For stupid IE, we need to clear the damn object.
-				if(typeof $(this).attr("style") == 'object') { $(this).attr("style")["cssText"] = ""; $(this).attr("style")["cssText"] = oldStyleAttr; } else $(this).attr("style", oldStyleAttr);
-				if(value.add) $(this).addClass(value.add); if(value.remove) $(this).removeClass(value.remove);
-				if(cb) cb.apply(this, arguments);
-			});
-
-		});
-	}
-});
-
-//Extend the methods of jQuery
-$.fn.extend({
-	//Save old methods
-	_show: $.fn.show,
-	_hide: $.fn.hide,
-	__toggle: $.fn.toggle,
-	_addClass: $.fn.addClass,
-	_removeClass: $.fn.removeClass,
-	_toggleClass: $.fn.toggleClass,
-	// New ec methods
-	effect: function(fx,o,speed,callback) {
-		return $.effects[fx] ? $.effects[fx].call(this, {method: fx, options: o || {}, duration: speed, callback: callback }) : null;
-	},
-	show: function() {
-		if(!arguments[0] || (arguments[0].constructor == Number || /(slow|normal|fast)/.test(arguments[0])))
-			return this._show.apply(this, arguments);
-		else {
-			var o = arguments[1] || {}; o['mode'] = 'show';
-			return this.effect.apply(this, [arguments[0], o, arguments[2] || o.duration, arguments[3] || o.callback]);
-		}
-	},
-	hide: function() {
-		if(!arguments[0] || (arguments[0].constructor == Number || /(slow|normal|fast)/.test(arguments[0])))
-			return this._hide.apply(this, arguments);
-		else {
-			var o = arguments[1] || {}; o['mode'] = 'hide';
-			return this.effect.apply(this, [arguments[0], o, arguments[2] || o.duration, arguments[3] || o.callback]);
-		}
-	},
-	toggle: function(){
-		if(!arguments[0] || (arguments[0].constructor == Number || /(slow|normal|fast)/.test(arguments[0])) || (arguments[0].constructor == Function))
-			return this.__toggle.apply(this, arguments);
-		else {
-			var o = arguments[1] || {}; o['mode'] = 'toggle';
-			return this.effect.apply(this, [arguments[0], o, arguments[2] || o.duration, arguments[3] || o.callback]);
-		}
-	},
-	addClass: function(classNames,speed,easing,callback) {
-		return speed ? $.effects.animateClass.apply(this, [{ add: classNames },speed,easing,callback]) : this._addClass(classNames);
-	},
-	removeClass: function(classNames,speed,easing,callback) {
-		return speed ? $.effects.animateClass.apply(this, [{ remove: classNames },speed,easing,callback]) : this._removeClass(classNames);
-	},
-	toggleClass: function(classNames,speed,easing,callback) {
-		return speed ? $.effects.animateClass.apply(this, [{ toggle: classNames },speed,easing,callback]) : this._toggleClass(classNames);
-	},
-	morph: function(remove,add,speed,easing,callback) {
-		return $.effects.animateClass.apply(this, [{ add: add, remove: remove },speed,easing,callback]);
-	},
-	switchClass: function() {
-		return this.morph.apply(this, arguments);
-	},
-	// helper functions
-	cssUnit: function(key) {
-		var style = this.css(key), val = [];
-		$.each( ['em','px','%','pt'], function(i, unit){
-			if(style.indexOf(unit) > 0)
-				val = [parseFloat(style), unit];
-		});
-		return val;
-	}
-});
-
-/*
- * jQuery Color Animations
- * Copyright 2007 John Resig
- * Released under the MIT and GPL licenses.
- */
-
-// We override the animation for all of these color styles
-jQuery.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i,attr){
-		jQuery.fx.step[attr] = function(fx){
-				if ( fx.state == 0 ) {
-						fx.start = getColor( fx.elem, attr );
-						fx.end = getRGB( fx.end );
-				}
-
-				fx.elem.style[attr] = "rgb(" + [
-						Math.max(Math.min( parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0]), 255), 0),
-						Math.max(Math.min( parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1]), 255), 0),
-						Math.max(Math.min( parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2]), 255), 0)
-				].join(",") + ")";
-		}
-});
-
-// Color Conversion functions from highlightFade
-// By Blair Mitchelmore
-// http://jquery.offput.ca/highlightFade/
-
-// Parse strings looking for color tuples [255,255,255]
-function getRGB(color) {
-		var result;
-
-		// Check if we're already dealing with an array of colors
-		if ( color && color.constructor == Array && color.length == 3 )
-				return color;
-
-		// Look for rgb(num,num,num)
-		if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
-				return [parseInt(result[1]), parseInt(result[2]), parseInt(result[3])];
-
-		// Look for rgb(num%,num%,num%)
-		if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
-				return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
-
-		// Look for #a0b1c2
-		if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
-				return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
-
-		// Look for #fff
-		if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
-				return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
-
-		// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
-		if (result = /rgba\(0, 0, 0, 0\)/.exec(color))
-				return colors['transparent']
-
-		// Otherwise, we're most likely dealing with a named color
-		return colors[jQuery.trim(color).toLowerCase()];
-}
-
-function getColor(elem, attr) {
-		var color;
-
-		do {
-				color = jQuery.curCSS(elem, attr);
-
-				// Keep going until we find an element that has color, or we hit the body
-				if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") )
-						break;
-
-				attr = "backgroundColor";
-		} while ( elem = elem.parentNode );
-
-		return getRGB(color);
-};
-
-// Some named colors to work with
-// From Interface by Stefan Petre
-// http://interface.eyecon.ro/
-
-var colors = {
-	aqua:[0,255,255],
-	azure:[240,255,255],
-	beige:[245,245,220],
-	black:[0,0,0],
-	blue:[0,0,255],
-	brown:[165,42,42],
-	cyan:[0,255,255],
-	darkblue:[0,0,139],
-	darkcyan:[0,139,139],
-	darkgrey:[169,169,169],
-	darkgreen:[0,100,0],
-	darkkhaki:[189,183,107],
-	darkmagenta:[139,0,139],
-	darkolivegreen:[85,107,47],
-	darkorange:[255,140,0],
-	darkorchid:[153,50,204],
-	darkred:[139,0,0],
-	darksalmon:[233,150,122],
-	darkviolet:[148,0,211],
-	fuchsia:[255,0,255],
-	gold:[255,215,0],
-	green:[0,128,0],
-	indigo:[75,0,130],
-	khaki:[240,230,140],
-	lightblue:[173,216,230],
-	lightcyan:[224,255,255],
-	lightgreen:[144,238,144],
-	lightgrey:[211,211,211],
-	lightpink:[255,182,193],
-	lightyellow:[255,255,224],
-	lime:[0,255,0],
-	magenta:[255,0,255],
-	maroon:[128,0,0],
-	navy:[0,0,128],
-	olive:[128,128,0],
-	orange:[255,165,0],
-	pink:[255,192,203],
-	purple:[128,0,128],
-	violet:[128,0,128],
-	red:[255,0,0],
-	silver:[192,192,192],
-	white:[255,255,255],
-	yellow:[255,255,0],
-	transparent: [255,255,255]
-};
-	
-/*
- * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
- *
- * Uses the built in easing capabilities added In jQuery 1.1
- * to offer multiple easing options
- *
- * TERMS OF USE - jQuery Easing
- * 
- * Open source under the BSD License. 
- * 
- * Copyright © 2008 George McGinley Smith
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list 
- * of conditions and the following disclaimer in the documentation and/or other materials 
- * provided with the distribution.
- * 
- * Neither the name of the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
-*/
-
-// t: current time, b: begInnIng value, c: change In value, d: duration
-jQuery.easing['jswing'] = jQuery.easing['swing'];
-
-jQuery.extend( jQuery.easing,
-{
-	def: 'easeOutQuad',
-	swing: function (x, t, b, c, d) {
-		//alert(jQuery.easing.default);
-		return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
-	},
-	easeInQuad: function (x, t, b, c, d) {
-		return c*(t/=d)*t + b;
-	},
-	easeOutQuad: function (x, t, b, c, d) {
-		return -c *(t/=d)*(t-2) + b;
-	},
-	easeInOutQuad: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t + b;
-		return -c/2 * ((--t)*(t-2) - 1) + b;
-	},
-	easeInCubic: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t + b;
-	},
-	easeOutCubic: function (x, t, b, c, d) {
-		return c*((t=t/d-1)*t*t + 1) + b;
-	},
-	easeInOutCubic: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t + b;
-		return c/2*((t-=2)*t*t + 2) + b;
-	},
-	easeInQuart: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t*t + b;
-	},
-	easeOutQuart: function (x, t, b, c, d) {
-		return -c * ((t=t/d-1)*t*t*t - 1) + b;
-	},
-	easeInOutQuart: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
-		return -c/2 * ((t-=2)*t*t*t - 2) + b;
-	},
-	easeInQuint: function (x, t, b, c, d) {
-		return c*(t/=d)*t*t*t*t + b;
-	},
-	easeOutQuint: function (x, t, b, c, d) {
-		return c*((t=t/d-1)*t*t*t*t + 1) + b;
-	},
-	easeInOutQuint: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
-		return c/2*((t-=2)*t*t*t*t + 2) + b;
-	},
-	easeInSine: function (x, t, b, c, d) {
-		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
-	},
-	easeOutSine: function (x, t, b, c, d) {
-		return c * Math.sin(t/d * (Math.PI/2)) + b;
-	},
-	easeInOutSine: function (x, t, b, c, d) {
-		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
-	},
-	easeInExpo: function (x, t, b, c, d) {
-		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
-	},
-	easeOutExpo: function (x, t, b, c, d) {
-		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
-	},
-	easeInOutExpo: function (x, t, b, c, d) {
-		if (t==0) return b;
-		if (t==d) return b+c;
-		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
-		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
-	},
-	easeInCirc: function (x, t, b, c, d) {
-		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
-	},
-	easeOutCirc: function (x, t, b, c, d) {
-		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
-	},
-	easeInOutCirc: function (x, t, b, c, d) {
-		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
-		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
-	},
-	easeInElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
-	},
-	easeOutElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
-	},
-	easeInOutElastic: function (x, t, b, c, d) {
-		var s=1.70158;var p=0;var a=c;
-		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
-		if (a < Math.abs(c)) { a=c; var s=p/4; }
-		else var s = p/(2*Math.PI) * Math.asin (c/a);
-		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
-		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
-	},
-	easeInBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158;
-		return c*(t/=d)*t*((s+1)*t - s) + b;
-	},
-	easeOutBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158;
-		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
-	},
-	easeInOutBack: function (x, t, b, c, d, s) {
-		if (s == undefined) s = 1.70158; 
-		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
-		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
-	},
-	easeInBounce: function (x, t, b, c, d) {
-		return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
-	},
-	easeOutBounce: function (x, t, b, c, d) {
-		if ((t/=d) < (1/2.75)) {
-			return c*(7.5625*t*t) + b;
-		} else if (t < (2/2.75)) {
-			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
-		} else if (t < (2.5/2.75)) {
-			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
-		} else {
-			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
-		}
-	},
-	easeInOutBounce: function (x, t, b, c, d) {
-		if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
-		return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
-	}
-});
-
-/*
- *
- * TERMS OF USE - EASING EQUATIONS
- * 
- * Open source under the BSD License. 
- * 
- * Copyright © 2001 Robert Penner
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of 
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list 
- * of conditions and the following disclaimer in the documentation and/or other materials 
- * provided with the distribution.
- * 
- * Neither the name of the author nor the names of contributors may be used to endorse 
- * or promote products derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
- */
-
-})(jQuery);
-/*
- * jQuery UI Effects Blind
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Blind
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.blind = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var direction = o.options.direction || 'vertical'; // Default direction
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
-		var ref = (direction == 'vertical') ? 'height' : 'width';
-		var distance = (direction == 'vertical') ? wrapper.height() : wrapper.width();
-		if(mode == 'show') wrapper.css(ref, 0); // Shift
-		
-		// Animation
-		var animation = {};
-		animation[ref] = mode == 'show' ? distance : 0;
-	 
-		// Animate
-		wrapper.animate(animation, o.duration, o.options.easing, function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(el[0], arguments); // Callback
-			el.dequeue();
-		});
-		
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Bounce
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Bounce
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.bounce = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var direction = o.options.direction || 'up'; // Default direction
-		var distance = o.options.distance || 20; // Default distance
-		var times = o.options.times || 5; // Default # of times
-		var speed = o.duration || 250; // Default speed per bounce
-		if (/show|hide/.test(mode)) props.push('opacity'); // Avoid touching opacity to prevent clearType and PNG issues in IE
-
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		$.effects.createWrapper(el); // Create Wrapper
-		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
-		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
-		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 3 : el.outerWidth({margin:true}) / 3);
-		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
-		if (mode == 'hide') distance = distance / (times * 2);
-		if (mode != 'hide') times--;
-		
-		// Animate
-		if (mode == 'show') { // Show Bounce
-			var animation = {opacity: 1};
-			animation[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
-			el.animate(animation, speed / 2, o.options.easing);
-			distance = distance / 2;
-			times--;
-		};
-		for (var i = 0; i < times; i++) { // Bounces
-			var animation1 = {}, animation2 = {};
-			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
-			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
-			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing);
-			distance = (mode == 'hide') ? distance * 2 : distance / 2;
-		};
-		if (mode == 'hide') { // Last Bounce
-			var animation = {opacity: 0};
-			animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
-			el.animate(animation, speed / 2, o.options.easing, function(){
-				el.hide(); // Hide
-				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-				if(o.callback) o.callback.apply(this, arguments); // Callback
-			});
-		} else {
-			var animation1 = {}, animation2 = {};
-			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
-			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
-			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing, function(){
-				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-				if(o.callback) o.callback.apply(this, arguments); // Callback
-			});
-		};
-		el.queue('fx', function() { el.dequeue(); });
-		el.dequeue();
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Clip
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Clip
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.clip = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left','height','width'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var direction = o.options.direction || 'vertical'; // Default direction
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
-		var animate = el[0].tagName == 'IMG' ? wrapper : el;
-		var ref = {
-			size: (direction == 'vertical') ? 'height' : 'width',
-			position: (direction == 'vertical') ? 'top' : 'left'
-		};
-		var distance = (direction == 'vertical') ? animate.height() : animate.width();
-		if(mode == 'show') { animate.css(ref.size, 0); animate.css(ref.position, distance / 2); } // Shift
-		
-		// Animation
-		var animation = {};
-		animation[ref.size] = mode == 'show' ? distance : 0;
-		animation[ref.position] = mode == 'show' ? 0 : distance / 2;
-			
-		// Animate
-		animate.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(el[0], arguments); // Callback
-			el.dequeue();
-		}}); 
-		
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Drop
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Drop
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.drop = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left','opacity'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var direction = o.options.direction || 'left'; // Default Direction
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		$.effects.createWrapper(el); // Create Wrapper
-		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
-		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
-		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 2 : el.outerWidth({margin:true}) / 2);
-		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
-		
-		// Animation
-		var animation = {opacity: mode == 'show' ? 1 : 0};
-		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
-		
-		// Animate
-		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(this, arguments); // Callback
-			el.dequeue();
-		}});
-		
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Explode
- *
- * Copyright (c) 2008 Paul Bakaus (ui.jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Explode
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.explode = function(o) {
-
-	return this.queue(function() {
-
-	var rows = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
-	var cells = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
-	
-	o.options.mode = o.options.mode == 'toggle' ? ($(this).is(':visible') ? 'hide' : 'show') : o.options.mode;
-	var el = $(this).show().css('visibility', 'hidden');
-	var offset = el.offset();
-	
-	//Substract the margins - not fixing the problem yet.
-	offset.top -= parseInt(el.css("marginTop")) || 0;
-	offset.left -= parseInt(el.css("marginLeft")) || 0;
-	
-	var width = el.outerWidth(true);
-	var height = el.outerHeight(true);
-
-	for(var i=0;i<rows;i++) { // =
-		for(var j=0;j<cells;j++) { // ||
-			el
-				.clone()
-				.appendTo('body')
-				.wrap('<div></div>')
-				.css({
-					position: 'absolute',
-					visibility: 'visible',
-					left: -j*(width/cells),
-					top: -i*(height/rows)
-				})
-				.parent()
-				.addClass('effects-explode')
-				.css({
-					position: 'absolute',
-					overflow: 'hidden',
-					width: width/cells,
-					height: height/rows,
-					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? (j-Math.floor(cells/2))*(width/cells) : 0),
-					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? (i-Math.floor(rows/2))*(height/rows) : 0),
-					opacity: o.options.mode == 'show' ? 0 : 1
-				}).animate({
-					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? 0 : (j-Math.floor(cells/2))*(width/cells)),
-					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? 0 : (i-Math.floor(rows/2))*(height/rows)),
-					opacity: o.options.mode == 'show' ? 1 : 0
-				}, o.duration || 500);
-		}
-	}
-
-	// Set a timeout, to call the callback approx. when the other animations have finished
-	setTimeout(function() {
-		
-		o.options.mode == 'show' ? el.css({ visibility: 'visible' }) : el.css({ visibility: 'visible' }).hide();
-				if(o.callback) o.callback.apply(el[0]); // Callback
-				el.dequeue();
-				
-				$('.effects-explode').remove();
-		
-	}, o.duration || 500);
-	
-		
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Fold
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Fold
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.fold = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var size = o.options.size || 15; // Default fold size
-		var horizFirst = !(!o.options.horizFirst); // Ensure a boolean value
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
-		var widthFirst = ((mode == 'show') != horizFirst);
-		var ref = widthFirst ? ['width', 'height'] : ['height', 'width'];
-		var distance = widthFirst ? [wrapper.width(), wrapper.height()] : [wrapper.height(), wrapper.width()];
-		var percent = /([0-9]+)%/.exec(size);
-		if(percent) size = parseInt(percent[1]) / 100 * distance[mode == 'hide' ? 0 : 1];
-		if(mode == 'show') wrapper.css(horizFirst ? {height: 0, width: size} : {height: size, width: 0}); // Shift
-		
-		// Animation
-		var animation1 = {}, animation2 = {};
-		animation1[ref[0]] = mode == 'show' ? distance[0] : size;
-		animation2[ref[1]] = mode == 'show' ? distance[1] : 0;
-		
-		// Animate
-		wrapper.animate(animation1, o.duration / 2, o.options.easing)
-		.animate(animation2, o.duration / 2, o.options.easing, function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(el[0], arguments); // Callback
-			el.dequeue();
-		});
-		
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Highlight
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Highlight
- *
- * Depends:
- *	effects.core.js
- */
-;(function($) {
-
-$.effects.highlight = function(o) {
-
-	return this.queue(function() {
-		
-		// Create element
-		var el = $(this), props = ['backgroundImage','backgroundColor','opacity'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
-		var color = o.options.color || "#ffff99"; // Default highlight color
-		var oldColor = el.css("backgroundColor");
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		el.css({backgroundImage: 'none', backgroundColor: color}); // Shift
-		
-		// Animation
-		var animation = {backgroundColor: oldColor };
-		if (mode == "hide") animation['opacity'] = 0;
-		
-		// Animate
-		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == "hide") el.hide();
-			$.effects.restore(el, props);
-		if (mode == "show" && jQuery.browser.msie) this.style.removeAttribute('filter'); 
-			if(o.callback) o.callback.apply(this, arguments);
-			el.dequeue();
-		}});
-		
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Pulsate
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Pulsate
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.pulsate = function(o) {
-
-	return this.queue(function() {
-		
-		// Create element
-		var el = $(this);
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
-		var times = o.options.times || 5; // Default # of times
-		
-		// Adjust
-		if (mode == 'hide') times--;
-		if (el.is(':hidden')) { // Show fadeIn
-			el.css('opacity', 0);
-			el.show(); // Show
-			el.animate({opacity: 1}, o.duration / 2, o.options.easing);
-			times = times-2;
-		}
-		
-		// Animate
-		for (var i = 0; i < times; i++) { // Pulsate
-			el.animate({opacity: 0}, o.duration / 2, o.options.easing).animate({opacity: 1}, o.duration / 2, o.options.easing);
-		};
-		if (mode == 'hide') { // Last Pulse
-			el.animate({opacity: 0}, o.duration / 2, o.options.easing, function(){
-				el.hide(); // Hide
-				if(o.callback) o.callback.apply(this, arguments); // Callback
-			});
-		} else {
-			el.animate({opacity: 0}, o.duration / 2, o.options.easing).animate({opacity: 1}, o.duration / 2, o.options.easing, function(){
-				if(o.callback) o.callback.apply(this, arguments); // Callback
-			});
-		};
-		el.queue('fx', function() { el.dequeue(); });
-		el.dequeue();
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Scale
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Scale
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.puff = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this);
-	
-		// Set options
-		var options = $.extend(true, {}, o.options);
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var percent = parseInt(o.options.percent) || 150; // Set default puff percent
-		options.fade = true; // It's not a puff if it doesn't fade! :)
-		var original = {height: el.height(), width: el.width()}; // Save original
-	
-		// Adjust
-		var factor = percent / 100;
-		el.from = (mode == 'hide') ? original : {height: original.height * factor, width: original.width * factor};
-	
-		// Animation
-		options.from = el.from;
-		options.percent = (mode == 'hide') ? percent : 100;
-		options.mode = mode;
-	
-		// Animate
-		el.effect('scale', options, o.duration, o.callback);
-		el.dequeue();
-	});
-	
-};
-
-$.effects.scale = function(o) {
-	
-	return this.queue(function() {
-	
-		// Create element
-		var el = $(this);
-
-		// Set options
-		var options = $.extend(true, {}, o.options);
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var percent = parseInt(o.options.percent) || (parseInt(o.options.percent) == 0 ? 0 : (mode == 'hide' ? 0 : 100)); // Set default scaling percent
-		var direction = o.options.direction || 'both'; // Set default axis
-		var origin = o.options.origin; // The origin of the scaling
-		if (mode != 'effect') { // Set default origin and restore for show/hide
-			options.origin = origin || ['middle','center'];
-			options.restore = true;
-		}
-		var original = {height: el.height(), width: el.width()}; // Save original
-		el.from = o.options.from || (mode == 'show' ? {height: 0, width: 0} : original); // Default from state
-	
-		// Adjust
-		var factor = { // Set scaling factor
-			y: direction != 'horizontal' ? (percent / 100) : 1,
-			x: direction != 'vertical' ? (percent / 100) : 1
-		};
-		el.to = {height: original.height * factor.y, width: original.width * factor.x}; // Set to state
-		
-		if (o.options.fade) { // Fade option to support puff
-			if (mode == 'show') {el.from.opacity = 0; el.to.opacity = 1;};
-			if (mode == 'hide') {el.from.opacity = 1; el.to.opacity = 0;};
-		};
-	
-		// Animation
-		options.from = el.from; options.to = el.to; options.mode = mode;
-	
-		// Animate
-		el.effect('size', options, o.duration, o.callback);
-		el.dequeue();
-	});
-	
-};
-
-$.effects.size = function(o) {
-
-	return this.queue(function() {
-		
-		// Create element
-		var el = $(this), props = ['position','top','left','width','height','overflow','opacity'];
-		var props1 = ['position','top','left','overflow','opacity']; // Always restore
-		var props2 = ['width','height','overflow']; // Copy for children
-		var cProps = ['fontSize'];
-		var vProps = ['borderTopWidth', 'borderBottomWidth', 'paddingTop', 'paddingBottom'];
-		var hProps = ['borderLeftWidth', 'borderRightWidth', 'paddingLeft', 'paddingRight'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var restore = o.options.restore || false; // Default restore
-		var scale = o.options.scale || 'both'; // Default scale mode
-		var origin = o.options.origin; // The origin of the sizing
-		var original = {height: el.height(), width: el.width()}; // Save original
-		el.from = o.options.from || original; // Default from state
-		el.to = o.options.to || original; // Default to state
-		// Adjust
-		if (origin) { // Calculate baseline shifts
-			var baseline = $.effects.getBaseline(origin, original);
-			el.from.top = (original.height - el.from.height) * baseline.y;
-			el.from.left = (original.width - el.from.width) * baseline.x;
-			el.to.top = (original.height - el.to.height) * baseline.y;
-			el.to.left = (original.width - el.to.width) * baseline.x;
-		};
-		var factor = { // Set scaling factor
-			from: {y: el.from.height / original.height, x: el.from.width / original.width},
-			to: {y: el.to.height / original.height, x: el.to.width / original.width}
-		};
-		if (scale == 'box' || scale == 'both') { // Scale the css box
-			if (factor.from.y != factor.to.y) { // Vertical props scaling
-				props = props.concat(vProps);
-				el.from = $.effects.setTransition(el, vProps, factor.from.y, el.from);
-				el.to = $.effects.setTransition(el, vProps, factor.to.y, el.to);
-			};
-			if (factor.from.x != factor.to.x) { // Horizontal props scaling
-				props = props.concat(hProps);
-				el.from = $.effects.setTransition(el, hProps, factor.from.x, el.from);
-				el.to = $.effects.setTransition(el, hProps, factor.to.x, el.to);
-			};
-		};
-		if (scale == 'content' || scale == 'both') { // Scale the content
-			if (factor.from.y != factor.to.y) { // Vertical props scaling
-				props = props.concat(cProps);
-				el.from = $.effects.setTransition(el, cProps, factor.from.y, el.from);
-				el.to = $.effects.setTransition(el, cProps, factor.to.y, el.to);
-			};
-		};
-		$.effects.save(el, restore ? props : props1); el.show(); // Save & Show
-		$.effects.createWrapper(el); // Create Wrapper
-		el.css('overflow','hidden').css(el.from); // Shift
-		
-		// Animate
-		if (scale == 'content' || scale == 'both') { // Scale the children
-			vProps = vProps.concat(['marginTop','marginBottom']).concat(cProps); // Add margins/font-size
-			hProps = hProps.concat(['marginLeft','marginRight']); // Add margins
-			props2 = props.concat(vProps).concat(hProps); // Concat
-			el.find("*[width]").each(function(){
-				child = $(this);
-				if (restore) $.effects.save(child, props2);
-				var c_original = {height: child.height(), width: child.width()}; // Save original
-				child.from = {height: c_original.height * factor.from.y, width: c_original.width * factor.from.x};
-				child.to = {height: c_original.height * factor.to.y, width: c_original.width * factor.to.x};
-				if (factor.from.y != factor.to.y) { // Vertical props scaling
-					child.from = $.effects.setTransition(child, vProps, factor.from.y, child.from);
-					child.to = $.effects.setTransition(child, vProps, factor.to.y, child.to);
-				};
-				if (factor.from.x != factor.to.x) { // Horizontal props scaling
-					child.from = $.effects.setTransition(child, hProps, factor.from.x, child.from);
-					child.to = $.effects.setTransition(child, hProps, factor.to.x, child.to);
-				};
-				child.css(child.from); // Shift children
-				child.animate(child.to, o.duration, o.options.easing, function(){
-					if (restore) $.effects.restore(child, props2); // Restore children
-				}); // Animate children
-			});
-		};
-		
-		// Animate
-		el.animate(el.to, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, restore ? props : props1); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(this, arguments); // Callback
-			el.dequeue();
-		}}); 
-		
-	});
-
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Shake
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Shake
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.shake = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var direction = o.options.direction || 'left'; // Default direction
-		var distance = o.options.distance || 20; // Default distance
-		var times = o.options.times || 3; // Default # of times
-		var speed = o.duration || o.options.duration || 140; // Default speed per shake
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		$.effects.createWrapper(el); // Create Wrapper
-		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
-		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
-		
-		// Animation
-		var animation = {}, animation1 = {}, animation2 = {};
-		animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
-		animation1[ref] = (motion == 'pos' ? '+=' : '-=')  + distance * 2;
-		animation2[ref] = (motion == 'pos' ? '-=' : '+=')  + distance * 2;
-		
-		// Animate
-		el.animate(animation, speed, o.options.easing);
-		for (var i = 1; i < times; i++) { // Shakes
-			el.animate(animation1, speed, o.options.easing).animate(animation2, speed, o.options.easing);
-		};
-		el.animate(animation1, speed, o.options.easing).
-		animate(animation, speed / 2, o.options.easing, function(){ // Last shake
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(this, arguments); // Callback
-		});
-		el.queue('fx', function() { el.dequeue(); });
-		el.dequeue();
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Slide
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Slide
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.slide = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
-		var direction = o.options.direction || 'left'; // Default Direction
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		$.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
-		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
-		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
-		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) : el.outerWidth({margin:true}));
-		if (mode == 'show') el.css(ref, motion == 'pos' ? -distance : distance); // Shift
-		
-		// Animation
-		var animation = {};
-		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
-		
-		// Animate
-		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(this, arguments); // Callback
-			el.dequeue();
-		}});
-		
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Effects Transfer
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Transfer
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.transfer = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this);
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var target = $(o.options.to); // Find Target
-		var position = el.offset();
-		var transfer = $('<div class="ui-effects-transfer"></div>').appendTo(document.body);
-		if(o.options.className) transfer.addClass(o.options.className);
-		
-		// Set target css
-		transfer.addClass(o.options.className);
-		transfer.css({
-			top: position.top,
-			left: position.left,
-			height: el.outerHeight() - parseInt(transfer.css('borderTopWidth')) - parseInt(transfer.css('borderBottomWidth')),
-			width: el.outerWidth() - parseInt(transfer.css('borderLeftWidth')) - parseInt(transfer.css('borderRightWidth')),
-			position: 'absolute'
-		});
-		
-		// Animation
-		position = target.offset();
-		animation = {
-			top: position.top,
-			left: position.left,
-			height: target.outerHeight() - parseInt(transfer.css('borderTopWidth')) - parseInt(transfer.css('borderBottomWidth')),
-			width: target.outerWidth() - parseInt(transfer.css('borderLeftWidth')) - parseInt(transfer.css('borderRightWidth'))
-		};
-		
-		// Animate
-		transfer.animate(animation, o.duration, o.options.easing, function() {
-			transfer.remove(); // Remove div
-			if(o.callback) o.callback.apply(el[0], arguments); // Callback
-			el.dequeue();
-		}); 
-		
-	});
-	
-};
-
-})(jQuery);
-/*
- * jQuery UI Accordion
- * 
- * Copyright (c) 2007, 2008 Jörn Zaefferer
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Accordion
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.accordion", {
-	init: function() {
-		var options = this.options;
-		
-		if ( options.navigation ) {
-			var current = this.element.find("a").filter(options.navigationFilter);
-			if ( current.length ) {
-				if ( current.filter(options.header).length ) {
-					options.active = current;
-				} else {
-					options.active = current.parent().parent().prev();
-					current.addClass("current");
-				}
-			}
-		}
-		
-		// calculate active if not specified, using the first header
-		options.headers = this.element.find(options.header);
-		options.active = findActive(options.headers, options.active);
-		
-		// IE7-/Win - Extra vertical space in Lists fixed
-		if ($.browser.msie) {
-			this.element.find('a').css('zoom', '1');
-		}
-		
-		if (!this.element.hasClass("ui-accordion")) {
-			this.element.addClass("ui-accordion");
-			$("<span class='ui-accordion-left'/>").insertBefore(options.headers);
-			$("<span class='ui-accordion-right'/>").appendTo(options.headers);
-			options.headers.addClass("ui-accordion-header").attr("tabindex", "0");
-		}
-		
-		var maxHeight;
-		if ( options.fillSpace ) {
-			maxHeight = this.element.parent().height();
-			options.headers.each(function() {
-				maxHeight -= $(this).outerHeight();
-			});
-			var maxPadding = 0;
-			options.headers.next().each(function() {
-				maxPadding = Math.max(maxPadding, $(this).innerHeight() - $(this).height());
-			}).height(maxHeight - maxPadding);
-		} else if ( options.autoHeight ) {
-			maxHeight = 0;
-			options.headers.next().each(function() {
-				maxHeight = Math.max(maxHeight, $(this).outerHeight());
-			}).height(maxHeight);
-		}
-	
-		options.headers
-			.not(options.active || "")
-			.next()
-			.hide();
-		options.active.parent().andSelf().addClass(options.selectedClass);
-		
-		if (options.event) {
-			this.element.bind((options.event) + ".accordion", clickHandler);
-		}
-	},
-	activate: function(index) {
-		// call clickHandler with custom event
-		clickHandler.call(this.element[0], {
-			target: findActive( this.options.headers, index )[0]
-		});
-	},
-	destroy: function() {
-		this.options.headers.next().css("display", "");
-		if ( this.options.fillSpace || this.options.autoHeight ) {
-			this.options.headers.next().css("height", "");
-		}
-		$.removeData(this.element[0], "accordion");
-		this.element.removeClass("ui-accordion").unbind(".accordion");
-	}
-});
-
-function scopeCallback(callback, scope) {
-	return function() {
-		return callback.apply(scope, arguments);
-	};
-};
-
-function completed(cancel) {
-	// if removed while animated data can be empty
-	if (!$.data(this, "accordion")) {
-		return;
-	}
-	
-	var instance = $.data(this, "accordion");
-	var options = instance.options;
-	options.running = cancel ? 0 : --options.running;
-	if ( options.running ) {
-		return;
-	}
-	if ( options.clearStyle ) {
-		options.toShow.add(options.toHide).css({
-			height: "",
-			overflow: ""
-		});
-	}
-	$(this).triggerHandler("accordionchange", [$.event.fix({type: 'accordionchange', target: instance.element[0]}), options.data], options.change);
-}
-
-function toggle(toShow, toHide, data, clickedActive, down) {
-	var options = $.data(this, "accordion").options;
-	options.toShow = toShow;
-	options.toHide = toHide;
-	options.data = data;
-	var complete = scopeCallback(completed, this);
-	
-	// count elements to animate
-	options.running = toHide.size() === 0 ? toShow.size() : toHide.size();
-	
-	if ( options.animated ) {
-		if ( !options.alwaysOpen && clickedActive ) {
-			$.ui.accordion.animations[options.animated]({
-				toShow: jQuery([]),
-				toHide: toHide,
-				complete: complete,
-				down: down,
-				autoHeight: options.autoHeight
-			});
-		} else {
-			$.ui.accordion.animations[options.animated]({
-				toShow: toShow,
-				toHide: toHide,
-				complete: complete,
-				down: down,
-				autoHeight: options.autoHeight
-			});
-		}
-	} else {
-		if ( !options.alwaysOpen && clickedActive ) {
-			toShow.toggle();
-		} else {
-			toHide.hide();
-			toShow.show();
-		}
-		complete(true);
-	}
-}
-
-function clickHandler(event) {
-	var options = $.data(this, "accordion").options;
-	if (options.disabled) {
-		return false;
-	}
-	
-	// called only when using activate(false) to close all parts programmatically
-	if ( !event.target && !options.alwaysOpen ) {
-		options.active.parent().andSelf().toggleClass(options.selectedClass);
-		var toHide = options.active.next(),
-			data = {
-				options: options,
-				newHeader: jQuery([]),
-				oldHeader: options.active,
-				newContent: jQuery([]),
-				oldContent: toHide
-			},
-			toShow = (options.active = $([]));
-		toggle.call(this, toShow, toHide, data );
-		return false;
-	}
-	// get the click target
-	var clicked = $(event.target);
-	
-	// due to the event delegation model, we have to check if one
-	// of the parent elements is our actual header, and find that
-	// otherwise stick with the initial target
-	clicked = $( clicked.parents(options.header)[0] || clicked );
-	
-	var clickedActive = clicked[0] == options.active[0];
-	
-	// if animations are still active, or the active header is the target, ignore click
-	if (options.running || (options.alwaysOpen && clickedActive)) {
-		return false;
-	}
-	if (!clicked.is(options.header)) {
-		return;
-	}
-	
-	// switch classes
-	options.active.parent().andSelf().toggleClass(options.selectedClass);
-	if ( !clickedActive ) {
-		clicked.parent().andSelf().addClass(options.selectedClass);
-	}
-	
-	// find elements to show and hide
-	var toShow = clicked.next(),
-		toHide = options.active.next(),
-		//data = [clicked, options.active, toShow, toHide],
-		data = {
-			options: options,
-			newHeader: clicked,
-			oldHeader: options.active,
-			newContent: toShow,
-			oldContent: toHide
-		},
-		down = options.headers.index( options.active[0] ) > options.headers.index( clicked[0] );
-	
-	options.active = clickedActive ? $([]) : clicked;
-	toggle.call(this, toShow, toHide, data, clickedActive, down );
-
-	return false;
-};
-
-function findActive(headers, selector) {
-	return selector != undefined
-		? typeof selector == "number"
-			? headers.filter(":eq(" + selector + ")")
-			: headers.not(headers.not(selector))
-		: selector === false
-			? $([])
-			: headers.filter(":eq(0)");
-}
-
-$.extend($.ui.accordion, {
-	defaults: {
-		selectedClass: "selected",
-		alwaysOpen: true,
-		animated: 'slide',
-		event: "click",
-		header: "a",
-		autoHeight: true,
-		running: 0,
-		navigationFilter: function() {
-			return this.href.toLowerCase() == location.href.toLowerCase();
-		}
-	},
-	animations: {
-		slide: function(options, additions) {
-			options = $.extend({
-				easing: "swing",
-				duration: 300
-			}, options, additions);
-			if ( !options.toHide.size() ) {
-				options.toShow.animate({height: "show"}, options);
-				return;
-			}
-			var hideHeight = options.toHide.height(),
-				showHeight = options.toShow.height(),
-				difference = showHeight / hideHeight;
-			options.toShow.css({ height: 0, overflow: 'hidden' }).show();
-			options.toHide.filter(":hidden").each(options.complete).end().filter(":visible").animate({height:"hide"},{
-				step: function(now) {
-					var current = (hideHeight - now) * difference;
-					if ($.browser.msie || $.browser.opera) {
-						current = Math.ceil(current);
-					}
-					options.toShow.height( current );
-				},
-				duration: options.duration,
-				easing: options.easing,
-				complete: function() {
-					if ( !options.autoHeight ) {
-						options.toShow.css("height", "auto");
-					}
-					options.complete();
-				}
-			});
-		},
-		bounceslide: function(options) {
-			this.slide(options, {
-				easing: options.down ? "bounceout" : "swing",
-				duration: options.down ? 1000 : 200
-			});
-		},
-		easeslide: function(options) {
-			this.slide(options, {
-				easing: "easeinout",
-				duration: 700
-			});
-		}
-	}
-});
-
-// deprecated, use accordion("activate", index) instead
-$.fn.activate = function(index) {
-	return this.accordion("activate", index);
-};
-
-})(jQuery);
-/*
- * jQuery UI Datepicker
- *
- * Copyright (c) 2006, 2007, 2008 Marc Grabanski
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Datepicker
- *
- * Depends:
- *	ui.core.js
- *
- * Marc Grabanski (m@marcgrabanski.com) and Keith Wood (kbwood@virginbroadband.com.au).
- */
-   
-(function($) { // hide the namespace
-
-var PROP_NAME = 'datepicker';
-
-/* Date picker manager.
-   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
-   Settings for (groups of) date pickers are maintained in an instance object,
-   allowing multiple different settings on the same page. */
-
-function Datepicker() {
-	this.debug = false; // Change this to true to start debugging
-	this._curInst = null; // The current instance in use
-	this._disabledInputs = []; // List of date picker inputs that have been disabled
-	this._datepickerShowing = false; // True if the popup picker is showing , false if not
-	this._inDialog = false; // True if showing within a "dialog", false if not
-	this._mainDivId = 'ui-datepicker-div'; // The ID of the main datepicker division
-	this._appendClass = 'ui-datepicker-append'; // The name of the append marker class
-	this._triggerClass = 'ui-datepicker-trigger'; // The name of the trigger marker class
-	this._dialogClass = 'ui-datepicker-dialog'; // The name of the dialog marker class
-	this._promptClass = 'ui-datepicker-prompt'; // The name of the dialog prompt marker class
-	this._unselectableClass = 'ui-datepicker-unselectable'; // The name of the unselectable cell marker class
-	this._currentClass = 'ui-datepicker-current-day'; // The name of the current day marker class
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[''] = { // Default regional settings
-		clearText: 'Clear', // Display text for clear link
-		clearStatus: 'Erase the current date', // Status text for clear link
-		closeText: 'Close', // Display text for close link
-		closeStatus: 'Close without change', // Status text for close link
-		prevText: '&#x3c;Prev', // Display text for previous month link
-		prevStatus: 'Show the previous month', // Status text for previous month link
-		nextText: 'Next&#x3e;', // Display text for next month link
-		nextStatus: 'Show the next month', // Status text for next month link
-		currentText: 'Today', // Display text for current month link
-		currentStatus: 'Show the current month', // Status text for current month link
-		monthNames: ['January','February','March','April','May','June',
-			'July','August','September','October','November','December'], // Names of months for drop-down and formatting
-		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], // For formatting
-		monthStatus: 'Show a different month', // Status text for selecting a month
-		yearStatus: 'Show a different year', // Status text for selecting a year
-		weekHeader: 'Wk', // Header for the week of the year column
-		weekStatus: 'Week of the year', // Status text for the week of the year column
-		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], // For formatting
-		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], // For formatting
-		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'], // Column headings for days starting at Sunday
-		dayStatus: 'Set DD as first week day', // Status text for the day of the week selection
-		dateStatus: 'Select DD, M d', // Status text for the date selection
-		dateFormat: 'mm/dd/yy', // See format options on parseDate
-		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
-		initStatus: 'Select a date', // Initial Status text on opening
-		isRTL: false // True if right-to-left language, false if left-to-right
-	};
-	this._defaults = { // Global defaults for all the date picker instances
-		showOn: 'focus', // 'focus' for popup on focus,
-			// 'button' for trigger button, or 'both' for either
-		showAnim: 'show', // Name of jQuery animation for popup
-		showOptions: {}, // Options for enhanced animations
-		defaultDate: null, // Used when field is blank: actual date,
-			// +/-number for offset from today, null for today
-		appendText: '', // Display text following the input box, e.g. showing the format
-		buttonText: '...', // Text for trigger button
-		buttonImage: '', // URL for trigger button image
-		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
-		closeAtTop: true, // True to have the clear/close at the top,
-			// false to have them at the bottom
-		mandatory: false, // True to hide the Clear link, false to include it
-		hideIfNoPrevNext: false, // True to hide next/previous month links
-			// if not applicable, false to just disable them
-		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
-		gotoCurrent: false, // True if today link goes back to current selection instead
-		changeMonth: true, // True if month can be selected directly, false if only prev/next
-		changeYear: true, // True if year can be selected directly, false if only prev/next
-		yearRange: '-10:+10', // Range of years to display in drop-down,
-			// either relative to current year (-nn:+nn) or absolute (nnnn:nnnn)
-		changeFirstDay: true, // True to click on day name to change, false to remain as set
-		highlightWeek: false, // True to highlight the selected week
-		showOtherMonths: false, // True to show dates in other months, false to leave blank
-		showWeeks: false, // True to show week of the year, false to omit
-		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
-			// takes a Date and returns the number of the week for it
-		shortYearCutoff: '+10', // Short year values < this are in the current century,
-			// > this are in the previous century, 
-			// string value starting with '+' for current year + value
-		showStatus: false, // True to show status bar at bottom, false to not show it
-		statusForDate: this.dateStatus, // Function to provide status text for a date -
-			// takes date and instance as parameters, returns display text
-		minDate: null, // The earliest selectable date, or null for no limit
-		maxDate: null, // The latest selectable date, or null for no limit
-		duration: 'normal', // Duration of display/closure
-		beforeShowDay: null, // Function that takes a date and returns an array with
-			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or '', 
-			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
-		beforeShow: null, // Function that takes an input field and
-			// returns a set of custom settings for the date picker
-		onSelect: null, // Define a callback function when a date is selected
-		onChangeMonthYear: null, // Define a callback function when the month or year is changed
-		onClose: null, // Define a callback function when the datepicker is closed
-		numberOfMonths: 1, // Number of months to show at a time
-		stepMonths: 1, // Number of months to step back/forward
-		rangeSelect: false, // Allows for selecting a date range on one date picker
-		rangeSeparator: ' - ', // Text between two dates in a range
-		altField: '', // Selector for an alternate field to store selected dates into
-		altFormat: '' // The date format to use for the alternate field
-	};
-	$.extend(this._defaults, this.regional['']);
-	this.dpDiv = $('<div id="' + this._mainDivId + '" style="display: none;"></div>');
-}
-
-$.extend(Datepicker.prototype, {
-	/* Class name added to elements to indicate already configured with a date picker. */
-	markerClassName: 'hasDatepicker',
-
-	/* Debug logging (if enabled). */
-	log: function () {
-		if (this.debug)
-			console.log.apply('', arguments);
-	},
-	
-	/* Override the default settings for all instances of the date picker. 
-	   @param  settings  object - the new settings to use as defaults (anonymous object)
-	   @return the manager object */
-	setDefaults: function(settings) {
-		extendRemove(this._defaults, settings || {});
-		return this;
-	},
-
-	/* Attach the date picker to a jQuery selection.
-	   @param  target    element - the target input field or division or span
-	   @param  settings  object - the new settings to use for this date picker instance (anonymous) */
-	_attachDatepicker: function(target, settings) {
-		// check for settings on the control itself - in namespace 'date:'
-		var inlineSettings = null;
-		for (attrName in this._defaults) {
-			var attrValue = target.getAttribute('date:' + attrName);
-			if (attrValue) {
-				inlineSettings = inlineSettings || {};
-				try {
-					inlineSettings[attrName] = eval(attrValue);
-				} catch (err) {
-					inlineSettings[attrName] = attrValue;
-				}
-			}
-		}
-		var nodeName = target.nodeName.toLowerCase();
-		var inline = (nodeName == 'div' || nodeName == 'span');
-		if (!target.id)
-			target.id = 'dp' + new Date().getTime();
-		var inst = this._newInst($(target), inline);
-		inst.settings = $.extend({}, settings || {}, inlineSettings || {}); 
-		if (nodeName == 'input') {
-			this._connectDatepicker(target, inst);
-		} else if (inline) {
-			this._inlineDatepicker(target, inst);
-		}
-	},
-
-	/* Create a new instance object. */
-	_newInst: function(target, inline) {
-		return {id: target[0].id, input: target, // associated target
-			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
-			drawMonth: 0, drawYear: 0, // month being drawn
-			inline: inline, // is datepicker inline or not
-			dpDiv: (!inline ? this.dpDiv : // presentation div
-			$('<div class="ui-datepicker-inline"></div>'))};
-	},
-
-	/* Attach the date picker to an input field. */
-	_connectDatepicker: function(target, inst) {
-		var input = $(target);
-		if (input.hasClass(this.markerClassName))
-			return;
-		var appendText = this._get(inst, 'appendText');
-		var isRTL = this._get(inst, 'isRTL');
-		if (appendText)
-			input[isRTL ? 'before' : 'after']('<span class="' + this._appendClass + '">' + appendText + '</span>');
-		var showOn = this._get(inst, 'showOn');
-		if (showOn == 'focus' || showOn == 'both') // pop-up date picker when in the marked field
-			input.focus(this._showDatepicker);
-		if (showOn == 'button' || showOn == 'both') { // pop-up date picker when button clicked
-			var buttonText = this._get(inst, 'buttonText');
-			var buttonImage = this._get(inst, 'buttonImage');
-			var trigger = $(this._get(inst, 'buttonImageOnly') ? 
-				$('<img/>').addClass(this._triggerClass).
-					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
-				$('<button type="button"></button>').addClass(this._triggerClass).
-					html(buttonImage == '' ? buttonText : $('<img/>').attr(
-					{ src:buttonImage, alt:buttonText, title:buttonText })));
-			input[isRTL ? 'before' : 'after'](trigger);
-			trigger.click(function() {
-				if ($.datepicker._datepickerShowing && $.datepicker._lastInput == target)
-					$.datepicker._hideDatepicker();
-				else
-					$.datepicker._showDatepicker(target);
-				return false;
-			});
-		}
-		input.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).
-			bind("setData.datepicker", function(event, key, value) {
-				inst.settings[key] = value;
-			}).bind("getData.datepicker", function(event, key) {
-				return this._get(inst, key);
-			});
-		$.data(target, PROP_NAME, inst);
-	},
-
-	/* Attach an inline date picker to a div. */
-	_inlineDatepicker: function(target, inst) {
-		var input = $(target);
-		if (input.hasClass(this.markerClassName))
-			return;
-		input.addClass(this.markerClassName).append(inst.dpDiv).
-			bind("setData.datepicker", function(event, key, value){
-				inst.settings[key] = value;
-			}).bind("getData.datepicker", function(event, key){
-				return this._get(inst, key);
-			});
-		$.data(target, PROP_NAME, inst);
-		this._setDate(inst, this._getDefaultDate(inst));
-		this._updateDatepicker(inst);
-	},
-
-	/* Tidy up after displaying the date picker. */
-	_inlineShow: function(inst) {
-		var numMonths = this._getNumberOfMonths(inst); // fix width for dynamic number of date pickers
-		inst.dpDiv.width(numMonths[1] * $('.ui-datepicker', inst.dpDiv[0]).width());
-	}, 
-
-	/* Pop-up the date picker in a "dialog" box.
-	   @param  input     element - ignored
-	   @param  dateText  string - the initial date to display (in the current format)
-	   @param  onSelect  function - the function(dateText) to call when a date is selected
-	   @param  settings  object - update the dialog date picker instance's settings (anonymous object)
-	   @param  pos       int[2] - coordinates for the dialog's position within the screen or
-	                     event - with x/y coordinates or
-	                     leave empty for default (screen centre)
-	   @return the manager object */
-	_dialogDatepicker: function(input, dateText, onSelect, settings, pos) {
-		var inst = this._dialogInst; // internal instance
-		if (!inst) {
-			var id = 'dp' + new Date().getTime();
-			this._dialogInput = $('<input type="text" id="' + id +
-				'" size="1" style="position: absolute; top: -100px;"/>');
-			this._dialogInput.keydown(this._doKeyDown);
-			$('body').append(this._dialogInput);
-			inst = this._dialogInst = this._newInst(this._dialogInput, false);
-			inst.settings = {};
-			$.data(this._dialogInput[0], PROP_NAME, inst);
-		}
-		extendRemove(inst.settings, settings || {});
-		this._dialogInput.val(dateText);
-
-		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
-		if (!this._pos) {
-			var browserWidth = window.innerWidth || document.documentElement.clientWidth ||	document.body.clientWidth;
-			var browserHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
-			var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
-			var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-			this._pos = // should use actual width/height below
-				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
-		}
-
-		// move input on screen for focus, but hidden behind dialog
-		this._dialogInput.css('left', this._pos[0] + 'px').css('top', this._pos[1] + 'px');
-		inst.settings.onSelect = onSelect;
-		this._inDialog = true;
-		this.dpDiv.addClass(this._dialogClass);
-		this._showDatepicker(this._dialogInput[0]);
-		if ($.blockUI)
-			$.blockUI(this.dpDiv);
-		$.data(this._dialogInput[0], PROP_NAME, inst);
-		return this;
-	},
-
-	/* Detach a datepicker from its control.
-	   @param  target    element - the target input field or division or span */
-	_destroyDatepicker: function(target) {
-		var nodeName = target.nodeName.toLowerCase();
-		var $target = $(target);
-		$.removeData(target, PROP_NAME);
-		if (nodeName == 'input') {
-			$target.siblings('.' + this._appendClass).remove().end().
-				siblings('.' + this._triggerClass).remove().end().
-				removeClass(this.markerClassName).
-				unbind('focus', this._showDatepicker).
-				unbind('keydown', this._doKeyDown).
-				unbind('keypress', this._doKeyPress);
-		} else if (nodeName == 'div' || nodeName == 'span')
-			$target.removeClass(this.markerClassName).empty();
-	},
-
-	/* Enable the date picker to a jQuery selection.
-	   @param  target    element - the target input field or division or span */
-	_enableDatepicker: function(target) {
-		target.disabled = false;
-		$(target).siblings('button.' + this._triggerClass).each(function() { this.disabled = false; }).end().
-			siblings('img.' + this._triggerClass).css({opacity: '1.0', cursor: ''});
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value == target ? null : value); }); // delete entry
-	},
-
-	/* Disable the date picker to a jQuery selection.
-	   @param  target    element - the target input field or division or span */
-	_disableDatepicker: function(target) {
-		target.disabled = true;
-		$(target).siblings('button.' + this._triggerClass).each(function() { this.disabled = true; }).end().
-			siblings('img.' + this._triggerClass).css({opacity: '0.5', cursor: 'default'});
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value == target ? null : value); }); // delete entry
-		this._disabledInputs[this._disabledInputs.length] = target;
-	},
-
-	/* Is the first field in a jQuery collection disabled as a datepicker?
-	   @param  target    element - the target input field or division or span
-	   @return boolean - true if disabled, false if enabled */
-	_isDisabledDatepicker: function(target) {
-		if (!target)
-			return false;
-		for (var i = 0; i < this._disabledInputs.length; i++) {
-			if (this._disabledInputs[i] == target)
-				return true;
-		}
-		return false;
-	},
-
-	/* Update the settings for a date picker attached to an input field or division.
-	   @param  target  element - the target input field or division or span
-	   @param  name    object - the new settings to update or
-	                   string - the name of the setting to change or
-	   @param  value   any - the new value for the setting (omit if above is an object) */
-	_changeDatepicker: function(target, name, value) {
-		var settings = name || {};
-		if (typeof name == 'string') {
-			settings = {};
-			settings[name] = value;
-		}
-		if (inst = $.data(target, PROP_NAME)) {
-			extendRemove(inst.settings, settings);
-			this._updateDatepicker(inst);
-		}
-	},
-
-	/* Set the dates for a jQuery selection.
-	   @param  target   element - the target input field or division or span
-	   @param  date     Date - the new date
-	   @param  endDate  Date - the new end date for a range (optional) */
-	_setDateDatepicker: function(target, date, endDate) {
-		var inst = $.data(target, PROP_NAME);
-		if (inst) {
-			this._setDate(inst, date, endDate);
-			this._updateDatepicker(inst);
-		}
-	},
-
-	/* Get the date(s) for the first entry in a jQuery selection.
-	   @param  target  element - the target input field or division or span
-	   @return Date - the current date or
-	           Date[2] - the current dates for a range */
-	_getDateDatepicker: function(target) {
-		var inst = $.data(target, PROP_NAME);
-		if (inst)
-			this._setDateFromField(inst); 
-		return (inst ? this._getDate(inst) : null);
-	},
-
-	/* Handle keystrokes. */
-	_doKeyDown: function(e) {
-		var inst = $.data(e.target, PROP_NAME);
-		var handled = true;
-		if ($.datepicker._datepickerShowing)
-			switch (e.keyCode) {
-				case 9:  $.datepicker._hideDatepicker(null, '');
-						break; // hide on tab out
-				case 13: $.datepicker._selectDay(e.target, inst.selectedMonth, inst.selectedYear,
-							$('td.ui-datepicker-days-cell-over', inst.dpDiv)[0]);
-						return false; // don't submit the form
-						break; // select the value on enter
-				case 27: $.datepicker._hideDatepicker(null, $.datepicker._get(inst, 'duration'));
-						break; // hide on escape
-				case 33: $.datepicker._adjustDate(e.target, (e.ctrlKey ? -1 :
-							-$.datepicker._get(inst, 'stepMonths')), (e.ctrlKey ? 'Y' : 'M'));
-						break; // previous month/year on page up/+ ctrl
-				case 34: $.datepicker._adjustDate(e.target, (e.ctrlKey ? +1 :
-							+$.datepicker._get(inst, 'stepMonths')), (e.ctrlKey ? 'Y' : 'M'));
-						break; // next month/year on page down/+ ctrl
-				case 35: if (e.ctrlKey) $.datepicker._clearDate(e.target);
-						break; // clear on ctrl+end
-				case 36: if (e.ctrlKey) $.datepicker._gotoToday(e.target);
-						break; // current on ctrl+home
-				case 37: if (e.ctrlKey) $.datepicker._adjustDate(e.target, -1, 'D');
-						break; // -1 day on ctrl+left
-				case 38: if (e.ctrlKey) $.datepicker._adjustDate(e.target, -7, 'D');
-						break; // -1 week on ctrl+up
-				case 39: if (e.ctrlKey) $.datepicker._adjustDate(e.target, +1, 'D');
-						break; // +1 day on ctrl+right
-				case 40: if (e.ctrlKey) $.datepicker._adjustDate(e.target, +7, 'D');
-						break; // +1 week on ctrl+down
-				default: handled = false;
-			}
-		else if (e.keyCode == 36 && e.ctrlKey) // display the date picker on ctrl+home
-			$.datepicker._showDatepicker(this);
-		else
-			handled = false;
-		if (handled) {
-			e.preventDefault();
-			e.stopPropagation();
-		}
-	},
-
-	/* Filter entered characters - based on date format. */
-	_doKeyPress: function(e) {
-		var inst = $.data(e.target, PROP_NAME);
-		var chars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat'));
-		var chr = String.fromCharCode(e.charCode == undefined ? e.keyCode : e.charCode);
-		return e.ctrlKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
-	},
-
-	/* Pop-up the date picker for a given input field.
-	   @param  input  element - the input field attached to the date picker or
-	                  event - if triggered by focus */
-	_showDatepicker: function(input) {
-		input = input.target || input;
-		if (input.nodeName.toLowerCase() != 'input') // find from button/image trigger
-			input = $('input', input.parentNode)[0];
-		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput == input) // already here
-			return;
-		var inst = $.data(input, PROP_NAME);
-		var beforeShow = $.datepicker._get(inst, 'beforeShow');
-		extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
-		$.datepicker._hideDatepicker(null, '');
-		$.datepicker._lastInput = input;
-		$.datepicker._setDateFromField(inst);
-		if ($.datepicker._inDialog) // hide cursor
-			input.value = '';
-		if (!$.datepicker._pos) { // position below input
-			$.datepicker._pos = $.datepicker._findPos(input);
-			$.datepicker._pos[1] += input.offsetHeight; // add the height
-		}
-		var isFixed = false;
-		$(input).parents().each(function() {
-			isFixed |= $(this).css('position') == 'fixed';
-			return !isFixed;
-		});
-		if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
-			$.datepicker._pos[0] -= document.documentElement.scrollLeft;
-			$.datepicker._pos[1] -= document.documentElement.scrollTop;
-		}
-		var offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
-		$.datepicker._pos = null;
-		inst.rangeStart = null;
-		// determine sizing offscreen
-		inst.dpDiv.css({position: 'absolute', display: 'block', top: '-1000px'});
-		$.datepicker._updateDatepicker(inst);
-		// fix width for dynamic number of date pickers
-		inst.dpDiv.width($.datepicker._getNumberOfMonths(inst)[1] *
-			$('.ui-datepicker', inst.dpDiv[0])[0].offsetWidth);
-		// and adjust position before showing
-		offset = $.datepicker._checkOffset(inst, offset, isFixed);
-		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
-			'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
-			left: offset.left + 'px', top: offset.top + 'px'});
-		if (!inst.inline) {
-			var showAnim = $.datepicker._get(inst, 'showAnim') || 'show';
-			var duration = $.datepicker._get(inst, 'duration');
-			var postProcess = function() {
-				$.datepicker._datepickerShowing = true;
-				if ($.browser.msie && parseInt($.browser.version) < 7) // fix IE < 7 select problems
-					$('iframe.ui-datepicker-cover').css({width: inst.dpDiv.width() + 4,
-						height: inst.dpDiv.height() + 4});
-			};
-			if ($.effects && $.effects[showAnim])
-				inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
-			else
-				inst.dpDiv[showAnim](duration, postProcess);
-			if (duration == '')
-				postProcess();
-			if (inst.input[0].type != 'hidden')
-				inst.input[0].focus();
-			$.datepicker._curInst = inst;
-		}
-	},
-
-	/* Generate the date picker content. */
-	_updateDatepicker: function(inst) {
-		var dims = {width: inst.dpDiv.width() + 4,
-			height: inst.dpDiv.height() + 4};
-		inst.dpDiv.empty().append(this._generateDatepicker(inst)).
-			find('iframe.ui-datepicker-cover').
-			css({width: dims.width, height: dims.height});
-		var numMonths = this._getNumberOfMonths(inst);
-		inst.dpDiv[(numMonths[0] != 1 || numMonths[1] != 1 ? 'add' : 'remove') +
-			'Class']('ui-datepicker-multi');
-		inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +
-			'Class']('ui-datepicker-rtl');
-		if (inst.input && inst.input[0].type != 'hidden')
-			$(inst.input[0]).focus();
-	},
-
-	/* Check positioning to remain on screen. */
-	_checkOffset: function(inst, offset, isFixed) {
-		var pos = inst.input ? this._findPos(inst.input[0]) : null;
-		var browserWidth = window.innerWidth || document.documentElement.clientWidth;
-		var browserHeight = window.innerHeight || document.documentElement.clientHeight;
-		var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
-		var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-		// reposition date picker horizontally if outside the browser window
-		if (this._get(inst, 'isRTL') || (offset.left + inst.dpDiv.width() - scrollX) > browserWidth)
-			offset.left = Math.max((isFixed ? 0 : scrollX),
-				pos[0] + (inst.input ? inst.input.width() : 0) - (isFixed ? scrollX : 0) - inst.dpDiv.width() -
-				(isFixed && $.browser.opera ? document.documentElement.scrollLeft : 0));
-		else
-			offset.left -= (isFixed ? scrollX : 0);
-		// reposition date picker vertically if outside the browser window
-		if ((offset.top + inst.dpDiv.height() - scrollY) > browserHeight)
-			offset.top = Math.max((isFixed ? 0 : scrollY),
-				pos[1] - (isFixed ? scrollY : 0) - (this._inDialog ? 0 : inst.dpDiv.height()) -
-				(isFixed && $.browser.opera ? document.documentElement.scrollTop : 0));
-		else
-			offset.top -= (isFixed ? scrollY : 0);
-		return offset;
-	},
-	
-	/* Find an object's position on the screen. */
-	_findPos: function(obj) {
-        while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
-            obj = obj.nextSibling;
-        }
-        var position = $(obj).offset();
-	    return [position.left, position.top];
-	},
-
-	/* Hide the date picker from view.
-	   @param  input  element - the input field attached to the date picker
-	   @param  duration  string - the duration over which to close the date picker */
-	_hideDatepicker: function(input, duration) {
-		var inst = this._curInst;
-		if (!inst)
-			return;
-		var rangeSelect = this._get(inst, 'rangeSelect');
-		if (rangeSelect && this._stayOpen)
-			this._selectDate('#' + inst.id, this._formatDate(inst,
-				inst.currentDay, inst.currentMonth, inst.currentYear));
-		this._stayOpen = false;
-		if (this._datepickerShowing) {
-			duration = (duration != null ? duration : this._get(inst, 'duration'));
-			var showAnim = this._get(inst, 'showAnim');
-			var postProcess = function() {
-				$.datepicker._tidyDialog(inst);
-			};
-			if (duration != '' && $.effects && $.effects[showAnim])
-				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, 'showOptions'),
-					duration, postProcess);
-			else
-				inst.dpDiv[(duration == '' ? 'hide' : (showAnim == 'slideDown' ? 'slideUp' :
-					(showAnim == 'fadeIn' ? 'fadeOut' : 'hide')))](duration, postProcess);
-			if (duration == '')
-				this._tidyDialog(inst);
-			var onClose = this._get(inst, 'onClose');
-			if (onClose)
-				onClose.apply((inst.input ? inst.input[0] : null),
-					[this._getDate(inst), inst]);  // trigger custom callback
-			this._datepickerShowing = false;
-			this._lastInput = null;
-			inst.settings.prompt = null;
-			if (this._inDialog) {
-				this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
-				if ($.blockUI) {
-					$.unblockUI();
-					$('body').append(this.dpDiv);
-				}
-			}
-			this._inDialog = false;
-		}
-		this._curInst = null;
-	},
-
-	/* Tidy up after a dialog display. */
-	_tidyDialog: function(inst) {
-		inst.dpDiv.removeClass(this._dialogClass).unbind('.ui-datepicker');
-		$('.' + this._promptClass, inst.dpDiv).remove();
-	},
-
-	/* Close date picker if clicked elsewhere. */
-	_checkExternalClick: function(event) {
-		if (!$.datepicker._curInst)
-			return;
-		var $target = $(event.target);
-		if (($target.parents('#' + $.datepicker._mainDivId).length == 0) &&
-				!$target.hasClass($.datepicker.markerClassName) &&
-				!$target.hasClass($.datepicker._triggerClass) &&
-				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI))
-			$.datepicker._hideDatepicker(null, '');
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustDate: function(id, offset, period) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		this._adjustInstDate(inst, offset, period);
-		this._updateDatepicker(inst);
-	},
-
-	/* Action for current link. */
-	_gotoToday: function(id) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		if (this._get(inst, 'gotoCurrent') && inst.currentDay) {
-			inst.selectedDay = inst.currentDay;
-			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
-			inst.drawYear = inst.selectedYear = inst.currentYear;
-		}
-		else {
-		var date = new Date();
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		}
-		this._adjustDate(target);
-		this._notifyChange(inst);
-	},
-
-	/* Action for selecting a new month/year. */
-	_selectMonthYear: function(id, select, period) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		inst._selectingMonthYear = false;
-		inst[period == 'M' ? 'drawMonth' : 'drawYear'] =
-			select.options[select.selectedIndex].value - 0;
-		this._adjustDate(target);
-		this._notifyChange(inst);
-	},
-
-	/* Restore input focus after not changing month/year. */
-	_clickMonthYear: function(id) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		if (inst.input && inst._selectingMonthYear && !$.browser.msie)
-			inst.input[0].focus();
-		inst._selectingMonthYear = !inst._selectingMonthYear;
-	},
-
-	/* Action for changing the first week day. */
-	_changeFirstDay: function(id, day) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		inst.settings.firstDay = day;
-		this._updateDatepicker(inst);
-	},
-
-	/* Action for selecting a day. */
-	_selectDay: function(id, month, year, td) {
-		if ($(td).hasClass(this._unselectableClass))
-			return;
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		var rangeSelect = this._get(inst, 'rangeSelect');
-		if (rangeSelect) {
-			this._stayOpen = !this._stayOpen;
-			if (this._stayOpen) {
-				$('.ui-datepicker td').removeClass(this._currentClass);
-				$(td).addClass(this._currentClass);
-			} 
-		}
-		inst.selectedDay = inst.currentDay = $('a', td).html();
-		inst.selectedMonth = inst.currentMonth = month;
-		inst.selectedYear = inst.currentYear = year;
-		if (this._stayOpen) {
-			inst.endDay = inst.endMonth = inst.endYear = null;
-		}
-		else if (rangeSelect) {
-			inst.endDay = inst.currentDay;
-			inst.endMonth = inst.currentMonth;
-			inst.endYear = inst.currentYear;
-		}
-		this._selectDate(id, this._formatDate(inst,
-			inst.currentDay, inst.currentMonth, inst.currentYear));
-		if (this._stayOpen) {
-			inst.rangeStart = new Date(inst.currentYear, inst.currentMonth, inst.currentDay);
-			this._updateDatepicker(inst);
-		}
-		else if (rangeSelect) {
-			inst.selectedDay = inst.currentDay = inst.rangeStart.getDate();
-			inst.selectedMonth = inst.currentMonth = inst.rangeStart.getMonth();
-			inst.selectedYear = inst.currentYear = inst.rangeStart.getFullYear();
-			inst.rangeStart = null;
-			if (inst.inline)
-				this._updateDatepicker(inst);
-		}
-	},
-
-	/* Erase the input field and hide the date picker. */
-	_clearDate: function(id) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		if (this._get(inst, 'mandatory'))
-			return;
-		this._stayOpen = false;
-		inst.endDay = inst.endMonth = inst.endYear = inst.rangeStart = null;
-		this._selectDate(target, '');
-	},
-
-	/* Update the input field with the selected date. */
-	_selectDate: function(id, dateStr) {
-		var target = $(id);
-		var inst = $.data(target[0], PROP_NAME);
-		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
-		if (this._get(inst, 'rangeSelect') && dateStr)
-			dateStr = (inst.rangeStart ? this._formatDate(inst, inst.rangeStart) :
-				dateStr) + this._get(inst, 'rangeSeparator') + dateStr;
-		if (inst.input)
-			inst.input.val(dateStr);
-		this._updateAlternate(inst);
-		var onSelect = this._get(inst, 'onSelect');
-		if (onSelect)
-			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
-		else if (inst.input)
-			inst.input.trigger('change'); // fire the change event
-		if (inst.inline)
-			this._updateDatepicker(inst);
-		else if (!this._stayOpen) {
-			this._hideDatepicker(null, this._get(inst, 'duration'));
-			this._lastInput = inst.input[0];
-			if (typeof(inst.input[0]) != 'object')
-				inst.input[0].focus(); // restore focus
-			this._lastInput = null;
-		}
-	},
-	
-	/* Update any alternate field to synchronise with the main field. */
-	_updateAlternate: function(inst) {
-		var altField = this._get(inst, 'altField');
-		if (altField) { // update alternate field too
-			var altFormat = this._get(inst, 'altFormat');
-			var date = this._getDate(inst);
-			dateStr = (isArray(date) ? (!date[0] && !date[1] ? '' :
-				this.formatDate(altFormat, date[0], this._getFormatConfig(inst)) +
-				this._get(inst, 'rangeSeparator') + this.formatDate(
-				altFormat, date[1] || date[0], this._getFormatConfig(inst))) :
-				this.formatDate(altFormat, date, this._getFormatConfig(inst)));
-			$(altField).each(function() { $(this).val(dateStr); });
-		}
-	},
-
-	/* Set as beforeShowDay function to prevent selection of weekends.
-	   @param  date  Date - the date to customise
-	   @return [boolean, string] - is this date selectable?, what is its CSS class? */
-	noWeekends: function(date) {
-		var day = date.getDay();
-		return [(day > 0 && day < 6), ''];
-	},
-	
-	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
-	   @param  date  Date - the date to get the week for
-	   @return  number - the number of the week within the year that contains this date */
-	iso8601Week: function(date) {
-		var checkDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), (date.getTimezoneOffset() / -60));
-		var firstMon = new Date(checkDate.getFullYear(), 1 - 1, 4); // First week always contains 4 Jan
-		var firstDay = firstMon.getDay() || 7; // Day of week: Mon = 1, ..., Sun = 7
-		firstMon.setDate(firstMon.getDate() + 1 - firstDay); // Preceding Monday
-		if (firstDay < 4 && checkDate < firstMon) { // Adjust first three days in year if necessary
-			checkDate.setDate(checkDate.getDate() - 3); // Generate for previous year
-			return $.datepicker.iso8601Week(checkDate);
-		} else if (checkDate > new Date(checkDate.getFullYear(), 12 - 1, 28)) { // Check last three days in year
-			firstDay = new Date(checkDate.getFullYear() + 1, 1 - 1, 4).getDay() || 7;
-			if (firstDay > 4 && (checkDate.getDay() || 7) < firstDay - 3) { // Adjust if necessary
-				checkDate.setDate(checkDate.getDate() + 3); // Generate for next year
-				return $.datepicker.iso8601Week(checkDate);
-			}
-		}
-		return Math.floor(((checkDate - firstMon) / 86400000) / 7) + 1; // Weeks to given date
-	},
-	
-	/* Provide status text for a particular date.
-	   @param  date  the date to get the status for
-	   @param  inst  the current datepicker instance
-	   @return  the status display text for this date */
-	dateStatus: function(date, inst) {
-		return $.datepicker.formatDate($.datepicker._get(inst, 'dateStatus'),
-			date, $.datepicker._getFormatConfig(inst));
-	},
-
-	/* Parse a string value into a date object.
-	   See formatDate below for the possible formats.
-
-	   @param  format    string - the expected format of the date
-	   @param  value     string - the date in the above format
-	   @param  settings  Object - attributes include:
-	                     shortYearCutoff  number - the cutoff year for determining the century (optional)
-	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
-	                     dayNames         string[7] - names of the days from Sunday (optional)
-	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
-	                     monthNames       string[12] - names of the months (optional)
-	   @return  Date - the extracted date value or null if value is blank */
-	parseDate: function (format, value, settings) {
-		if (format == null || value == null)
-			throw 'Invalid arguments';
-		value = (typeof value == 'object' ? value.toString() : value + '');
-		if (value == '')
-			return null;
-		var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
-		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
-		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
-		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
-		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
-		var year = -1;
-		var month = -1;
-		var day = -1;
-		var literal = false;
-		// Check whether a format character is doubled
-		var lookAhead = function(match) {
-			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
-			if (matches)
-				iFormat++;
-			return matches;	
-		};
-		// Extract a number from the string value
-		var getNumber = function(match) {
-			lookAhead(match);
-			var origSize = (match == '@' ? 14 : (match == 'y' ? 4 : 2));
-			var size = origSize;
-			var num = 0;
-			while (size > 0 && iValue < value.length &&
-					value.charAt(iValue) >= '0' && value.charAt(iValue) <= '9') {
-				num = num * 10 + (value.charAt(iValue++) - 0);
-				size--;
-			}
-			if (size == origSize)
-				throw 'Missing number at position ' + iValue;
-			return num;
-		};
-		// Extract a name from the string value and convert to an index
-		var getName = function(match, shortNames, longNames) {
-			var names = (lookAhead(match) ? longNames : shortNames);
-			var size = 0;
-			for (var j = 0; j < names.length; j++)
-				size = Math.max(size, names[j].length);
-			var name = '';
-			var iInit = iValue;
-			while (size > 0 && iValue < value.length) {
-				name += value.charAt(iValue++);
-				for (var i = 0; i < names.length; i++)
-					if (name == names[i])
-						return i + 1;
-				size--;
-			}
-			throw 'Unknown name at position ' + iInit;
-		};
-		// Confirm that a literal character matches the string value
-		var checkLiteral = function() {
-			if (value.charAt(iValue) != format.charAt(iFormat))
-				throw 'Unexpected literal at position ' + iValue;
-			iValue++;
-		};
-		var iValue = 0;
-		for (var iFormat = 0; iFormat < format.length; iFormat++) {
-			if (literal)
-				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
-					literal = false;
-				else
-					checkLiteral();
-			else
-				switch (format.charAt(iFormat)) {
-					case 'd':
-						day = getNumber('d');
-						break;
-					case 'D': 
-						getName('D', dayNamesShort, dayNames);
-						break;
-					case 'm': 
-						month = getNumber('m');
-						break;
-					case 'M':
-						month = getName('M', monthNamesShort, monthNames); 
-						break;
-					case 'y':
-						year = getNumber('y');
-						break;
-					case '@':
-						var date = new Date(getNumber('@'));
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "'":
-						if (lookAhead("'"))
-							checkLiteral();
-						else
-							literal = true;
-						break;
-					default:
-						checkLiteral();
-				}
-		}
-		if (year < 100)
-			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
-				(year <= shortYearCutoff ? 0 : -100);
-		var date = new Date(year, month - 1, day);
-		if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day)
-			throw 'Invalid date'; // E.g. 31/02/*
-		return date;
-	},
-
-	/* Standard date formats. */
-	ATOM: 'yy-mm-dd', // RFC 3339 (ISO 8601)
-	COOKIE: 'D, dd M yy',
-	ISO_8601: 'yy-mm-dd',
-	RFC_822: 'D, d M y',
-	RFC_850: 'DD, dd-M-y',
-	RFC_1036: 'D, d M y',
-	RFC_1123: 'D, d M yy',
-	RFC_2822: 'D, d M yy',
-	RSS: 'D, d M y', // RFC 822
-	TIMESTAMP: '@',
-	W3C: 'yy-mm-dd', // ISO 8601
-
-	/* Format a date object into a string value.
-	   The format can be combinations of the following:
-	   d  - day of month (no leading zero)
-	   dd - day of month (two digit)
-	   D  - day name short
-	   DD - day name long
-	   m  - month of year (no leading zero)
-	   mm - month of year (two digit)
-	   M  - month name short
-	   MM - month name long
-	   y  - year (two digit)
-	   yy - year (four digit)
-	   @ - Unix timestamp (ms since 01/01/1970)
-	   '...' - literal text
-	   '' - single quote
-
-	   @param  format    string - the desired format of the date
-	   @param  date      Date - the date value to format
-	   @param  settings  Object - attributes include:
-	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
-	                     dayNames         string[7] - names of the days from Sunday (optional)
-	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
-	                     monthNames       string[12] - names of the months (optional)
-	   @return  string - the date in the above format */
-	formatDate: function (format, date, settings) {
-		if (!date)
-			return '';
-		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
-		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
-		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
-		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
-		// Check whether a format character is doubled
-		var lookAhead = function(match) {
-			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
-			if (matches)
-				iFormat++;
-			return matches;	
-		};
-		// Format a number, with leading zero if necessary
-		var formatNumber = function(match, value) {
-			return (lookAhead(match) && value < 10 ? '0' : '') + value;
-		};
-		// Format a name, short or long as requested
-		var formatName = function(match, value, shortNames, longNames) {
-			return (lookAhead(match) ? longNames[value] : shortNames[value]);
-		};
-		var output = '';
-		var literal = false;
-		if (date)
-			for (var iFormat = 0; iFormat < format.length; iFormat++) {
-				if (literal)
-					if (format.charAt(iFormat) == "'" && !lookAhead("'"))
-						literal = false;
-					else
-						output += format.charAt(iFormat);
-				else
-					switch (format.charAt(iFormat)) {
-						case 'd':
-							output += formatNumber('d', date.getDate()); 
-							break;
-						case 'D': 
-							output += formatName('D', date.getDay(), dayNamesShort, dayNames);
-							break;
-						case 'm': 
-							output += formatNumber('m', date.getMonth() + 1); 
-							break;
-						case 'M':
-							output += formatName('M', date.getMonth(), monthNamesShort, monthNames); 
-							break;
-						case 'y':
-							output += (lookAhead('y') ? date.getFullYear() : 
-								(date.getYear() % 100 < 10 ? '0' : '') + date.getYear() % 100);
-							break;
-						case '@':
-							output += date.getTime(); 
-							break;
-						case "'":
-							if (lookAhead("'"))
-								output += "'";
-							else
-								literal = true;
-							break;
-						default:
-							output += format.charAt(iFormat);
-					}
-			}
-		return output;
-	},
-
-	/* Extract all possible characters from the date format. */
-	_possibleChars: function (format) {
-		var chars = '';
-		var literal = false;
-		for (var iFormat = 0; iFormat < format.length; iFormat++)
-			if (literal)
-				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
-					literal = false;
-				else
-					chars += format.charAt(iFormat);
-			else
-				switch (format.charAt(iFormat)) {
-					case 'd': case 'm': case 'y': case '@':
-						chars += '0123456789'; 
-						break;
-					case 'D': case 'M':
-						return null; // Accept anything
-					case "'":
-						if (lookAhead("'"))
-							chars += "'";
-						else
-							literal = true;
-						break;
-					default:
-						chars += format.charAt(iFormat);
-				}
-		return chars;
-	},
-
-	/* Get a setting value, defaulting if necessary. */
-	_get: function(inst, name) {
-		return inst.settings[name] !== undefined ?
-			inst.settings[name] : this._defaults[name];
-	},
-
-	/* Parse existing date and initialise date picker. */
-	_setDateFromField: function(inst) {
-		var dateFormat = this._get(inst, 'dateFormat');
-		var dates = inst.input ? inst.input.val().split(this._get(inst, 'rangeSeparator')) : null; 
-		inst.endDay = inst.endMonth = inst.endYear = null;
-		var date = defaultDate = this._getDefaultDate(inst);
-		if (dates.length > 0) {
-			var settings = this._getFormatConfig(inst);
-			if (dates.length > 1) {
-				date = this.parseDate(dateFormat, dates[1], settings) || defaultDate;
-				inst.endDay = date.getDate();
-				inst.endMonth = date.getMonth();
-				inst.endYear = date.getFullYear();
-			}
-			try {
-				date = this.parseDate(dateFormat, dates[0], settings) || defaultDate;
-			} catch (e) {
-				this.log(e);
-				date = defaultDate;
-			}
-		}
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		inst.currentDay = (dates[0] ? date.getDate() : 0);
-		inst.currentMonth = (dates[0] ? date.getMonth() : 0);
-		inst.currentYear = (dates[0] ? date.getFullYear() : 0);
-		this._adjustInstDate(inst);
-	},
-	
-	/* Retrieve the default date shown on opening. */
-	_getDefaultDate: function(inst) {
-		var date = this._determineDate(this._get(inst, 'defaultDate'), new Date());
-		var minDate = this._getMinMaxDate(inst, 'min', true);
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		date = (minDate && date < minDate ? minDate : date);
-		date = (maxDate && date > maxDate ? maxDate : date);
-		return date;
-	},
-
-	/* A date may be specified as an exact value or a relative one. */
-	_determineDate: function(date, defaultDate) {
-		var offsetNumeric = function(offset) {
-			var date = new Date();
-			date.setUTCDate(date.getUTCDate() + offset);
-			return date;
-		};
-		var offsetString = function(offset, getDaysInMonth) {
-			var date = new Date();
-			var year = date.getFullYear();
-			var month = date.getMonth();
-			var day = date.getDate();
-			var pattern = /([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;
-			var matches = pattern.exec(offset);
-			while (matches) {
-				switch (matches[2] || 'd') {
-					case 'd' : case 'D' :
-						day += (matches[1] - 0); break;
-					case 'w' : case 'W' :
-						day += (matches[1] * 7); break;
-					case 'm' : case 'M' :
-						month += (matches[1] - 0); 
-						day = Math.min(day, getDaysInMonth(year, month));
-						break;
-					case 'y': case 'Y' :
-						year += (matches[1] - 0);
-						day = Math.min(day, getDaysInMonth(year, month));
-						break;
-				}
-				matches = pattern.exec(offset);
-			}
-			return new Date(year, month, day);
-		};
-		return (date == null ? defaultDate :
-			(typeof date == 'string' ? offsetString(date, this._getDaysInMonth) :
-			(typeof date == 'number' ? offsetNumeric(date) : date)));
-	},
-
-	/* Set the date(s) directly. */
-	_setDate: function(inst, date, endDate) {
-		var clear = !(date);
-		date = this._determineDate(date, new Date());
-		inst.selectedDay = inst.currentDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = inst.currentMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = inst.currentYear = date.getFullYear();
-		if (this._get(inst, 'rangeSelect')) {
-			if (endDate) {
-				endDate = this._determineDate(endDate, null);
-				inst.endDay = endDate.getDate();
-				inst.endMonth = endDate.getMonth();
-				inst.endYear = endDate.getFullYear();
-			} else {
-				inst.endDay = inst.currentDay;
-				inst.endMonth = inst.currentMonth;
-				inst.endYear = inst.currentYear;
-			}
-		}
-		this._adjustInstDate(inst);
-		if (inst.input)
-			inst.input.val(clear ? '' : this._formatDate(inst) +
-				(!this._get(inst, 'rangeSelect') ? '' : this._get(inst, 'rangeSeparator') +
-				this._formatDate(inst, inst.endDay, inst.endMonth, inst.endYear)));
-	},
-
-	/* Retrieve the date(s) directly. */
-	_getDate: function(inst) {
-		var startDate = (!inst.currentYear || (inst.input && inst.input.val() == '') ? null :
-			new Date(inst.currentYear, inst.currentMonth, inst.currentDay));
-		if (this._get(inst, 'rangeSelect')) {
-			return [inst.rangeStart || startDate, (!inst.endYear ? null :
-				new Date(inst.endYear, inst.endMonth, inst.endDay))];
-		} else
-			return startDate;
-	},
-
-	/* Generate the HTML for the current state of the date picker. */
-	_generateDatepicker: function(inst) {
-		var today = new Date();
-		today = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // clear time
-		var showStatus = this._get(inst, 'showStatus');
-		var isRTL = this._get(inst, 'isRTL');
-		// build the date picker HTML
-		var clear = (this._get(inst, 'mandatory') ? '' :
-			'<div class="ui-datepicker-clear"><a onclick="jQuery.datepicker._clearDate(\'#' + inst.id + '\');"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'clearStatus') || '&#xa0;') : '') + '>' +
-			this._get(inst, 'clearText') + '</a></div>');
-		var controls = '<div class="ui-datepicker-control">' + (isRTL ? '' : clear) +
-			'<div class="ui-datepicker-close"><a onclick="jQuery.datepicker._hideDatepicker();"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'closeStatus') || '&#xa0;') : '') + '>' +
-			this._get(inst, 'closeText') + '</a></div>' + (isRTL ? clear : '')  + '</div>';
-		var prompt = this._get(inst, 'prompt');
-		var closeAtTop = this._get(inst, 'closeAtTop');
-		var hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext');
-		var navigationAsDateFormat = this._get(inst, 'navigationAsDateFormat');
-		var numMonths = this._getNumberOfMonths(inst);
-		var stepMonths = this._get(inst, 'stepMonths');
-		var isMultiMonth = (numMonths[0] != 1 || numMonths[1] != 1);
-		var currentDate = (!inst.currentDay ? new Date(9999, 9, 9) :
-			new Date(inst.currentYear, inst.currentMonth, inst.currentDay));
-		var minDate = this._getMinMaxDate(inst, 'min', true);
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		var drawMonth = inst.drawMonth;
-		var drawYear = inst.drawYear;
-		if (maxDate) {
-			var maxDraw = new Date(maxDate.getFullYear(),
-				maxDate.getMonth() - numMonths[1] + 1, maxDate.getDate());
-			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
-			while (new Date(drawYear, drawMonth, 1) > maxDraw) {
-				drawMonth--;
-				if (drawMonth < 0) {
-					drawMonth = 11;
-					drawYear--;
-				}
-			}
-		}
-		// controls and links
-		var prevText = this._get(inst, 'prevText');
-		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(
-			prevText, new Date(drawYear, drawMonth - stepMonths, 1), this._getFormatConfig(inst)));
-		var prev = '<div class="ui-datepicker-prev">' + (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ? 
-			'<a onclick="jQuery.datepicker._adjustDate(\'#' + inst.id + '\', -' + stepMonths + ', \'M\');"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'prevStatus') || '&#xa0;') : '') + '>' + prevText + '</a>' :
-			(hideIfNoPrevNext ? '' : '<label>' + prevText + '</label>')) + '</div>';
-		var nextText = this._get(inst, 'nextText');
-		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(
-			nextText, new Date(drawYear, drawMonth + stepMonths, 1), this._getFormatConfig(inst)));
-		var next = '<div class="ui-datepicker-next">' + (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
-			'<a onclick="jQuery.datepicker._adjustDate(\'#' + inst.id + '\', +' + stepMonths + ', \'M\');"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'nextStatus') || '&#xa0;') : '') + '>' + nextText + '</a>' :
-			(hideIfNoPrevNext ? '' : '<label>' + nextText + '</label>')) + '</div>';
-		var currentText = this._get(inst, 'currentText');
-		currentText = (!navigationAsDateFormat ? currentText: this.formatDate(
-			currentText, today, this._getFormatConfig(inst)));
-		var html = (prompt ? '<div class="' + this._promptClass + '">' + prompt + '</div>' : '') +
-			(closeAtTop && !inst.inline ? controls : '') +
-			'<div class="ui-datepicker-links">' + (isRTL ? next : prev) +
-			(this._isInRange(inst, (this._get(inst, 'gotoCurrent') && inst.currentDay ?
-			currentDate : today)) ? '<div class="ui-datepicker-current">' +
-			'<a onclick="jQuery.datepicker._gotoToday(\'#' + inst.id + '\');"' +
-			(showStatus ? this._addStatus(inst, this._get(inst, 'currentStatus') || '&#xa0;') : '') + '>' +
-			currentText + '</a></div>' : '') + (isRTL ? prev : next) + '</div>';
-		var firstDay = this._get(inst, 'firstDay');
-		var changeFirstDay = this._get(inst, 'changeFirstDay');
-		var dayNames = this._get(inst, 'dayNames');
-		var dayNamesShort = this._get(inst, 'dayNamesShort');
-		var dayNamesMin = this._get(inst, 'dayNamesMin');
-		var monthNames = this._get(inst, 'monthNames');
-		var beforeShowDay = this._get(inst, 'beforeShowDay');
-		var highlightWeek = this._get(inst, 'highlightWeek');
-		var showOtherMonths = this._get(inst, 'showOtherMonths');
-		var showWeeks = this._get(inst, 'showWeeks');
-		var calculateWeek = this._get(inst, 'calculateWeek') || this.iso8601Week;
-		var status = (showStatus ? this._get(inst, 'dayStatus') || '&#xa0;' : '');
-		var dateStatus = this._get(inst, 'statusForDate') || this.dateStatus;
-		var endDate = inst.endDay ? new Date(inst.endYear, inst.endMonth, inst.endDay) : currentDate;
-		for (var row = 0; row < numMonths[0]; row++)
-			for (var col = 0; col < numMonths[1]; col++) {
-				var selectedDate = new Date(drawYear, drawMonth, inst.selectedDay);
-				html += '<div class="ui-datepicker-one-month' + (col == 0 ? ' ui-datepicker-new-row' : '') + '">' +
-					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
-					selectedDate, row > 0 || col > 0, showStatus, monthNames) + // draw month headers
-					'<table class="ui-datepicker" cellpadding="0" cellspacing="0"><thead>' + 
-					'<tr class="ui-datepicker-title-row">' +
-					(showWeeks ? '<td>' + this._get(inst, 'weekHeader') + '</td>' : '');
-				for (var dow = 0; dow < 7; dow++) { // days of the week
-					var day = (dow + firstDay) % 7;
-					var dayStatus = (status.indexOf('DD') > -1 ? status.replace(/DD/, dayNames[day]) :
-						status.replace(/D/, dayNamesShort[day]));
-					html += '<td' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end-cell"' : '') + '>' +
-						(!changeFirstDay ? '<span' :
-						'<a onclick="jQuery.datepicker._changeFirstDay(\'#' + inst.id + '\', ' + day + ');"') + 
-						(showStatus ? this._addStatus(inst, dayStatus) : '') + ' title="' + dayNames[day] + '">' +
-						dayNamesMin[day] + (changeFirstDay ? '</a>' : '</span>') + '</td>';
-				}
-				html += '</tr></thead><tbody>';
-				var daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
-				if (drawYear == inst.selectedYear && drawMonth == inst.selectedMonth)
-					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
-				var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
-				var printDate = new Date(drawYear, drawMonth, 1 - leadDays);
-				var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate
-				for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
-					html += '<tr class="ui-datepicker-days-row">' +
-						(showWeeks ? '<td class="ui-datepicker-week-col">' + calculateWeek(printDate) + '</td>' : '');
-					for (var dow = 0; dow < 7; dow++) { // create date picker days
-						var daySettings = (beforeShowDay ?
-							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, '']);
-						var otherMonth = (printDate.getMonth() != drawMonth);
-						var unselectable = otherMonth || !daySettings[0] ||
-							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
-						html += '<td class="ui-datepicker-days-cell' +
-							((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end-cell' : '') + // highlight weekends
-							(otherMonth ? ' ui-datepicker-otherMonth' : '') + // highlight days from other months
-							(printDate.getTime() == selectedDate.getTime() && drawMonth == inst.selectedMonth ?
-							' ui-datepicker-days-cell-over' : '') + // highlight selected day
-							(unselectable ? ' ' + this._unselectableClass : '') +  // highlight unselectable days
-							(otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
-							(printDate.getTime() >= currentDate.getTime() && printDate.getTime() <= endDate.getTime() ?  // in current range
-							' ' + this._currentClass : '') + // highlight selected day
-							(printDate.getTime() == today.getTime() ? ' ui-datepicker-today' : '')) + '"' + // highlight today (if different)
-							((!otherMonth || showOtherMonths) && daySettings[2] ? ' title="' + daySettings[2] + '"' : '') + // cell title
-							(unselectable ? (highlightWeek ? ' onmouseover="jQuery(this).parent().addClass(\'ui-datepicker-week-over\');"' + // highlight selection week
-							' onmouseout="jQuery(this).parent().removeClass(\'ui-datepicker-week-over\');"' : '') : // unhighlight selection week
-							' onmouseover="jQuery(this).addClass(\'ui-datepicker-days-cell-over\')' + // highlight selection
-							(highlightWeek ? '.parent().addClass(\'ui-datepicker-week-over\')' : '') + ';' + // highlight selection week
-							(!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#ui-datepicker-status-' +
-							inst.id + '\').html(\'' + (dateStatus.apply((inst.input ? inst.input[0] : null),
-							[printDate, inst]) || '&#xa0;') +'\');') + '"' +
-							' onmouseout="jQuery(this).removeClass(\'ui-datepicker-days-cell-over\')' + // unhighlight selection
-							(highlightWeek ? '.parent().removeClass(\'ui-datepicker-week-over\')' : '') + ';' + // unhighlight selection week
-							(!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#ui-datepicker-status-' +
-							inst.id + '\').html(\'&#xa0;\');') + '" onclick="jQuery.datepicker._selectDay(\'#' +
-							inst.id + '\',' + drawMonth + ',' + drawYear + ', this);"') + '>' + // actions
-							(otherMonth ? (showOtherMonths ? printDate.getDate() : '&#xa0;') : // display for other months
-							(unselectable ? printDate.getDate() : '<a>' + printDate.getDate() + '</a>')) + '</td>'; // display for this month
-						printDate.setUTCDate(printDate.getUTCDate() + 1);
-					}
-					html += '</tr>';
-				}
-				drawMonth++;
-				if (drawMonth > 11) {
-					drawMonth = 0;
-					drawYear++;
-				}
-				html += '</tbody></table></div>';
-			}
-		html += (showStatus ? '<div style="clear: both;"></div><div id="ui-datepicker-status-' + inst.id + 
-			'" class="ui-datepicker-status">' + (this._get(inst, 'initStatus') || '&#xa0;') + '</div>' : '') +
-			(!closeAtTop && !inst.inline ? controls : '') +
-			'<div style="clear: both;"></div>' + 
-			($.browser.msie && parseInt($.browser.version) < 7 && !inst.inline ? 
-			'<iframe src="javascript:false;" class="ui-datepicker-cover"></iframe>' : '');
-		return html;
-	},
-	
-	/* Generate the month and year header. */
-	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
-			selectedDate, secondary, showStatus, monthNames) {
-		minDate = (inst.rangeStart && minDate && selectedDate < minDate ? selectedDate : minDate);
-		var html = '<div class="ui-datepicker-header">';
-		// month selection
-		if (secondary || !this._get(inst, 'changeMonth'))
-			html += monthNames[drawMonth] + '&#xa0;';
-		else {
-			var inMinYear = (minDate && minDate.getFullYear() == drawYear);
-			var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
-			html += '<select class="ui-datepicker-new-month" ' +
-				'onchange="jQuery.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'M\');" ' +
-				'onclick="jQuery.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
-				(showStatus ? this._addStatus(inst, this._get(inst, 'monthStatus') || '&#xa0;') : '') + '>';
-			for (var month = 0; month < 12; month++) {
-				if ((!inMinYear || month >= minDate.getMonth()) &&
-						(!inMaxYear || month <= maxDate.getMonth()))
-					html += '<option value="' + month + '"' +
-						(month == drawMonth ? ' selected="selected"' : '') +
-						'>' + monthNames[month] + '</option>';
-			}
-			html += '</select>';
-		}
-		// year selection
-		if (secondary || !this._get(inst, 'changeYear'))
-			html += drawYear;
-		else {
-			// determine range of years to display
-			var years = this._get(inst, 'yearRange').split(':');
-			var year = 0;
-			var endYear = 0;
-			if (years.length != 2) {
-				year = drawYear - 10;
-				endYear = drawYear + 10;
-			} else if (years[0].charAt(0) == '+' || years[0].charAt(0) == '-') {
-				year = endYear = new Date().getFullYear();
-				year += parseInt(years[0], 10);
-				endYear += parseInt(years[1], 10);
-			} else {
-				year = parseInt(years[0], 10);
-				endYear = parseInt(years[1], 10);
-			}
-			year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
-			endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
-			html += '<select class="ui-datepicker-new-year" ' +
-				'onchange="jQuery.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'Y\');" ' +
-				'onclick="jQuery.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
-				(showStatus ? this._addStatus(inst, this._get(inst, 'yearStatus') || '&#xa0;') : '') + '>';
-			for (; year <= endYear; year++) {
-				html += '<option value="' + year + '"' +
-					(year == drawYear ? ' selected="selected"' : '') +
-					'>' + year + '</option>';
-			}
-			html += '</select>';
-		}
-		html += '</div>'; // Close datepicker_header
-		return html;
-	},
-
-	/* Provide code to set and clear the status panel. */
-	_addStatus: function(inst, text) {
-		return ' onmouseover="jQuery(\'#ui-datepicker-status-' + inst.id + '\').html(\'' + text + '\');" ' +
-			'onmouseout="jQuery(\'#ui-datepicker-status-' + inst.id + '\').html(\'&#xa0;\');"';
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustInstDate: function(inst, offset, period) {
-		var year = inst.drawYear + (period == 'Y' ? offset : 0);
-		var month = inst.drawMonth + (period == 'M' ? offset : 0);
-		var day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) +
-			(period == 'D' ? offset : 0);
-		var date = new Date(year, month, day);
-		// ensure it is within the bounds set
-		var minDate = this._getMinMaxDate(inst, 'min', true);
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		date = (minDate && date < minDate ? minDate : date);
-		date = (maxDate && date > maxDate ? maxDate : date);
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		if (period == 'M' || period == 'Y')
-			this._notifyChange(inst);
-	},
-
-	/* Notify change of month/year. */
-	_notifyChange: function(inst) {
-		var onChange = this._get(inst, 'onChangeMonthYear');
-		if (onChange)
-			onChange.apply((inst.input ? inst.input[0] : null),
-				[new Date(inst.selectedYear, inst.selectedMonth, 1), inst]);
-	},
-	
-	/* Determine the number of months to show. */
-	_getNumberOfMonths: function(inst) {
-		var numMonths = this._get(inst, 'numberOfMonths');
-		return (numMonths == null ? [1, 1] : (typeof numMonths == 'number' ? [1, numMonths] : numMonths));
-	},
-
-	/* Determine the current maximum date - ensure no time components are set - may be overridden for a range. */
-	_getMinMaxDate: function(inst, minMax, checkRange) {
-		var date = this._determineDate(this._get(inst, minMax + 'Date'), null);
-		if (date) {
-			date.setHours(0);
-			date.setMinutes(0);
-			date.setSeconds(0);
-			date.setMilliseconds(0);
-		}
-		return (!checkRange || !inst.rangeStart ? date :
-			(!date || inst.rangeStart > date ? inst.rangeStart : date));
-	},
-
-	/* Find the number of days in a given month. */
-	_getDaysInMonth: function(year, month) {
-		return 32 - new Date(year, month, 32).getDate();
-	},
-
-	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function(year, month) {
-		return new Date(year, month, 1).getDay();
-	},
-
-	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
-		var numMonths = this._getNumberOfMonths(inst);
-		var date = new Date(curYear, curMonth + (offset < 0 ? offset : numMonths[1]), 1);
-		if (offset < 0)
-			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
-		return this._isInRange(inst, date);
-	},
-
-	/* Is the given date in the accepted range? */
-	_isInRange: function(inst, date) {
-		// during range selection, use minimum of selected date and range start
-		var newMinDate = (!inst.rangeStart ? null :
-			new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay));
-		newMinDate = (newMinDate && inst.rangeStart < newMinDate ? inst.rangeStart : newMinDate);
-		var minDate = newMinDate || this._getMinMaxDate(inst, 'min');
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		return ((!minDate || date >= minDate) && (!maxDate || date <= maxDate));
-	},
-	
-	/* Provide the configuration settings for formatting/parsing. */
-	_getFormatConfig: function(inst) {
-		var shortYearCutoff = this._get(inst, 'shortYearCutoff');
-		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
-		return {shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get(inst, 'dayNamesShort'), dayNames: this._get(inst, 'dayNames'),
-			monthNamesShort: this._get(inst, 'monthNamesShort'), monthNames: this._get(inst, 'monthNames')};
-	},
-
-	/* Format the given date for display. */
-	_formatDate: function(inst, day, month, year) {
-		if (!day) {
-			inst.currentDay = inst.selectedDay;
-			inst.currentMonth = inst.selectedMonth;
-			inst.currentYear = inst.selectedYear;
-		}
-		var date = (day ? (typeof day == 'object' ? day : new Date(year, month, day)) :
-			new Date(inst.currentYear, inst.currentMonth, inst.currentDay));
-		return this.formatDate(this._get(inst, 'dateFormat'), date, this._getFormatConfig(inst));
-	}
-});
-
-/* jQuery extend now ignores nulls! */
-function extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props)
-		if (props[name] == null || props[name] == undefined)
-			target[name] = props[name];
-	return target;
-};
-
-/* Determine whether an object is an array. */
-function isArray(a) {
-	return (a && (($.browser.safari && typeof a == 'object' && a.length) ||
-		(a.constructor && a.constructor.toString().match(/\Array\(\)/))));
-};
-
-/* Invoke the datepicker functionality.
-   @param  options  string - a command, optionally followed by additional parameters or
-                    Object - settings for attaching new datepicker functionality
-   @return  jQuery object */
-$.fn.datepicker = function(options){
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate'))
-		return $.datepicker['_' + options + 'Datepicker'].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	return this.each(function() {
-		typeof options == 'string' ?
-			$.datepicker['_' + options + 'Datepicker'].
-				apply($.datepicker, [this].concat(otherArgs)) :
-			$.datepicker._attachDatepicker(this, options);
-	});
-};
-
-$.datepicker = new Datepicker(); // singleton instance
-	
-/* Initialise the date picker. */
-$(document).ready(function() {
-	$(document.body).append($.datepicker.dpDiv).
-		mousedown($.datepicker._checkExternalClick);
-});
-
-})(jQuery);
-/*
- * jQuery UI Dialog
- *
- * Copyright (c) 2008 Richard D. Worth (rdworth.org)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Dialog
- *
- * Depends:
- *	ui.core.js
- *	ui.draggable.js
- *	ui.resizable.js
- */
-(function($) {
-
-var setDataSwitch = {
-	dragStart: "start.draggable",
-	drag: "drag.draggable",
-	dragStop: "stop.draggable",
-	maxHeight: "maxHeight.resizable",
-	minHeight: "minHeight.resizable",
-	maxWidth: "maxWidth.resizable",
-	minWidth: "minWidth.resizable",
-	resizeStart: "start.resizable",
-	resize: "drag.resizable",
-	resizeStop: "stop.resizable"
-};
-
-$.widget("ui.dialog", {
-	init: function() {
-		var self = this,
-			options = this.options,
-			resizeHandles = typeof options.resizable == 'string'
-				? options.resizable
-				: 'n,e,s,w,se,sw,ne,nw',
-			
-			uiDialogContent = this.element
-				.addClass('ui-dialog-content')
-				.wrap('<div/>')
-				.wrap('<div/>'),
-			
-			uiDialogContainer = (this.uiDialogContainer = uiDialogContent.parent()
-				.addClass('ui-dialog-container')
-				.css({position: 'relative', width: '100%', height: '100%'})),
-			
-			title = options.title || uiDialogContent.attr('title') || '',
-			uiDialogTitlebar = (this.uiDialogTitlebar =
-				$('<div class="ui-dialog-titlebar"/>'))
-				.append('<span class="ui-dialog-title">' + title + '</span>')
-				.append('<a href="#" class="ui-dialog-titlebar-close"><span>X</span></a>')
-				.prependTo(uiDialogContainer),
-			
-			uiDialog = (this.uiDialog = uiDialogContainer.parent())
-				.appendTo(document.body)
-				.hide()
-				.addClass('ui-dialog')
-				.addClass(options.dialogClass)
-				// add content classes to dialog
-				// to inherit theme at top level of element
-				.addClass(uiDialogContent.attr('className'))
-					.removeClass('ui-dialog-content')
-				.css({
-					position: 'absolute',
-					width: options.width,
-					height: options.height,
-					overflow: 'hidden',
-					zIndex: options.zIndex
-				})
-				// setting tabIndex makes the div focusable
-				// setting outline to 0 prevents a border on focus in Mozilla
-				.attr('tabIndex', -1).css('outline', 0).keydown(function(ev) {
-					if (options.closeOnEscape) {
-						var ESC = 27;
-						(ev.keyCode && ev.keyCode == ESC && self.close());
-					}
-				})
-				.mousedown(function() {
-					self.moveToTop();
-				}),
-			
-			uiDialogButtonPane = (this.uiDialogButtonPane = $('<div/>'))
-				.addClass('ui-dialog-buttonpane').css({ position: 'absolute', bottom: 0 })
-				.appendTo(uiDialog);
-		
-		this.uiDialogTitlebarClose = $('.ui-dialog-titlebar-close', uiDialogTitlebar)
-			.hover(
-				function() {
-					$(this).addClass('ui-dialog-titlebar-close-hover');
-				},
-				function() {
-					$(this).removeClass('ui-dialog-titlebar-close-hover');
-				}
-			)
-			.mousedown(function(ev) {
-				ev.stopPropagation();
-			})
-			.click(function() {
-				self.close();
-				return false;
-			});
-
-		this.uiDialogTitlebar.find("*").add(this.uiDialogTitlebar).each(function() {
-			$.ui.disableSelection(this);
-		});
-
-		if ($.fn.draggable) {
-			uiDialog.draggable({
-				cancel: '.ui-dialog-content',
-				helper: options.dragHelper,
-				handle: '.ui-dialog-titlebar',
-				start: function(e, ui) {
-					self.moveToTop();
-					(options.dragStart && options.dragStart.apply(self.element[0], arguments));
-				},
-				drag: function(e, ui) {
-					(options.drag && options.drag.apply(self.element[0], arguments));
-				},
-				stop: function(e, ui) {
-					(options.dragStop && options.dragStop.apply(self.element[0], arguments));
-					$.ui.dialog.overlay.resize();
-				}
-			});
-			(options.draggable || uiDialog.draggable('disable'));
-		}
-		
-		if ($.fn.resizable) {
-			uiDialog.resizable({
-				cancel: '.ui-dialog-content',
-				helper: options.resizeHelper,
-				maxWidth: options.maxWidth,
-				maxHeight: options.maxHeight,
-				minWidth: options.minWidth,
-				minHeight: options.minHeight,
-				start: function() {
-					(options.resizeStart && options.resizeStart.apply(self.element[0], arguments));
-				},
-				resize: function(e, ui) {
-					(options.autoResize && self.size.apply(self));
-					(options.resize && options.resize.apply(self.element[0], arguments));
-				},
-				handles: resizeHandles,
-				stop: function(e, ui) {
-					(options.autoResize && self.size.apply(self));
-					(options.resizeStop && options.resizeStop.apply(self.element[0], arguments));
-					$.ui.dialog.overlay.resize();
-				}
-			});
-			(options.resizable || uiDialog.resizable('disable'));
-		}
-		
-		this.createButtons(options.buttons);
-		this.isOpen = false;
-		
-		(options.bgiframe && $.fn.bgiframe && uiDialog.bgiframe());
-		(options.autoOpen && this.open());
-	},
-	
-	setData: function(key, value){
-		(setDataSwitch[key] && this.uiDialog.data(setDataSwitch[key], value));
-		switch (key) {
-			case "buttons":
-				this.createButtons(value);
-				break;
-			case "draggable":
-				this.uiDialog.draggable(value ? 'enable' : 'disable');
-				break;
-			case "height":
-				this.uiDialog.height(value);
-				break;
-			case "position":
-				this.position(value);
-				break;
-			case "resizable":
-				(typeof value == 'string' && this.uiDialog.data('handles.resizable', value));
-				this.uiDialog.resizable(value ? 'enable' : 'disable');
-				break;
-			case "title":
-				$(".ui-dialog-title", this.uiDialogTitlebar).text(value);
-				break;
-			case "width":
-				this.uiDialog.width(value);
-				break;
-		}
-		
-		$.widget.prototype.setData.apply(this, arguments);
-	},
-	
-	position: function(pos) {
-		var wnd = $(window), doc = $(document),
-			pTop = doc.scrollTop(), pLeft = doc.scrollLeft(),
-			minTop = pTop;
-		
-		if ($.inArray(pos, ['center','top','right','bottom','left']) >= 0) {
-			pos = [
-				pos == 'right' || pos == 'left' ? pos : 'center',
-				pos == 'top' || pos == 'bottom' ? pos : 'middle'
-			];
-		}
-		if (pos.constructor != Array) {
-			pos = ['center', 'middle'];
-		}
-		if (pos[0].constructor == Number) {
-			pLeft += pos[0];
-		} else {
-			switch (pos[0]) {
-				case 'left':
-					pLeft += 0;
-					break;
-				case 'right':
-					pLeft += wnd.width() - this.uiDialog.width();
-					break;
-				default:
-				case 'center':
-					pLeft += (wnd.width() - this.uiDialog.width()) / 2;
-			}
-		}
-		if (pos[1].constructor == Number) {
-			pTop += pos[1];
-		} else {
-			switch (pos[1]) {
-				case 'top':
-					pTop += 0;
-					break;
-				case 'bottom':
-					pTop += wnd.height() - this.uiDialog.height();
-					break;
-				default:
-				case 'middle':
-					pTop += (wnd.height() - this.uiDialog.height()) / 2;
-			}
-		}
-		
-		// prevent the dialog from being too high (make sure the titlebar
-		// is accessible)
-		pTop = Math.max(pTop, minTop);
-		this.uiDialog.css({top: pTop, left: pLeft});
-	},
-
-	size: function() {
-		var container = this.uiDialogContainer,
-			titlebar = this.uiDialogTitlebar,
-			content = this.element,
-			tbMargin = parseInt(content.css('margin-top'),10) + parseInt(content.css('margin-bottom'),10),
-			lrMargin = parseInt(content.css('margin-left'),10) + parseInt(content.css('margin-right'),10);
-		content.height(container.height() - titlebar.outerHeight() - tbMargin);
-		content.width(container.width() - lrMargin);
-	},
-	
-	open: function() {
-		if (this.isOpen) { return; }
-		
-		this.overlay = this.options.modal ? new $.ui.dialog.overlay(this) : null;
-		(this.uiDialog.next().length > 0) && this.uiDialog.appendTo('body');
-		this.position(this.options.position);
-		this.uiDialog.show(this.options.show);
-		this.options.autoResize && this.size();
-		this.moveToTop(true);
-		
-		// CALLBACK: open
-		var openEV = null;
-		var openUI = {
-			options: this.options
-		};
-		this.uiDialogTitlebarClose.focus();
-		this.element.triggerHandler("dialogopen", [openEV, openUI], this.options.open);
-		
-		this.isOpen = true;
-	},
-	
-	// the force parameter allows us to move modal dialogs to their correct
-	// position on open
-	moveToTop: function(force) {
-		if ((this.options.modal && !force)
-			|| (!this.options.stack && !this.options.modal)) { return this.element.triggerHandler("dialogfocus", [null, { options: this.options }], this.options.focus); }
-		
-		var maxZ = this.options.zIndex, options = this.options;
-		$('.ui-dialog:visible').each(function() {
-			maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10) || options.zIndex);
-		});
-		(this.overlay && this.overlay.$el.css('z-index', ++maxZ));
-		this.uiDialog.css('z-index', ++maxZ);
-		
-		this.element.triggerHandler("dialogfocus", [null, { options: this.options }], this.options.focus);
-	},
-	
-	close: function() {
-		(this.overlay && this.overlay.destroy());
-		this.uiDialog.hide(this.options.hide);
-
-		// CALLBACK: close
-		var closeEV = null;
-		var closeUI = {
-			options: this.options
-		};
-		this.element.triggerHandler("dialogclose", [closeEV, closeUI], this.options.close);
-		$.ui.dialog.overlay.resize();
-		
-		this.isOpen = false;
-	},
-	
-	destroy: function() {
-		(this.overlay && this.overlay.destroy());
-		this.uiDialog.hide();
-		this.element
-			.unbind('.dialog')
-			.removeData('dialog')
-			.removeClass('ui-dialog-content')
-			.hide().appendTo('body');
-		this.uiDialog.remove();
-	},
-	
-	createButtons: function(buttons) {
-		var self = this,
-			hasButtons = false,
-			uiDialogButtonPane = this.uiDialogButtonPane;
-		
-		// remove any existing buttons
-		uiDialogButtonPane.empty().hide();
-		
-		$.each(buttons, function() { return !(hasButtons = true); });
-		if (hasButtons) {
-			uiDialogButtonPane.show();
-			$.each(buttons, function(name, fn) {
-				$('<button/>')
-					.text(name)
-					.click(function() { fn.apply(self.element[0], arguments); })
-					.appendTo(uiDialogButtonPane);
-			});
-		}
-	}
-});
-
-$.extend($.ui.dialog, {
-	defaults: {
-		autoOpen: true,
-		autoResize: true,
-		bgiframe: false,
-		buttons: {},
-		closeOnEscape: true,
-		draggable: true,
-		height: 200,
-		minHeight: 100,
-		minWidth: 150,
-		modal: false,
-		overlay: {},
-		position: 'center',
-		resizable: true,
-		stack: true,
-		width: 300,
-		zIndex: 1000
-	},
-	
-	overlay: function(dialog) {
-		this.$el = $.ui.dialog.overlay.create(dialog);
-	}
-});
-
-$.extend($.ui.dialog.overlay, {
-	instances: [],
-	events: $.map('focus,mousedown,mouseup,keydown,keypress,click'.split(','),
-		function(e) { return e + '.dialog-overlay'; }).join(' '),
-	create: function(dialog) {
-		if (this.instances.length === 0) {
-			// prevent use of anchors and inputs
-			// we use a setTimeout in case the overlay is created from an
-			// event that we're going to be cancelling (see #2804)
-			setTimeout(function() {
-				$('a, :input').bind($.ui.dialog.overlay.events, function() {
-					// allow use of the element if inside a dialog and
-					// - there are no modal dialogs
-					// - there are modal dialogs, but we are in front of the topmost modal
-					var allow = false;
-					var $dialog = $(this).parents('.ui-dialog');
-					if ($dialog.length) {
-						var $overlays = $('.ui-dialog-overlay');
-						if ($overlays.length) {
-							var maxZ = parseInt($overlays.css('z-index'), 10);
-							$overlays.each(function() {
-								maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10));
-							});
-							allow = parseInt($dialog.css('z-index'), 10) > maxZ;
-						} else {
-							allow = true;
-						}
-					}
-					return allow;
-				});
-			}, 1);
-			
-			// allow closing by pressing the escape key
-			$(document).bind('keydown.dialog-overlay', function(e) {
-				var ESC = 27;
-				(e.keyCode && e.keyCode == ESC && dialog.close()); 
-			});
-			
-			// handle window resize
-			$(window).bind('resize.dialog-overlay', $.ui.dialog.overlay.resize);
-		}
-		
-		var $el = $('<div/>').appendTo(document.body)
-			.addClass('ui-dialog-overlay').css($.extend({
-				borderWidth: 0, margin: 0, padding: 0,
-				position: 'absolute', top: 0, left: 0,
-				width: this.width(),
-				height: this.height()
-			}, dialog.options.overlay));
-		
-		(dialog.options.bgiframe && $.fn.bgiframe && $el.bgiframe());
-		
-		this.instances.push($el);
-		return $el;
-	},
-	
-	destroy: function($el) {
-		this.instances.splice($.inArray(this.instances, $el), 1);
-		
-		if (this.instances.length === 0) {
-			$('a, :input').add([document, window]).unbind('.dialog-overlay');
-		}
-		
-		$el.remove();
-	},
-	
-	height: function() {
-		if ($.browser.msie && $.browser.version < 7) {
-			var scrollHeight = Math.max(
-				document.documentElement.scrollHeight,
-				document.body.scrollHeight
-			);
-			var offsetHeight = Math.max(
-				document.documentElement.offsetHeight,
-				document.body.offsetHeight
-			);
-			
-			if (scrollHeight < offsetHeight) {
-				return $(window).height() + 'px';
-			} else {
-				return scrollHeight + 'px';
-			}
-		} else {
-			return $(document).height() + 'px';
-		}
-	},
-	
-	width: function() {
-		if ($.browser.msie && $.browser.version < 7) {
-			var scrollWidth = Math.max(
-				document.documentElement.scrollWidth,
-				document.body.scrollWidth
-			);
-			var offsetWidth = Math.max(
-				document.documentElement.offsetWidth,
-				document.body.offsetWidth
-			);
-			
-			if (scrollWidth < offsetWidth) {
-				return $(window).width() + 'px';
-			} else {
-				return scrollWidth + 'px';
-			}
-		} else {
-			return $(document).width() + 'px';
-		}
-	},
-	
-	resize: function() {
-		/* If the dialog is draggable and the user drags it past the
-		 * right edge of the window, the document becomes wider so we
-		 * need to stretch the overlay. If the user then drags the
-		 * dialog back to the left, the document will become narrower,
-		 * so we need to shrink the overlay to the appropriate size.
-		 * This is handled by shrinking the overlay before setting it
-		 * to the full document size.
-		 */
-		var $overlays = $([]);
-		$.each($.ui.dialog.overlay.instances, function() {
-			$overlays = $overlays.add(this);
-		});
-		
-		$overlays.css({
-			width: 0,
-			height: 0
-		}).css({
-			width: $.ui.dialog.overlay.width(),
-			height: $.ui.dialog.overlay.height()
-		});
-	}
-});
-
-$.extend($.ui.dialog.overlay.prototype, {
-	destroy: function() {
-		$.ui.dialog.overlay.destroy(this.$el);
-	}
-});
-
-})(jQuery);
-/*
- * jQuery UI Slider
- *
- * Copyright (c) 2008 Paul Bakaus
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Slider
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.fn.unwrap = $.fn.unwrap || function(expr) {
-  return this.each(function(){
-     $(this).parents(expr).eq(0).after(this).remove();
-  });
-};
-
-$.widget("ui.slider", {
-	plugins: {},
-	ui: function(e) {
-		return {
-			options: this.options,
-			handle: this.currentHandle,
-			value: this.options.axis != "both" || !this.options.axis ? Math.round(this.value(null,this.options.axis == "vertical" ? "y" : "x")) : {
-				x: Math.round(this.value(null,"x")),
-				y: Math.round(this.value(null,"y"))
-			},
-			range: this.getRange()
-		};
-	},
-	propagate: function(n,e) {
-		$.ui.plugin.call(this, n, [e, this.ui()]);
-		this.element.triggerHandler(n == "slide" ? n : "slide"+n, [e, this.ui()], this.options[n]);
-	},
-	destroy: function() {
-		
-		this.element
-			.removeClass("ui-slider ui-slider-disabled")
-			.removeData("slider")
-			.unbind(".slider");
-		
-		if(this.handle && this.handle.length) {
-			this.handle
-				.unwrap("a");
-			this.handle.each(function() {
-				$(this).data("mouse").mouseDestroy();
-			});
-		}
-		
-		this.generated && this.generated.remove();
-		
-	},
-	setData: function(key, value) {
-		$.widget.prototype.setData.apply(this, arguments);
-		if (/min|max|steps/.test(key)) {
-			this.initBoundaries();
-		}
-		
-		if(key == "range") {
-			value ? this.handle.length == 2 && this.createRange() : this.removeRange();
-		}
-		
-	},
-
-	init: function() {
-		
-		var self = this;
-		this.element.addClass("ui-slider");
-		this.initBoundaries();
-		
-		// Initialize mouse and key events for interaction
-		this.handle = $(this.options.handle, this.element);
-		if (!this.handle.length) {
-			self.handle = self.generated = $(self.options.handles || [0]).map(function() {
-				var handle = $("<div/>").addClass("ui-slider-handle").appendTo(self.element);
-				if (this.id)
-					handle.attr("id", this.id);
-				return handle[0];
-			});
-		}
-		
-		
-		var handleclass = function(el) {
-			this.element = $(el);
-			this.element.data("mouse", this);
-			this.options = self.options;
-			
-			this.element.bind("mousedown", function() {
-				if(self.currentHandle) this.blur(self.currentHandle);
-				self.focus(this,1);
-			});
-			
-			this.mouseInit();
-		};
-		
-		$.extend(handleclass.prototype, $.ui.mouse, {
-			mouseStart: function(e) { return self.start.call(self, e, this.element[0]); },
-			mouseStop: function(e) { return self.stop.call(self, e, this.element[0]); },
-			mouseDrag: function(e) { return self.drag.call(self, e, this.element[0]); },
-			mouseCapture: function() { return true; },
-			trigger: function(e) { this.mouseDown(e); }
-		});
-		
-		
-		$(this.handle)
-			.each(function() {
-				new handleclass(this);
-			})
-			.wrap('<a href="javascript:void(0)" style="outline:none;border:none;"></a>')
-			.parent()
-				.bind('focus', function(e) { self.focus(this.firstChild); })
-				.bind('blur', function(e) { self.blur(this.firstChild); })
-				.bind('keydown', function(e) { if(!self.options.noKeyboard) self.keydown(e.keyCode, this.firstChild); })
-		;
-		
-		// Bind the click to the slider itself
-		this.element.bind('mousedown.slider', function(e) {
-			self.click.apply(self, [e]);
-			self.currentHandle.data("mouse").trigger(e);
-			self.firstValue = self.firstValue + 1; //This is for always triggering the change event
-		});
-		
-		// Move the first handle to the startValue
-		$.each(this.options.handles || [], function(index, handle) {
-			self.moveTo(handle.start, index, true);
-		});
-		if (!isNaN(this.options.startValue))
-			this.moveTo(this.options.startValue, 0, true);
-
-		this.previousHandle = $(this.handle[0]); //set the previous handle to the first to allow clicking before selecting the handle
-		if(this.handle.length == 2 && this.options.range) this.createRange();
-	},
-	initBoundaries: function() {
-		
-		var element = this.element[0], o = this.options;
-		this.actualSize = { width: this.element.outerWidth() , height: this.element.outerHeight() };			
-		
-		$.extend(o, {
-			axis: o.axis || (element.offsetWidth < element.offsetHeight ? 'vertical' : 'horizontal'),
-			max: !isNaN(parseInt(o.max,10)) ? { x: parseInt(o.max, 10), y: parseInt(o.max, 10) } : ({ x: o.max && o.max.x || 100, y: o.max && o.max.y || 100 }),
-			min: !isNaN(parseInt(o.min,10)) ? { x: parseInt(o.min, 10), y: parseInt(o.min, 10) } : ({ x: o.min && o.min.x || 0, y: o.min && o.min.y || 0 })
-		});
-		//Prepare the real maxValue
-		o.realMax = {
-			x: o.max.x - o.min.x,
-			y: o.max.y - o.min.y
-		};
-		//Calculate stepping based on steps
-		o.stepping = {
-			x: o.stepping && o.stepping.x || parseInt(o.stepping, 10) || (o.steps ? o.realMax.x/(o.steps.x || parseInt(o.steps, 10) || o.realMax.x) : 0),
-			y: o.stepping && o.stepping.y || parseInt(o.stepping, 10) || (o.steps ? o.realMax.y/(o.steps.y || parseInt(o.steps, 10) || o.realMax.y) : 0)
-		};
-	},
-
-	
-	keydown: function(keyCode, handle) {
-		if(/(37|38|39|40)/.test(keyCode)) {
-			this.moveTo({
-				x: /(37|39)/.test(keyCode) ? (keyCode == 37 ? '-' : '+') + '=' + this.oneStep("x") : 0,
-				y: /(38|40)/.test(keyCode) ? (keyCode == 38 ? '-' : '+') + '=' + this.oneStep("y") : 0
-			}, handle);
-		}
-	},
-	focus: function(handle,hard) {
-		this.currentHandle = $(handle).addClass('ui-slider-handle-active');
-		if (hard)
-			this.currentHandle.parent()[0].focus();
-	},
-	blur: function(handle) {
-		$(handle).removeClass('ui-slider-handle-active');
-		if(this.currentHandle && this.currentHandle[0] == handle) { this.previousHandle = this.currentHandle; this.currentHandle = null; };
-	},
-	click: function(e) {
-		// This method is only used if:
-		// - The user didn't click a handle
-		// - The Slider is not disabled
-		// - There is a current, or previous selected handle (otherwise we wouldn't know which one to move)
-		
-		var pointer = [e.pageX,e.pageY];
-		
-		var clickedHandle = false;
-		this.handle.each(function() {
-			if(this == e.target)
-				clickedHandle = true;
-		});
-		if (clickedHandle || this.options.disabled || !(this.currentHandle || this.previousHandle))
-			return;
-
-		// If a previous handle was focussed, focus it again
-		if (!this.currentHandle && this.previousHandle)
-			this.focus(this.previousHandle, true);
-		
-		// propagate only for distance > 0, otherwise propagation is done my drag
-		this.offset = this.element.offset();
-
-		this.moveTo({
-			y: this.convertValue(e.pageY - this.offset.top - this.currentHandle[0].offsetHeight/2, "y"),
-			x: this.convertValue(e.pageX - this.offset.left - this.currentHandle[0].offsetWidth/2, "x")
-		}, null, !this.options.distance);
-	},
-	
-
-
-	createRange: function() {
-		if(this.rangeElement) return;
-		this.rangeElement = $('<div></div>')
-			.addClass('ui-slider-range')
-			.css({ position: 'absolute' })
-			.appendTo(this.element);
-		this.updateRange();
-	},
-	removeRange: function() {
-		this.rangeElement.remove();
-		this.rangeElement = null;
-	},
-	updateRange: function() {
-			var prop = this.options.axis == "vertical" ? "top" : "left";
-			var size = this.options.axis == "vertical" ? "height" : "width";
-			this.rangeElement.css(prop, (parseInt($(this.handle[0]).css(prop),10) || 0) + this.handleSize(0, this.options.axis == "vertical" ? "y" : "x")/2);
-			this.rangeElement.css(size, (parseInt($(this.handle[1]).css(prop),10) || 0) - (parseInt($(this.handle[0]).css(prop),10) || 0));
-	},
-	getRange: function() {
-		return this.rangeElement ? this.convertValue(parseInt(this.rangeElement.css(this.options.axis == "vertical" ? "height" : "width"),10), this.options.axis == "vertical" ? "y" : "x") : null;
-	},
-
-	handleIndex: function() {
-		return this.handle.index(this.currentHandle[0]);
-	},
-	value: function(handle, axis) {
-		if(this.handle.length == 1) this.currentHandle = this.handle;
-		if(!axis) axis = this.options.axis == "vertical" ? "y" : "x";
-
-		var curHandle = $(handle != undefined && handle !== null ? this.handle[handle] || handle : this.currentHandle);
-		
-		if(curHandle.data("mouse").sliderValue) {
-			return parseInt(curHandle.data("mouse").sliderValue[axis],10);
-		} else {
-			return parseInt(((parseInt(curHandle.css(axis == "x" ? "left" : "top"),10) / (this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(handle,axis))) * this.options.realMax[axis]) + this.options.min[axis],10);
-		}
-
-	},
-	convertValue: function(value,axis) {
-		return this.options.min[axis] + (value / (this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(null,axis))) * this.options.realMax[axis];
-	},
-	
-	translateValue: function(value,axis) {
-		return ((value - this.options.min[axis]) / this.options.realMax[axis]) * (this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(null,axis));
-	},
-	translateRange: function(value,axis) {
-		if (this.rangeElement) {
-			if (this.currentHandle[0] == this.handle[0] && value >= this.translateValue(this.value(1),axis))
-				value = this.translateValue(this.value(1,axis) - this.oneStep(axis), axis);
-			if (this.currentHandle[0] == this.handle[1] && value <= this.translateValue(this.value(0),axis))
-				value = this.translateValue(this.value(0,axis) + this.oneStep(axis), axis);
-		}
-		if (this.options.handles) {
-			var handle = this.options.handles[this.handleIndex()];
-			if (value < this.translateValue(handle.min,axis)) {
-				value = this.translateValue(handle.min,axis);
-			} else if (value > this.translateValue(handle.max,axis)) {
-				value = this.translateValue(handle.max,axis);
-			}
-		}
-		return value;
-	},
-	translateLimits: function(value,axis) {
-		if (value >= this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(null,axis))
-			value = this.actualSize[axis == "x" ? "width" : "height"] - this.handleSize(null,axis);
-		if (value <= 0)
-			value = 0;
-		return value;
-	},
-	handleSize: function(handle,axis) {
-		return $(handle != undefined && handle !== null ? this.handle[handle] : this.currentHandle)[0]["offset"+(axis == "x" ? "Width" : "Height")];	
-	},
-	oneStep: function(axis) {
-		return this.options.stepping[axis] || 1;
-	},
-
-
-	start: function(e, handle) {
-	
-		var o = this.options;
-		if(o.disabled) return false;
-
-		// Prepare the outer size
-		this.actualSize = { width: this.element.outerWidth() , height: this.element.outerHeight() };
-	
-		// This is a especially ugly fix for strange blur events happening on mousemove events
-		if (!this.currentHandle)
-			this.focus(this.previousHandle, true); 
-
-		this.offset = this.element.offset();
-		
-		this.handleOffset = this.currentHandle.offset();
-		this.clickOffset = { top: e.pageY - this.handleOffset.top, left: e.pageX - this.handleOffset.left };
-		
-		this.firstValue = this.value();
-		
-		this.propagate('start', e);
-		this.drag(e, handle);
-		return true;
-					
-	},
-	stop: function(e) {
-		this.propagate('stop', e);
-		if (this.firstValue != this.value())
-			this.propagate('change', e);
-		// This is a especially ugly fix for strange blur events happening on mousemove events
-		this.focus(this.currentHandle, true);
-		return false;
-	},
-	drag: function(e, handle) {
-
-		var o = this.options;
-		var position = { top: e.pageY - this.offset.top - this.clickOffset.top, left: e.pageX - this.offset.left - this.clickOffset.left};
-		if(!this.currentHandle) this.focus(this.previousHandle, true); //This is a especially ugly fix for strange blur events happening on mousemove events
-
-		position.left = this.translateLimits(position.left, "x");
-		position.top = this.translateLimits(position.top, "y");
-		
-		if (o.stepping.x) {
-			var value = this.convertValue(position.left, "x");
-			value = Math.round(value / o.stepping.x) * o.stepping.x;
-			position.left = this.translateValue(value, "x");	
-		}
-		if (o.stepping.y) {
-			var value = this.convertValue(position.top, "y");
-			value = Math.round(value / o.stepping.y) * o.stepping.y;
-			position.top = this.translateValue(value, "y");	
-		}
-		
-		position.left = this.translateRange(position.left, "x");
-		position.top = this.translateRange(position.top, "y");
-
-		if(o.axis != "vertical") this.currentHandle.css({ left: position.left });
-		if(o.axis != "horizontal") this.currentHandle.css({ top: position.top });
-		
-		//Store the slider's value
-		this.currentHandle.data("mouse").sliderValue = {
-			x: Math.round(this.convertValue(position.left, "x")) || 0,
-			y: Math.round(this.convertValue(position.top, "y")) || 0
-		};
-		
-		if (this.rangeElement)
-			this.updateRange();
-		this.propagate('slide', e);
-		return false;
-	},
-	
-	moveTo: function(value, handle, noPropagation) {
-
-		var o = this.options;
-
-		// Prepare the outer size
-		this.actualSize = { width: this.element.outerWidth() , height: this.element.outerHeight() };
-
-		//If no handle has been passed, no current handle is available and we have multiple handles, return false
-		if (handle == undefined && !this.currentHandle && this.handle.length != 1)
-			return false; 
-		
-		//If only one handle is available, use it
-		if (handle == undefined && !this.currentHandle)
-			handle = 0;
-		
-		if (handle != undefined)
-			this.currentHandle = this.previousHandle = $(this.handle[handle] || handle);
-
-
-		if(value.x !== undefined && value.y !== undefined) {
-			var x = value.x, y = value.y;
-		} else {
-			var x = value, y = value;
-		}
-
-		if(x !== undefined && x.constructor != Number) {
-			var me = /^\-\=/.test(x), pe = /^\+\=/.test(x);
-			if(me || pe) {
-				x = this.value(null, "x") + parseInt(x.replace(me ? '=' : '+=', ''), 10);
-			} else {
-				x = isNaN(parseInt(x, 10)) ? undefined : parseInt(x, 10);
-			}
-		}
-		
-		if(y !== undefined && y.constructor != Number) {
-			var me = /^\-\=/.test(y), pe = /^\+\=/.test(y);
-			if(me || pe) {
-				y = this.value(null, "y") + parseInt(y.replace(me ? '=' : '+=', ''), 10);
-			} else {
-				y = isNaN(parseInt(y, 10)) ? undefined : parseInt(y, 10);
-			}
-		}
-
-		if(o.axis != "vertical" && x !== undefined) {
-			if(o.stepping.x) x = Math.round(x / o.stepping.x) * o.stepping.x;
-			x = this.translateValue(x, "x");
-			x = this.translateLimits(x, "x");
-			x = this.translateRange(x, "x");
-
-			o.animate ? this.currentHandle.stop().animate({ left: x }, (Math.abs(parseInt(this.currentHandle.css("left")) - x)) * (!isNaN(parseInt(o.animate)) ? o.animate : 5)) : this.currentHandle.css({ left: x });
-		}
-
-		if(o.axis != "horizontal" && y !== undefined) {
-			if(o.stepping.y) y = Math.round(y / o.stepping.y) * o.stepping.y;
-			y = this.translateValue(y, "y");
-			y = this.translateLimits(y, "y");
-			y = this.translateRange(y, "y");
-			o.animate ? this.currentHandle.stop().animate({ top: y }, (Math.abs(parseInt(this.currentHandle.css("top")) - y)) * (!isNaN(parseInt(o.animate)) ? o.animate : 5)) : this.currentHandle.css({ top: y });
-		}
-		
-		if (this.rangeElement)
-			this.updateRange();
-			
-		//Store the slider's value
-		this.currentHandle.data("mouse").sliderValue = {
-			x: Math.round(this.convertValue(x, "x")) || 0,
-			y: Math.round(this.convertValue(y, "y")) || 0
-		};
-	
-		if (!noPropagation) {
-			this.propagate('start', null);
-			this.propagate('stop', null);
-			this.propagate('change', null);
-			this.propagate("slide", null);
-		}
-	}
-});
-
-$.ui.slider.getter = "value";
-
-$.ui.slider.defaults = {
-	handle: ".ui-slider-handle",
-	distance: 1,
-	animate: false
-};
-
-})(jQuery);
-/*
- * jQuery UI Tabs
- *
- * Copyright (c) 2007, 2008 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Tabs
- *
- * Depends:
- *	ui.core.js
- */
-(function($) {
-
-$.widget("ui.tabs", {
-	init: function() {
-		this.options.event += '.tabs'; // namespace event
-		
-		// create tabs
-		this.tabify(true);
-	},
-	setData: function(key, value) {
-		if ((/^selected/).test(key))
-			this.select(value);
-		else {
-			this.options[key] = value;
-			this.tabify();
-		}
-	},
-	length: function() {
-		return this.$tabs.length;
-	},
-	tabId: function(a) {
-		return a.title && a.title.replace(/\s/g, '_').replace(/[^A-Za-z0-9\-_:\.]/g, '')
-			|| this.options.idPrefix + $.data(a);
-	},
-	ui: function(tab, panel) {
-		return {
-			options: this.options,
-			tab: tab,
-			panel: panel,
-			index: this.$tabs.index(tab)
-		};
-	},
-	tabify: function(init) {
-
-		this.$lis = $('li:has(a[href])', this.element);
-		this.$tabs = this.$lis.map(function() { return $('a', this)[0]; });
-		this.$panels = $([]);
-
-		var self = this, o = this.options;
-
-		this.$tabs.each(function(i, a) {
-			// inline tab
-			if (a.hash && a.hash.replace('#', '')) // Safari 2 reports '#' for an empty hash
-				self.$panels = self.$panels.add(a.hash);
-			// remote tab
-			else if ($(a).attr('href') != '#') { // prevent loading the page itself if href is just "#"
-				$.data(a, 'href.tabs', a.href); // required for restore on destroy
-				$.data(a, 'load.tabs', a.href); // mutable
-				var id = self.tabId(a);
-				a.href = '#' + id;
-				var $panel = $('#' + id);
-				if (!$panel.length) {
-					$panel = $(o.panelTemplate).attr('id', id).addClass(o.panelClass)
-						.insertAfter( self.$panels[i - 1] || self.element );
-					$panel.data('destroy.tabs', true);
-				}
-				self.$panels = self.$panels.add( $panel );
-			}
-			// invalid tab href
-			else
-				o.disabled.push(i + 1);
-		});
-
-		if (init) {
-
-			// attach necessary classes for styling if not present
-			this.element.addClass(o.navClass);
-			this.$panels.each(function() {
-				var $this = $(this);
-				$this.addClass(o.panelClass);
-			});
-
-			// Selected tab
-			// use "selected" option or try to retrieve:
-			// 1. from fragment identifier in url
-			// 2. from cookie
-			// 3. from selected class attribute on <li>
-			if (o.selected === undefined) {
-				if (location.hash) {
-					this.$tabs.each(function(i, a) {
-						if (a.hash == location.hash) {
-							o.selected = i;
-							// prevent page scroll to fragment
-							if ($.browser.msie || $.browser.opera) { // && !o.remote
-								var $toShow = $(location.hash), toShowId = $toShow.attr('id');
-								$toShow.attr('id', '');
-								setTimeout(function() {
-									$toShow.attr('id', toShowId); // restore id
-								}, 500);
-							}
-							scrollTo(0, 0);
-							return false; // break
-						}
-					});
-				}
-				else if (o.cookie) {
-					var index = parseInt($.cookie('ui-tabs' + $.data(self.element)),10);
-					if (index && self.$tabs[index])
-						o.selected = index;
-				}
-				else if (self.$lis.filter('.' + o.selectedClass).length)
-					o.selected = self.$lis.index( self.$lis.filter('.' + o.selectedClass)[0] );
-			}
-			o.selected = o.selected === null || o.selected !== undefined ? o.selected : 0; // first tab selected by default
-
-			// Take disabling tabs via class attribute from HTML
-			// into account and update option properly.
-			// A selected tab cannot become disabled.
-			o.disabled = $.unique(o.disabled.concat(
-				$.map(this.$lis.filter('.' + o.disabledClass),
-					function(n, i) { return self.$lis.index(n); } )
-			)).sort();
-			if ($.inArray(o.selected, o.disabled) != -1)
-				o.disabled.splice($.inArray(o.selected, o.disabled), 1);
-			
-			// highlight selected tab
-			this.$panels.addClass(o.hideClass);
-			this.$lis.removeClass(o.selectedClass);
-			if (o.selected !== null) {
-				this.$panels.eq(o.selected).show().removeClass(o.hideClass); // use show and remove class to show in any case no matter how it has been hidden before
-				this.$lis.eq(o.selected).addClass(o.selectedClass);
-				
-				// seems to be expected behavior that the show callback is fired
-				var onShow = function() {
-					$(self.element).triggerHandler('tabsshow',
-						[self.fakeEvent('tabsshow'), self.ui(self.$tabs[o.selected], self.$panels[o.selected])], o.show);
-				}; 
-
-				// load if remote tab
-				if ($.data(this.$tabs[o.selected], 'load.tabs'))
-					this.load(o.selected, onShow);
-				// just trigger show event
-				else
-					onShow();
-				
-			}
-			
-			// clean up to avoid memory leaks in certain versions of IE 6
-			$(window).bind('unload', function() {
-				self.$tabs.unbind('.tabs');
-				self.$lis = self.$tabs = self.$panels = null;
-			});
-
-		}
-
-		// disable tabs
-		for (var i = 0, li; li = this.$lis[i]; i++)
-			$(li)[$.inArray(i, o.disabled) != -1 && !$(li).hasClass(o.selectedClass) ? 'addClass' : 'removeClass'](o.disabledClass);
-
-		// reset cache if switching from cached to not cached
-		if (o.cache === false)
-			this.$tabs.removeData('cache.tabs');
-		
-		// set up animations
-		var hideFx, showFx, baseFx = { 'min-width': 0, duration: 1 }, baseDuration = 'normal';
-		if (o.fx && o.fx.constructor == Array)
-			hideFx = o.fx[0] || baseFx, showFx = o.fx[1] || baseFx;
-		else
-			hideFx = showFx = o.fx || baseFx;
-
-		// reset some styles to maintain print style sheets etc.
-		var resetCSS = { display: '', overflow: '', height: '' };
-		if (!$.browser.msie) // not in IE to prevent ClearType font issue
-			resetCSS.opacity = '';
-
-		// Hide a tab, animation prevents browser scrolling to fragment,
-		// $show is optional.
-		function hideTab(clicked, $hide, $show) {
-			$hide.animate(hideFx, hideFx.duration || baseDuration, function() { //
-				$hide.addClass(o.hideClass).css(resetCSS); // maintain flexible height and accessibility in print etc.
-				if ($.browser.msie && hideFx.opacity)
-					$hide[0].style.filter = '';
-				if ($show)
-					showTab(clicked, $show, $hide);
-			});
-		}
-
-		// Show a tab, animation prevents browser scrolling to fragment,
-		// $hide is optional.
-		function showTab(clicked, $show, $hide) {
-			if (showFx === baseFx)
-				$show.css('display', 'block'); // prevent occasionally occuring flicker in Firefox cause by gap between showing and hiding the tab panels
-			$show.animate(showFx, showFx.duration || baseDuration, function() {
-				$show.removeClass(o.hideClass).css(resetCSS); // maintain flexible height and accessibility in print etc.
-				if ($.browser.msie && showFx.opacity)
-					$show[0].style.filter = '';
-
-				// callback
-				$(self.element).triggerHandler('tabsshow',
-					[self.fakeEvent('tabsshow'), self.ui(clicked, $show[0])], o.show);
-
-			});
-		}
-
-		// switch a tab
-		function switchTab(clicked, $li, $hide, $show) {
-			/*if (o.bookmarkable && trueClick) { // add to history only if true click occured, not a triggered click
-				$.ajaxHistory.update(clicked.hash);
-			}*/
-			$li.addClass(o.selectedClass)
-				.siblings().removeClass(o.selectedClass);
-			hideTab(clicked, $hide, $show);
-		}
-
-		// attach tab event handler, unbind to avoid duplicates from former tabifying...
-		this.$tabs.unbind('.tabs').bind(o.event, function() {
-
-			//var trueClick = e.clientX; // add to history only if true click occured, not a triggered click
-			var $li = $(this).parents('li:eq(0)'),
-				$hide = self.$panels.filter(':visible'),
-				$show = $(this.hash);
-
-			// If tab is already selected and not unselectable or tab disabled or 
-			// or is already loading or click callback returns false stop here.
-			// Check if click handler returns false last so that it is not executed
-			// for a disabled or loading tab!
-			if (($li.hasClass(o.selectedClass) && !o.unselect)
-				|| $li.hasClass(o.disabledClass) 
-				|| $(this).hasClass(o.loadingClass)
-				|| $(self.element).triggerHandler('tabsselect', [self.fakeEvent('tabsselect'), self.ui(this, $show[0])], o.select) === false
-				) {
-				this.blur();
-				return false;
-			}
-
-			self.options.selected = self.$tabs.index(this);
-
-			// if tab may be closed
-			if (o.unselect) {
-				if ($li.hasClass(o.selectedClass)) {
-					self.options.selected = null;
-					$li.removeClass(o.selectedClass);
-					self.$panels.stop();
-					hideTab(this, $hide);
-					this.blur();
-					return false;
-				} else if (!$hide.length) {
-					self.$panels.stop();
-					var a = this;
-					self.load(self.$tabs.index(this), function() {
-						$li.addClass(o.selectedClass).addClass(o.unselectClass);
-						showTab(a, $show);
-					});
-					this.blur();
-					return false;
-				}
-			}
-
-			if (o.cookie)
-				$.cookie('ui-tabs' + $.data(self.element), self.options.selected, o.cookie);
-
-			// stop possibly running animations
-			self.$panels.stop();
-
-			// show new tab
-			if ($show.length) {
-
-				// prevent scrollbar scrolling to 0 and than back in IE7, happens only if bookmarking/history is enabled
-				/*if ($.browser.msie && o.bookmarkable) {
-					var showId = this.hash.replace('#', '');
-					$show.attr('id', '');
-					setTimeout(function() {
-						$show.attr('id', showId); // restore id
-					}, 0);
-				}*/
-
-				var a = this;
-				self.load(self.$tabs.index(this), $hide.length ? 
-					function() {
-						switchTab(a, $li, $hide, $show);
-					} :
-					function() {
-						$li.addClass(o.selectedClass);
-						showTab(a, $show);
-					}
-				);
-
-				// Set scrollbar to saved position - need to use timeout with 0 to prevent browser scroll to target of hash
-				/*var scrollX = window.pageXOffset || document.documentElement && document.documentElement.scrollLeft || document.body.scrollLeft || 0;
-				var scrollY = window.pageYOffset || document.documentElement && document.documentElement.scrollTop || document.body.scrollTop || 0;
-				setTimeout(function() {
-					scrollTo(scrollX, scrollY);
-				}, 0);*/
-
-			} else
-				throw 'jQuery UI Tabs: Mismatching fragment identifier.';
-
-			// Prevent IE from keeping other link focussed when using the back button
-			// and remove dotted border from clicked link. This is controlled in modern
-			// browsers via CSS, also blur removes focus from address bar in Firefox
-			// which can become a usability and annoying problem with tabsRotate.
-			if ($.browser.msie)
-				this.blur();
-
-			//return o.bookmarkable && !!trueClick; // convert trueClick == undefined to Boolean required in IE
-			return false;
-
-		});
-
-		// disable click if event is configured to something else
-		if (!(/^click/).test(o.event))
-			this.$tabs.bind('click.tabs', function() { return false; });
-
-	},
-	add: function(url, label, index) {
-		if (index == undefined) 
-			index = this.$tabs.length; // append by default
-
-		var o = this.options;
-		var $li = $(o.tabTemplate.replace(/#\{href\}/g, url).replace(/#\{label\}/g, label));
-		$li.data('destroy.tabs', true);
-
-		var id = url.indexOf('#') == 0 ? url.replace('#', '') : this.tabId( $('a:first-child', $li)[0] );
-
-		// try to find an existing element before creating a new one
-		var $panel = $('#' + id);
-		if (!$panel.length) {
-			$panel = $(o.panelTemplate).attr('id', id)
-				.addClass(o.hideClass)
-				.data('destroy.tabs', true);
-		}
-		$panel.addClass(o.panelClass);
-		if (index >= this.$lis.length) {
-			$li.appendTo(this.element);
-			$panel.appendTo(this.element[0].parentNode);
-		} else {
-			$li.insertBefore(this.$lis[index]);
-			$panel.insertBefore(this.$panels[index]);
-		}
-		
-		o.disabled = $.map(o.disabled,
-			function(n, i) { return n >= index ? ++n : n });
-			
-		this.tabify();
-
-		if (this.$tabs.length == 1) {
-			$li.addClass(o.selectedClass);
-			$panel.removeClass(o.hideClass);
-			var href = $.data(this.$tabs[0], 'load.tabs');
-			if (href)
-				this.load(index, href);
-		}
-
-		// callback
-		this.element.triggerHandler('tabsadd',
-			[this.fakeEvent('tabsadd'), this.ui(this.$tabs[index], this.$panels[index])], o.add
-		);
-	},
-	remove: function(index) {
-		var o = this.options, $li = this.$lis.eq(index).remove(),
-			$panel = this.$panels.eq(index).remove();
-
-		// If selected tab was removed focus tab to the right or
-		// in case the last tab was removed the tab to the left.
-		if ($li.hasClass(o.selectedClass) && this.$tabs.length > 1)
-			this.select(index + (index + 1 < this.$tabs.length ? 1 : -1));
-
-		o.disabled = $.map($.grep(o.disabled, function(n, i) { return n != index; }),
-			function(n, i) { return n >= index ? --n : n });
-
-		this.tabify();
-
-		// callback
-		this.element.triggerHandler('tabsremove',
-			[this.fakeEvent('tabsremove'), this.ui($li.find('a')[0], $panel[0])], o.remove
-		);
-	},
-	enable: function(index) {
-		var o = this.options;
-		if ($.inArray(index, o.disabled) == -1)
-			return;
-			
-		var $li = this.$lis.eq(index).removeClass(o.disabledClass);
-		if ($.browser.safari) { // fix disappearing tab (that used opacity indicating disabling) after enabling in Safari 2...
-			$li.css('display', 'inline-block');
-			setTimeout(function() {
-				$li.css('display', 'block');
-			}, 0);
-		}
-
-		o.disabled = $.grep(o.disabled, function(n, i) { return n != index; });
-
-		// callback
-		this.element.triggerHandler('tabsenable',
-			[this.fakeEvent('tabsenable'), this.ui(this.$tabs[index], this.$panels[index])], o.enable
-		);
-
-	},
-	disable: function(index) {
-		var self = this, o = this.options;
-		if (index != o.selected) { // cannot disable already selected tab
-			this.$lis.eq(index).addClass(o.disabledClass);
-
-			o.disabled.push(index);
-			o.disabled.sort();
-
-			// callback
-			this.element.triggerHandler('tabsdisable',
-				[this.fakeEvent('tabsdisable'), this.ui(this.$tabs[index], this.$panels[index])], o.disable
-			);
-		}
-	},
-	select: function(index) {
-		if (typeof index == 'string')
-			index = this.$tabs.index( this.$tabs.filter('[href$=' + index + ']')[0] );
-		this.$tabs.eq(index).trigger(this.options.event);
-	},
-	load: function(index, callback) { // callback is for internal usage only
-		
-		var self = this, o = this.options, $a = this.$tabs.eq(index), a = $a[0],
-				bypassCache = callback == undefined || callback === false, url = $a.data('load.tabs');
-
-		callback = callback || function() {};
-		
-		// no remote or from cache - just finish with callback
-		if (!url || !bypassCache && $.data(a, 'cache.tabs')) {
-			callback();
-			return;
-		}
-
-		// load remote from here on
-		
-		var inner = function(parent) {
-			var $parent = $(parent), $inner = $parent.find('*:last');
-			return $inner.length && $inner.is(':not(img)') && $inner || $parent;
-		};
-		var cleanup = function() {
-			self.$tabs.filter('.' + o.loadingClass).removeClass(o.loadingClass)
-						.each(function() {
-							if (o.spinner)
-								inner(this).parent().html(inner(this).data('label.tabs'));
-						});
-			self.xhr = null;
-		};
-		
-		if (o.spinner) {
-			var label = inner(a).html();
-			inner(a).wrapInner('<em></em>')
-				.find('em').data('label.tabs', label).html(o.spinner);
-		}
-
-		var ajaxOptions = $.extend({}, o.ajaxOptions, {
-			url: url,
-			success: function(r, s) {
-				$(a.hash).html(r);
-				cleanup();
-				
-				if (o.cache)
-					$.data(a, 'cache.tabs', true); // if loaded once do not load them again
-
-				// callbacks
-				$(self.element).triggerHandler('tabsload',
-					[self.fakeEvent('tabsload'), self.ui(self.$tabs[index], self.$panels[index])], o.load
-				);
-				o.ajaxOptions.success && o.ajaxOptions.success(r, s);
-				
-				// This callback is required because the switch has to take
-				// place after loading has completed. Call last in order to 
-				// fire load before show callback...
-				callback();
-			}
-		});
-		if (this.xhr) {
-			// terminate pending requests from other tabs and restore tab label
-			this.xhr.abort();
-			cleanup();
-		}
-		$a.addClass(o.loadingClass);
-		setTimeout(function() { // timeout is again required in IE, "wait" for id being restored
-			self.xhr = $.ajax(ajaxOptions);
-		}, 0);
-
-	},
-	url: function(index, url) {
-		this.$tabs.eq(index).removeData('cache.tabs').data('load.tabs', url);
-	},
-	destroy: function() {
-		var o = this.options;
-		this.element.unbind('.tabs')
-			.removeClass(o.navClass).removeData('tabs');
-		this.$tabs.each(function() {
-			var href = $.data(this, 'href.tabs');
-			if (href)
-				this.href = href;
-			var $this = $(this).unbind('.tabs');
-			$.each(['href', 'load', 'cache'], function(i, prefix) {
-				$this.removeData(prefix + '.tabs');
-			});
-		});
-		this.$lis.add(this.$panels).each(function() {
-			if ($.data(this, 'destroy.tabs'))
-				$(this).remove();
-			else
-				$(this).removeClass([o.selectedClass, o.unselectClass,
-					o.disabledClass, o.panelClass, o.hideClass].join(' '));
-		});
-	},
-	fakeEvent: function(type) {
-		return $.event.fix({
-			type: type,
-			target: this.element[0]
-		});
-	}
-});
-
-$.ui.tabs.defaults = {
-	// basic setup
-	unselect: false,
-	event: 'click',
-	disabled: [],
-	cookie: null, // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
-	// TODO history: false,
-
-	// Ajax
-	spinner: 'Loading&#8230;',
-	cache: false,
-	idPrefix: 'ui-tabs-',
-	ajaxOptions: {},
-
-	// animations
-	fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
-
-	// templates
-	tabTemplate: '<li><a href="#{href}"><span>#{label}</span></a></li>',
-	panelTemplate: '<div></div>',
-
-	// CSS classes
-	navClass: 'ui-tabs-nav',
-	selectedClass: 'ui-tabs-selected',
-	unselectClass: 'ui-tabs-unselect',
-	disabledClass: 'ui-tabs-disabled',
-	panelClass: 'ui-tabs-panel',
-	hideClass: 'ui-tabs-hide',
-	loadingClass: 'ui-tabs-loading'
-};
-
-$.ui.tabs.getter = "length";
-
-/*
- * Tabs Extensions
- */
-
-/*
- * Rotate
- */
-$.extend($.ui.tabs.prototype, {
-	rotation: null,
-	rotate: function(ms, continuing) {
-		
-		continuing = continuing || false;
-		
-		var self = this, t = this.options.selected;
-		
-		function start() {
-			self.rotation = setInterval(function() {
-				t = ++t < self.$tabs.length ? t : 0;
-				self.select(t);
-			}, ms); 
-		}
-		
-		function stop(e) {
-			if (!e || e.clientX) { // only in case of a true click
-				clearInterval(self.rotation);
-			}
-		}
-		
-		// start interval
-		if (ms) {
-			start();
-			if (!continuing)
-				this.$tabs.bind(this.options.event, stop);
-			else
-				this.$tabs.bind(this.options.event, function() {
-					stop();
-					t = self.options.selected;
-					start();
-				});
-		}
-		// stop interval
-		else {
-			stop();
-			this.$tabs.unbind(this.options.event, stop);
-		}
-	}
-});
-
-})(jQuery);
Index: js/ui/effects.transfer.js
===================================================================
--- js/ui/effects.transfer.js	(revision 6370)
+++ js/ui/effects.transfer.js	(working copy)
@@ -1,59 +0,0 @@
-/*
- * jQuery UI Effects Transfer
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Transfer
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.transfer = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this);
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
-		var target = $(o.options.to); // Find Target
-		var position = el.offset();
-		var transfer = $('<div class="ui-effects-transfer"></div>').appendTo(document.body);
-		if(o.options.className) transfer.addClass(o.options.className);
-		
-		// Set target css
-		transfer.addClass(o.options.className);
-		transfer.css({
-			top: position.top,
-			left: position.left,
-			height: el.outerHeight() - parseInt(transfer.css('borderTopWidth')) - parseInt(transfer.css('borderBottomWidth')),
-			width: el.outerWidth() - parseInt(transfer.css('borderLeftWidth')) - parseInt(transfer.css('borderRightWidth')),
-			position: 'absolute'
-		});
-		
-		// Animation
-		position = target.offset();
-		animation = {
-			top: position.top,
-			left: position.left,
-			height: target.outerHeight() - parseInt(transfer.css('borderTopWidth')) - parseInt(transfer.css('borderBottomWidth')),
-			width: target.outerWidth() - parseInt(transfer.css('borderLeftWidth')) - parseInt(transfer.css('borderRightWidth'))
-		};
-		
-		// Animate
-		transfer.animate(animation, o.duration, o.options.easing, function() {
-			transfer.remove(); // Remove div
-			if(o.callback) o.callback.apply(el[0], arguments); // Callback
-			el.dequeue();
-		}); 
-		
-	});
-	
-};
-
-})(jQuery);
Index: js/ui/effects.fold.js
===================================================================
--- js/ui/effects.fold.js	(revision 6370)
+++ js/ui/effects.fold.js	(working copy)
@@ -1,55 +0,0 @@
-/*
- * jQuery UI Effects Fold
- *
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://docs.jquery.com/UI/Effects/Fold
- *
- * Depends:
- *	effects.core.js
- */
-(function($) {
-
-$.effects.fold = function(o) {
-
-	return this.queue(function() {
-
-		// Create element
-		var el = $(this), props = ['position','top','left'];
-		
-		// Set options
-		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
-		var size = o.options.size || 15; // Default fold size
-		var horizFirst = !(!o.options.horizFirst); // Ensure a boolean value
-		
-		// Adjust
-		$.effects.save(el, props); el.show(); // Save & Show
-		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
-		var widthFirst = ((mode == 'show') != horizFirst);
-		var ref = widthFirst ? ['width', 'height'] : ['height', 'width'];
-		var distance = widthFirst ? [wrapper.width(), wrapper.height()] : [wrapper.height(), wrapper.width()];
-		var percent = /([0-9]+)%/.exec(size);
-		if(percent) size = parseInt(percent[1]) / 100 * distance[mode == 'hide' ? 0 : 1];
-		if(mode == 'show') wrapper.css(horizFirst ? {height: 0, width: size} : {height: size, width: 0}); // Shift
-		
-		// Animation
-		var animation1 = {}, animation2 = {};
-		animation1[ref[0]] = mode == 'show' ? distance[0] : size;
-		animation2[ref[1]] = mode == 'show' ? distance[1] : 0;
-		
-		// Animate
-		wrapper.animate(animation1, o.duration / 2, o.options.easing)
-		.animate(animation2, o.duration / 2, o.options.easing, function() {
-			if(mode == 'hide') el.hide(); // Hide
-			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-			if(o.callback) o.callback.apply(el[0], arguments); // Callback
-			el.dequeue();
-		});
-		
-	});
-	
-};
-
-})(jQuery);
Index: examples/classes.html
===================================================================
--- examples/classes.html	(revision 6370)
+++ examples/classes.html	(working copy)
@@ -1,312 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE>Survey To examine Survey Style Sheets</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252"><LINK
-href="../public/css/template.css" type=text/css rel=stylesheet>
-<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
-<BODY>
-<FORM name=phpesp_response action=/phpESP_latest/public/survey.php
-method=post><INPUT type=hidden name=referer> <INPUT type=hidden
-value=192.168.1.2 name=userid> <INPUT type=hidden value=5 name=sid> <INPUT
-type=hidden name=rid> <INPUT type=hidden value=1 name=sec>
-<TABLE class=headerGraphic>
-  <TBODY>
-  <TR>
-    <TD class=image></TD></TR></TBODY></TABLE>
-<center><p>Above you will find the results of the headerGraphic and image classes. The grey color of this page results from the redefinition of the body html tag</p></center>
-<H2 class=surveyTitle>Survey To examine Survey Style Sheets</H2>
-<center>surveyTitle class above.<center>
-<H3 class=surveySubtitle>This is the sub title</H3>
-<center>surveySubtitle class above.<center>
-<BLOCKQUOTE class=addInfo>Here is some additional Information that is
-  pertinent to this survey.</BLOCKQUOTE>
-<center>addInfo class above.<center>
-<BLOCKQUOTE class=message></BLOCKQUOTE>
-<P class=reqQuestion><FONT size=-1>Questions marked with a <FONT
-color=#ff0000>*</FONT> are required.</FONT></P>
-<center>reqQuestion class above.<center>
-<TABLE class=mainTable>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder><center><font color="#FFFFFF">This is the preQuestionBorder class.</font><center></TD></TR>
-  <TR>
-    <TD vAlign=top height=62>
-      <TABLE class=qnOuterTable cellSpacing=1 width="100%">
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=60>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10
-              width="100%"><TBODY>
-              <TR>
-                <TD class=qnInnerTd rowSpan=2><A name=Q1>1.</A></TD>
-                <TD class=qnInner>The black box is the result of the qnOuterTable class and the white inner divisions are the result of the qnInnerTable class. The question number is the result of the qnInnerTd class and this text is in the qnInner class</TD></TR>
-              <TR>
-                <TD class=qnType>
-                  <BLOCKQUOTE><INPUT name=41> this cell has been rendered with the qnType class
-          </BLOCKQUOTE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR></TBODY>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder>&nbsp;</TD></TR>
-  <TR>
-    <TD vAlign=top height=62>
-      <TABLE class=qnOuterTable cellSpacing=1 width="100%">
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=60>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10
-              width="100%"><TBODY>
-              <TR>
-                <TD class=qnInnerTd rowSpan=2><A name=Q2>2.</A></TD>
-                <TD class=qnInner>Here's a yes/no question </TD></TR>
-              <TR>
-                <TD class=qnType>
-                  <BLOCKQUOTE>
-                    <TABLE cellSpacing=0 cellPadding=0>
-                      <TBODY>
-                      <TR>
-                        <TD><INPUT type=radio value=Y name=42></TD>
-                        <TD>Yes</TD></TR>
-                      <TR>
-                        <TD><INPUT type=radio value=N name=42></TD>
-                        <TD>No</TD></TR></TBODY></TABLE></BLOCKQUOTE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR></TBODY>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder><font color="#FFFFFF">The orange that surrounds all the questions is the result of the mainTable class</font></TD></TR>
-  <TR>
-    <TD vAlign=top height=62>
-      <TABLE class=qnOuterTable cellSpacing=1 width="100%">
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=60>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10
-              width="100%"><TBODY>
-              <TR>
-                <TD class=qnInnerTd rowSpan=2><FONT color=#ff0000>*</FONT><A
-                  name=Q3>3.</A></TD>
-                <TD class=qnInner>Here's an essay box question </TD></TR>
-              <TR>
-                <TD class=qnType>
-                  <BLOCKQUOTE><TEXTAREA name=43 rows=5 wrap=virtual cols=60></TEXTAREA>
-                  </BLOCKQUOTE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR></TBODY>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder>&nbsp;</TD></TR>
-  <TR>
-    <TD vAlign=top height=35>
-      <TABLE class=qnOuterTable cellSpacing=1 cellPadding=0 width="100%"
-      border=0>
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=35>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10 width="100%"
-            border=0>
-              <TBODY>
-              <TR>
-                <TD class=qnInner width="100%" height=35>Here's the statement
-                  text question .... well not really a question ... I gues you
-                  know what I
-mean.</TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder>&nbsp;</TD></TR>
-  <TR>
-    <TD vAlign=top height=62>
-      <TABLE class=qnOuterTable cellSpacing=1 width="100%">
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=60>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10
-              width="100%"><TBODY>
-              <TR>
-                <TD class=qnInnerTd rowSpan=2><FONT color=#ff0000>*</FONT><A
-                  name=Q4>4.</A></TD>
-                <TD class=qnInner>Here's the radio buttons question </TD></TR>
-              <TR>
-                <TD class=qnType>
-                  <BLOCKQUOTE>
-                    <TABLE cellSpacing=0 cellPadding=0 border=0>
-                      <TBODY>
-                      <TR>
-                        <TD><INPUT type=radio value=65 name=45></TD>
-                        <TD>option one</TD></TR>
-                      <TR>
-                        <TD><INPUT type=radio value=66 name=45></TD>
-                        <TD>option two</TD></TR>
-                      <TR>
-                        <TD><INPUT type=radio value=67 name=45></TD>
-                        <TD>option three</TD></TR>
-                      <TR>
-                        <TD><INPUT type=radio value=68 name=45></TD>
-                        <TD>option
-              four</TD></TR></TBODY></TABLE></BLOCKQUOTE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR></TBODY>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder>&nbsp;</TD></TR>
-  <TR>
-    <TD vAlign=top height=62>
-      <TABLE class=qnOuterTable cellSpacing=1 width="100%">
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=60>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10
-              width="100%"><TBODY>
-              <TR>
-                <TD class=qnInnerTd rowSpan=2><FONT color=#ff0000>*</FONT><A
-                  name=Q5>5.</A></TD>
-                <TD class=qnInner>Here's the check boxes question </TD></TR>
-              <TR>
-                <TD class=qnType>
-                  <BLOCKQUOTE>
-                    <TABLE cellSpacing=0 cellPadding=0 border=0>
-                      <TBODY>
-                      <TR>
-                        <TD><INPUT type=checkbox value=69 name=46[]></TD>
-                        <TD>option one</TD></TR>
-                      <TR>
-                        <TD><INPUT type=checkbox value=70 name=46[]></TD>
-                        <TD>option two</TD></TR>
-                      <TR>
-                        <TD><INPUT type=checkbox value=71 name=46[]></TD>
-                        <TD>option three</TD></TR>
-                      <TR>
-                        <TD><INPUT type=checkbox value=72 name=46[]></TD>
-                        <TD>option
-              four</TD></TR></TBODY></TABLE></BLOCKQUOTE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR></TBODY>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder>&nbsp;</TD></TR>
-  <TR>
-    <TD vAlign=top height=62>
-      <TABLE class=qnOuterTable cellSpacing=1 width="100%">
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=60>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10
-              width="100%"><TBODY>
-              <TR>
-                <TD class=qnInnerTd rowSpan=2><FONT color=#ff0000>*</FONT><A
-                  name=Q6>6.</A></TD>
-                <TD class=qnInner>Here's the dropdown question </TD></TR>
-              <TR>
-                <TD class=qnType>
-                  <BLOCKQUOTE><SELECT name=47> <OPTION selected></OPTION>
-                      <OPTION value=73>option one</OPTION> <OPTION
-                      value=74>option two</OPTION> <OPTION value=75>option
-                      three</OPTION> <OPTION value=76>option
-                    four</OPTION></SELECT>
-        </BLOCKQUOTE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR></TBODY>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder>&nbsp;</TD></TR>
-  <TR>
-    <TD vAlign=top height=62>
-      <TABLE class=qnOuterTable cellSpacing=1 width="100%">
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=60>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10
-              width="100%"><TBODY>
-              <TR>
-                <TD class=qnInnerTd rowSpan=2><FONT color=#ff0000>*</FONT><A
-                  name=Q7>7.</A></TD>
-                <TD class=qnInner>Here's a rate question </TD></TR>
-              <TR>
-                <TD class=qnType>
-                  <BLOCKQUOTE>
-                    <TABLE cellSpacing=1 cellPadding=0 border=0>
-                      <TBODY>
-                      <TR>
-                        <TD></TD>
-                        <TD align=middle width=40 bgColor=#eeeeee>1</TD>
-                        <TD align=middle width=40 bgColor=#dddddd>2</TD>
-                        <TD align=middle width=40 bgColor=#eeeeee>3</TD>
-                        <TD align=middle width=40 bgColor=#dddddd>4</TD>
-                        <TD align=middle width=40 bgColor=#eeeeee>5</TD></TR>
-                      <TR>
-                        <TD align=right>question 1</TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=0 name=48_77></TD>
-                        <TD align=middle width=40 bgColor=#dddddd><INPUT
-                          type=radio value=1 name=48_77></TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=2 name=48_77></TD>
-                        <TD align=middle width=40 bgColor=#dddddd><INPUT
-                          type=radio value=3 name=48_77></TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=4 name=48_77></TD></TR>
-                      <TR>
-                        <TD align=right>question 2</TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=0 name=48_78></TD>
-                        <TD align=middle width=40 bgColor=#dddddd><INPUT
-                          type=radio value=1 name=48_78></TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=2 name=48_78></TD>
-                        <TD align=middle width=40 bgColor=#dddddd><INPUT
-                          type=radio value=3 name=48_78></TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=4 name=48_78></TD></TR>
-                      <TR>
-                        <TD align=right>question 3</TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=0 name=48_79></TD>
-                        <TD align=middle width=40 bgColor=#dddddd><INPUT
-                          type=radio value=1 name=48_79></TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=2 name=48_79></TD>
-                        <TD align=middle width=40 bgColor=#dddddd><INPUT
-                          type=radio value=3 name=48_79></TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=4 name=48_79></TD></TR>
-                      <TR>
-                        <TD align=right>question 4</TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=0 name=48_80></TD>
-                        <TD align=middle width=40 bgColor=#dddddd><INPUT
-                          type=radio value=1 name=48_80></TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=2 name=48_80></TD>
-                        <TD align=middle width=40 bgColor=#dddddd><INPUT
-                          type=radio value=3 name=48_80></TD>
-                        <TD align=middle width=40 bgColor=#eeeeee><INPUT
-                          type=radio value=4
-                  name=48_80></TD></TR></TBODY></TABLE></BLOCKQUOTE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR></TBODY>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder>&nbsp;</TD></TR>
-  <TR>
-    <TD vAlign=top height=62>
-      <TABLE class=qnOuterTable cellSpacing=1 width="100%">
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=60>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10
-              width="100%"><TBODY>
-              <TR>
-                <TD class=qnInnerTd rowSpan=2><FONT color=#ff0000>*</FONT><A
-                  name=Q8>8.</A></TD>
-                <TD class=qnInner>Here's the date question </TD></TR>
-              <TR>
-                <TD class=qnType>
-                  <BLOCKQUOTE><INPUT maxLength=10 size=10 name=49> <EM>(e.g.
-                    4/21/2002)</EM>
-      </BLOCKQUOTE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR></TBODY>
-  <TBODY>
-  <TR>
-    <TD class=preQuestionBorder>&nbsp;</TD></TR>
-  <TR>
-    <TD vAlign=top height=62>
-      <TABLE class=qnOuterTable cellSpacing=1 width="100%">
-        <TBODY>
-        <TR>
-          <TD vAlign=top width="100%" height=60>
-            <TABLE class=qnInnerTable cellSpacing=1 cellPadding=10
-              width="100%"><TBODY>
-              <TR>
-                <TD class=qnInnerTd rowSpan=2><FONT color=#ff0000>*</FONT><A
-                  name=Q9>9.</A></TD>
-                <TD class=qnInner>Here's a numeric qustion </TD></TR>
-              <TR>
-                <TD class=qnType>
-                  <BLOCKQUOTE><INPUT maxLength=11 size=11 name=50>
-                </BLOCKQUOTE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE><INPUT type=submit value="Submit Survey" name=submit>
-</FORM></BODY></HTML>
Index: examples/survey.php
===================================================================
--- examples/survey.php	(revision 6370)
+++ examples/survey.php	(working copy)
@@ -1,19 +0,0 @@
-<?
-// example use of handler.php
-$template_file = file_get_contents("http://blahblahblah.site.org/index.php?module=webpage&id=27");
-$page_header = preg_replace ('/FORM_BODY.*/s','',$template_file);
-$page_header = preg_replace ('/<div class="title">Survey<\/div>/s','',$page_header);
-$page_footer = preg_replace ('/.*FORM_BODY/s','',$template_file);
-
- $sid=0;
- if (isset($_GET['sid'])) $sid=intval($_GET['sid']);
- $lang="en_US";
- # this must be included before any output happens
- include("public/phpESP.first.php");
-
- if ($sid>0) {
-    echo $page_header;
-    include("public/handler.php");
-    echo $page_footer;
- }
-?>
Index: examples/survey_fr.php
===================================================================
--- examples/survey_fr.php	(revision 6370)
+++ examples/survey_fr.php	(working copy)
@@ -1,19 +0,0 @@
-<?
-// example use of handler.php
-$template_file = file_get_contents("http://blahblahblah.site.org/index.php?module=webpage&id=27");
-$page_header = preg_replace ('/FORM_BODY.*/s','',$template_file);
-$page_header = preg_replace ('/<div class="title">Survey<\/div>/s','',$page_header);
-$page_footer = preg_replace ('/.*FORM_BODY/s','',$template_file);
-
- $sid=0;
- if (isset($_GET['sid'])) $sid=intval($_GET['sid']);
- $lang="fr_FR";
- # this must be included before any output happens
- include("public/phpESP.first.php");
-
- if ($sid>0) {
-    echo $page_header;
-    include("public/handler.php");
-    echo $page_footer;
- }
-?>
Index: examples/survey_nl.php
===================================================================
--- examples/survey_nl.php	(revision 6370)
+++ examples/survey_nl.php	(working copy)
@@ -1,19 +0,0 @@
-<?
-// example use of handler.php
-$template_file = file_get_contents("http://blahblahblah.site.org/index.php?module=webpage&id=27");
-$page_header = preg_replace ('/FORM_BODY.*/s','',$template_file);
-$page_header = preg_replace ('/<div class="title">Survey<\/div>/s','',$page_header);
-$page_footer = preg_replace ('/.*FORM_BODY/s','',$template_file);
-
- $sid=0;
- if (isset($_GET['sid'])) $sid=intval($_GET['sid']);
- $lang="nl_NL";
- # this must be included before any output happens
- include("public/phpESP.first.php");
-
- if ($sid>0) {
-    echo $page_header;
-    include("public/handler.php");
-    echo $page_footer;
- }
-?>
Index: public/rascal.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: public/survey.php
===================================================================
--- public/survey.php	(revision 6370)
+++ public/survey.php	(working copy)
@@ -1,182 +0,0 @@
-<?php
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-	
-File: 		survey.php \\v 1.0
-Info:		- public viewing/handling of surveys
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-
-/* $Id: survey.php,v 1.21 2007/07/09 12:58:21 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Matthew Gregg
-// <greggmc at musc.edu>
-	require_once('../admin/include_all.php');
-	require_once("./phpESP.first.php");	
-
-	$_name = '';
-	$_title = '';
-	$_css = '';
-    $sid = '';
-	
-	if (isset($_GET['name'])) {
-		$_name = _addslashes($_GET['name']);
-		unset($_GET['name']);
-		$_SERVER['QUERY_STRING'] = ereg_replace('(^|&)name=[^&]*&?', '', $_SERVER['QUERY_STRING']);
-	}
-    	if (isset($_POST['name'])) {
-        	$_name = _addslashes($_POST['name']);
-        	unset($_POST['name']);
-    	}
-
-	if (!empty($_name)) {
-        	$_sql = "SELECT id,title,theme FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE name = $_name";
-        	if ($_result = execute_sql($_sql)) {
-            		if (record_count($_result) > 0)
-                		list($sid, $_title, $_css) = fetch_row($_result);
-            		db_close($_result);
-        	}
-        	unset($_sql);
-        	unset($_result);
-	}
-	
-	
-	if (isset($_GET['id'])) {
-		$_name = _addslashes($_GET['id']);
-		unset($_GET['id']);
-		$_SERVER['QUERY_STRING'] = ereg_replace('(^|&)id=[^&]*&?', '', $_SERVER['QUERY_STRING']);
-	}
-    	if (isset($_POST['id'])) {
-        	$_name = _addslashes($_POST['id']);
-        	unset($_POST['id']);
-    	}
-
-	if (!empty($_name)) {
-        	$_sql = "SELECT id,title,theme FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id = $_name";
-        	if ($_result = execute_sql($_sql)) {
-            		if (record_count($_result) > 0)
-                		list($sid, $_title, $_css) = fetch_row($_result);
-            		db_close($_result);
-        	}
-        	unset($_sql);
-        	unset($_result);
-	}
-
-        // To make all results public uncomment the next line.
-        //$results = 1;
-        // See the FAQ for more instructions.
-
-        // call the handler-prefix once $sid is set to handle
-        // authentication / authorization
-
-
-        if (empty($_name) && isset($sid) && $sid) {
-            $_sql = "SELECT title,theme FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id = '$sid'";
-            if ($_result = execute_sql($_sql)) {
-                if (record_count($_result) > 0){
-                    list($_title, $_css) = fetch_row($_result);
-                }
-                db_close($_result);
-            }
-            unset($_sql);
-            unset($_result);
-        }
-        
-    if (isset($_GET['project'])) {
-		$__id = _addslashes($_GET['project']);
-		//unset($_GET['project']);
-		$_SERVER['QUERY_STRING'] = ereg_replace('(^|&)project=[^&]*&?', '', $_SERVER['QUERY_STRING']);
-	}
-    	if (isset($_POST['project'])) {
-        	$__id = _addslashes($_POST['project']);
-        	unset($_POST['project']);
-    	}
-
-	if (!empty($__id)) {
-        	$_sql = "SELECT id,name,presurvey,postsurvey,action_url FROM project WHERE id = $__id";
-        	if ($_result = execute_sql($_sql)) {
-            		if (record_count($_result) > 0)
-                		list($__sid, $__pname, $__pres,$__posts, $__action) = fetch_row($_result);
-            		db_close($_result);
-        	}
-        	unset($_sql);
-        	unset($_result);
-	}
-	if (isset($_GET['stype']))
-		$stype = $_GET['stype'];
-    include($ESPCONFIG['handler_prefix']);
-?>
-<!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">
-<head>
-<title><?php echo($_title); ?></title>
-<script type="text/javascript" src="js/default.js"></script>
-<script type="text/javascript" src="js/jquery.js"></script>
-<script type="text/javascript" src="js/vulab.public.js"></script>
-<?php
-    if (!empty($_css)) {
-	    echo('<link rel="stylesheet" href="'. $GLOBALS['ESPCONFIG']['css_url'].$_css ."\" type=\"text/css\" />\n");
-    }
-    unset($_css);
-?>
-<script type="text/javascript">
-
-</script>
-</head>
-<body>
-<?php
-	unset($_name);
-	unset($_title);
-	include($ESPCONFIG['handler']);
-
-if ($_GET['stype'] == 'post' AND $_REQUEST[rid] AND $_GET['sessionid']) {
-	$vid = $_GET['sessionid'];
-	$rid = $_REQUEST['rid'];
-	require_once('../admin/include_all.php');
-	require_once("./phpESP.first.php");	
-	include('../admin/include/lib/vulab.responses.class.php');
-		$response = new Response(@$rid);
-		@$response_data = array('vid'=>@$vid);
-
-		$result = $response->update(@$response_data);
-		if (is_array($result)) {
-			$err = $result;
-			die($err);
-		} else {
-			if ($result) {
-				#echo "Successfully submitted your Video ID! <br />You Can Now Return with the Above Link";
-			}
-		}
-}
-/*	echo "<pre>";
-	print_r($_POST);
-	print_r($_SESSION);
-	print_r($_REQUEST);
-	echo "</pre>";
-	if ($stype == 'post' AND $_REQUEST['rid']) {
-		echo "<div id='submitVID' style='padding:10px;'>			
-				What was your video id? <input type='text' name='vid' /> <input type='hidden' name='rid' value='$_REQUEST[rid]'/> <input type='submit' value='Submit Video ID' />
-		</div>";
-	}*/
-	/*if (isset($__action) && $__action != "" && $__action != null)
-		echo "<a href=\"gluebox.php?project=$__sid\">Visit URL</a><br />";
-	elseif (isset($__postname) && $__postname != "" && $__postname != null)
-		echo "<a href=\"survey.php?name=" . $__postname ."&project=$__sid&stype=post\">Post-Survey</a><br />";*/
-?>
-</body>
-</html>
Index: public/captcha_check.php
===================================================================
--- public/captcha_check.php	(revision 6370)
+++ public/captcha_check.php	(working copy)
@@ -1,36 +0,0 @@
-<?
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-*/
-?>
-
-<?php
-   if (!isset($_SESSION)) session_start();
-
-   // if the session fails to start
-   if (!isset($_SESSION)) {
-      echo "This script can't work without setting the php session variable first!!!";
-      exit ;
-   }
-
-   function response_check_captcha($post_var,$cleanup=1) {
-      if (!isset($_POST[$post_var]) || (md5($_POST[$post_var]) != $_SESSION['captcha'])) {
-	   return _('You entered an incorrect code. Please fill in the correct code.');
-      } else {
-	if ($cleanup==1) {
-      	   unset($_SESSION['captcha']);
-      	   unset($_POST[$post_var]);
-	}
-        return ('');
-      }
-   }
-?>
Index: public/css/mystic.css
===================================================================
--- public/css/mystic.css	(revision 6370)
+++ public/css/mystic.css	(working copy)
@@ -1,178 +0,0 @@
-/* $Id: mystic.css,v 1.6 2005/12/05 14:19:35 greggmc Exp $ */
-
-body {
-    font-family: Arial, Helvetica, sans-serif;
-    background-color: #CCCCCC;
-    margin: 0px;
-}
-.image {
-    height:60px;
-    width:100%;
-}
-/* title - extra large normal font */
-#title {
-    font-size: 150%;
-    font-weight: bold;
-    color: #000000;
-    text-align: center;
-}
-/* subtitle - bold normal font */
-#subtitle {
-    font-size: 120%;
-    font-weight: bold;
-    color: #000000;
-    text-align: center;
-}
-
-/* main table (bordering the question boxes) - dark blue */
-#body {
-    background-color: #253D8E;
-    width: 100%;
-    border: 0px;
-    font-size: 100%;
-    color: #000000;
-    text-align: center;
-}
-/* information below subtitle - normal font */
-.addinfo {
-    font-size: medium;
-    color: #000000;
-    text-align: center;
-}
-.message {
-    font-size: medium;
-    font-weight: bold;
-    color: #000000;
-    text-align: center;
-}
-
-.notice {
-    text-align: center;
-}
-
-.required {
-    color: red;
-    font-weight: bold;
-}
-
-fieldset.hidden {
-    display: none;
-}
-
-.ranktable td {
-    text-align: center;
-    padding-left: 8px;
-    padding-right: 8px;
-}
-
-.alt {
-    background-color: #eeeeee;
-}
-
-.nom {
-    background-color: #dddddd;
-}
-/* bars between question boxes - dark blue */
-#body fieldset {
-    margin: 10px;
-    padding: 0px;
-    border: 2px solid;
-    background-color: #aaaaaa;
-}
-
-#survey ul {
-    margin: 0px;
-    padding: 0px;
-    list-style: none;
-}
-
-/* number cell box - large bold number inside a dark grey box */
-.qnumber {
-    float: left;
-    background-color: #aaaaaa;
-    font-weight: bold;
-    font-size: 120%;
-    color: #000000;
-    height: 100%;
-    width: 4%;
-    vertical-align: text-top;
-}
-.qtext {
-    float: right;
-    background-color: #CCCCCC;
-    border-left: 1px solid;
-    border-bottom: 1px solid;
-    width: 92%;
-    vertical-align: middle;
-    padding-left: 20px;
-    padding-right: 20px;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    margin: 0px;
-    color: #000000; 
-    font-size: 100%;
-    font-weight: bold;
-    text-align: left;
-}
-/* answer box  - white, normal black font */
-.qbody {
-    float: right;
-    border-left: 1px solid;
-    width: 92%;
-    background-color: #FFFFFF;
-    vertical-align: middle;
-    color: #000000;
-    font-size: 100%;
-    text-align: left;
-    min-height: 50px;
-    padding: 20px;
-}
-.sectiontext {
-    background-color: #CCCCCC;
-    border-left: 1px solid;
-    vertical-align: middle;
-    padding: 5px;
-    color: #000000; 
-    font-size: 100%;
-    font-weight: bold;
-    text-align: left;
-}
-
-.thankHead {
-    /* completion page font - large black */
-    font-size: 130%;
-    color: #000000;
-}
-.thankBody {
-    /* completion page body font - normal black */
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 80%;
-    color: #000000;
-}
-.returnLink {
-    /* completion page link font - small dark blue */
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 80%;
-    color: #253D8E;
-    text-decoration: underline;
-}
-body#auth {
-    margin: 5px;
-}
-
-#loginform {
-    width: 14em;
-}
-
-#loginform label, #loginform input {
-    display: block;
-}
-
-#loginform label {
-    padding: .5em;
-    font-weight: bold;
-}
-
-#loginform form {
-    float: left;
-}
Index: public/css/template.css
===================================================================
--- public/css/template.css	(revision 6370)
+++ public/css/template.css	(working copy)
@@ -1,192 +0,0 @@
-/* $Id: template.css,v 1.5 2005/03/28 18:35:53 greggmc Exp $ */
-.headerGraphic {
-	background-image: url(../../images/surveyimages/phpespHeader.jpg);
-	background-repeat: no-repeat;
-	width: 100%;
-	border: none;
-}
-.image {
-	height:60;
-	width:100%;
-}
-.surveyTitle {
-	font-family: "Courier New", Courier, mono;
-	font-size: x-large;
-	font-style: normal;
-	font-weight: bold;
-	font-variant: small-caps;
-	text-transform: capitalize;
-	color: #999999;
-	text-decoration: underline;
-	text-align: center;
-	vertical-align: default;
-}
-.surveySubtitle {
-	font-family: "Courier New", Courier, mono;
-	font-size: large;
-	font-style: normal;
-	font-weight: bold;
-	font-variant: small-caps;
-	text-transform: none;
-	color: #999999;
-	text-decoration: none;
-	text-align: center;
-	vertical-align: default;
-}
-.surveyPage {
-        font-family: Verdana, Arial, Helvetica, sans-serif;
-        font-size: 12px;
-        font-style: normal;
-        font-weight: 600;
-        font-variant: small-caps;
-        text-transform: none;
-        color: #CC0000;
-        text-decoration: none;
-        text-align: center;
-}	
-.addInfo {
-	font-family: "Courier New", Courier, mono;
-	font-size: medium;
-	font-style: normal;
-	font-weight: normal;
-	font-variant: small-caps;
-	text-transform: lowercase;
-	color: #999999;
-	text-align: center;
-	vertical-align: default;
-}
-.message {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: medium;
-	font-variant: small-caps;
-	font-weight: bold;
-	color: #CC0000;
-	text-align: center;
-}
-.reqQuestion {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: normal;
-	font-weight: 600;
-	font-variant: small-caps;
-	text-transform: none;
-	color: #CC0000;
-	text-decoration: none;
-	text-align: center;
-}
-.mainTable {
-	background-color: orange;
-/*	background-image: url();*/
-	background-repeat: repeat-y;
-	cell-sapcing: 0;
-	width: 100%;
-	border: 0;
-}
-body {
-	background-color: #BEBEBE;
-	margin: 0px;
-}
-.preQuestionBorder {
-	width: 500px;
-	margin: 0px auto;
-	text-align: center;
-	padding: 0px;
-	border: 1px none #999999;
-	background-color: darkred;
-	height: 8px;
-	vertical-align: text-top;
-}
-.qnOuterTable {
-	width: 100%;
-	border: none;
-	background-color: #000000;
-	cell-spacing: 1;
-}
-.qnInnerTable {
-	width: 100%;
-	border: none;
-	background-color: #FFFFFF;
-	cell-spacing: 1;
-}
-.qnInnerTd {
-	background-color: #CCCCCC;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: normal;
-	font-variant: small-caps;
-	text-transform: none;
-	color: #000000;
-	text-decoration: none;
-	width: 26px;
-	vertical-align: text-top;
-}
-.qnInner {
-	background-color: #999999;
-	width: 100%;
-	height: 27;
-	vertical-align: middle;
-	color: #FFFFFF;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: normal;
-	font-variant: small-caps;
-	text-transform: none;
-	text-decoration: none;
-}
-.qnType {
-	height: auto;
-	background-color: khaki;
-	vertical-align: middle;
-	color: #000000;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: normal;
-	font-variant: small-caps;
-	text-transform: none;
-	text-decoration: none;
-}
-.thankHead {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: medium;
-	font-variant: small-caps;
-	color: #CCCCCC;
-}
-.thankBody {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: small;
-	font-variant: small-caps;
-	color: #FFFFFF;
-}
-.returnLink {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: x-small;
-	font-variant: small-caps;
-	color: #FFFFFF;
-	text-decoration: underline;
-}
-input, textarea, select, option {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: x-small;
-	color: #FFFFFF;
-	background-color: #000000;
-}
-body#auth {
-    margin: 5px;
-}
-.login {
-    width: 480;
-}
-.login form {
-    float: left;
-}
-div.row {
-    clear: both;
-    padding-top: 10px;
-}
-
-div.row label {
-    float: left;
-    padding-right: 5px;
-    width: 100px;
-    text-align: right;
-}
Index: public/css/thickbox.css
===================================================================
--- public/css/thickbox.css	(revision 6370)
+++ public/css/thickbox.css	(working copy)
@@ -1,167 +0,0 @@
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-*{padding: 0; margin: 0;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_window {
-	font: 12px Arial, Helvetica, sans-serif;
-	color: #333333;
-}
-
-#TB_secondLine {
-	font: 10px Arial, Helvetica, sans-serif;
-	color:#666666;
-}
-
-#TB_window a:link {color: #666666;}
-#TB_window a:visited {color: #666666;}
-#TB_window a:hover {color: #000;}
-#TB_window a:active {color: #666666;}
-#TB_window a:focus{color: #666666;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_overlay {
-	position: fixed;
-	z-index:100;
-	top: 0px;
-	left: 0px;
-	height:100%;
-	width:100%;
-}
-
-.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
-.TB_overlayBG {
-	background-color:#000;
-	filter:alpha(opacity=75);
-	-moz-opacity: 0.75;
-	opacity: 0.75;
-}
-
-* html #TB_overlay { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_window {
-	position: fixed;
-	background: #ffffff;
-	z-index: 102;
-	color:#000000;
-	display:none;
-	border: 4px solid #525252;
-	text-align:left;
-	top:55%;
-	left:50%;
-}
-
-* html #TB_window { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_window img#TB_Image {
-	display:block;
-	margin: 15px 0 0 15px;
-	border-right: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
-	border-top: 1px solid #666;
-	border-left: 1px solid #666;
-}
-
-#TB_caption{
-	height:25px;
-	padding:7px 30px 10px 25px;
-	float:left;
-}
-
-#TB_closeWindow{
-	height:25px;
-	padding:11px 25px 10px 0;
-	float:right;
-}
-
-#TB_closeAjaxWindow{
-	padding:7px 10px 5px 0;
-	margin-bottom:1px;
-	text-align:right;
-	float:right;
-}
-
-#TB_ajaxWindowTitle{
-	float:left;
-	padding:7px 0 5px 10px;
-	margin-bottom:1px;
-}
-
-#TB_title{
-	background-color:#e8e8e8;
-	height:27px;
-}
-
-#TB_ajaxContent{
-	clear:both;
-	padding:2px 15px 15px 15px;
-	overflow:auto;
-	text-align:left;
-	line-height:1.4em;
-}
-
-#TB_ajaxContent.TB_modal{
-	padding:15px;
-}
-
-#TB_ajaxContent p{
-	padding:5px 0px 5px 0px;
-}
-
-#TB_load{
-	position: fixed;
-	display:none;
-	height:13px;
-	width:208px;
-	z-index:103;
-	top: 50%;
-	left: 50%;
-	margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
-}
-
-* html #TB_load { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_HideSelect{
-	z-index:99;
-	position:fixed;
-	top: 0;
-	left: 0;
-	background-color:#fff;
-	border:none;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-	height:100%;
-	width:100%;
-}
-
-* html #TB_HideSelect { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_iframeContent{
-	clear:both;
-	border:none;
-	margin-bottom:-1px;
-	margin-top:1px;
-	_margin-bottom:1px;
-}
-#gluebox {
-z-index:99999;clear:both;background:#CCC;text-align:center;padding:5px;
-display:none;
-}
\ No newline at end of file
Index: public/css/crawcram.css
===================================================================
--- public/css/crawcram.css	(revision 6370)
+++ public/css/crawcram.css	(working copy)
@@ -1,186 +0,0 @@
-/* $Id: crawcram.css,v 1.4 2005/03/28 18:35:53 greggmc Exp $ */
-/* Brian Crawford @ IT Lab (http://www.itlab.musc.edu/) */
-.headerGraphic {
-	background-repeat: no-repeat;
-	width: 100%;
-	border: none;
-}
-.image {
-	height:60;
-	width:100%;
-}
-/* title - extra large normal font */
-.surveyTitle {
-	font-family: "Arial", Arial, Helvetica, sans-serif, mono;
-	font-size: x-large;
-	font-style: normal;
-	font-weight: bold;
-	text-transform: none;
-	color: #000000;
-	text-decoration: none;
-	text-align: center;
-	vertical-align: default;
-}
-/* subtitle - bold normal font */
-.surveySubtitle {
-	font-family: "Arial", Arial, Helvetica, sans-serif, mono;
-	font-size: large;
-	font-style: normal;
-	font-weight: bold;
-	text-transform: none;
-	color: #000000;
-	text-decoration: none;
-	text-align: center;
-	vertical-align: default;
-}
-/* information below subtitle - normal font */
-.addInfo {
-	font-family: "Arial", Arial, Helvetica, sans-serif, mono;
-	font-size: medium;
-	font-style: normal;
-	font-weight: normal;
-	text-transform: none;
-	color: #000000;
-	text-align: center;
-	vertical-align: default;
-}
-.message {
-	font-family: "Arial", Arial, Helvetica, sans-serif;
-	font-size: medium;
-	font-weight: bold;
-	color: #000000;
-	text-align: center;
-}
-.reqQuestion {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: normal;
-	font-weight: 600;
-	color: #000000;
-	text-decoration: none;
-	text-align: center;
-}
-/* main table (bordering the question boxes) - white */
-.mainTable {
-	background-color: #FFFFFF;
-/*	background-image: url(); */
-	background-repeat: repeat-y;
-	cell-spacing: 0;
-	width: 100%;
-	border: 0;
-}
-body {
-	background-color: #FFFFFF;
-	margin: 0px;
-}
-/* bars between question boxes - white */
-.preQuestionBorder {
-	width: 500px;
-	margin: 0px auto;
-	text-align: center;
-	padding: 2px;
-	border: 5px #000000;
-	background-color: #FFFFFF;
-	height: 8px;
-	vertical-align: text-top;
-}
-/* outer borders, surrounding each question and answer */
-.qnOuterTable {
-	width: 100%;
-	border: none;
-	background-color: #660000;
-	cell-spacing: 1;
-}
-/* inner borders - surrounding boxes inside question boxes - burgundy, thick */
-.qnInnerTable {
-	width: 99%;
-	border: 3;
-	padding: 3px;
-	background-color: #660000;
-	cell-spacing: 3;
-}
-/* number cell box - extra large bold white number inside a black box */
-.qnInnerTd {
-	background-color: #660000;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	font-style: normal;
-	font-weight: bold;
-	text-transform: none;
-	color: #FFFFFF;
-	text-decoration: none;
-	width: 26px;
-	vertical-align: text-top;
-}
-/* question box color */
-.qnInner {
-	background-color: #CCCCCC;
-	width: 100%;
-	height: 27;
-	vertical-align: middle;
-	color: #000000;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	font-style: normal;
-	text-transform: none;
-	text-decoration: none;
-}
-/* answer box  - white, normal black font */
-.qnType {
-	height: auto;
-	background-color: #FFFFFF;
-	vertical-align: middle;
-	color: #000000;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-style: normal;
-	text-transform: none;
-	text-decoration: none;
-}
-.thankHead {
-/* completion page font - large black */
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: x-large;
-	color: #000000;
-}
-.thankBody {
-/* completion page body font - normal black */
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: medium;
-	color: #000000;
-}
-.returnLink {
-/* completion page link font - small burgundy */
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: small;
-	color: #660000;
-	text-decoration: underline;
-}
-/* textbox and radio button colors - black answers in white boxes */
-input, textarea, select, option {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: normal;
-	color: #000000;
-	background-color: #FFFFFF;
-}
-body#auth {
-    margin: 5px;
-}
-.login {
-    width: 480;
-}
-.login form {
-    float: left;
-}
-div.row {
-    clear: both;
-    padding-top: 10px;
-}
-
-div.row label {
-    float: left;
-    padding-right: 5px;
-    width: 100px;
-    text-align: right;
-}
Index: public/css/default.css
===================================================================
--- public/css/default.css	(revision 6370)
+++ public/css/default.css	(working copy)
@@ -1,91 +0,0 @@
-/* $Id: default.css,v 1.6 2005/12/05 14:19:35 greggmc Exp $ */
-body {
-    font-family: Arial, Helvetica, sans-serif;
-}
-
-body#auth {
-    margin: 5px;
-}
-
-#loginform {
-    width: 14em;
-}
-
-#loginform label, #loginform input {
-    display: block;
-}
-
-#loginform label {
-    padding: .5em;
-    font-weight: bold;
-}
-
-#loginform form {
-    float: left;
-}
-
-.message {
-        font-size: medium;
-        font-variant: normal;
-        font-weight: bold;
-        color: #CC0000;
-        text-align: center;
-}
-
-.error {
-    color: #CC0000;
-}
-
-.qnumber {
-    float: left;
-    padding-right: 3px;
-}
-
-.qbody {
-    padding-top: 3px;
-    padding-left: 25px;
-}
-
-.qbody ul {
-    margin: 0px;
-    padding: 0px;
-    padding-left: 15px;
-}
-
-.qsectiontext {
-    padding: 5px;
-}
-
-#survey fieldset {
-    border: 0px;
-    border-bottom: 2px solid grey;
-    padding: 28px;
-}
-
-fieldset.hidden {
-    display: none;
-}
-
-.ranktable td {
-    text-align: center;
-    padding-left: 8px;
-    padding-right: 8px;
-}
-
-.alt {
-    background-color: #eeeeee;
-}
-
-.nom {
-    background-color: #dddddd;
-}
-
-.required {
-    color: red;
-    font-weight: bold;
-    font-size: 120%;
-}
-
-.notice {
-    text-align: center;
-}
Index: public/captcha.php
===================================================================
--- public/captcha.php	(revision 6370)
+++ public/captcha.php	(working copy)
@@ -1,80 +0,0 @@
-<?
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-*/
-?>
-<?php
-
-if (!isset($_SESSION)) session_start();
-
-if (!isset($_SERVER['HTTP_REFERER']) || !strrchr($_SERVER['HTTP_REFERER'],$_SERVER['HTTP_HOST'])) {
-   echo "no abuse allowed";
-   exit;
-}
-
-// 23 letters
-$alfabet="abcdefghjkmnpqrstuvwxyz";
-$random1 = substr($alfabet,rand(1,23)-1,1);
-$random2 = rand(2,9);
-$rand=rand(1,23)-1;
-$random3 = substr($alfabet,rand(1,23)-1,1);
-$random4 = rand(2,9);
-$rand=rand(1,23)-1;
-$random5 = substr($alfabet,rand(1,23)-1,1);
-
-$randomtext=$random1.$random2.$random3.$random4.$random5;
-$_SESSION['captcha'] = md5($randomtext);
-
-$im = imagecreatetruecolor(120, 38);
-
-// some colors
-$white = imagecolorallocate($im, 255, 255, 255);
-$grey = imagecolorallocate($im, 128, 128, 128);
-$black = imagecolorallocate($im, 0, 0, 0);
-$red = imagecolorallocate($im, 255, 0, 0);
-$blue = imagecolorallocate($im, 0, 0, 255);
-$green = imagecolorallocate($im, 0, 255, 0);
-$background_colors=array($red,$blue,$green,$black);
-
-// draw rectangle in random color
-$background_color=$background_colors[rand(0,3)];
-imagefilledrectangle($im, 0, 0, 120, 38, $background_color);
-
-// replace font.ttf with the location of your own ttf font file
-$font = 'font.ttf';
-
-// add shadow
-imagettftext($im, 25, 8, 15, 28, $grey, $font, $random1);
-imagettftext($im, 25, -8, 35, 28, $grey, $font, $random2);
-imagettftext($im, 25, 8, 55, 28, $grey, $font, $random3);
-imagettftext($im, 25, -8, 75, 28, $grey, $font, $random4);
-imagettftext($im, 25, 8, 95, 28, $grey, $font, $random5);
-
-// add text
-imagettftext($im, 25, 8, 8, 30, $white, $font, $random1);
-imagettftext($im, 25, -8, 28, 30, $white, $font, $random2);
-imagettftext($im, 25, 8, 48, 30, $white, $font, $random3);
-imagettftext($im, 25, -8, 68, 30, $white, $font, $random4);
-imagettftext($im, 25, 8, 88, 30, $white, $font, $random5);
-
-// prevent caching
-header("Expires: Wed, 1 Jan 1997 00:00:00 GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-// give image back
-header ("Content-type: image/gif");
-imagegif($im);
-imagedestroy($im);
-?> 
Index: public/gluebox.php
===================================================================
--- public/gluebox.php	(revision 6370)
+++ public/gluebox.php	(working copy)
@@ -1,225 +0,0 @@
-<?php
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-*/
-
-/* $Id: survey.php,v 1.21 2007/07/09 12:58:21 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Matthew Gregg
-// <greggmc at musc.edu>
-
-	require_once('../admin/include_all.php');
-	require_once("./phpESP.first.php");	
-	
-	# error_reporting(E_ALL);
-	
-	if (isset($_GET['ps']))
-	{
-		$sql = "SELECT * FROM `survey` WHERE `name` = '$_GET[ps]'";
-		echo $sql;
-		
-		$result = execute_sql($sql);
-		$sid = $result->fields[0];
-		$sql = "SELECT * FROM `project` WHERE `presurvey` = $sid AND `action_url` = '$_GET[pid]'";
-		echo $sql;
-		
-		$result = execute_sql($sql);
-		$pid = $result->fields[0];
-		$_GET['project'] = $pid;
-	}
-	if (isset($_GET['project'])) {
-		$_id = _addslashes($_GET['project']);
-		$project = new Project;
-		$project->init($_id);
-		unset($_GET['project']);
-		$_SERVER['QUERY_STRING'] = ereg_replace('(^|&)project=[^&]*&?', '', $_SERVER['QUERY_STRING']);
-	}
-    	if (isset($_POST['project'])) {
-        	$_id = _addslashes($_POST['project']);
-        	unset($_POST['project']);
-    	}
-
-	if (!empty($_id)) {
-        	$_sql = "SELECT id,name,presurvey,postsurvey,action_url FROM project WHERE id = $_id";
-        	if ($_result = execute_sql($_sql)) {
-            		if (record_count($_result) > 0)
-                		list($sid, $_pname, $_pres,$_posts, $_action) = fetch_row($_result);
-            		db_close($_result);
-        	}
-        	unset($_sql);
-        	unset($_result);
-	}
-
-?>
-<!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">
-<head>
-<title><?php echo(@$_pname); ?></title>
-<style type="text/css">
-body {
-font-family:Tahoma;
-}
-a,
-a:visited,
-a:link {
-color:black;
-}
-a:hover {
-text-decoration:none;
-}
-.finishsurvey {
-	display:none;
-}
-#TB_window {
-}
-#frameWrapper {
-	text-align:center;
-	display:none;
-}
-#webFrame {
-	width:80%;
-	height:500px;
-	margin-top:15px;
-}
-</style>
-<script type="text/javascript" src="<?php echo($ESPCONFIG['js_url']);?>default.js"></script>
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
-<script type="text/javascript" src="<?php echo($ESPCONFIG['js_url']);?>thickbox.js"></script>
-<script type="text/javascript" src="/public/js/jquery.timers.js"></script>
-<script type="text/javascript">
-
-$(document).ready(function() {
-	$('#followed').click(function() {
-		$('#gluebox').fadeIn();
-		$('#instructions').fadeOut();
-	});
-	$('a.startTest').click(function() {
-		$('.startTest').hide();
-		$('.finishsurvey').fadeIn();
-		$('#webFrame').attr('src','<?php echo @$_action; ?>');
-		$('#frameWrapper').fadeIn();
-		started = startRecordingApplet();
-		debug.log('started recording = '+started);
-	});
-	
-	
-	$('.finishsurvey').click(function() {
-		$('#frameWrapper').slideUp('slow');
-		$('#gluebox').slideUp('slow');
-		$('#instructions').empty();
-		$('#instructions').attr('innerHTML','<center><p>We are uploading your testing video and audio, this can take a few minutes<\/p><br/><img src="/images/ajax-loader.gif"/><\/center>');
-		$('#instructions').fadeIn('fast');
-		stopped = stopRecordingApplet();
-		debug.log('stopped recording = '+stopped);
-		$(this).everyTime("1s", 'doneCheck', function() {
-			isRecording = isRecordingApplet();
-			debug.log(isRecording);
-			if (isRecording == false) {
-				$(this).stopTime();
-				$(this).everyTime("1s", 'hasID', function() {
-					debug.log(getSessionIdFromApplet());
-					if (getSessionIdFromApplet() != '') {
-						id = getSessionIdFromApplet();
-						if (id == '') {
-							id = '12345667';
-						}
-						window.location = "/public/survey.php?id=<?=$_posts?>&stype=post&sessionid="+id;
-					}
-				});
-			}
-		});
-	});
-	
-	var debug = {
-		log: function() {
-	        if (typeof console == 'object' && typeof console.log != "undefined") {
-            	for (var i = 0, l = arguments.length; i < l; i++)
-                	console.log(arguments[i]);
-            }
-        }
-    }
-    
-	function startRecordingApplet(){
-		return document.rascal.startRecording();
-	}
-	function stopRecordingApplet(){
-		return document.rascal.stopRecording();
-	}
-
-	function isRecordingApplet(){
-		return document.rascal.isRecording();
-	}
-	function getSessionIdFromApplet(){
-		return document.rascal.getSessionid();
-	}
-
-});
-</script>
-<?php
-    if (!empty($_css)) {
-	    echo('<link rel="stylesheet" href="'. $GLOBALS['ESPCONFIG']['css_url'].$_css ."\" type=\"text/css\" />\n");
-    }
-    unset($_css);
-    
-    echo('<link rel="stylesheet" href="'. $GLOBALS['ESPCONFIG']['css_url'].'thickbox.css' ."\" media=\"screen\" type=\"text/css\" />\n");
-?>
-</head>
-<body>
-<APPLET name="rascal" ARCHIVE="rascal.jar" CODE="org.fluidproject.vulab.rascal.ui.ScreencastApplet.class" WIDTH="0" HEIGHT="0" mayscript>
-	<param name="java_arguments" value="-Xmx512m"/>
-	<param name="mode" value="nogui"/>			
-</APPLET>
-<div id="gluebox">
-<? /*<a href="<?php echo @$_action; ?>?keepThis=true&TB_iframe=true&height=400&width=780" title="Please perform the following test" class="thickbox startTest">Start Test!</a>*/ ?>
-<a href="#start" title="Please perform the following test" class="startTest">Start Test!</a>
-<a href='#finish' class='finishsurvey'>I'm finished, lets continue.</a>
-<? /*
-	if (@$_posts == 0) {
-		echo "<a href='#' class='finishsurvey'>Click here after you've clicked \"stop recording\"</a>";
-	}
-	else {
-		echo "<a href='#' class='finishsurvey'>Click here after you've clicked \"stop recording\"</a>";
-	}*/
-?>
-</div>
-<div id="frameWrapper">
-	<iframe src="" id="webFrame" height="50%"></iframe>
-</div>
-<div id="instructions" style='padding-left:100px;padding-top:50px;'>
-<h1><?php echo $project->details['name']; ?></h1>
-</br>
-<h2>Introduction</h2>
-<p><?php echo $project->details['intro']; ?></p>
-<br/>
-<?php if ($project->details['goal']) { ?>
-	<h2>Study Goal</h2>
-	<p><?php echo $project->details['goal']; ?></p>
-	<br/>
-<?php } ?>
-<div style='padding-left:20px;font-size:12px;color:#4F4F4F'>
-	<h2>You should know...</h2>
-	<p>While taking this online survey your entire screen and your microphone will be recorded until you continue to the final step (experience survey)</p>
-	<br/>
-	<h3>Requirements</h3>
-	<strong>Mac OSX 10.5</strong>
-	<ul style='margin-left:30px;'>
-		<li>Make sure you have the following update installed:<br/><a href="http://www.apple.com/support/downloads/javaformacosx105update1.html" target="_blank">http://www.apple.com/support/downloads/javaformacosx105update1.html</a></li>
-	</ul>
-</div>
-<br/>
-<a href="#ok" id='followed'>I understand, I want to continue.</a>
-</div>
-</body>
-</html>
Index: public/signup.php
===================================================================
--- public/signup.php	(revision 6370)
+++ public/signup.php	(working copy)
@@ -1,186 +0,0 @@
-<?
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-*/
-?>
-<?php
-/* $Id: signup.php,v 1.6 2005/11/20 00:59:41 greggmc Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James E Flemer
-// <jflemer@alum.rpi.edu>
-
-/* This is a script to let users sign-up for respondent accounts.
- * It will ask for the following information:
- *   o Username (*)
- *   o Email Address (*)
- *   o First Name
- *   o Last Name
- *   o Password (*)
- * and create a new respondent in the group $ESPCONFIG['signup_realm'].
- */
-
-  if (!defined('ESP_BASE'))
-    define('ESP_BASE', dirname(dirname(__FILE__)) .'/');
-
-  require_once(ESP_BASE . '/admin/phpESP.ini.php');
-  
-  esp_init_adodb();
-
-  $fields = array(
-      'username',
-      'password',
-      'email',
-      'fname',
-      'lname',
-    );
-  
-  $rqd_fields = array(
-      'username',
-      'password',
-      'password2',
-      'email',
-    );
-  
-  /* Set this value to override value from phpESP.ini. */
-  $signup_realm = null;
-  
-  /* Make this false to generate full HTML, rather than embedable. */
-  $embed = true;
-
-  //$post =& $GLOBALS['HTTP_POST_VARS'];
-  $post =& $_POST;
-  unset($msg);
-  
-  /* sanity check the signup_realm */
-  if ($signup_realm == null || empty($signup_realm))
-    $signup_realm = $GLOBALS['ESPCONFIG']['signup_realm'];
-  if ($signup_realm == null || empty($signup_realm)) {
-    echo mkerror(_('Sorry, the account request form is disabled.'));
-    return;
-  }
-  
-  /* process form values */
-  do if (isset($post['submit'])) {
-    /* check for required fields */
-    foreach ($rqd_fields as $f) {
-      if (!isset($post[$f]) || empty($post[$f])) {
-        $msg = '<font color="red">'. _('Please complete all required fields.') . '</font>';
-        break;
-      }
-    }
-    if (isset($msg))
-      break;
-    
-    /* make sure passwords match */
-    if ($post['password'] != $post['password2']) {
-      $msg = '<font color="red">'. _('Passwords do not match.') . '</font>';
-      break;
-    }
-    
-    /* prepare sql statement */
-    $sqlf = array();
-    $sqlv = array();
-    
-    foreach ($fields as $f) {
-    	if (isset($post[$f]) && !empty($post[$f])) {
-        	array_push($sqlf, $f);
-        	if ($f == 'password') {
-          		array_push($sqlv, db_crypt(_addslashes($post[$f])));
-        	}
-        	else {
-          		array_push($sqlv,  _addslashes($post[$f]) );
-      		}
-    	}
-    }
-    array_push($sqlf, 'realm');
-    array_push($sqlv, addslashes($signup_realm) );
-
-    $sqlf = implode(',', $sqlf);
-    $sqlv = implode(',', $sqlv);
-    
-    $sql = "INSERT INTO respondent ($sqlf) VALUES ($sqlv)";
-    
-    /* execute statement */
-    $res = execute_sql($sql);
-    if (!$res) {
-      $msg = '<font color="red">'. _('Request failed, please choose a different username.') .'</font>';
-      if ($GLOBALS['ESPCONFIG']['DEBUG'])
-        $msg .= mkerror(ErrorNo() . ': ' . ErrorMsg());
-      break;
-    }
-    
-    $msg = '<font color="blue">'. 
-        sprintf(_('Your account, %s, has been created!'), htmlspecialchars($post['username'])) . '</font>';
-
-    foreach ($fields as $f) {
-      $post[$f] = null;
-      unset($post[$f]);
-    }
-  } while(0);
-  
-  $rqd = '<font color="red">*</font>';
-?>
-<?php if (!$embed) { ?>
-<html>
-<head>
-<title><?php echo _('Account Request Form'); ?></title>
-</head>
-<body>
-<?php } // !$embed ?>
-<form method="post">
-  <p><?php printf(
-_('Please complete the following form to request an account.
-Items marked with a %s are required.'), $rqd); ?></p>
-<?php if (isset($msg) && !empty($msg)) echo "<p>$msg</p>\n"; ?>
-  <table border="0"><tbody align="left">
-  <tr>
-    <td>&nbsp;</td>
-    <th><?php echo _('First Name'); ?>:</th>
-    <td><?php echo mktext('fname', 16, 16); ?></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <th><?php echo _('Last Name'); ?>:</th>
-    <td><?php echo mktext('lname', 24, 24); ?></td>
-  </tr>
-  <tr>
-    <td><?php echo $rqd; ?></td>
-    <th><?php echo _('Email Address'); ?>:</th>
-    <td><?php echo mktext('email', 30, 64); ?></td>
-  </tr>
-  <tr>
-    <td><?php echo $rqd; ?></td>
-    <th><?php echo _('Username'); ?>:</th>
-    <td><?php echo mktext('username', 16, 16); ?></td>
-  </tr>
-  <tr>
-    <td><?php echo $rqd; ?></td>
-    <th><?php echo _('Password'); ?>:</th>
-    <td><?php echo mkpass('password'); ?></td>
-  </tr>
-  <tr>
-    <td><?php echo $rqd; ?></td>
-    <th><?php echo _('Confirm Password'); ?>:</th>
-    <td><?php echo mkpass('password2'); ?></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td colspan="2"><?php echo mksubmit('submit'); ?></td>
-  </tr>
-  </tbody></table>
-</form>
-<?php if (!$embed) { ?>
-</body>
-</html>
-<?php } // !$embed ?>
Index: public/project.php
===================================================================
--- public/project.php	(revision 6370)
+++ public/project.php	(working copy)
@@ -1,157 +0,0 @@
-<?php
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-*/
-?>
-<?php
-/* $Id: survey.php,v 1.21 2007/07/09 12:58:21 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Matthew Gregg
-// <greggmc at musc.edu>
-
-	require_once('../admin/include_all.php');
-	require_once("./phpESP.first.php");	
-	error_reporting(E_ALL);
-	$_name = '';
-	$_title = '';
-	$_css = '';
-    $sid = '';
-    
-    
-    if (isset($_GET['id'])) {
-    	$aProject = new Project;
-    	$aProject->init($_GET['id']);
-    	if ($aProject->details['status'] != 2) {
-    		die('<h1>This study is not available at this time. We\'re Sorry!</h1><ul><li><a href="javascript:history.go(-1)">Go Back...</a></li><li><a href="http://vulab.yorku.ca">Go to VULab.yorku.ca</li></ul>');
-    	}
-    }
-	/*if (isset($_GET['name'])) {
-		$_name = _addslashes($_GET['name']);
-		unset($_GET['name']);
-		$_SERVER['QUERY_STRING'] = ereg_replace('(^|&)name=[^&]*&?', '', $_SERVER['QUERY_STRING']);
-	}
-    	if (isset($_POST['name'])) {
-        	$_name = _addslashes($_POST['name']);
-        	unset($_POST['name']);
-    	}
-
-	if (!empty($_name)) {
-        	$_sql = "SELECT id,name,presurvey,postsurvey,action_url FROM project WHERE name = $_name";
-        	if ($_result = execute_sql($_sql)) {
-            		if (record_count($_result) > 0)
-                		list($sid, $_pname, $_pres,$_posts, $_action) = fetch_row($_result);
-            		db_close($_result);
-        	}
-        	unset($_sql);
-        	unset($_result);
-	}
-	*/
-	if (isset($_GET['id'])) {
-		$_id = _addslashes($_GET['id']);
-		unset($_GET['id']);
-		$_SERVER['QUERY_STRING'] = ereg_replace('(^|&)id=[^&]*&?', '', $_SERVER['QUERY_STRING']);
-	}
-    	if (isset($_POST['id'])) {
-        	$_id = _addslashes($_POST['id']);
-        	unset($_POST['id']);
-    	}
-
-	if (!empty($_id)) {
-        	$_sql = "SELECT id,name,presurvey,postsurvey,action_url FROM project WHERE id = $_id";
-        	if ($_result = execute_sql($_sql)) {
-            		if (record_count($_result) > 0)
-                		list($sid, $_pname, $_pres,$_posts, $_action) = fetch_row($_result);
-            		db_close($_result);
-        	}
-        	unset($_sql);
-        	unset($_result);
-	}
-        // To make all results public uncomment the next line.
-        //$results = 1;
-        // See the FAQ for more instructions.
-
-        // call the handler-prefix once $sid is set to handle
-        // authentication / authorization
-
-
-       $presql = "select name from survey where id = " . $_pres;
-       //$postsql = "select name from survey where id = " . $_posts;
-		if ($_result = execute_sql($presql)) {
-            		if (record_count($_result) > 0)
-                		list($prename) = fetch_row($_result);
-            		db_close($_result);
-        	}
-        	unset($presql);
-        	unset($_result);
-        	
-        //$presql = "select name from survey where id = " . $_pres;
-       $postsql = "select name from survey where id = " . $_posts;
-		if ($_result = execute_sql($postsql)) {
-            		if (record_count($_result) > 0)
-                		list($postname) = fetch_row($_result);
-            		db_close($_result);
-        	}
-        	unset($postsql);
-        	unset($_result);
-		
-       
-      /*$sqlins = 'update survey set thanks_page =' .
-     " 'gluebox.php?ps=$postname".  "&pid=" . $_action ."' where id =" . $_pres;*/
-	
-	//$result = execute_sql($sqlins);
-	//echo ErrorMsg();
-	//db_close($_result);
-
-	if (isset($_pres) && $_pres != "" && $_pres != null && $_pres>0 ) {
-			header("Location: survey.php?id=" . $_pres ."&project=$sid&stype=pre"); 
-			exit;
-		}
-	elseif (isset($_action) && $_action != "" && $_action != null) {
-		header("Location: gluebox.php?&project=$sid");
-		}
-	elseif (isset($_posts) && $_posts != "" && $_posts != null && $_pres>0 ) {
-		header("Location: survey.php?id=" . $_posts ."&project=$sid&stype=post");
-		}
-	else
-	{
-?>
-
-<!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">
-<head>
-<title><?php echo($_pname); ?></title>
-<script type="text/javascript" src="<?php echo($ESPCONFIG['js_url']);?>default.js"></script>
-<?php
-    if (!empty($_css)) {
-	    echo('<link rel="stylesheet" href="'. $GLOBALS['ESPCONFIG']['css_url'].$_css ."\" type=\"text/css\" />\n");
-    }
-    unset($_css);
-?>
-</head>
-<body>
-<?php
-	/*if (isset($_pres) && $_pres != "" && $_pres != null && $_pres>0 )
-		echo "<a href=\"survey.php?id=" . $_pres ."&project=$sid&stype=pre\">Pre-Survey</a><br />";
-	if (isset($_action) && $_action != "" && $_action != null)
-		echo "<a href=\"gluebox.php?&project=$sid\">Visit URL</a><br />";
-	if (isset($_posts) && $_posts != "" && $_posts != null && $_pres>0 )
-		echo "<a href=\"survey.php?id=" . $_posts ."&project=$sid&stype=post\">Post-Survey</a><br />";*/
-?>
-This survey does not have any action handlers!
-</body>
-</html>
-<?php
-	}
-?>
\ No newline at end of file
Index: public/handler-prefix.php
===================================================================
--- public/handler-prefix.php	(revision 6370)
+++ public/handler-prefix.php	(working copy)
@@ -1,157 +0,0 @@
-<?
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-*/
-?>
-<?php
-
-/* $Id: handler-prefix.php,v 1.33 2007/12/17 08:45:31 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-    if (!defined('ESP-FIRST-INCLUDED')) {
-        echo "In order to conduct surveys, please include phpESP.first.php in your php script, not handler-prefix.php!";
-        exit;
-    }
-
-    if (defined('ESP-HANDLER-PREFIX'))
-        return;
-
-    define('ESP-HANDLER-PREFIX', true);
-
-    $GLOBALS['errmsg'] = '';
-
-    if(isset($_REQUEST['results']) || isset($_REQUEST['results'])) {
-        $GLOBALS['errmsg'] = mkerror(_('Error processing survey: Security violation.'));
-        return;
-    }
-
-    if (isset($sid) && !empty($sid)) {
-        $sid = intval($sid);
-    }
-    else if (isset($_REQUEST['sid']) && !empty($_REQUEST['sid'])) {
-        $sid = intval($_REQUEST['sid']);
-    }
-
-    if(!isset($sid) || empty($sid)) {
-        $GLOBALS['errmsg'] = mkerror(_('Error processing survey: Survey not specified.'));
-        return;
-    }
-
-    if(!isset($_css)) {
-        $_css = "";
-    }
-
-    if (!isset($_title)) {
-        $_title = "";
-    }
-
-    if (!isset($survey_name)) {
-        $survey_name = "";
-    }
-
-    if(empty($_REQUEST['userid'])) {
-        // find remote user id (takes the first non-empty of the following)
-        //  1. a GET variable named 'userid'
-        //  2. the REMOTE_USER set by HTTP-Authentication
-        //  3. the query string
-        //  4. the remote ip address
-        if (!empty($_REQUEST['userid'])) {
-            $_REQUEST['userid'] = $_REQUEST['userid'];
-        } elseif(!empty($_SERVER['REMOTE_USER'])) {
-            $_REQUEST['userid'] = $_SERVER['REMOTE_USER'];
-        } elseif(!empty($_SERVER['QUERY_STRING'])) {
-            $_REQUEST['userid'] = urldecode($_SERVER['QUERY_STRING']);
-        } else {
-            $_REQUEST['userid'] = $_SERVER['REMOTE_ADDR'];
-        }
-    }
-
-    if(empty($_REQUEST['referer']))
-        $_REQUEST['referer'] = isset($_SERVER['HTTP_REFERER']) ?
-            $_SERVER['HTTP_REFERER'] : '';
-
-
-    if (empty($_REQUEST['rid']))
-        $_REQUEST['rid'] = '';
-    else
-        $_REQUEST['rid'] = intval($_REQUEST['rid']) ?
-                intval($_REQUEST['rid']) : '';
-
-    if($ESPCONFIG['auth_response']) {
-        // check for authorization on the survey
-        require_once($ESPCONFIG['include_path']."/lib/espauth".$ESPCONFIG['extension']);
-        if ($GLOBALS['ESPCONFIG']['auth_mode'] == 'basic') {
-            $espuser = ''; $esppass = '';
-            if (isset($_SERVER['PHP_AUTH_USER']))
-                $espuser = $_SERVER['PHP_AUTH_USER'];
-            if (isset($_SERVER['PHP_AUTH_PW']))
-                $esppass = $_SERVER['PHP_AUTH_PW'];
-        }
-        elseif ($GLOBALS['ESPCONFIG']['auth_mode'] == 'form') {
-            if (!isset($_REQUEST['username'])) {
-                $_REQUEST['username'] = "";
-            }
-            if ($_REQUEST['username'] != "") {
-                $_SESSION['espuser'] = $_REQUEST['username'];
-            }
-            if (isset($_SESSION['espuser'])) {
-                $espuser = $_SESSION['espuser'];
-            }
-            else {
-                $espuser = "";
-            }
-
-            if (!isset($_REQUEST['password'])) {
-                $_REQUEST['password'] = "";
-            }
-            if ($_REQUEST['password'] != "") {
-                $_SESSION['esppass'] = $_REQUEST['password'];
-            }
-            if (isset($_SESSION['esppass'])) {
-                $esppass = $_SESSION['esppass'];
-            }
-            else {
-                $esppass = "";
-            }
-
-        }
-
-        if(!survey_auth($sid, $espuser, _addslashes($esppass), $esppass, $_css, $_title))
-            return;
-
-        if (auth_get_option('resume')) {
-            $_REQUEST['rid'] = auth_get_rid($sid, $espuser,
-                    $_REQUEST['rid']);
-
-            if (!empty($_REQUEST['rid']) && (empty($_REQUEST['sec']) ||
-                    intval($_REQUEST['sec']) < 1))
-            {
-                $_REQUEST['sec'] = response_select_max_sec($sid,
-                        $_REQUEST['rid']);
-            }
-        }
-    }
-
-    if (empty($_REQUEST['sec']))
-        $_REQUEST['sec'] = 1;
-    else
-        $_REQUEST['sec'] = (intval($_REQUEST['sec']) > 0) ?
-                intval($_REQUEST['sec']) : 1;
-
-    define('ESP-AUTH-OK', true);
-
-?>
Index: public/captcha.README
===================================================================
--- public/captcha.README	(revision 6370)
+++ public/captcha.README	(working copy)
@@ -1,24 +0,0 @@
-howto include in another page:
-  <table><tr><td><img src="./captcha.php"></td>
-             <td> <?php echo _("Please fill in the code displayed here"); ?><br>
-                  <input type="text" name="captcha_check"></td>
-  </table>
-
-and to check the result in the form submit page:
-
-  require_once(ESP_BASE.'public/captcha_check.php');
-  $msg = response_check_captcha("captcha_check",1);
-  if(!empty($msg)) {
-    ... print your error
-    exit;
-  }
-
-The function response_check_captcha() receives 2 parameters:
-- first: the name of the input field that has the captcha value
-- second:
-      whether or not to cleanup the captcha session var and the input var
-      after positive evaluation (so the captcha is correct). This prevents
-      from entering the same value again by eg. reloading the page.
-      Possible values: 0|1 (default: 1, cleanup)
-      In some cases the cleanup is not immediately desired (like the way I
-      use it in phpESP, so that's why this variable is there).
Index: public/font.ttf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: public/mod.response.php
===================================================================
--- public/mod.response.php	(revision 6370)
+++ public/mod.response.php	(working copy)
@@ -1,43 +0,0 @@
-<?
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-*/
-?>
-<?php
-/*
-File: 		mod.response.php \\v 1.0
-Info:		- dutchtape fix for the vid implementation
-Author: 	Blake Edwards
-Email:		electBlake@gmail.com
-
-License: 	http://source.fluidproject.org/svn/fluid/components/trunk/LICENSE.txt
-*/
-?>
-<?php
-	require_once('../admin/include_all.php');
-	require_once("./phpESP.first.php");	
-	include('../admin/include/lib/vulab.responses.class.php');
-
-	if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-		$response = new Response(@$_POST[rid]);
-		@$response_data = array('vid'=>@$_POST[vid]);
-		$result = $response->update(@$response_data);
-		if (is_array($result)) {
-			$err = $result;
-		} else {
-			if ($result) {
-				echo "Successfully submitted your Video ID! <br />You Can Now Return with the Above Link";
-			}
-		}
-	}
-
-?>
\ No newline at end of file
Index: public/handler.php
===================================================================
--- public/handler.php	(revision 6370)
+++ public/handler.php	(working copy)
@@ -1,240 +0,0 @@
-<?
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-*/
-?>
-<?php
-
-/* $Id: handler.php,v 1.49 2007/12/17 08:45:31 liedekef Exp $ */
-
-/* vim: set tabstop=4 shiftwidth=4 expandtab: */
-
-// Written by James Flemer
-// For eGrad2000.com
-// <jflemer@alum.rpi.edu>
-
-/* When using the authentication for responses you need to include
- * part of the script *before* your template so that the
- * HTTP Auth headers can be sent when needed.
- *
- * See the handler-prefix.php file for details.
- */
-
-	// add this at the top of every php script using this one:
-	// require_once("./phpESP.first.php");
-
-	if (!defined('ESP-FIRST-INCLUDED')) {
-		echo "In order to conduct surveys, please include phpESP.first.php in your php script!!!";
-		exit;
-	}
-
-	require_once($ESPCONFIG['include_path']."/funcs".$ESPCONFIG['extension']);
-	require_once($ESPCONFIG['handler_prefix']);
-	if(!defined('ESP-AUTH-OK')) {
-		if (!empty($GLOBALS['errmsg']))
-			echo($GLOBALS['errmsg']);
-		return;
-	}
-
-	// get the survey
-	$sql = "SELECT status, name, public FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${sid}";
-	$result = execute_sql($sql);
-        if ($result && record_count($result) > 0)
-       	   list ($status, $name, $survey_public) = fetch_row($result);
-        else
-           $status = 2;
-
-	// Added for cookie auth, to eliminate double submits
-	// only for public surveys
-	$cookiename="survey_".$sid;
-	
-	$GLOBALS['ESPCONFIG']['limit_double_postings'] = 0;
-	
-	if (($GLOBALS['ESPCONFIG']['limit_double_postings']>0) &&
-	     isset($_COOKIE["$cookiename"]) &&
-	     $survey_public=='Y' &&
-	     !($ESPCONFIG['auth_response'] && auth_get_option('resume'))) {
-			echo (mkerror(_('You have already completed this survey.')));
-			return;
-	}
-		
-    
-	$_REQUEST['direct'] = '';
-
-	if (empty($_REQUEST['referer'])) {
-		$_REQUEST['referer'] = '';
- 		$_REQUEST['direct'] = 1;
-	}
-
-	if (isset($_REQUEST['test'])) {
-	    $test = intval($_REQUEST['test']);
-	} else {
-       	    $test = 0;
-	}
-
-	if (!isset($_REQUEST['sec'])) {
-            $_REQUEST['sec'] = 1;
-	}
-
-	if (!isset($_REQUEST['rid'])) {
-            $_REQUEST['rid'] = "";
-	}
-
-	$_REQUEST['rid'] = intval($_REQUEST['rid']);
-	$_REQUEST['direct'] = intval($_REQUEST['direct']);
-	$_REQUEST['referer'] = htmlspecialchars($_REQUEST['referer']);
-
-
-	// show results instead of show survey
-	// but do not allow getting results from URL or FORM
-	if(isset($results) && $results) {
-           if (!isset($precision)) {
-               $precision = '';
-           }
-           if (!isset($totals)) {
-               $totals = '';
-           }
-           if (!isset($qid)) {
-               $qid = '';
-           }
-           if (!isset($cids)) {
-               $cids = '';
-           }
-           $precision = intval($precision);
-           $totals = intval($totals);
-           $qid = intval($qid);
-           $cids = intval($cids);
-	   // small security issue here, anyone could pick a QID to crossanalyze
-	   survey_results($sid,$precision,$totals,$qid,$cids);
-	   return;
-	}
-
-	if($status & ( STATUS_DONE | STATUS_DELETED )) {
-		echo(mkerror(_('Error processing survey: Survey is not active.')));
-		return;
-	}
-	if(!($status & STATUS_ACTIVE)) {
-		if(!(isset($test) && $test && ($status & STATUS_TEST))) {
-			echo(mkerror(_('Error processing survey: Survey is not active.')));
-			return;
-		}
-	}
-
-   	if ($_REQUEST['referer'] == $ESPCONFIG['autopub_url'])
-       	$_REQUEST['referer'] .= "?name=$name";
-
-	$num_sections = survey_num_sections($sid);
-
-
-	$action = $ESPCONFIG['proto'] . $_SERVER['HTTP_HOST'] . htmlspecialchars($_SERVER['PHP_SELF']);
-	if (!empty($_SERVER['QUERY_STRING']))
-		$action .= "?" . htmlspecialchars($_SERVER['QUERY_STRING']);
-
-	$msg = '';
-	if(!empty($_REQUEST['submit'])) {
-	      $msg .= response_check_answers($sid,$_REQUEST['sec']);
-	      # we only check the captcha if no all required 
-              if (empty($msg) && $ESPCONFIG['use_captcha']) {
-                 require_once(ESP_BASE.'public/captcha_check.php');
-                 $msg .= response_check_captcha("captcha_check",1);
-              }   
-
-		if(empty($msg)) {
-            		if ($ESPCONFIG['auth_response'] && auth_get_option('resume')) {
-
-                		response_delete($sid, $_REQUEST['rid'], $_REQUEST['sec']);
-			}
-			$_REQUEST['rid'] = response_insert($sid,$_REQUEST['sec'],$_REQUEST['rid']);
-			response_commit($_REQUEST['rid']);
-			response_send_email($sid,$_REQUEST['rid']);
-			
-			if ($_POST['stype'] != 'pre')
-				//goto_thankyou($sid,$_REQUEST['referer']);
-				goto_thankyou($sid,"/admin/manage.php");
-			else
-				goto_action_url($_GET['project']);
-			return;
-		}
-	}
-
-	if(!empty($_REQUEST['resume']) && $ESPCONFIG['auth_response'] && auth_get_option('resume')) {
-        	response_delete($sid, $_REQUEST['rid'], $_REQUEST['sec']);
-		$_REQUEST['rid'] = response_insert($sid,$_REQUEST['sec'],$_REQUEST['rid']);
-        if ($action == $ESPCONFIG['autopub_url'])
-    		goto_saved("$action?name=$name");
-        else
-            goto_saved($action);
-		return;
-	}
-
-	if(!empty($_REQUEST['next'])) {
-		$msg = response_check_answers($sid,$_REQUEST['sec']);
-		if(empty($msg)) {
-            		if ($ESPCONFIG['auth_response'] && auth_get_option('resume'))
-                		response_delete($sid, $_REQUEST['rid'], $_REQUEST['sec']);
-            		$_REQUEST['rid'] = response_insert($sid,$_REQUEST['sec'],$_REQUEST['rid']);
-			$_REQUEST['sec']++;
-		}
-	}
-	
-	if (!empty($_REQUEST['prev']) && $ESPCONFIG['auth_response'] && auth_get_option('navigate')) {
-		if(empty($msg)) {
-            		if (auth_get_option('resume'))
-               			response_delete($sid, $_REQUEST['rid'], $_REQUEST['sec']);
-			$_REQUEST['rid'] = response_insert($sid,$_REQUEST['sec'],$_REQUEST['rid']);
-			$_REQUEST['sec']--;
-		}
-	}
-    
-    if ($ESPCONFIG['auth_response'] && auth_get_option('resume') && $_REQUEST['rid']>0)
-        response_import_sec($sid, $_REQUEST['rid'], $_REQUEST['sec']);
-	
-?>
-<form method="post" id="phpesp_response" action="<?php echo($action); ?><?php if(isset($_GET['project'])) /*if(eregi('?',$action)) echo '&project='; else echo '?project='; echo $_GET['project']; */ echo '&project='.$_GET['project'];?>">
-    <fieldset class="hidden">
-<input type="hidden" name="referer" value="<?php echo ($_REQUEST['referer']); ?>" />
-<input type="hidden" name="direct" value="<?php echo($_REQUEST['direct']); ?>" />
-<input type="hidden" name="userid" value="<?php echo($_REQUEST['userid']); ?>" />
-<input type="hidden" name="sid" value="<?php echo($sid); ?>" />
-<input type="hidden" name="rid" value="<?php echo($_REQUEST['rid']); ?>" />
-<input type="hidden" name="sec" value="<?php echo($_REQUEST['sec']); ?>" />
-<input type="hidden" name="name" value="<?php echo($name); ?>" />
-<input type="hidden" name="stype" value="<?php if(isset($stype)) echo $stype; else echo "pre";?>" />
-<input type="hidden" name="vid" value="<?php $vid; ?>2" />
-    </fieldset>
-<?php
-        survey_render($sid,$_REQUEST['sec'],$_REQUEST['rid'],$msg);
-?>
-    <fieldset>
-<?php
-		if ($ESPCONFIG['auth_response']) {
-			if (auth_get_option('navigate') && $_REQUEST['sec'] > 1) {
-                echo(mksubmit("prev", _('Previous Page')));
-			}
-			if (auth_get_option('resume')) {
-                echo(mksubmit("resume", _('Save')));
-			}
-		}
-		if($_REQUEST['sec'] == $num_sections) {
-            if ($ESPCONFIG['use_captcha']) {
-                print '<table><tr><td><img src="'.$ESPCONFIG['base_url'].'public/captcha.php"></td>';
-                print '<td>';
-                echo _("Please fill in the code displayed here.");
-                print '<br><input type="text" name="captcha_check"></td></tr></table>';
-            }
-            echo(mksubmit("submit", _('Submit Survey')));
-        } else {
-            echo(mksubmit("next", _('Next Page')));
-        }
-?>
-        </fieldset>
-</form>
Index: public/phpESP.first.php
===================================================================
--- public/phpESP.first.php	(revision 6370)
+++ public/phpESP.first.php	(working copy)
@@ -1,74 +0,0 @@
-<?php
-/*
-###################################################################
-Copyright 2008 York University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://source.fluidproject.org/svn/LICENSE.txt
-###################################################################
-*/
-?>
-<?php
-    	if (defined('ESP-FIRST-INCLUDED'))
-        	return;
-	define ('ESP-FIRST-INCLUDED',true);
-
-        if (!defined('ESP_BASE'))
-                define('ESP_BASE', dirname(dirname(__FILE__)) .'/');
-
-        $CONFIGfile = ESP_BASE . 'admin/config.inc.php';
-
-        if(!file_exists($CONFIGfile)) {
-                echo("<b>FATAL: Unable to open config file Aborting.</b>");
-                exit;
-        }
-        if(!extension_loaded('mysql')) {
-                echo('<b>FATAL: Mysql extension not loaded. Aborting.</b>');
-                exit;
-        }
-
-        require_once($CONFIGfile);
-
-        esp_init_adodb();
-
-        if(!empty($_REQUEST['submit'])) {
-		$sid=intval($_POST['sid']);
-                $msg = response_check_answers($sid,$_REQUEST['sec']);
-
-		if ($ESPCONFIG['use_captcha']) {
-        		require_once(ESP_BASE.'public/captcha_check.php');
-			$msg .= response_check_captcha("captcha_check",0);
-		}
-
-		// if the parameter test is set in the URL
-		// and the survey is in fact in the test stage
-		// then don't set the cookie
-		if (isset($_REQUEST['test'])) {
-			$sql = "SELECT status, name FROM ".$GLOBALS['ESPCONFIG']['survey_table']." WHERE id=${sid}";
-			$result = execute_sql($sql);
-			if ($result && record_count($result) > 0) {
-			    list ($status, $name) = fetch_row($result);
-			} else {
-			    $status = 0;
-			}
-			if ($status & STATUS_TEST) {
-				$test = 1;
-			} else {
-				$test = 0;
-			}
-		} else {
-			$test = 0;
-		}
-
-                if(empty($msg) && !$test) {
-                        // Added for cookie auth, to eliminate double submits
-                        $cookiename="survey_".$sid;
-                        $expire=time()+60*60*24*$GLOBALS['ESPCONFIG']['limit_double_postings'];
-                        $res=setcookie($cookiename,"done",$expire,"/");
-                }
-        }
-?>
\ No newline at end of file
Index: public/.htaccess
===================================================================
--- public/.htaccess	(revision 6370)
+++ public/.htaccess	(working copy)
@@ -1 +0,0 @@
-Options +FollowSymLinks
\ No newline at end of file
Index: public/js/default.js
===================================================================
--- public/js/default.js	(revision 6370)
+++ public/js/default.js	(working copy)
@@ -1,109 +0,0 @@
-<!--
-function activateConfirm() {
-    if (confirm("Warning! Once activated, this survey can no longer be edited.  Any further changes must be done on a copy.")) {
-        return true;
-    }
-    return false;
-}
-
-function cancelConfirm() {
-    if (confirm("Warning! This survey has not been saved.  Canceling now will remove any changes.")) {
-        return true;
-    }
-    return false;
-}
-
-function exportSubmit(type, f) {
-    f.where.value=type;
-    f.submit();
-}
-
-function clearTextInputs() {
-    var i = 1;
-    while (document.forms[1].elements["choice_content_" + i]) {
-        document.forms[1].elements["choice_content_" + i].value = "";
-        i++;
-    }
-}
-
-function addAnswerLine() {
-    var el = document.getElementById('answerlines');
-    var numchoice = document.getElementById('num_choices').value;
-    numchoice++;
-    var tablerow = el.insertRow(numchoice+1);
-    var tablecell = tablerow.insertCell(-1);
-    tablecell.innerHTML = numchoice+".";
-    tablecell.className = "numbered";
-    tablecell = tablerow.insertCell(-1);
-    var text = "<input type=\"hidden\" name=\"choice_id_"+numchoice+"\" value=\"\" />\n";
-    text = text+"<input type=\"text\" size=\"60\" name=\"choice_content_"+numchoice+"\" value=\"\" />\n";
-    tablecell.innerHTML = text;
-    tablecell.className = "left";
-    document.getElementById('num_choices').value = numchoice;
-}
-
-
-function validate() {
-    return true;
-}
-
-function other_check(name)
-{
-    other = name.split("_");
-    var f = document.phpesp_response;
-    for (var i=0; i<=f.elements.length; i++) {
-        if (f.elements[i].value == "other_"+other[1]) {
-            f.elements[i].checked=true;
-            break;
-        }
-    }
-}
-
-function merge(box) {
-    if(box.options.length >= 2){
-        ml = new Array();
-        for(var i=0; i<box.options.length; i++) {
-            ml[i] = box.options[i].value;
-            sidsArray=ml;
-        }
-        sids = sidsArray.join("+");
-        document.getElementById('sids').value = sids; 
-        form = document.getElementById('merge');
-        form.submit();
-    } else {
-        document.getElementById('error').innerHTML = "<h2>You must select at least two surveys before you can merge</h2>";
-    }
-}
-
-function move(fbox,tbox) {
-    for(var i=0; i<fbox.options.length; i++) {
-        if(fbox.options[i].selected && fbox.options[i].value != "") {
-            var no = new Option();
-            no.value = fbox.options[i].value;
-            no.text = fbox.options[i].text;
-            tbox.options[tbox.options.length] = no;
-            fbox.options[i].value = "";
-            fbox.options[i].text = "";
-        }
-    }
-    BumpUp(fbox);
-}
-
-function BumpUp(box)  {
-    for(var i=0; i<box.options.length; i++) {
-        if(box.options[i].value == "")  {
-            for(var j=i; j<box.options.length-1; j++)  {
-                box.options[j].value = box.options[j+1].value;
-                box.options[j].text = box.options[j+1].text;
-            }
-            var ln = i;
-            break;
-        }
-    }
-    if(ln < box.options.length)  {
-        box.options.length -= 1;
-        BumpUp(box);
-    }
-}
-
--->
Index: public/js/vulab.public.js
===================================================================
--- public/js/vulab.public.js	(revision 6370)
+++ public/js/vulab.public.js	(working copy)
@@ -1,18 +0,0 @@
-$(document).ready(function() {
-	$('.thankbody,.returnlink').hide();
-	$('#submitVID input[type="submit"]').click(function() {
-		var vid = $('#submitVID input[name="vid"]').attr('value');
-		var rid = $('#submitVID input[name="rid"]').attr('value');
-		$('#submitVID').fadeOut('fast');
-		 $.ajax({
-   			type: "POST",
-		    url: "mod.response.php",
-			data: "vid="+vid+"&rid="+rid,
-			success: function(msg){
-				$('#submitVID').html(msg);
-				$('#submitVID').fadeIn();
-				$('.thankbody,.returnlink').fadeIn();
-	   		}
-		 });
-	});
-});
\ No newline at end of file
Index: public/js/jquery.js
===================================================================
--- public/js/jquery.js	(revision 6370)
+++ public/js/jquery.js	(working copy)
@@ -1,3549 +0,0 @@
-(function(){
-/*
- * jQuery 1.2.6 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
- */
-
-// Map over jQuery in case of overwrite
-var _jQuery = window.jQuery,
-// Map over the $ in case of overwrite
-	_$ = window.$;
-
-var jQuery = window.jQuery = window.$ = function( selector, context ) {
-	// The jQuery object is actually just the init constructor 'enhanced'
-	return new jQuery.fn.init( selector, context );
-};
-
-// A simple way to check for HTML strings or ID strings
-// (both of which we optimize for)
-var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,
-
-// Is it a simple selector
-	isSimple = /^.[^:#\[\.]*$/,
-
-// Will speed up references to undefined, and allows munging its name.
-	undefined;
-
-jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
-		// Make sure that a selection was provided
-		selector = selector || document;
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-		// Handle HTML strings
-		if ( typeof selector == "string" ) {
-			// Are we dealing with HTML string or an ID?
-			var match = quickExpr.exec( selector );
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] )
-					selector = jQuery.clean( [ match[1] ], context );
-
-				// HANDLE: $("#id")
-				else {
-					var elem = document.getElementById( match[3] );
-
-					// Make sure an element was located
-					if ( elem ){
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id != match[3] )
-							return jQuery().find( selector );
-
-						// Otherwise, we inject the element directly into the jQuery object
-						return jQuery( elem );
-					}
-					selector = [];
-				}
-
-			// HANDLE: $(expr, [context])
-			// (which is just equivalent to: $(content).find(expr)
-			} else
-				return jQuery( context ).find( selector );
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) )
-			return jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector );
-
-		return this.setArray(jQuery.makeArray(selector));
-	},
-
-	// The current version of jQuery being used
-	jquery: "1.2.6",
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	// The number of elements contained in the matched element set
-	length: 0,
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == undefined ?
-
-			// Return a 'clean' array
-			jQuery.makeArray( this ) :
-
-			// Return just the object
-			this[ num ];
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-		// Build a new jQuery matched element set
-		var ret = jQuery( elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Force the current matched set of elements to become
-	// the specified array of elements (destroying the stack in the process)
-	// You should use pushStack() in order to do this, but maintain the stack
-	setArray: function( elems ) {
-		// Resetting the length to 0, then using the native Array push
-		// is a super-fast way to populate an object with array-like properties
-		this.length = 0;
-		Array.prototype.push.apply( this, elems );
-
-		return this;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-		var ret = -1;
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem && elem.jquery ? elem[0] : elem
-		, this );
-	},
-
-	attr: function( name, value, type ) {
-		var options = name;
-
-		// Look for the case where we're accessing a style value
-		if ( name.constructor == String )
-			if ( value === undefined )
-				return this[0] && jQuery[ type || "attr" ]( this[0], name );
-
-			else {
-				options = {};
-				options[ name ] = value;
-			}
-
-		// Check to see if we're setting style values
-		return this.each(function(i){
-			// Set all the styles
-			for ( name in options )
-				jQuery.attr(
-					type ?
-						this.style :
-						this,
-					name, jQuery.prop( this, options[ name ], type, i, name )
-				);
-		});
-	},
-
-	css: function( key, value ) {
-		// ignore negative width and height values
-		if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
-			value = undefined;
-		return this.attr( key, value, "curCSS" );
-	},
-
-	text: function( text ) {
-		if ( typeof text != "object" && text != null )
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-
-		var ret = "";
-
-		jQuery.each( text || this, function(){
-			jQuery.each( this.childNodes, function(){
-				if ( this.nodeType != 8 )
-					ret += this.nodeType != 1 ?
-						this.nodeValue :
-						jQuery.fn.text( [ this ] );
-			});
-		});
-
-		return ret;
-	},
-
-	wrapAll: function( html ) {
-		if ( this[0] )
-			// The elements to wrap the target around
-			jQuery( html, this[0].ownerDocument )
-				.clone()
-				.insertBefore( this[0] )
-				.map(function(){
-					var elem = this;
-
-					while ( elem.firstChild )
-						elem = elem.firstChild;
-
-					return elem;
-				})
-				.append(this);
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		return this.each(function(){
-			jQuery( this ).contents().wrapAll( html );
-		});
-	},
-
-	wrap: function( html ) {
-		return this.each(function(){
-			jQuery( this ).wrapAll( html );
-		});
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, false, function(elem){
-			if (this.nodeType == 1)
-				this.appendChild( elem );
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, true, function(elem){
-			if (this.nodeType == 1)
-				this.insertBefore( elem, this.firstChild );
-		});
-	},
-
-	before: function() {
-		return this.domManip(arguments, false, false, function(elem){
-			this.parentNode.insertBefore( elem, this );
-		});
-	},
-
-	after: function() {
-		return this.domManip(arguments, false, true, function(elem){
-			this.parentNode.insertBefore( elem, this.nextSibling );
-		});
-	},
-
-	end: function() {
-		return this.prevObject || jQuery( [] );
-	},
-
-	find: function( selector ) {
-		var elems = jQuery.map(this, function(elem){
-			return jQuery.find( selector, elem );
-		});
-
-		return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ?
-			jQuery.unique( elems ) :
-			elems );
-	},
-
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function(){
-			if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var clone = this.cloneNode(true),
-					container = document.createElement("div");
-				container.appendChild(clone);
-				return jQuery.clean([container.innerHTML])[0];
-			} else
-				return this.cloneNode(true);
-		});
-
-		// Need to set the expando to null on the cloned set if it exists
-		// removeData doesn't work here, IE removes it from the original as well
-		// this is primarily for IE but the data expando shouldn't be copied over in any browser
-		var clone = ret.find("*").andSelf().each(function(){
-			if ( this[ expando ] != undefined )
-				this[ expando ] = null;
-		});
-
-		// Copy the events from the original to the clone
-		if ( events === true )
-			this.find("*").andSelf().each(function(i){
-				if (this.nodeType == 3)
-					return;
-				var events = jQuery.data( this, "events" );
-
-				for ( var type in events )
-					for ( var handler in events[ type ] )
-						jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data );
-			});
-
-		// Return the cloned set
-		return ret;
-	},
-
-	filter: function( selector ) {
-		return this.pushStack(
-			jQuery.isFunction( selector ) &&
-			jQuery.grep(this, function(elem, i){
-				return selector.call( elem, i );
-			}) ||
-
-			jQuery.multiFilter( selector, this ) );
-	},
-
-	not: function( selector ) {
-		if ( selector.constructor == String )
-			// test special case where just one selector is passed in
-			if ( isSimple.test( selector ) )
-				return this.pushStack( jQuery.multiFilter( selector, this, true ) );
-			else
-				selector = jQuery.multiFilter( selector, this );
-
-		var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType;
-		return this.filter(function() {
-			return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector;
-		});
-	},
-
-	add: function( selector ) {
-		return this.pushStack( jQuery.unique( jQuery.merge(
-			this.get(),
-			typeof selector == 'string' ?
-				jQuery( selector ) :
-				jQuery.makeArray( selector )
-		)));
-	},
-
-	is: function( selector ) {
-		return !!selector && jQuery.multiFilter( selector, this ).length > 0;
-	},
-
-	hasClass: function( selector ) {
-		return this.is( "." + selector );
-	},
-
-	val: function( value ) {
-		if ( value == undefined ) {
-
-			if ( this.length ) {
-				var elem = this[0];
-
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						options = elem.options,
-						one = elem.type == "select-one";
-
-					// Nothing was selected
-					if ( index < 0 )
-						return null;
-
-					// Loop through all the selected options
-					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-						var option = options[ i ];
-
-						if ( option.selected ) {
-							// Get the specifc value for the option
-							value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
-
-							// We don't need an array for one selects
-							if ( one )
-								return value;
-
-							// Multi-Selects return an array
-							values.push( value );
-						}
-					}
-
-					return values;
-
-				// Everything else, we just grab the value
-				} else
-					return (this[0].value || "").replace(/\r/g, "");
-
-			}
-
-			return undefined;
-		}
-
-		if( value.constructor == Number )
-			value += '';
-
-		return this.each(function(){
-			if ( this.nodeType != 1 )
-				return;
-
-			if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
-				this.checked = (jQuery.inArray(this.value, value) >= 0 ||
-					jQuery.inArray(this.name, value) >= 0);
-
-			else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = jQuery.makeArray(value);
-
-				jQuery( "option", this ).each(function(){
-					this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
-						jQuery.inArray( this.text, values ) >= 0);
-				});
-
-				if ( !values.length )
-					this.selectedIndex = -1;
-
-			} else
-				this.value = value;
-		});
-	},
-
-	html: function( value ) {
-		return value == undefined ?
-			(this[0] ?
-				this[0].innerHTML :
-				null) :
-			this.empty().append( value );
-	},
-
-	replaceWith: function( value ) {
-		return this.after( value ).remove();
-	},
-
-	eq: function( i ) {
-		return this.slice( i, i + 1 );
-	},
-
-	slice: function() {
-		return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function(elem, i){
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	},
-
-	data: function( key, value ){
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
-
-		if ( value === undefined ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-
-			if ( data === undefined && this.length )
-				data = jQuery.data( this[0], key );
-
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-		} else
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
-				jQuery.data( this, key, value );
-			});
-	},
-
-	removeData: function( key ){
-		return this.each(function(){
-			jQuery.removeData( this, key );
-		});
-	},
-
-	domManip: function( args, table, reverse, callback ) {
-		var clone = this.length > 1, elems;
-
-		return this.each(function(){
-			if ( !elems ) {
-				elems = jQuery.clean( args, this.ownerDocument );
-
-				if ( reverse )
-					elems.reverse();
-			}
-
-			var obj = this;
-
-			if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) )
-				obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") );
-
-			var scripts = jQuery( [] );
-
-			jQuery.each(elems, function(){
-				var elem = clone ?
-					jQuery( this ).clone( true )[0] :
-					this;
-
-				// execute all scripts after the elements have been injected
-				if ( jQuery.nodeName( elem, "script" ) )
-					scripts = scripts.add( elem );
-				else {
-					// Remove any inner scripts for later evaluation
-					if ( elem.nodeType == 1 )
-						scripts = scripts.add( jQuery( "script", elem ).remove() );
-
-					// Inject the elements into the document
-					callback.call( obj, elem );
-				}
-			});
-
-			scripts.each( evalScript );
-		});
-	}
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-function evalScript( i, elem ) {
-	if ( elem.src )
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-
-	else
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-
-	if ( elem.parentNode )
-		elem.parentNode.removeChild( elem );
-}
-
-function now(){
-	return +new Date;
-}
-
-jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
-
-	// Handle a deep copy situation
-	if ( target.constructor == Boolean ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target != "object" && typeof target != "function" )
-		target = {};
-
-	// extend jQuery itself if only one argument is passed
-	if ( length == i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ )
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null )
-			// Extend the base object
-			for ( var name in options ) {
-				var src = target[ name ], copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy )
-					continue;
-
-				// Recurse if we're merging object values
-				if ( deep && copy && typeof copy == "object" && !copy.nodeType )
-					target[ name ] = jQuery.extend( deep, 
-						// Never move original objects, clone them
-						src || ( copy.length != null ? [ ] : { } )
-					, copy );
-
-				// Don't bring in undefined values
-				else if ( copy !== undefined )
-					target[ name ] = copy;
-
-			}
-
-	// Return the modified object
-	return target;
-};
-
-var expando = "jQuery" + now(), uuid = 0, windowData = {},
-	// exclude the following css properties to add px
-	exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-	// cache defaultView
-	defaultView = document.defaultView || {};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		window.$ = _$;
-
-		if ( deep )
-			window.jQuery = _jQuery;
-
-		return jQuery;
-	},
-
-	// See test/unit/core.js for details concerning this function.
-	isFunction: function( fn ) {
-		return !!fn && typeof fn != "string" && !fn.nodeName &&
-			fn.constructor != Array && /^[\s[]?function/.test( fn + "" );
-	},
-
-	// check if an element is in a (or is an) XML document
-	isXMLDoc: function( elem ) {
-		return elem.documentElement && !elem.body ||
-			elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
-	},
-
-	// Evalulates a script in a global context
-	globalEval: function( data ) {
-		data = jQuery.trim( data );
-
-		if ( data ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-			if ( jQuery.browser.msie )
-				script.text = data;
-			else
-				script.appendChild( document.createTextNode( data ) );
-
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709).
-			head.insertBefore( script, head.firstChild );
-			head.removeChild( script );
-		}
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
-	},
-
-	cache: {},
-
-	data: function( elem, name, data ) {
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ];
-
-		// Compute a unique ID for the element
-		if ( !id )
-			id = elem[ expando ] = ++uuid;
-
-		// Only generate the data cache if we're
-		// trying to access or manipulate it
-		if ( name && !jQuery.cache[ id ] )
-			jQuery.cache[ id ] = {};
-
-		// Prevent overriding the named cache with undefined values
-		if ( data !== undefined )
-			jQuery.cache[ id ][ name ] = data;
-
-		// Return the named cache data, or the ID for the element
-		return name ?
-			jQuery.cache[ id ][ name ] :
-			id;
-	},
-
-	removeData: function( elem, name ) {
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ];
-
-		// If we want to remove a specific section of the element's data
-		if ( name ) {
-			if ( jQuery.cache[ id ] ) {
-				// Remove the section of cache data
-				delete jQuery.cache[ id ][ name ];
-
-				// If we've removed all the data, remove the element's cache
-				name = "";
-
-				for ( name in jQuery.cache[ id ] )
-					break;
-
-				if ( !name )
-					jQuery.removeData( elem );
-			}
-
-		// Otherwise, we want to remove all of the element's data
-		} else {
-			// Clean up the element expando
-			try {
-				delete elem[ expando ];
-			} catch(e){
-				// IE has trouble directly removing the expando
-				// but it's ok with using removeAttribute
-				if ( elem.removeAttribute )
-					elem.removeAttribute( expando );
-			}
-
-			// Completely remove the data cache
-			delete jQuery.cache[ id ];
-		}
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0, length = object.length;
-
-		if ( args ) {
-			if ( length == undefined ) {
-				for ( name in object )
-					if ( callback.apply( object[ name ], args ) === false )
-						break;
-			} else
-				for ( ; i < length; )
-					if ( callback.apply( object[ i++ ], args ) === false )
-						break;
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( length == undefined ) {
-				for ( name in object )
-					if ( callback.call( object[ name ], name, object[ name ] ) === false )
-						break;
-			} else
-				for ( var value = object[0];
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
-		}
-
-		return object;
-	},
-
-	prop: function( elem, value, type, i, name ) {
-		// Handle executable functions
-		if ( jQuery.isFunction( value ) )
-			value = value.call( elem, i );
-
-		// Handle passing in a number to a CSS property
-		return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
-			value + "px" :
-			value;
-	},
-
-	className: {
-		// internal only, use addClass("class")
-		add: function( elem, classNames ) {
-			jQuery.each((classNames || "").split(/\s+/), function(i, className){
-				if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
-					elem.className += (elem.className ? " " : "") + className;
-			});
-		},
-
-		// internal only, use removeClass("class")
-		remove: function( elem, classNames ) {
-			if (elem.nodeType == 1)
-				elem.className = classNames != undefined ?
-					jQuery.grep(elem.className.split(/\s+/), function(className){
-						return !jQuery.className.has( classNames, className );
-					}).join(" ") :
-					"";
-		},
-
-		// internal only, use hasClass("class")
-		has: function( elem, className ) {
-			return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
-		}
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		callback.call( elem );
-
-		// Revert the old values
-		for ( var name in options )
-			elem.style[ name ] = old[ name ];
-	},
-
-	css: function( elem, name, force ) {
-		if ( name == "width" || name == "height" ) {
-			var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
-
-			function getWH() {
-				val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
-				var padding = 0, border = 0;
-				jQuery.each( which, function() {
-					padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-				});
-				val -= Math.round(padding + border);
-			}
-
-			if ( jQuery(elem).is(":visible") )
-				getWH();
-			else
-				jQuery.swap( elem, props, getWH );
-
-			return Math.max(0, val);
-		}
-
-		return jQuery.curCSS( elem, name, force );
-	},
-
-	curCSS: function( elem, name, force ) {
-		var ret, style = elem.style;
-
-		// A helper method for determining if an element's values are broken
-		function color( elem ) {
-			if ( !jQuery.browser.safari )
-				return false;
-
-			// defaultView is cached
-			var ret = defaultView.getComputedStyle( elem, null );
-			return !ret || ret.getPropertyValue("color") == "";
-		}
-
-		// We need to handle opacity special in IE
-		if ( name == "opacity" && jQuery.browser.msie ) {
-			ret = jQuery.attr( style, "opacity" );
-
-			return ret == "" ?
-				"1" :
-				ret;
-		}
-		// Opera sometimes will give the wrong display answer, this fixes it, see #2037
-		if ( jQuery.browser.opera && name == "display" ) {
-			var save = style.outline;
-			style.outline = "0 solid black";
-			style.outline = save;
-		}
-
-		// Make sure we're using the right name for getting the float value
-		if ( name.match( /float/i ) )
-			name = styleFloat;
-
-		if ( !force && style && style[ name ] )
-			ret = style[ name ];
-
-		else if ( defaultView.getComputedStyle ) {
-
-			// Only "float" is needed here
-			if ( name.match( /float/i ) )
-				name = "float";
-
-			name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
-
-			var computedStyle = defaultView.getComputedStyle( elem, null );
-
-			if ( computedStyle && !color( elem ) )
-				ret = computedStyle.getPropertyValue( name );
-
-			// If the element isn't reporting its values properly in Safari
-			// then some display: none elements are involved
-			else {
-				var swap = [], stack = [], a = elem, i = 0;
-
-				// Locate all of the parent display: none elements
-				for ( ; a && color(a); a = a.parentNode )
-					stack.unshift(a);
-
-				// Go through and make them visible, but in reverse
-				// (It would be better if we knew the exact display type that they had)
-				for ( ; i < stack.length; i++ )
-					if ( color( stack[ i ] ) ) {
-						swap[ i ] = stack[ i ].style.display;
-						stack[ i ].style.display = "block";
-					}
-
-				// Since we flip the display style, we have to handle that
-				// one special, otherwise get the value
-				ret = name == "display" && swap[ stack.length - 1 ] != null ?
-					"none" :
-					( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
-
-				// Finally, revert the display styles back
-				for ( i = 0; i < swap.length; i++ )
-					if ( swap[ i ] != null )
-						stack[ i ].style.display = swap[ i ];
-			}
-
-			// We should always get a number back from opacity
-			if ( name == "opacity" && ret == "" )
-				ret = "1";
-
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(/\-(\w)/g, function(all, letter){
-				return letter.toUpperCase();
-			});
-
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
-
-			// From the awesome hack by Dean Edwards
-			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-			// If we're not dealing with a regular pixel number
-			// but a number that has a weird ending, we need to convert it to pixels
-			if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
-				// Remember the original values
-				var left = style.left, rsLeft = elem.runtimeStyle.left;
-
-				// Put in the new values to get a computed value out
-				elem.runtimeStyle.left = elem.currentStyle.left;
-				style.left = ret || 0;
-				ret = style.pixelLeft + "px";
-
-				// Revert the changed values
-				style.left = left;
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret;
-	},
-
-	clean: function( elems, context ) {
-		var ret = [];
-		context = context || document;
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if (typeof context.createElement == 'undefined')
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-
-		jQuery.each(elems, function(i, elem){
-			if ( !elem )
-				return;
-
-			if ( elem.constructor == Number )
-				elem += '';
-
-			// Convert html string into DOM nodes
-			if ( typeof elem == "string" ) {
-				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
-					return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
-						all :
-						front + "></" + tag + ">";
-				});
-
-				// Trim whitespace, otherwise indexOf won't work as expected
-				var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div");
-
-				var wrap =
-					// option or optgroup
-					!tags.indexOf("<opt") &&
-					[ 1, "<select multiple='multiple'>", "</select>" ] ||
-
-					!tags.indexOf("<leg") &&
-					[ 1, "<fieldset>", "</fieldset>" ] ||
-
-					tags.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
-					[ 1, "<table>", "</table>" ] ||
-
-					!tags.indexOf("<tr") &&
-					[ 2, "<table><tbody>", "</tbody></table>" ] ||
-
-				 	// <thead> matched above
-					(!tags.indexOf("<td") || !tags.indexOf("<th")) &&
-					[ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] ||
-
-					!tags.indexOf("<col") &&
-					[ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] ||
-
-					// IE can't serialize <link> and <script> tags normally
-					jQuery.browser.msie &&
-					[ 1, "div<div>", "</div>" ] ||
-
-					[ 0, "", "" ];
-
-				// Go to html and back, then peel off extra wrappers
-				div.innerHTML = wrap[1] + elem + wrap[2];
-
-				// Move to the right depth
-				while ( wrap[0]-- )
-					div = div.lastChild;
-
-				// Remove IE's autoinserted <tbody> from table fragments
-				if ( jQuery.browser.msie ) {
-
-					// String was a <table>, *may* have spurious <tbody>
-					var tbody = !tags.indexOf("<table") && tags.indexOf("<tbody") < 0 ?
-						div.firstChild && div.firstChild.childNodes :
-
-						// String was a bare <thead> or <tfoot>
-						wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ?
-							div.childNodes :
-							[];
-
-					for ( var j = tbody.length - 1; j >= 0 ; --j )
-						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
-							tbody[ j ].parentNode.removeChild( tbody[ j ] );
-
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( /^\s/.test( elem ) )
-						div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
-
-				}
-
-				elem = jQuery.makeArray( div.childNodes );
-			}
-
-			if ( elem.length === 0 && (!jQuery.nodeName( elem, "form" ) && !jQuery.nodeName( elem, "select" )) )
-				return;
-
-			if ( elem[0] == undefined || jQuery.nodeName( elem, "form" ) || elem.options )
-				ret.push( elem );
-
-			else
-				ret = jQuery.merge( ret, elem );
-
-		});
-
-		return ret;
-	},
-
-	attr: function( elem, name, value ) {
-		// don't set attributes on text and comment nodes
-		if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
-			return undefined;
-
-		var notxml = !jQuery.isXMLDoc( elem ),
-			// Whether we are setting (or getting)
-			set = value !== undefined,
-			msie = jQuery.browser.msie;
-
-		// Try to normalize/fix the name
-		name = notxml && jQuery.props[ name ] || name;
-
-		// Only do all the following if this is a node (faster for style)
-		// IE elem.getAttribute passes even for style
-		if ( elem.tagName ) {
-
-			// These attributes require special treatment
-			var special = /href|src|style/.test( name );
-
-			// Safari mis-reports the default selected property of a hidden option
-			// Accessing the parent's selectedIndex property fixes it
-			if ( name == "selected" && jQuery.browser.safari )
-				elem.parentNode.selectedIndex;
-
-			// If applicable, access the attribute via the DOM 0 way
-			if ( name in elem && notxml && !special ) {
-				if ( set ){
-					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
-						throw "type property can't be changed";
-
-					elem[ name ] = value;
-				}
-
-				// browsers index elements by id/name on forms, give priority to attributes.
-				if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) )
-					return elem.getAttributeNode( name ).nodeValue;
-
-				return elem[ name ];
-			}
-
-			if ( msie && notxml &&  name == "style" )
-				return jQuery.attr( elem.style, "cssText", value );
-
-			if ( set )
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
-
-			var attr = msie && notxml && special
-					// Some attributes require a special call on IE
-					? elem.getAttribute( name, 2 )
-					: elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return attr === null ? undefined : attr;
-		}
-
-		// elem is actually elem.style ... set the style
-
-		// IE uses filters for opacity
-		if ( msie && name == "opacity" ) {
-			if ( set ) {
-				// IE has trouble with opacity if it does not have layout
-				// Force it by setting the zoom level
-				elem.zoom = 1;
-
-				// Set the alpha filter to set the opacity
-				elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) +
-					(parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
-			}
-
-			return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
-				(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
-				"";
-		}
-
-		name = name.replace(/-([a-z])/ig, function(all, letter){
-			return letter.toUpperCase();
-		});
-
-		if ( set )
-			elem[ name ] = value;
-
-		return elem[ name ];
-	},
-
-	trim: function( text ) {
-		return (text || "").replace( /^\s+|\s+$/g, "" );
-	},
-
-	makeArray: function( array ) {
-		var ret = [];
-
-		if( array != null ){
-			var i = array.length;
-			//the window, strings and functions also have 'length'
-			if( i == null || array.split || array.setInterval || array.call )
-				ret[0] = array;
-			else
-				while( i )
-					ret[--i] = array[i];
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array ) {
-		for ( var i = 0, length = array.length; i < length; i++ )
-		// Use === because on IE, window == document
-			if ( array[ i ] === elem )
-				return i;
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		// We have to loop this way because IE & Opera overwrite the length
-		// expando of getElementsByTagName
-		var i = 0, elem, pos = first.length;
-		// Also, we need to make sure that the correct elements are being returned
-		// (IE returns comment nodes in a '*' query)
-		if ( jQuery.browser.msie ) {
-			while ( elem = second[ i++ ] )
-				if ( elem.nodeType != 8 )
-					first[ pos++ ] = elem;
-
-		} else
-			while ( elem = second[ i++ ] )
-				first[ pos++ ] = elem;
-
-		return first;
-	},
-
-	unique: function( array ) {
-		var ret = [], done = {};
-
-		try {
-
-			for ( var i = 0, length = array.length; i < length; i++ ) {
-				var id = jQuery.data( array[ i ] );
-
-				if ( !done[ id ] ) {
-					done[ id ] = true;
-					ret.push( array[ i ] );
-				}
-			}
-
-		} catch( e ) {
-			ret = array;
-		}
-
-		return ret;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [];
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ )
-			if ( !inv != !callback( elems[ i ], i ) )
-				ret.push( elems[ i ] );
-
-		return ret;
-	},
-
-	map: function( elems, callback ) {
-		var ret = [];
-
-		// Go through the array, translating each of the items to their
-		// new value (or values).
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			var value = callback( elems[ i ], i );
-
-			if ( value != null )
-				ret[ ret.length ] = value;
-		}
-
-		return ret.concat.apply( [], ret );
-	}
-});
-
-var userAgent = navigator.userAgent.toLowerCase();
-
-// Figure out what browser is being used
-jQuery.browser = {
-	version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1],
-	safari: /webkit/.test( userAgent ),
-	opera: /opera/.test( userAgent ),
-	msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
-	mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
-};
-
-var styleFloat = jQuery.browser.msie ?
-	"styleFloat" :
-	"cssFloat";
-
-jQuery.extend({
-	// Check to see if the W3C box model is being used
-	boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
-
-	props: {
-		"for": "htmlFor",
-		"class": "className",
-		"float": styleFloat,
-		cssFloat: styleFloat,
-		styleFloat: styleFloat,
-		readonly: "readOnly",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing"
-	}
-});
-
-jQuery.each({
-	parent: function(elem){return elem.parentNode;},
-	parents: function(elem){return jQuery.dir(elem,"parentNode");},
-	next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
-	prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
-	nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
-	prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
-	siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
-	children: function(elem){return jQuery.sibling(elem.firstChild);},
-	contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
-}, function(name, fn){
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = jQuery.map( this, fn );
-
-		if ( selector && typeof selector == "string" )
-			ret = jQuery.multiFilter( selector, ret );
-
-		return this.pushStack( jQuery.unique( ret ) );
-	};
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function(name, original){
-	jQuery.fn[ name ] = function() {
-		var args = arguments;
-
-		return this.each(function(){
-			for ( var i = 0, length = args.length; i < length; i++ )
-				jQuery( args[ i ] )[ original ]( this );
-		});
-	};
-});
-
-jQuery.each({
-	removeAttr: function( name ) {
-		jQuery.attr( this, name, "" );
-		if (this.nodeType == 1)
-			this.removeAttribute( name );
-	},
-
-	addClass: function( classNames ) {
-		jQuery.className.add( this, classNames );
-	},
-
-	removeClass: function( classNames ) {
-		jQuery.className.remove( this, classNames );
-	},
-
-	toggleClass: function( classNames ) {
-		jQuery.className[ jQuery.className.has( this, classNames ) ? "remove" : "add" ]( this, classNames );
-	},
-
-	remove: function( selector ) {
-		if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) {
-			// Prevent memory leaks
-			jQuery( "*", this ).add(this).each(function(){
-				jQuery.event.remove(this);
-				jQuery.removeData(this);
-			});
-			if (this.parentNode)
-				this.parentNode.removeChild( this );
-		}
-	},
-
-	empty: function() {
-		// Remove element nodes and prevent memory leaks
-		jQuery( ">*", this ).remove();
-
-		// Remove any remaining nodes
-		while ( this.firstChild )
-			this.removeChild( this.firstChild );
-	}
-}, function(name, fn){
-	jQuery.fn[ name ] = function(){
-		return this.each( fn, arguments );
-	};
-});
-
-jQuery.each([ "Height", "Width" ], function(i, name){
-	var type = name.toLowerCase();
-
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		return this[0] == window ?
-			// Opera reports document.body.client[Width/Height] properly in both quirks and standards
-			jQuery.browser.opera && document.body[ "client" + name ] ||
-
-			// Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
-			jQuery.browser.safari && window[ "inner" + name ] ||
-
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :
-
-			// Get document width or height
-			this[0] == document ?
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max(
-					Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]),
-					Math.max(document.body["offset" + name], document.documentElement["offset" + name])
-				) :
-
-				// Get or set width or height on the element
-				size == undefined ?
-					// Get width or height on the element
-					(this.length ? jQuery.css( this[0], type ) : null) :
-
-					// Set the width or height on the element (default to pixels if value is unitless)
-					this.css( type, size.constructor == String ? size : size + "px" );
-	};
-});
-
-// Helper function used by the dimensions and offset modules
-function num(elem, prop) {
-	return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
-}var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
-		"(?:[\\w*_-]|\\\\.)" :
-		"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
-	quickChild = new RegExp("^>\\s*(" + chars + "+)"),
-	quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"),
-	quickClass = new RegExp("^([#.]?)(" + chars + "*)");
-
-jQuery.extend({
-	expr: {
-		"": function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},
-		"#": function(a,i,m){return a.getAttribute("id")==m[2];},
-		":": {
-			// Position Checks
-			lt: function(a,i,m){return i<m[3]-0;},
-			gt: function(a,i,m){return i>m[3]-0;},
-			nth: function(a,i,m){return m[3]-0==i;},
-			eq: function(a,i,m){return m[3]-0==i;},
-			first: function(a,i){return i==0;},
-			last: function(a,i,m,r){return i==r.length-1;},
-			even: function(a,i){return i%2==0;},
-			odd: function(a,i){return i%2;},
-
-			// Child Checks
-			"first-child": function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},
-			"last-child": function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},
-			"only-child": function(a){return !jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},
-
-			// Parent Checks
-			parent: function(a){return a.firstChild;},
-			empty: function(a){return !a.firstChild;},
-
-			// Text Check
-			contains: function(a,i,m){return (a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},
-
-			// Visibility
-			visible: function(a){return "hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},
-			hidden: function(a){return "hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},
-
-			// Form attributes
-			enabled: function(a){return !a.disabled;},
-			disabled: function(a){return a.disabled;},
-			checked: function(a){return a.checked;},
-			selected: function(a){return a.selected||jQuery.attr(a,"selected");},
-
-			// Form elements
-			text: function(a){return "text"==a.type;},
-			radio: function(a){return "radio"==a.type;},
-			checkbox: function(a){return "checkbox"==a.type;},
-			file: function(a){return "file"==a.type;},
-			password: function(a){return "password"==a.type;},
-			submit: function(a){return "submit"==a.type;},
-			image: function(a){return "image"==a.type;},
-			reset: function(a){return "reset"==a.type;},
-			button: function(a){return "button"==a.type||jQuery.nodeName(a,"button");},
-			input: function(a){return /input|select|textarea|button/i.test(a.nodeName);},
-
-			// :has()
-			has: function(a,i,m){return jQuery.find(m[3],a).length;},
-
-			// :header
-			header: function(a){return /h\d/i.test(a.nodeName);},
-
-			// :animated
-			animated: function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}
-		}
-	},
-
-	// The regular expressions that power the parsing engine
-	parse: [
-		// Match: [@value='test'], [@foo]
-		/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,
-
-		// Match: :contains('foo')
-		/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
-
-		// Match: :even, :last-child, #id, .class
-		new RegExp("^([:.#]*)(" + chars + "+)")
-	],
-
-	multiFilter: function( expr, elems, not ) {
-		var old, cur = [];
-
-		while ( expr && expr != old ) {
-			old = expr;
-			var f = jQuery.filter( expr, elems, not );
-			expr = f.t.replace(/^\s*,\s*/, "" );
-			cur = not ? elems = f.r : jQuery.merge( cur, f.r );
-		}
-
-		return cur;
-	},
-
-	find: function( t, context ) {
-		// Quickly handle non-string expressions
-		if ( typeof t != "string" )
-			return [ t ];
-
-		// check to make sure context is a DOM element or a document
-		if ( context && context.nodeType != 1 && context.nodeType != 9)
-			return [ ];
-
-		// Set the correct context (if none is provided)
-		context = context || document;
-
-		// Initialize the search
-		var ret = [context], done = [], last, nodeName;
-
-		// Continue while a selector expression exists, and while
-		// we're no longer looping upon ourselves
-		while ( t && last != t ) {
-			var r = [];
-			last = t;
-
-			t = jQuery.trim(t);
-
-			var foundToken = false,
-
-			// An attempt at speeding up child selectors that
-			// point to a specific element tag
-				re = quickChild,
-
-				m = re.exec(t);
-
-			if ( m ) {
-				nodeName = m[1].toUpperCase();
-
-				// Perform our own iteration and filter
-				for ( var i = 0; ret[i]; i++ )
-					for ( var c = ret[i].firstChild; c; c = c.nextSibling )
-						if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName) )
-							r.push( c );
-
-				ret = r;
-				t = t.replace( re, "" );
-				if ( t.indexOf(" ") == 0 ) continue;
-				foundToken = true;
-			} else {
-				re = /^([>+~])\s*(\w*)/i;
-
-				if ( (m = re.exec(t)) != null ) {
-					r = [];
-
-					var merge = {};
-					nodeName = m[2].toUpperCase();
-					m = m[1];
-
-					for ( var j = 0, rl = ret.length; j < rl; j++ ) {
-						var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild;
-						for ( ; n; n = n.nextSibling )
-							if ( n.nodeType == 1 ) {
-								var id = jQuery.data(n);
-
-								if ( m == "~" && merge[id] ) break;
-
-								if (!nodeName || n.nodeName.toUpperCase() == nodeName ) {
-									if ( m == "~" ) merge[id] = true;
-									r.push( n );
-								}
-
-								if ( m == "+" ) break;
-							}
-					}
-
-					ret = r;
-
-					// And remove the token
-					t = jQuery.trim( t.replace( re, "" ) );
-					foundToken = true;
-				}
-			}
-
-			// See if there's still an expression, and that we haven't already
-			// matched a token
-			if ( t && !foundToken ) {
-				// Handle multiple expressions
-				if ( !t.indexOf(",") ) {
-					// Clean the result set
-					if ( context == ret[0] ) ret.shift();
-
-					// Merge the result sets
-					done = jQuery.merge( done, ret );
-
-					// Reset the context
-					r = ret = [context];
-
-					// Touch up the selector string
-					t = " " + t.substr(1,t.length);
-
-				} else {
-					// Optimize for the case nodeName#idName
-					var re2 = quickID;
-					var m = re2.exec(t);
-
-					// Re-organize the results, so that they're consistent
-					if ( m ) {
-						m = [ 0, m[2], m[3], m[1] ];
-
-					} else {
-						// Otherwise, do a traditional filter check for
-						// ID, class, and element selectors
-						re2 = quickClass;
-						m = re2.exec(t);
-					}
-
-					m[2] = m[2].replace(/\\/g, "");
-
-					var elem = ret[ret.length-1];
-
-					// Try to do a global search by ID, where we can
-					if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) {
-						// Optimization for HTML document case
-						var oid = elem.getElementById(m[2]);
-
-						// Do a quick check for the existence of the actual ID attribute
-						// to avoid selecting by the name attribute in IE
-						// also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
-						if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] )
-							oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
-
-						// Do a quick check for node name (where applicable) so
-						// that div#foo searches will be really fast
-						ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
-					} else {
-						// We need to find all descendant elements
-						for ( var i = 0; ret[i]; i++ ) {
-							// Grab the tag name being searched for
-							var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2];
-
-							// Handle IE7 being really dumb about <object>s
-							if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )
-								tag = "param";
-
-							r = jQuery.merge( r, ret[i].getElementsByTagName( tag ));
-						}
-
-						// It's faster to filter by class and be done with it
-						if ( m[1] == "." )
-							r = jQuery.classFilter( r, m[2] );
-
-						// Same with ID filtering
-						if ( m[1] == "#" ) {
-							var tmp = [];
-
-							// Try to find the element with the ID
-							for ( var i = 0; r[i]; i++ )
-								if ( r[i].getAttribute("id") == m[2] ) {
-									tmp = [ r[i] ];
-									break;
-								}
-
-							r = tmp;
-						}
-
-						ret = r;
-					}
-
-					t = t.replace( re2, "" );
-				}
-
-			}
-
-			// If a selector string still exists
-			if ( t ) {
-				// Attempt to filter it
-				var val = jQuery.filter(t,r);
-				ret = r = val.r;
-				t = jQuery.trim(val.t);
-			}
-		}
-
-		// An error occurred with the selector;
-		// just return an empty set instead
-		if ( t )
-			ret = [];
-
-		// Remove the root context
-		if ( ret && context == ret[0] )
-			ret.shift();
-
-		// And combine the results
-		done = jQuery.merge( done, ret );
-
-		return done;
-	},
-
-	classFilter: function(r,m,not){
-		m = " " + m + " ";
-		var tmp = [];
-		for ( var i = 0; r[i]; i++ ) {
-			var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
-			if ( !not && pass || not && !pass )
-				tmp.push( r[i] );
-		}
-		return tmp;
-	},
-
-	filter: function(t,r,not) {
-		var last;
-
-		// Look for common filter expressions
-		while ( t && t != last ) {
-			last = t;
-
-			var p = jQuery.parse, m;
-
-			for ( var i = 0; p[i]; i++ ) {
-				m = p[i].exec( t );
-
-				if ( m ) {
-					// Remove what we just matched
-					t = t.substring( m[0].length );
-
-					m[2] = m[2].replace(/\\/g, "");
-					break;
-				}
-			}
-
-			if ( !m )
-				break;
-
-			// :not() is a special case that can be optimized by
-			// keeping it out of the expression list
-			if ( m[1] == ":" && m[2] == "not" )
-				// optimize if only one selector found (most common case)
-				r = isSimple.test( m[3] ) ?
-					jQuery.filter(m[3], r, true).r :
-					jQuery( r ).not( m[3] );
-
-			// We can get a big speed boost by filtering by class here
-			else if ( m[1] == "." )
-				r = jQuery.classFilter(r, m[2], not);
-
-			else if ( m[1] == "[" ) {
-				var tmp = [], type = m[3];
-
-				for ( var i = 0, rl = r.length; i < rl; i++ ) {
-					var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
-
-					if ( z == null || /href|src|selected/.test(m[2]) )
-						z = jQuery.attr(a,m[2]) || '';
-
-					if ( (type == "" && !!z ||
-						 type == "=" && z == m[5] ||
-						 type == "!=" && z != m[5] ||
-						 type == "^=" && z && !z.indexOf(m[5]) ||
-						 type == "$=" && z.substr(z.length - m[5].length) == m[5] ||
-						 (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not )
-							tmp.push( a );
-				}
-
-				r = tmp;
-
-			// We can get a speed boost by handling nth-child here
-			} else if ( m[1] == ":" && m[2] == "nth-child" ) {
-				var merge = {}, tmp = [],
-					// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-					test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
-						m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
-						!/\D/.test(m[3]) && "0n+" + m[3] || m[3]),
-					// calculate the numbers (first)n+(last) including if they are negative
-					first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0;
-
-				// loop through all the elements left in the jQuery object
-				for ( var i = 0, rl = r.length; i < rl; i++ ) {
-					var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode);
-
-					if ( !merge[id] ) {
-						var c = 1;
-
-						for ( var n = parentNode.firstChild; n; n = n.nextSibling )
-							if ( n.nodeType == 1 )
-								n.nodeIndex = c++;
-
-						merge[id] = true;
-					}
-
-					var add = false;
-
-					if ( first == 0 ) {
-						if ( node.nodeIndex == last )
-							add = true;
-					} else if ( (node.nodeIndex - last) % first == 0 && (node.nodeIndex - last) / first >= 0 )
-						add = true;
-
-					if ( add ^ not )
-						tmp.push( node );
-				}
-
-				r = tmp;
-
-			// Otherwise, find the expression to execute
-			} else {
-				var fn = jQuery.expr[ m[1] ];
-				if ( typeof fn == "object" )
-					fn = fn[ m[2] ];
-
-				if ( typeof fn == "string" )
-					fn = eval("false||function(a,i){return " + fn + ";}");
-
-				// Execute it against the current filter
-				r = jQuery.grep( r, function(elem, i){
-					return fn(elem, i, m, r);
-				}, not );
-			}
-		}
-
-		// Return an array of filtered elements (r)
-		// and the modified expression string (t)
-		return { r: r, t: t };
-	},
-
-	dir: function( elem, dir ){
-		var matched = [],
-			cur = elem[dir];
-		while ( cur && cur != document ) {
-			if ( cur.nodeType == 1 )
-				matched.push( cur );
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	nth: function(cur,result,dir,elem){
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] )
-			if ( cur.nodeType == 1 && ++num == result )
-				break;
-
-		return cur;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType == 1 && n != elem )
-				r.push( n );
-		}
-
-		return r;
-	}
-});
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code orignated from
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function(elem, types, handler, data) {
-		if ( elem.nodeType == 3 || elem.nodeType == 8 )
-			return;
-
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( jQuery.browser.msie && elem.setInterval )
-			elem = window;
-
-		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid )
-			handler.guid = this.guid++;
-
-		// if data is passed, bind to handler
-		if( data != undefined ) {
-			// Create temporary function pointer to original handler
-			var fn = handler;
-
-			// Create unique handler function, wrapped around original handler
-			handler = this.proxy( fn, function() {
-				// Pass arguments and context to original handler
-				return fn.apply(this, arguments);
-			});
-
-			// Store data in unique handler
-			handler.data = data;
-		}
-
-		// Init the element's event structure
-		var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
-			handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
-				// Handle the second event of a trigger and when
-				// an event is called after a page has unloaded
-				if ( typeof jQuery != "undefined" && !jQuery.event.triggered )
-					return jQuery.event.handle.apply(arguments.callee.elem, arguments);
-			});
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native
-		// event in IE.
-		handle.elem = elem;
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		jQuery.each(types.split(/\s+/), function(index, type) {
-			// Namespaced event handlers
-			var parts = type.split(".");
-			type = parts[0];
-			handler.type = parts[1];
-
-			// Get the current list of functions bound to this event
-			var handlers = events[type];
-
-			// Init the event handler queue
-			if (!handlers) {
-				handlers = events[type] = {};
-
-				// Check for a special event handler
-				// Only use addEventListener/attachEvent if the special
-				// events handler returns false
-				if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) {
-					// Bind the global event handler to the element
-					if (elem.addEventListener)
-						elem.addEventListener(type, handle, false);
-					else if (elem.attachEvent)
-						elem.attachEvent("on" + type, handle);
-				}
-			}
-
-			// Add the function to the element's handler list
-			handlers[handler.guid] = handler;
-
-			// Keep track of which events have been used, for global triggering
-			jQuery.event.global[type] = true;
-		});
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	guid: 1,
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function(elem, types, handler) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType == 3 || elem.nodeType == 8 )
-			return;
-
-		var events = jQuery.data(elem, "events"), ret, index;
-
-		if ( events ) {
-			// Unbind all events for the element
-			if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") )
-				for ( var type in events )
-					this.remove( elem, type + (types || "") );
-			else {
-				// types is actually an event object here
-				if ( types.type ) {
-					handler = types.handler;
-					types = types.type;
-				}
-
-				// Handle multiple events seperated by a space
-				// jQuery(...).unbind("mouseover mouseout", fn);
-				jQuery.each(types.split(/\s+/), function(index, type){
-					// Namespaced event handlers
-					var parts = type.split(".");
-					type = parts[0];
-
-					if ( events[type] ) {
-						// remove the given handler for the given type
-						if ( handler )
-							delete events[type][handler.guid];
-
-						// remove all handlers for the given type
-						else
-							for ( handler in events[type] )
-								// Handle the removal of namespaced events
-								if ( !parts[1] || events[type][handler].type == parts[1] )
-									delete events[type][handler];
-
-						// remove generic event handler if no more handlers exist
-						for ( ret in events[type] ) break;
-						if ( !ret ) {
-							if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) {
-								if (elem.removeEventListener)
-									elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
-								else if (elem.detachEvent)
-									elem.detachEvent("on" + type, jQuery.data(elem, "handle"));
-							}
-							ret = null;
-							delete events[type];
-						}
-					}
-				});
-			}
-
-			// Remove the expando if it's no longer used
-			for ( ret in events ) break;
-			if ( !ret ) {
-				var handle = jQuery.data( elem, "handle" );
-				if ( handle ) handle.elem = null;
-				jQuery.removeData( elem, "events" );
-				jQuery.removeData( elem, "handle" );
-			}
-		}
-	},
-
-	trigger: function(type, data, elem, donative, extra) {
-		// Clone the incoming data, if any
-		data = jQuery.makeArray(data);
-
-		if ( type.indexOf("!") >= 0 ) {
-			type = type.slice(0, -1);
-			var exclusive = true;
-		}
-
-		// Handle a global trigger
-		if ( !elem ) {
-			// Only trigger if we've ever bound an event for it
-			if ( this.global[type] )
-				jQuery("*").add([window, document]).trigger(type, data);
-
-		// Handle triggering a single element
-		} else {
-			// don't do events on text and comment nodes
-			if ( elem.nodeType == 3 || elem.nodeType == 8 )
-				return undefined;
-
-			var val, ret, fn = jQuery.isFunction( elem[ type ] || null ),
-				// Check to see if we need to provide a fake event, or not
-				event = !data[0] || !data[0].preventDefault;
-
-			// Pass along a fake event
-			if ( event ) {
-				data.unshift({
-					type: type,
-					target: elem,
-					preventDefault: function(){},
-					stopPropagation: function(){},
-					timeStamp: now()
-				});
-				data[0][expando] = true; // no need to fix fake event
-			}
-
-			// Enforce the right trigger type
-			data[0].type = type;
-			if ( exclusive )
-				data[0].exclusive = true;
-
-			// Trigger the event, it is assumed that "handle" is a function
-			var handle = jQuery.data(elem, "handle");
-			if ( handle )
-				val = handle.apply( elem, data );
-
-			// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
-			if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
-				val = false;
-
-			// Extra functions don't get the custom event object
-			if ( event )
-				data.shift();
-
-			// Handle triggering of extra function
-			if ( extra && jQuery.isFunction( extra ) ) {
-				// call the extra function and tack the current return value on the end for possible inspection
-				ret = extra.apply( elem, val == null ? data : data.concat( val ) );
-				// if anything is returned, give it precedence and have it overwrite the previous value
-				if (ret !== undefined)
-					val = ret;
-			}
-
-			// Trigger the native events (except for clicks on links)
-			if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
-				this.triggered = true;
-				try {
-					elem[ type ]();
-				// prevent IE from throwing an error for some hidden elements
-				} catch (e) {}
-			}
-
-			this.triggered = false;
-		}
-
-		return val;
-	},
-
-	handle: function(event) {
-		// returned undefined or false
-		var val, ret, namespace, all, handlers;
-
-		event = arguments[0] = jQuery.event.fix( event || window.event );
-
-		// Namespaced event handlers
-		namespace = event.type.split(".");
-		event.type = namespace[0];
-		namespace = namespace[1];
-		// Cache this now, all = true means, any handler
-		all = !namespace && !event.exclusive;
-
-		handlers = ( jQuery.data(this, "events") || {} )[event.type];
-
-		for ( var j in handlers ) {
-			var handler = handlers[j];
-
-			// Filter the functions by class
-			if ( all || handler.type == namespace ) {
-				// Pass in a reference to the handler function itself
-				// So that we can later remove it
-				event.handler = handler;
-				event.data = handler.data;
-
-				ret = handler.apply( this, arguments );
-
-				if ( val !== false )
-					val = ret;
-
-				if ( ret === false ) {
-					event.preventDefault();
-					event.stopPropagation();
-				}
-			}
-		}
-
-		return val;
-	},
-
-	fix: function(event) {
-		if ( event[expando] == true )
-			return event;
-
-		// store a copy of the original event object
-		// and "clone" to set read-only properties
-		var originalEvent = event;
-		event = { originalEvent: originalEvent };
-		var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");
-		for ( var i=props.length; i; i-- )
-			event[ props[i] ] = originalEvent[ props[i] ];
-
-		// Mark it as fixed
-		event[expando] = true;
-
-		// add preventDefault and stopPropagation since
-		// they will not work on the clone
-		event.preventDefault = function() {
-			// if preventDefault exists run it on the original event
-			if (originalEvent.preventDefault)
-				originalEvent.preventDefault();
-			// otherwise set the returnValue property of the original event to false (IE)
-			originalEvent.returnValue = false;
-		};
-		event.stopPropagation = function() {
-			// if stopPropagation exists run it on the original event
-			if (originalEvent.stopPropagation)
-				originalEvent.stopPropagation();
-			// otherwise set the cancelBubble property of the original event to true (IE)
-			originalEvent.cancelBubble = true;
-		};
-
-		// Fix timeStamp
-		event.timeStamp = event.timeStamp || now();
-
-		// Fix target property, if necessary
-		if ( !event.target )
-			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
-
-		// check if target is a textnode (safari)
-		if ( event.target.nodeType == 3 )
-			event.target = event.target.parentNode;
-
-		// Add relatedTarget, if necessary
-		if ( !event.relatedTarget && event.fromElement )
-			event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement;
-
-		// Calculate pageX/Y if missing and clientX/Y available
-		if ( event.pageX == null && event.clientX != null ) {
-			var doc = document.documentElement, body = document.body;
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0);
-		}
-
-		// Add which for key events
-		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) )
-			event.which = event.charCode || event.keyCode;
-
-		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-		if ( !event.metaKey && event.ctrlKey )
-			event.metaKey = event.ctrlKey;
-
-		// Add which for click: 1 == left; 2 == middle; 3 == right
-		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button )
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-
-		return event;
-	},
-
-	proxy: function( fn, proxy ){
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
-		// So proxy can be declared as an argument
-		return proxy;
-	},
-
-	special: {
-		ready: {
-			setup: function() {
-				// Make sure the ready event is setup
-				bindReady();
-				return;
-			},
-
-			teardown: function() { return; }
-		},
-
-		mouseenter: {
-			setup: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler);
-				return true;
-			},
-
-			teardown: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler);
-				return true;
-			},
-
-			handler: function(event) {
-				// If we actually just moused on to a sub-element, ignore it
-				if ( withinElement(event, this) ) return true;
-				// Execute the right handlers by setting the event type to mouseenter
-				event.type = "mouseenter";
-				return jQuery.event.handle.apply(this, arguments);
-			}
-		},
-
-		mouseleave: {
-			setup: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler);
-				return true;
-			},
-
-			teardown: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler);
-				return true;
-			},
-
-			handler: function(event) {
-				// If we actually just moused on to a sub-element, ignore it
-				if ( withinElement(event, this) ) return true;
-				// Execute the right handlers by setting the event type to mouseleave
-				event.type = "mouseleave";
-				return jQuery.event.handle.apply(this, arguments);
-			}
-		}
-	}
-};
-
-jQuery.fn.extend({
-	bind: function( type, data, fn ) {
-		return type == "unload" ? this.one(type, data, fn) : this.each(function(){
-			jQuery.event.add( this, type, fn || data, fn && data );
-		});
-	},
-
-	one: function( type, data, fn ) {
-		var one = jQuery.event.proxy( fn || data, function(event) {
-			jQuery(this).unbind(event, one);
-			return (fn || data).apply( this, arguments );
-		});
-		return this.each(function(){
-			jQuery.event.add( this, type, one, fn && data);
-		});
-	},
-
-	unbind: function( type, fn ) {
-		return this.each(function(){
-			jQuery.event.remove( this, type, fn );
-		});
-	},
-
-	trigger: function( type, data, fn ) {
-		return this.each(function(){
-			jQuery.event.trigger( type, data, this, true, fn );
-		});
-	},
-
-	triggerHandler: function( type, data, fn ) {
-		return this[0] && jQuery.event.trigger( type, data, this[0], false, fn );
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments, i = 1;
-
-		// link all the functions, so any of them can unbind this click handler
-		while( i < args.length )
-			jQuery.event.proxy( fn, args[i++] );
-
-		return this.click( jQuery.event.proxy( fn, function(event) {
-			// Figure out which function to execute
-			this.lastToggle = ( this.lastToggle || 0 ) % i;
-
-			// Make sure that clicks stop
-			event.preventDefault();
-
-			// and execute the function
-			return args[ this.lastToggle++ ].apply( this, arguments ) || false;
-		}));
-	},
-
-	hover: function(fnOver, fnOut) {
-		return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut);
-	},
-
-	ready: function(fn) {
-		// Attach the listeners
-		bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady )
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		else
-			// Add the function to the wait list
-			jQuery.readyList.push( function() { return fn.call(this, jQuery); } );
-
-		return this;
-	}
-});
-
-jQuery.extend({
-	isReady: false,
-	readyList: [],
-	// Handle when the DOM is ready
-	ready: function() {
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.isReady ) {
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If there are functions bound, to execute
-			if ( jQuery.readyList ) {
-				// Execute all of them
-				jQuery.each( jQuery.readyList, function(){
-					this.call( document );
-				});
-
-				// Reset the list of functions
-				jQuery.readyList = null;
-			}
-
-			// Trigger any bound ready events
-			jQuery(document).triggerHandler("ready");
-		}
-	}
-});
-
-var readyBound = false;
-
-function bindReady(){
-	if ( readyBound ) return;
-	readyBound = true;
-
-	// Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
-	if ( document.addEventListener && !jQuery.browser.opera)
-		// Use the handy event callback
-		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
-
-	// If IE is used and is not in a frame
-	// Continually check to see if the document is ready
-	if ( jQuery.browser.msie && window == top ) (function(){
-		if (jQuery.isReady) return;
-		try {
-			// If IE is used, use the trick by Diego Perini
-			// http://javascript.nwbox.com/IEContentLoaded/
-			document.documentElement.doScroll("left");
-		} catch( error ) {
-			setTimeout( arguments.callee, 0 );
-			return;
-		}
-		// and execute any waiting functions
-		jQuery.ready();
-	})();
-
-	if ( jQuery.browser.opera )
-		document.addEventListener( "DOMContentLoaded", function () {
-			if (jQuery.isReady) return;
-			for (var i = 0; i < document.styleSheets.length; i++)
-				if (document.styleSheets[i].disabled) {
-					setTimeout( arguments.callee, 0 );
-					return;
-				}
-			// and execute any waiting functions
-			jQuery.ready();
-		}, false);
-
-	if ( jQuery.browser.safari ) {
-		var numStyles;
-		(function(){
-			if (jQuery.isReady) return;
-			if ( document.readyState != "loaded" && document.readyState != "complete" ) {
-				setTimeout( arguments.callee, 0 );
-				return;
-			}
-			if ( numStyles === undefined )
-				numStyles = jQuery("style, link[rel=stylesheet]").length;
-			if ( document.styleSheets.length != numStyles ) {
-				setTimeout( arguments.callee, 0 );
-				return;
-			}
-			// and execute any waiting functions
-			jQuery.ready();
-		})();
-	}
-
-	// A fallback to window.onload, that will always work
-	jQuery.event.add( window, "load", jQuery.ready );
-}
-
-jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
-	"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," +
-	"submit,keydown,keypress,keyup,error").split(","), function(i, name){
-
-	// Handle event binding
-	jQuery.fn[name] = function(fn){
-		return fn ? this.bind(name, fn) : this.trigger(name);
-	};
-});
-
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function(event, elem) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-	// Traverse up the tree
-	while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; }
-	// Return true if we actually just moused on to a sub-element
-	return parent == elem;
-};
-
-// Prevent memory leaks in IE
-// And prevent errors on refresh with events like mouseover in other browsers
-// Window isn't included so as not to unbind existing unload events
-jQuery(window).bind("unload", function() {
-	jQuery("*").add(document).unbind();
-});
-jQuery.fn.extend({
-	// Keep a copy of the old load
-	_load: jQuery.fn.load,
-
-	load: function( url, params, callback ) {
-		if ( typeof url != 'string' )
-			return this._load( url );
-
-		var off = url.indexOf(" ");
-		if ( off >= 0 ) {
-			var selector = url.slice(off, url.length);
-			url = url.slice(0, off);
-		}
-
-		callback = callback || function(){};
-
-		// Default to a GET request
-		var type = "GET";
-
-		// If the second parameter was provided
-		if ( params )
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = null;
-
-			// Otherwise, build a param string
-			} else {
-				params = jQuery.param( params );
-				type = "POST";
-			}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			complete: function(res, status){
-				// If successful, inject the HTML into all the matched elements
-				if ( status == "success" || status == "notmodified" )
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div/>")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						res.responseText );
-
-				self.each( callback, [res.responseText, status, res] );
-			}
-		});
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param(this.serializeArray());
-	},
-	serializeArray: function() {
-		return this.map(function(){
-			return jQuery.nodeName(this, "form") ?
-				jQuery.makeArray(this.elements) : this;
-		})
-		.filter(function(){
-			return this.name && !this.disabled &&
-				(this.checked || /select|textarea/i.test(this.nodeName) ||
-					/text|hidden|password/i.test(this.type));
-		})
-		.map(function(i, elem){
-			var val = jQuery(this).val();
-			return val == null ? null :
-				val.constructor == Array ?
-					jQuery.map( val, function(val, i){
-						return {name: elem.name, value: val};
-					}) :
-					{name: elem.name, value: val};
-		}).get();
-	}
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
-	jQuery.fn[o] = function(f){
-		return this.bind(o, f);
-	};
-});
-
-var jsc = now();
-
-jQuery.extend({
-	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was ommited
-		if ( jQuery.isFunction( data ) ) {
-			callback = data;
-			data = null;
-		}
-
-		return jQuery.ajax({
-			type: "GET",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get(url, null, callback, "script");
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get(url, data, callback, "json");
-	},
-
-	post: function( url, data, callback, type ) {
-		if ( jQuery.isFunction( data ) ) {
-			callback = data;
-			data = {};
-		}
-
-		return jQuery.ajax({
-			type: "POST",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	ajaxSetup: function( settings ) {
-		jQuery.extend( jQuery.ajaxSettings, settings );
-	},
-
-	ajaxSettings: {
-		url: location.href,
-		global: true,
-		type: "GET",
-		timeout: 0,
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		data: null,
-		username: null,
-		password: null,
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			script: "text/javascript, application/javascript",
-			json: "application/json, text/javascript",
-			text: "text/plain",
-			_default: "*/*"
-		}
-	},
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-
-	ajax: function( s ) {
-		// Extend the settings, but re-extend 's' so that it can be
-		// checked again later (in the test suite, specifically)
-		s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
-
-		var jsonp, jsre = /=\?(&|$)/g, status, data,
-			type = s.type.toUpperCase();
-
-		// convert data if not already a string
-		if ( s.data && s.processData && typeof s.data != "string" )
-			s.data = jQuery.param(s.data);
-
-		// Handle JSONP Parameter Callbacks
-		if ( s.dataType == "jsonp" ) {
-			if ( type == "GET" ) {
-				if ( !s.url.match(jsre) )
-					s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
-			} else if ( !s.data || !s.data.match(jsre) )
-				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
-			s.dataType = "json";
-		}
-
-		// Build temporary JSONP function
-		if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
-			jsonp = "jsonp" + jsc++;
-
-			// Replace the =? sequence both in the query string and the data
-			if ( s.data )
-				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
-			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
-
-			// We need to make sure
-			// that a JSONP style response is executed properly
-			s.dataType = "script";
-
-			// Handle JSONP-style loading
-			window[ jsonp ] = function(tmp){
-				data = tmp;
-				success();
-				complete();
-				// Garbage collect
-				window[ jsonp ] = undefined;
-				try{ delete window[ jsonp ]; } catch(e){}
-				if ( head )
-					head.removeChild( script );
-			};
-		}
-
-		if ( s.dataType == "script" && s.cache == null )
-			s.cache = false;
-
-		if ( s.cache === false && type == "GET" ) {
-			var ts = now();
-			// try replacing _= if it is there
-			var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
-			// if nothing was replaced, add timestamp to the end
-			s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
-		}
-
-		// If data is available, append data to url for get requests
-		if ( s.data && type == "GET" ) {
-			s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
-
-			// IE likes to send both get and post data, prevent this
-			s.data = null;
-		}
-
-		// Watch for a new set of requests
-		if ( s.global && ! jQuery.active++ )
-			jQuery.event.trigger( "ajaxStart" );
-
-		// Matches an absolute URL, and saves the domain
-		var remote = /^(?:\w+:)?\/\/([^\/?#]+)/;
-
-		// If we're requesting a remote document
-		// and trying to load JSON or Script with a GET
-		if ( s.dataType == "script" && type == "GET"
-				&& remote.test(s.url) && remote.exec(s.url)[1] != location.host ){
-			var head = document.getElementsByTagName("head")[0];
-			var script = document.createElement("script");
-			script.src = s.url;
-			if (s.scriptCharset)
-				script.charset = s.scriptCharset;
-
-			// Handle Script loading
-			if ( !jsonp ) {
-				var done = false;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function(){
-					if ( !done && (!this.readyState ||
-							this.readyState == "loaded" || this.readyState == "complete") ) {
-						done = true;
-						success();
-						complete();
-						head.removeChild( script );
-					}
-				};
-			}
-
-			head.appendChild(script);
-
-			// We handle everything using the script element injection
-			return undefined;
-		}
-
-		var requestDone = false;
-
-		// Create the request object; Microsoft failed to properly
-		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
-		var xhr = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
-
-		// Open the socket
-		// Passing null username, generates a login popup on Opera (#2865)
-		if( s.username )
-			xhr.open(type, s.url, s.async, s.username, s.password);
-		else
-			xhr.open(type, s.url, s.async);
-
-		// Need an extra try/catch for cross domain requests in Firefox 3
-		try {
-			// Set the correct header, if data is being sent
-			if ( s.data )
-				xhr.setRequestHeader("Content-Type", s.contentType);
-
-			// Set the If-Modified-Since header, if ifModified mode.
-			if ( s.ifModified )
-				xhr.setRequestHeader("If-Modified-Since",
-					jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
-
-			// Set header so the called script knows that it's an XMLHttpRequest
-			xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-
-			// Set the Accepts header for the server, depending on the dataType
-			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
-				s.accepts[ s.dataType ] + ", */*" :
-				s.accepts._default );
-		} catch(e){}
-
-		// Allow custom headers/mimetypes
-		if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
-			// cleanup active request counter
-			s.global && jQuery.active--;
-			// close opended socket
-			xhr.abort();
-			return false;
-		}
-
-		if ( s.global )
-			jQuery.event.trigger("ajaxSend", [xhr, s]);
-
-		// Wait for a response to come back
-		var onreadystatechange = function(isTimeout){
-			// The transfer is complete and the data is available, or the request timed out
-			if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
-				requestDone = true;
-
-				// clear poll interval
-				if (ival) {
-					clearInterval(ival);
-					ival = null;
-				}
-
-				status = isTimeout == "timeout" && "timeout" ||
-					!jQuery.httpSuccess( xhr ) && "error" ||
-					s.ifModified && jQuery.httpNotModified( xhr, s.url ) && "notmodified" ||
-					"success";
-
-				if ( status == "success" ) {
-					// Watch for, and catch, XML document parse errors
-					try {
-						// process the data (runs the xml through httpData regardless of callback)
-						data = jQuery.httpData( xhr, s.dataType, s.dataFilter );
-					} catch(e) {
-						status = "parsererror";
-					}
-				}
-
-				// Make sure that the request was successful or notmodified
-				if ( status == "success" ) {
-					// Cache Last-Modified header, if ifModified mode.
-					var modRes;
-					try {
-						modRes = xhr.getResponseHeader("Last-Modified");
-					} catch(e) {} // swallow exception thrown by FF if header is not available
-
-					if ( s.ifModified && modRes )
-						jQuery.lastModified[s.url] = modRes;
-
-					// JSONP handles its own success callback
-					if ( !jsonp )
-						success();
-				} else
-					jQuery.handleError(s, xhr, status);
-
-				// Fire the complete handlers
-				complete();
-
-				// Stop memory leaks
-				if ( s.async )
-					xhr = null;
-			}
-		};
-
-		if ( s.async ) {
-			// don't attach the handler to the request, just poll it instead
-			var ival = setInterval(onreadystatechange, 13);
-
-			// Timeout checker
-			if ( s.timeout > 0 )
-				setTimeout(function(){
-					// Check to see if the request is still happening
-					if ( xhr ) {
-						// Cancel the request
-						xhr.abort();
-
-						if( !requestDone )
-							onreadystatechange( "timeout" );
-					}
-				}, s.timeout);
-		}
-
-		// Send the data
-		try {
-			xhr.send(s.data);
-		} catch(e) {
-			jQuery.handleError(s, xhr, null, e);
-		}
-
-		// firefox 1.5 doesn't fire statechange for sync requests
-		if ( !s.async )
-			onreadystatechange();
-
-		function success(){
-			// If a local callback was specified, fire it and pass it the data
-			if ( s.success )
-				s.success( data, status );
-
-			// Fire the global callback
-			if ( s.global )
-				jQuery.event.trigger( "ajaxSuccess", [xhr, s] );
-		}
-
-		function complete(){
-			// Process result
-			if ( s.complete )
-				s.complete(xhr, status);
-
-			// The request was completed
-			if ( s.global )
-				jQuery.event.trigger( "ajaxComplete", [xhr, s] );
-
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active )
-				jQuery.event.trigger( "ajaxStop" );
-		}
-
-		// return XMLHttpRequest to allow aborting the request etc.
-		return xhr;
-	},
-
-	handleError: function( s, xhr, status, e ) {
-		// If a local callback was specified, fire it
-		if ( s.error ) s.error( xhr, status, e );
-
-		// Fire the global callback
-		if ( s.global )
-			jQuery.event.trigger( "ajaxError", [xhr, s, e] );
-	},
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function( xhr ) {
-		try {
-			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-			return !xhr.status && location.protocol == "file:" ||
-				( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223 ||
-				jQuery.browser.safari && xhr.status == undefined;
-		} catch(e){}
-		return false;
-	},
-
-	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function( xhr, url ) {
-		try {
-			var xhrRes = xhr.getResponseHeader("Last-Modified");
-
-			// Firefox always returns 200. check Last-Modified date
-			return xhr.status == 304 || xhrRes == jQuery.lastModified[url] ||
-				jQuery.browser.safari && xhr.status == undefined;
-		} catch(e){}
-		return false;
-	},
-
-	httpData: function( xhr, type, filter ) {
-		var ct = xhr.getResponseHeader("content-type"),
-			xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
-			data = xml ? xhr.responseXML : xhr.responseText;
-
-		if ( xml && data.documentElement.tagName == "parsererror" )
-			throw "parsererror";
-			
-		// Allow a pre-filtering function to sanitize the response
-		if( filter )
-			data = filter( data, type );
-
-		// If the type is "script", eval it in global context
-		if ( type == "script" )
-			jQuery.globalEval( data );
-
-		// Get the JavaScript object, if JSON is used.
-		if ( type == "json" )
-			data = eval("(" + data + ")");
-
-		return data;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a ) {
-		var s = [];
-
-		// If an array was passed in, assume that it is an array
-		// of form elements
-		if ( a.constructor == Array || a.jquery )
-			// Serialize the form elements
-			jQuery.each( a, function(){
-				s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) );
-			});
-
-		// Otherwise, assume that it's an object of key/value pairs
-		else
-			// Serialize the key/values
-			for ( var j in a )
-				// If the value is an array then the key names need to be repeated
-				if ( a[j] && a[j].constructor == Array )
-					jQuery.each( a[j], function(){
-						s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
-					});
-				else
-					s.push( encodeURIComponent(j) + "=" + encodeURIComponent( jQuery.isFunction(a[j]) ? a[j]() : a[j] ) );
-
-		// Return the resulting serialization
-		return s.join("&").replace(/%20/g, "+");
-	}
-
-});
-jQuery.fn.extend({
-	show: function(speed,callback){
-		return speed ?
-			this.animate({
-				height: "show", width: "show", opacity: "show"
-			}, speed, callback) :
-
-			this.filter(":hidden").each(function(){
-				this.style.display = this.oldblock || "";
-				if ( jQuery.css(this,"display") == "none" ) {
-					var elem = jQuery("<" + this.tagName + " />").appendTo("body");
-					this.style.display = elem.css("display");
-					// handle an edge condition where css is - div { display:none; } or similar
-					if (this.style.display == "none")
-						this.style.display = "block";
-					elem.remove();
-				}
-			}).end();
-	},
-
-	hide: function(speed,callback){
-		return speed ?
-			this.animate({
-				height: "hide", width: "hide", opacity: "hide"
-			}, speed, callback) :
-
-			this.filter(":visible").each(function(){
-				this.oldblock = this.oldblock || jQuery.css(this,"display");
-				this.style.display = "none";
-			}).end();
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-
-	toggle: function( fn, fn2 ){
-		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
-			this._toggle.apply( this, arguments ) :
-			fn ?
-				this.animate({
-					height: "toggle", width: "toggle", opacity: "toggle"
-				}, fn, fn2) :
-				this.each(function(){
-					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
-				});
-	},
-
-	slideDown: function(speed,callback){
-		return this.animate({height: "show"}, speed, callback);
-	},
-
-	slideUp: function(speed,callback){
-		return this.animate({height: "hide"}, speed, callback);
-	},
-
-	slideToggle: function(speed, callback){
-		return this.animate({height: "toggle"}, speed, callback);
-	},
-
-	fadeIn: function(speed, callback){
-		return this.animate({opacity: "show"}, speed, callback);
-	},
-
-	fadeOut: function(speed, callback){
-		return this.animate({opacity: "hide"}, speed, callback);
-	},
-
-	fadeTo: function(speed,to,callback){
-		return this.animate({opacity: to}, speed, callback);
-	},
-
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed(speed, easing, callback);
-
-		return this[ optall.queue === false ? "each" : "queue" ](function(){
-			if ( this.nodeType != 1)
-				return false;
-
-			var opt = jQuery.extend({}, optall), p,
-				hidden = jQuery(this).is(":hidden"), self = this;
-
-			for ( p in prop ) {
-				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
-					return opt.complete.call(this);
-
-				if ( p == "height" || p == "width" ) {
-					// Store display property
-					opt.display = jQuery.css(this, "display");
-
-					// Make sure that nothing sneaks out
-					opt.overflow = this.style.overflow;
-				}
-			}
-
-			if ( opt.overflow != null )
-				this.style.overflow = "hidden";
-
-			opt.curAnim = jQuery.extend({}, prop);
-
-			jQuery.each( prop, function(name, val){
-				var e = new jQuery.fx( self, opt, name );
-
-				if ( /toggle|show|hide/.test(val) )
-					e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
-				else {
-					var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
-						start = e.cur(true) || 0;
-
-					if ( parts ) {
-						var end = parseFloat(parts[2]),
-							unit = parts[3] || "px";
-
-						// We need to compute starting value
-						if ( unit != "px" ) {
-							self.style[ name ] = (end || 1) + unit;
-							start = ((end || 1) / e.cur(true)) * start;
-							self.style[ name ] = start + unit;
-						}
-
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] )
-							end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
-
-						e.custom( start, end, unit );
-					} else
-						e.custom( start, val, "" );
-				}
-			});
-
-			// For JS strict compliance
-			return true;
-		});
-	},
-
-	queue: function(type, fn){
-		if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
-			fn = type;
-			type = "fx";
-		}
-
-		if ( !type || (typeof type == "string" && !fn) )
-			return queue( this[0], type );
-
-		return this.each(function(){
-			if ( fn.constructor == Array )
-				queue(this, type, fn);
-			else {
-				queue(this, type).push( fn );
-
-				if ( queue(this, type).length == 1 )
-					fn.call(this);
-			}
-		});
-	},
-
-	stop: function(clearQueue, gotoEnd){
-		var timers = jQuery.timers;
-
-		if (clearQueue)
-			this.queue([]);
-
-		this.each(function(){
-			// go in reverse order so anything added to the queue during the loop is ignored
-			for ( var i = timers.length - 1; i >= 0; i-- )
-				if ( timers[i].elem == this ) {
-					if (gotoEnd)
-						// force the next step to be the last
-						timers[i](true);
-					timers.splice(i, 1);
-				}
-		});
-
-		// start the next in the queue if the last step wasn't forced
-		if (!gotoEnd)
-			this.dequeue();
-
-		return this;
-	}
-
-});
-
-var queue = function( elem, type, array ) {
-	if ( elem ){
-
-		type = type || "fx";
-
-		var q = jQuery.data( elem, type + "queue" );
-
-		if ( !q || array )
-			q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) );
-
-	}
-	return q;
-};
-
-jQuery.fn.dequeue = function(type){
-	type = type || "fx";
-
-	return this.each(function(){
-		var q = queue(this, type);
-
-		q.shift();
-
-		if ( q.length )
-			q[0].call( this );
-	});
-};
-
-jQuery.extend({
-
-	speed: function(speed, easing, fn) {
-		var opt = speed && speed.constructor == Object ? speed : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && easing.constructor != Function && easing
-		};
-
-		opt.duration = (opt.duration && opt.duration.constructor == Number ?
-			opt.duration :
-			jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds.def;
-
-		// Queueing
-		opt.old = opt.complete;
-		opt.complete = function(){
-			if ( opt.queue !== false )
-				jQuery(this).dequeue();
-			if ( jQuery.isFunction( opt.old ) )
-				opt.old.call( this );
-		};
-
-		return opt;
-	},
-
-	easing: {
-		linear: function( p, n, firstNum, diff ) {
-			return firstNum + diff * p;
-		},
-		swing: function( p, n, firstNum, diff ) {
-			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
-		}
-	},
-
-	timers: [],
-	timerId: null,
-
-	fx: function( elem, options, prop ){
-		this.options = options;
-		this.elem = elem;
-		this.prop = prop;
-
-		if ( !options.orig )
-			options.orig = {};
-	}
-
-});
-
-jQuery.fx.prototype = {
-
-	// Simple function for setting a style value
-	update: function(){
-		if ( this.options.step )
-			this.options.step.call( this.elem, this.now, this );
-
-		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-
-		// Set display property to block for height/width animations
-		if ( this.prop == "height" || this.prop == "width" )
-			this.elem.style.display = "block";
-	},
-
-	// Get the current size
-	cur: function(force){
-		if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
-			return this.elem[ this.prop ];
-
-		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
-		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
-	},
-
-	// Start an animation from one number to another
-	custom: function(from, to, unit){
-		this.startTime = now();
-		this.start = from;
-		this.end = to;
-		this.unit = unit || this.unit || "px";
-		this.now = this.start;
-		this.pos = this.state = 0;
-		this.update();
-
-		var self = this;
-		function t(gotoEnd){
-			return self.step(gotoEnd);
-		}
-
-		t.elem = this.elem;
-
-		jQuery.timers.push(t);
-
-		if ( jQuery.timerId == null ) {
-			jQuery.timerId = setInterval(function(){
-				var timers = jQuery.timers;
-
-				for ( var i = 0; i < timers.length; i++ )
-					if ( !timers[i]() )
-						timers.splice(i--, 1);
-
-				if ( !timers.length ) {
-					clearInterval( jQuery.timerId );
-					jQuery.timerId = null;
-				}
-			}, 13);
-		}
-	},
-
-	// Simple 'show' function
-	show: function(){
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		this.custom(0, this.cur());
-
-		// Make sure that we start at a small width/height to avoid any
-		// flash of content
-		if ( this.prop == "width" || this.prop == "height" )
-			this.elem.style[this.prop] = "1px";
-
-		// Start by showing the element
-		jQuery(this.elem).show();
-	},
-
-	// Simple 'hide' function
-	hide: function(){
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom(this.cur(), 0);
-	},
-
-	// Each step of an animation
-	step: function(gotoEnd){
-		var t = now();
-
-		if ( gotoEnd || t > this.options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			this.options.curAnim[ this.prop ] = true;
-
-			var done = true;
-			for ( var i in this.options.curAnim )
-				if ( this.options.curAnim[i] !== true )
-					done = false;
-
-			if ( done ) {
-				if ( this.options.display != null ) {
-					// Reset the overflow
-					this.elem.style.overflow = this.options.overflow;
-
-					// Reset the display
-					this.elem.style.display = this.options.display;
-					if ( jQuery.css(this.elem, "display") == "none" )
-						this.elem.style.display = "block";
-				}
-
-				// Hide the element if the "hide" operation was done
-				if ( this.options.hide )
-					this.elem.style.display = "none";
-
-				// Reset the properties, if the item has been hidden or shown
-				if ( this.options.hide || this.options.show )
-					for ( var p in this.options.curAnim )
-						jQuery.attr(this.elem.style, p, this.options.orig[p]);
-			}
-
-			if ( done )
-				// Execute the complete function
-				this.options.complete.call( this.elem );
-
-			return false;
-		} else {
-			var n = t - this.startTime;
-			this.state = n / this.options.duration;
-
-			// Perform the easing function, defaults to swing
-			this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
-			this.now = this.start + ((this.end - this.start) * this.pos);
-
-			// Perform the next step of the animation
-			this.update();
-		}
-
-		return true;
-	}
-
-};
-
-jQuery.extend( jQuery.fx, {
-	speeds:{
-		slow: 600,
- 		fast: 200,
- 		// Default speed
- 		def: 400
-	},
-	step: {
-		scrollLeft: function(fx){
-			fx.elem.scrollLeft = fx.now;
-		},
-
-		scrollTop: function(fx){
-			fx.elem.scrollTop = fx.now;
-		},
-
-		opacity: function(fx){
-			jQuery.attr(fx.elem.style, "opacity", fx.now);
-		},
-
-		_default: function(fx){
-			fx.elem.style[ fx.prop ] = fx.now + fx.unit;
-		}
-	}
-});
-// The Offset Method
-// Originally By Brandon Aaron, part of the Dimension Plugin
-// http://jquery.com/plugins/project/dimensions
-jQuery.fn.offset = function() {
-	var left = 0, top = 0, elem = this[0], results;
-
-	if ( elem ) with ( jQuery.browser ) {
-		var parent       = elem.parentNode,
-		    offsetChild  = elem,
-		    offsetParent = elem.offsetParent,
-		    doc          = elem.ownerDocument,
-		    safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
-		    css          = jQuery.curCSS,
-		    fixed        = css(elem, "position") == "fixed";
-
-		// Use getBoundingClientRect if available
-		if ( elem.getBoundingClientRect ) {
-			var box = elem.getBoundingClientRect();
-
-			// Add the document scroll offsets
-			add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-				box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
-
-			// IE adds the HTML element's border, by default it is medium which is 2px
-			// IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; }
-			// IE 7 standards mode, the border is always 2px
-			// This border/offset is typically represented by the clientLeft and clientTop properties
-			// However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS
-			// Therefore this method will be off by 2px in IE while in quirksmode
-			add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop );
-
-		// Otherwise loop through the offsetParents and parentNodes
-		} else {
-
-			// Initial element offsets
-			add( elem.offsetLeft, elem.offsetTop );
-
-			// Get parent offsets
-			while ( offsetParent ) {
-				// Add offsetParent offsets
-				add( offsetParent.offsetLeft, offsetParent.offsetTop );
-
-				// Mozilla and Safari > 2 does not include the border on offset parents
-				// However Mozilla adds the border for table or table cells
-				if ( mozilla && !/^t(able|d|h)$/i.test(offsetParent.tagName) || safari && !safari2 )
-					border( offsetParent );
-
-				// Add the document scroll offsets if position is fixed on any offsetParent
-				if ( !fixed && css(offsetParent, "position") == "fixed" )
-					fixed = true;
-
-				// Set offsetChild to previous offsetParent unless it is the body element
-				offsetChild  = /^body$/i.test(offsetParent.tagName) ? offsetChild : offsetParent;
-				// Get next offsetParent
-				offsetParent = offsetParent.offsetParent;
-			}
-
-			// Get parent scroll offsets
-			while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
-				// Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
-				if ( !/^inline|table.*$/i.test(css(parent, "display")) )
-					// Subtract parent scroll offsets
-					add( -parent.scrollLeft, -parent.scrollTop );
-
-				// Mozilla does not add the border for a parent that has overflow != visible
-				if ( mozilla && css(parent, "overflow") != "visible" )
-					border( parent );
-
-				// Get next parent
-				parent = parent.parentNode;
-			}
-
-			// Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild
-			// Mozilla doubles body offsets with a non-absolutely positioned offsetChild
-			if ( (safari2 && (fixed || css(offsetChild, "position") == "absolute")) ||
-				(mozilla && css(offsetChild, "position") != "absolute") )
-					add( -doc.body.offsetLeft, -doc.body.offsetTop );
-
-			// Add the document scroll offsets if position is fixed
-			if ( fixed )
-				add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-					Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
-		}
-
-		// Return an object with top and left properties
-		results = { top: top, left: left };
-	}
-
-	function border(elem) {
-		add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
-	}
-
-	function add(l, t) {
-		left += parseInt(l, 10) || 0;
-		top += parseInt(t, 10) || 0;
-	}
-
-	return results;
-};
-
-
-jQuery.fn.extend({
-	position: function() {
-		var left = 0, top = 0, results;
-
-		if ( this[0] ) {
-			// Get *real* offsetParent
-			var offsetParent = this.offsetParent(),
-
-			// Get correct offsets
-			offset       = this.offset(),
-			parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-			// Subtract element margins
-			// note: when an element has margin: auto the offsetLeft and marginLeft 
-			// are the same in Safari causing offset.left to incorrectly be 0
-			offset.top  -= num( this, 'marginTop' );
-			offset.left -= num( this, 'marginLeft' );
-
-			// Add offsetParent borders
-			parentOffset.top  += num( offsetParent, 'borderTopWidth' );
-			parentOffset.left += num( offsetParent, 'borderLeftWidth' );
-
-			// Subtract the two offsets
-			results = {
-				top:  offset.top  - parentOffset.top,
-				left: offset.left - parentOffset.left
-			};
-		}
-
-		return results;
-	},
-
-	offsetParent: function() {
-		var offsetParent = this[0].offsetParent;
-		while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
-			offsetParent = offsetParent.offsetParent;
-		return jQuery(offsetParent);
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( ['Left', 'Top'], function(i, name) {
-	var method = 'scroll' + name;
-	
-	jQuery.fn[ method ] = function(val) {
-		if (!this[0]) return;
-
-		return val != undefined ?
-
-			// Set the scroll offset
-			this.each(function() {
-				this == window || this == document ?
-					window.scrollTo(
-						!i ? val : jQuery(window).scrollLeft(),
-						 i ? val : jQuery(window).scrollTop()
-					) :
-					this[ method ] = val;
-			}) :
-
-			// Return the scroll offset
-			this[0] == window || this[0] == document ?
-				self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
-					jQuery.boxModel && document.documentElement[ method ] ||
-					document.body[ method ] :
-				this[0][ method ];
-	};
-});
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function(i, name){
-
-	var tl = i ? "Left"  : "Top",  // top or left
-		br = i ? "Right" : "Bottom"; // bottom or right
-
-	// innerHeight and innerWidth
-	jQuery.fn["inner" + name] = function(){
-		return this[ name.toLowerCase() ]() +
-			num(this, "padding" + tl) +
-			num(this, "padding" + br);
-	};
-
-	// outerHeight and outerWidth
-	jQuery.fn["outer" + name] = function(margin) {
-		return this["inner" + name]() +
-			num(this, "border" + tl + "Width") +
-			num(this, "border" + br + "Width") +
-			(margin ?
-				num(this, "margin" + tl) + num(this, "margin" + br) : 0);
-	};
-
-});})();
Index: public/js/jquery.timers.js
===================================================================
--- public/js/jquery.timers.js	(revision 6370)
+++ public/js/jquery.timers.js	(working copy)
@@ -1,142 +0,0 @@
-jQuery.fn.extend({
-	everyTime: function(interval, label, fn, times, belay) {
-		return this.each(function() {
-			jQuery.timer.add(this, interval, label, fn, times, belay);
-		});
-	},
-	oneTime: function(interval, label, fn) {
-		return this.each(function() {
-			jQuery.timer.add(this, interval, label, fn, 1);
-		});
-	},
-	stopTime: function(label, fn) {
-		return this.each(function() {
-			jQuery.timer.remove(this, label, fn);
-		});
-	}
-});
-
-jQuery.extend({
-	timer: {
-		guid: 1,
-		global: {},
-		regex: /^([0-9]+)\s*(.*s)?$/,
-		powers: {
-			// Yeah this is major overkill...
-			'ms': 1,
-			'cs': 10,
-			'ds': 100,
-			's': 1000,
-			'das': 10000,
-			'hs': 100000,
-			'ks': 1000000
-		},
-		timeParse: function(value) {
-			if (value == undefined || value == null)
-				return null;
-			var result = this.regex.exec(jQuery.trim(value.toString()));
-			if (result[2]) {
-				var num = parseInt(result[1], 10);
-				var mult = this.powers[result[2]] || 1;
-				return num * mult;
-			} else {
-				return value;
-			}
-		},
-		add: function(element, interval, label, fn, times, belay) {
-			var counter = 0;
-			
-			if (jQuery.isFunction(label)) {
-				if (!times) 
-					times = fn;
-				fn = label;
-				label = interval;
-			}
-			
-			interval = jQuery.timer.timeParse(interval);
-
-			if (typeof interval != 'number' || isNaN(interval) || interval <= 0)
-				return;
-
-			if (times && times.constructor != Number) {
-				belay = !!times;
-				times = 0;
-			}
-			
-			times = times || 0;
-			belay = belay || false;
-			
-			if (!element.$timers) 
-				element.$timers = {};
-			
-			if (!element.$timers[label])
-				element.$timers[label] = {};
-			
-			fn.$timerID = fn.$timerID || this.guid++;
-			
-			var handler = function() {
-				if (belay && this.inProgress) 
-					return;
-				this.inProgress = true;
-				if ((++counter > times && times !== 0) || fn.call(element, counter) === false)
-					jQuery.timer.remove(element, label, fn);
-				this.inProgress = false;
-			};
-			
-			handler.$timerID = fn.$timerID;
-			
-			if (!element.$timers[label][fn.$timerID]) 
-				element.$timers[label][fn.$timerID] = window.setInterval(handler,interval);
-			
-			if ( !this.global[label] )
-				this.global[label] = [];
-			this.global[label].push( element );
-			
-		},
-		remove: function(element, label, fn) {
-			var timers = element.$timers, ret;
-			
-			if ( timers ) {
-				
-				if (!label) {
-					for ( label in timers )
-						this.remove(element, label, fn);
-				} else if ( timers[label] ) {
-					if ( fn ) {
-						if ( fn.$timerID ) {
-							window.clearInterval(timers[label][fn.$timerID]);
-							delete timers[label][fn.$timerID];
-						}
-					} else {
-						for ( var fn in timers[label] ) {
-							window.clearInterval(timers[label][fn]);
-							delete timers[label][fn];
-						}
-					}
-					
-					for ( ret in timers[label] ) break;
-					if ( !ret ) {
-						ret = null;
-						delete timers[label];
-					}
-				}
-				
-				for ( ret in timers ) break;
-				if ( !ret ) 
-					element.$timers = null;
-			}
-		}
-	}
-});
-
-if (jQuery.browser.msie)
-	jQuery(window).one("unload", function() {
-		var global = jQuery.timer.global;
-		for ( var label in global ) {
-			var els = global[label], i = els.length;
-			while ( --i )
-				jQuery.timer.remove(els[i], label);
-		}
-	});
-
-
